diff --git a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java index bc2265bf6..1dfa11638 100644 --- a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java +++ b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java @@ -51,7 +51,7 @@ import org.antlr.v4.parse.ANTLRParser.throwsSpec_return; public class JavaTXCompiler { final CompilationEnvironment environment; - Boolean resultmodel = false; + Boolean resultmodel = true; public final Map sourceFiles = new HashMap<>(); Boolean log = true; //gibt an ob ein Log-File nach System.getProperty("user.dir")+"src/test/java/logFiles" geschrieben werden soll? @@ -550,8 +550,8 @@ public class JavaTXCompiler { } /* UnifyResultModel End */ else { - //Set> result = unify.unify(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure)); - Set> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure)); + Set> result = unify.unify(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure)); + //Set> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure)); System.out.println("RESULT: " + result); logFile.write("RES: " + result.toString()+"\n"); logFile.flush(); diff --git a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java index d726544ed..3feed6cc1 100644 --- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java +++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java @@ -959,6 +959,7 @@ public class TypeUnifyTask extends RecursiveTask>> { noOfThread--; writeLog("wait "+ forkOrig.thNo); res = forkOrig.join(); + forkOrig.writeLog("final Orig 1"); //Set> fork_res = forkOrig.join(); writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString()); //noOfThread--; an das Ende von compute verschoben @@ -978,6 +979,7 @@ public class TypeUnifyTask extends RecursiveTask>> { if (!isUndefinedPairSetSet(fork_res)) { aParDef.add(fork.getNextSetElement()); } + fork.writeLog("final 1"); }; } noOfThread++; @@ -1019,6 +1021,7 @@ public class TypeUnifyTask extends RecursiveTask>> { noOfThread--; writeLog("wait "+ forkOrig.thNo); res = forkOrig.join(); + forkOrig.writeLog("final Orig -1"); //Set> fork_res = forkOrig.join(); writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString()); //noOfThread--; an das Ende von compute verschoben @@ -1038,6 +1041,7 @@ public class TypeUnifyTask extends RecursiveTask>> { if (!isUndefinedPairSetSet(fork_res)) { aParDef.add(fork.getNextSetElement()); } + fork.writeLog("final -1"); }; } noOfThread++; @@ -1078,6 +1082,7 @@ public class TypeUnifyTask extends RecursiveTask>> { noOfThread--; writeLog("wait "+ forkOrig.thNo); res = forkOrig.join(); + forkOrig.writeLog("final Orig 2"); //Set> fork_res = forkOrig.join(); writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString()); //noOfThread--; an das Ende von compute verschoben @@ -1091,6 +1096,7 @@ public class TypeUnifyTask extends RecursiveTask>> { writeLog("Join " + new Integer(fork.thNo).toString()); //noOfThread--; an das Ende von compute verschoben add_res.add(fork_res); + fork.writeLog("final 2"); }; } noOfThread++;