From 362e797b100f30541090dcff55aae6a2df32bdfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Tue, 19 Feb 2019 17:51:11 +0100
Subject: [PATCH] 	modified:  
 ../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java 	modified:  
 ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java

---
 src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java     | 6 +++---
 .../de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

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<File, SourceFile> 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<Set<UnifyPair>> result = unify.unify(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure));
-				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure));
+				Set<Set<UnifyPair>> result = unify.unify(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure));
+				//Set<Set<UnifyPair>> 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<Set<Set<UnifyPair>>>  {
 					noOfThread--;
 					writeLog("wait "+ forkOrig.thNo);
 					res = forkOrig.join();
+					forkOrig.writeLog("final Orig 1");
 					//Set<Set<UnifyPair>> 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<Set<Set<UnifyPair>>>  {
 						if (!isUndefinedPairSetSet(fork_res)) {
 							aParDef.add(fork.getNextSetElement());
 						}
+						fork.writeLog("final 1");
 					};
 				}
 				noOfThread++;
@@ -1019,6 +1021,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					noOfThread--;
 					writeLog("wait "+ forkOrig.thNo);
 					res = forkOrig.join();
+					forkOrig.writeLog("final Orig -1");
 					//Set<Set<UnifyPair>> 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<Set<Set<UnifyPair>>>  {
 						if (!isUndefinedPairSetSet(fork_res)) {
 							aParDef.add(fork.getNextSetElement());
 						}
+						fork.writeLog("final -1");
 					};
 				}
 				noOfThread++;
@@ -1078,6 +1082,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    		noOfThread--;
 		    		writeLog("wait "+ forkOrig.thNo);
 					res = forkOrig.join();
+					forkOrig.writeLog("final Orig 2");
 					//Set<Set<UnifyPair>> 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<Set<Set<UnifyPair>>>  {
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben 
 						add_res.add(fork_res);
+						fork.writeLog("final 2");
 					};
 				} 
 		    	noOfThread++;