added unifyTest

src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java

@@ -9,6 +9,7 @@ import java.util.Optional;
 import java.util.Queue;
 import java.util.Set;
 import java.util.Stack;
+import java.util.concurrent.ForkJoinPool;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -48,7 +49,7 @@ public class RuleSet implements IRuleSet{
 	
 	public RuleSet() {
 		super();
-		logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()));
+		logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()), ForkJoinPool.commonPool());
 	}
 	
 	RuleSet(WriterActiveObject logFile) {

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java

@@ -24,8 +24,8 @@ public class TypeUnify {
 	 * @return
 	 */
 	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile), log, 0, ret, usedTasks);
-		ForkJoinPool pool = new ForkJoinPool();
+		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, usedTasks, pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -50,8 +50,8 @@ public class TypeUnify {
 	 * @return
 	 */
 	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile), log, 0, ret, usedTasks);
-		ForkJoinPool pool = new ForkJoinPool();
+		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, usedTasks, pool);
 		pool.invoke(unifyTask);
 		return ret;
 	}
@@ -68,9 +68,10 @@ public class TypeUnify {
 	 * @return
 	 */
 	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
 		TypeUnifyTask unifyTask = //new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile), log, 0, ret, usedTasks, statistics);
-		ForkJoinPool pool = new ForkJoinPool();
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, usedTasks, pool, statistics);
+
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -104,7 +105,7 @@ public class TypeUnify {
 	 * @return
 	 */
 	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, new WriterActiveObject(logFile), log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, new WriterActiveObject(logFile, ForkJoinPool.commonPool()), log, 0, ret, usedTasks, ForkJoinPool.commonPool());
 		unifyTask.statisticsFile = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ForkJoinPool;
 
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
@@ -20,17 +21,17 @@ public class TypeUnify2Task extends TypeUnifyTask {
        Set<UnifyPair> methodSignatureConstraintUebergabe;
 
        //statistics
-       TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, 
-    		   List<Set<Constraint<UnifyPair>>> oderConstraints, 
-    		   Set<UnifyPair> nextSetElement, 
-    		   IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks,
-    		   Set<UnifyPair> methodSignatureConstraintUebergabe, Writer statistics) {
-    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraintUebergabe );
+       TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq,
+                      List<Set<Constraint<UnifyPair>>> oderConstraints,
+                      Set<UnifyPair> nextSetElement,
+                      IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks,
+                      Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool, Writer statistics) {
+    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraintUebergabe, pool );
     	   
        }
        
-       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe) {
-               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool) {
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, pool);
                this.setToFlatten = setToFlatten;
                this.nextSetElement = nextSetElement;
                this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
@@ -64,6 +65,10 @@ public class TypeUnify2Task extends TypeUnifyTask {
        	}
        
        public void closeLogFile() {
-           logFile.close();
+           if(parallel){
+               logFile.close();
+           }else{
+               logFile.closeNonThreaded();
+           }
        }
 }

src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java

@@ -13,6 +13,7 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.RecursiveTask;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
@@ -42,6 +43,7 @@ import de.dhbwstuttgart.typeinference.unify.model.UnifyType;
 import de.dhbwstuttgart.typeinference.unify.model.WildcardType;
 import de.dhbwstuttgart.util.Pair;
 import de.dhbwstuttgart.typeinference.unify.model.OrderingUnifyPair;
+import org.apache.commons.io.output.NullWriter;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -78,6 +80,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 
 	public static final String rootDirectory = System.getProperty("user.dir")+"/test/logFiles/";
 	protected WriterActiveObject logFile;
+	protected ForkJoinPool pool;
 	/**
 	 * The implementation of setOps that will be used during the unification
 	 */
@@ -126,7 +129,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	volatile UnifyTaskModel usedTasks;
 	
-	static Writer statisticsFile;
+	static Writer statisticsFile = new NullWriter();
 	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
@@ -147,11 +150,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	*/
 	
 	//statistics
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Writer statisticsFile) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks);
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, ForkJoinPool pool, Writer statisticsFile) {
+		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks, pool);
 		this.statisticsFile = statisticsFile;
 	}
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, ForkJoinPool pool) {
 			this.eq = eq;
 			//this.oderConstraints = oderConstraints.stream().map(x -> x.stream().map(y -> new HashSet<>(y)).collect(Collectors.toSet(HashSet::new))).collect(Collectors.toList(ArrayList::new));
 			this.oderConstraintsField = oderConstraints; /*.stream().map(x -> {
@@ -170,6 +173,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			this.parallel = parallel;
 			this.logFile = logFile;
 			this.log = log;
+			this.pool = pool;
 			
 			noOfThread++; 
 			totalnoOfThread++;
@@ -178,11 +182,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			writeLog("thNo2 " + thNo);
 			try {
 				if(log){
-					this.logFile = new WriterActiveObject(new FileWriter(new File(System.getProperty("user.dir") + "/logFiles/" + "Thread_"+thNo)));
+					this.logFile = new WriterActiveObject(new FileWriter(new File(System.getProperty("user.dir") + "/logFiles/" + "Thread_"+thNo)), pool);
 				}else{
-					this.logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()));
+					this.logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()), pool);
 				}
-				logFile.write("");
 			}
 			catch (IOException e) { 
 				System.err.println("log-File nicht vorhanden");
@@ -264,7 +267,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefeField, new HashSet<>());
 		noOfThread--;
 
-		logFile.close();
+		if(parallel){
+			logFile.close();
+		}else{
+			logFile.closeNonThreaded();
+		}
 
 		if (isUndefinedPairSetSet(res)) { 
 			//fuer debug-Zwecke
@@ -375,8 +382,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		
 		eq0.forEach(x -> x.disableCondWildcards());
 		
-		writeLog(nOfUnify.toString() + " Unifikation nach applyTypeUnificationRules: " + eq.toString());
-        writeLog(nOfUnify.toString() + " Oderconstraints nach applyTypeUnificationRules: " + oderConstraints.toString());
+		writeLog(nOfUnify.toString() + " Unifikation nach applyTypeUnificationRules: " + eq.toString() + "\n"
+				+ nOfUnify.toString() + " Oderconstraints nach applyTypeUnificationRules: " + oderConstraints.toString());
 
 		/*
 		 * Step 2 and 3: Create a subset eq1s of pairs where both sides are TPH and eq2s of the other pairs
@@ -435,8 +442,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		if(!undefinedPairs.isEmpty()) {
 			noUndefPair++;
 			for (UnifyPair up : undefinedPairs) {
-				writeLog(noUndefPair.toString() + " UndefinedPairs; " + up);
-				writeLog("BasePair; " + up.getBasePair());
+				writeLog(noUndefPair.toString() + " UndefinedPairs; " + up + "\n"
+					+ "BasePair; " + up.getBasePair());
 			}
 			Set<Set<UnifyPair>> error = new HashSet<>();
 			undefinedPairs = undefinedPairs.stream().map(x -> { x.setUndefinedPair(); return x;}).collect(Collectors.toCollection(HashSet::new));
@@ -803,8 +810,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			 */
 			List<Set<UnifyPair>> nextSetasListOderConstraints = new ArrayList<>();
 			
-			writeLog("nextSet: " + nextSet.toString());
-			writeLog("nextSetasList: " + nextSetasList.toString());
+			writeLog("nextSet: " + nextSet.toString() + "\n"
+				+ "nextSetasList: " + nextSetasList.toString());
 			
 			/* staistics Nextvar an Hand Varianzbestimmung auskommentieren Anfang 
 			if (variance == 1) {
@@ -922,7 +929,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				newElemsOrig.add(a);
 				
 				/* FORK ANFANG */
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint, this.pool);
 				//forks.add(forkOrig);
 				synchronized(usedTasks) {
 					if (this.myIsCancelled()) {
@@ -931,16 +938,15 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					forkOrig.fork();
 				}
 				/* FORK ENDE */
-				
-				synchronized (this) {
-					writeLog("a in " + variance + " "+ a);
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
-				}
+
+				writeLog("a in " + variance + " "+ a + "\n" +
+				"nextSetasListRest: " + nextSetasListRest.toString());
+
 				while (!nextSetasList.isEmpty()) {
 					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					synchronized (this) { //nextSetasList.remove(nSaL);
-						writeLog("1 RM" + nSaL.toString());
-					}
+					//nextSetasList.remove(nSaL);
+					writeLog("1 RM" + nSaL.toString());
+
 					
 					if (!oderConstraint) {
 						
@@ -960,7 +966,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 					List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint), this.pool);
 					forks.add(fork);
 					synchronized(usedTasks) {
 						if (this.myIsCancelled()) {
@@ -972,47 +978,44 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
 				/* FORK ANFANG */
-				synchronized (this) {
-					writeLog("wait "+ forkOrig.thNo);
+
+				writeLog("wait "+ forkOrig.thNo);
+				noOfThread--;
+				res = forkOrig.join();
+				synchronized (usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
+				}
+				//noOfThread++;
+				forkOrig.writeLog("final Orig 1");
+				forkOrig.closeLogFile();
+				//Set<Set<UnifyPair>> fork_res = forkOrig.join();
+				writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
+				//noOfThread--; an das Ende von compute verschoben
+				//add_res.add(fork_res);
+				/* FORK ENDE */
+				
+				forks.forEach(x -> writeLog("wait: " + x.thNo));
+				for(TypeUnify2Task fork : forks) {
 					noOfThread--;
-					res = forkOrig.join();
+					Set<Set<UnifyPair>> fork_res = fork.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
 							return new HashSet<>();
 						}
 					}
 					//noOfThread++;
-					forkOrig.writeLog("final Orig 1");
-					forkOrig.closeLogFile();
-					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
-					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
-					//noOfThread--; an das Ende von compute verschoben 
-					//add_res.add(fork_res);
-				};
-				/* FORK ENDE */
-				
-				forks.forEach(x -> writeLog("wait: " + x.thNo));
-				for(TypeUnify2Task fork : forks) {
-					synchronized (this) {
-						noOfThread--;
-						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
-						//noOfThread++;
-						writeLog("Join " + new Integer(fork.thNo).toString());
-						//noOfThread--; an das Ende von compute verschoben
-						writeLog("fork_res: " + fork_res.toString());
-						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
-						add_res.add(fork_res);
-						if (!isUndefinedPairSetSet(fork_res)) {
-							aParDef.add(fork.getNextSetElement());
-						}
-						fork.writeLog("final 1");
-						fork.closeLogFile();
-					};
+					//noOfThread--; an das Ende von compute verschoben
+					writeLog("Join " + new Integer(fork.thNo).toString() + "\n" +
+					"fork_res: " + fork_res.toString() + "\n" +
+					new Boolean((isUndefinedPairSetSet(fork_res))).toString());
+					add_res.add(fork_res);
+					if (!isUndefinedPairSetSet(fork_res)) {
+						aParDef.add(fork.getNextSetElement());
+					}
+					fork.writeLog("final 1");
+					fork.closeLogFile();
 				}
 				//noOfThread++;
 			} else {
@@ -1024,7 +1027,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				newElemsOrig.add(a);
 				
 				/* FORK ANFANG */
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint), this.pool);
 				//forks.add(forkOrig);
 				synchronized(usedTasks) {
 					if (this.myIsCancelled()) {
@@ -1034,15 +1037,14 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				/* FORK ENDE */
 				
-				synchronized (this) {
-					writeLog("a in " + variance + " "+ a);
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
-				}
+
+				writeLog("a in " + variance + " "+ a + "\n" +
+						"nextSetasListRest: " + nextSetasListRest.toString());
+
 				while (!nextSetasList.isEmpty()) {
 					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					synchronized (this) { //nextSetasList.remove(nSaL);
-						writeLog("-1 RM" + nSaL.toString());
-					}
+					//nextSetasList.remove(nSaL);
+					writeLog("-1 RM" + nSaL.toString());
 					
 					if (!oderConstraint) {
 						/* statistics sameEq wird nicht betrachtet ANGFANG
@@ -1061,7 +1063,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 					List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint), this.pool);
 					forks.add(fork);
 					synchronized(usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1073,48 +1075,45 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
 				/* FORK ANFANG */
-				synchronized (this) {
-					writeLog("wait "+ forkOrig.thNo);
+				writeLog("wait "+ forkOrig.thNo);
+				noOfThread--;
+				res = forkOrig.join();
+				synchronized (usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
+				}
+				//noOfThread++;
+				forkOrig.writeLog("final Orig -1");
+				forkOrig.closeLogFile();
+				//Set<Set<UnifyPair>> fork_res = forkOrig.join();
+				writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
+				//noOfThread--; an das Ende von compute verschoben
+				//add_res.add(fork_res);
+				/* FORK ENDE */
+				
+				forks.forEach(x -> writeLog("wait: " + x.thNo));
+				for(TypeUnify2Task fork : forks) {
 					noOfThread--;
-					res = forkOrig.join();
+					Set<Set<UnifyPair>> fork_res = fork.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
 							return new HashSet<>();
 						}
 					}
 					//noOfThread++;
-					forkOrig.writeLog("final Orig -1");
-					forkOrig.closeLogFile();
-					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
-					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
-					//noOfThread--; an das Ende von compute verschoben 
-					//add_res.add(fork_res);
+					writeLog("Join " + new Integer(fork.thNo).toString());
+					//noOfThread--; an das Ende von compute verschoben
+					writeLog("fork_res: " + fork_res.toString());
+					writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
+					add_res.add(fork_res);
+					if (!isUndefinedPairSetSet(fork_res)) {
+						aParDef.add(fork.getNextSetElement());
+					}
+					fork.writeLog("final -1");
+					fork.closeLogFile();
 				};
-				/* FORK ENDE */
-				
-				forks.forEach(x -> writeLog("wait: " + x.thNo));
-				for(TypeUnify2Task fork : forks) {
-					synchronized (this) {
-						noOfThread--;
-						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
-						//noOfThread++;
-						writeLog("Join " + new Integer(fork.thNo).toString());
-						//noOfThread--; an das Ende von compute verschoben 
-						writeLog("fork_res: " + fork_res.toString());
-						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
-						add_res.add(fork_res);
-						if (!isUndefinedPairSetSet(fork_res)) {
-							aParDef.add(fork.getNextSetElement());
-						}
-						fork.writeLog("final -1");
-						fork.closeLogFile();
-					};
-				}
+
 				//noOfThread++;
 		    } else {
 		    if(parallel && (variance == 2) && noOfThread <= MaxNoOfThreads) {
@@ -1126,7 +1125,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	newElemsOrig.add(a);
 				
 				/* FORK ANFANG */
-		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
+		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint), this.pool);
 		    	//forks.add(forkOrig);
 		    	synchronized(usedTasks) {
 					if (this.myIsCancelled()) {
@@ -1135,11 +1134,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					forkOrig.fork();
 		    	}
 		    	/* FORK ENDE */
-		    	
-		    	synchronized (this) {
-					writeLog("a in " + variance + " "+ a);
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
-				}
+
+				writeLog("a in " + variance + " "+ a + "\n" +
+					"nextSetasListRest: " + nextSetasListRest.toString());
+
 		    	while (!nextSetasList.isEmpty()) {
 		    		Set<UnifyPair> nSaL = nextSetasList.remove(0);
 		    		//nextSetasList.remove(nSaL); //PL einkommentiert 20-02-03
@@ -1147,7 +1145,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    		Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 		    		List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 		    		newElems.add(nSaL);
-		    		TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint);
+		    		TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint, this.pool);
 		    		forks.add(fork);
 		    		synchronized(usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1159,41 +1157,39 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 		    	
 		    	/* FORK ANFANG */
-		    	synchronized (this) {
-		    		writeLog("wait "+ forkOrig.thNo);
-		    		noOfThread--;
-					res = forkOrig.join();
+
+				writeLog("wait "+ forkOrig.thNo);
+				noOfThread--;
+				res = forkOrig.join();
+				synchronized (usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
+				}
+				//noOfThread++;
+				forkOrig.writeLog("final Orig 2");
+				forkOrig.closeLogFile();
+				//Set<Set<UnifyPair>> fork_res = forkOrig.join();
+				writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
+				//noOfThread--; an das Ende von compute verschoben
+				//add_res.add(fork_res); //vermutlich falsch
+
+				/* FORK ENDE */
+		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
+		    	for(TypeUnify2Task fork : forks) {
+					noOfThread--;
+					Set<Set<UnifyPair>> fork_res = fork.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
 							return new HashSet<>();
 						}
 					}
 					//noOfThread++;
-					forkOrig.writeLog("final Orig 2");
-					forkOrig.closeLogFile();
-					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
-					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
-					//noOfThread--; an das Ende von compute verschoben 
-					//add_res.add(fork_res); //vermutlich falsch
-				};
-				/* FORK ENDE */
-		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
-		    	for(TypeUnify2Task fork : forks) {
-		    		synchronized (this) {
-		    			noOfThread--;
-						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
-						//noOfThread++;
-						writeLog("Join " + new Integer(fork.thNo).toString());
-						//noOfThread--; an das Ende von compute verschoben 
-						add_res.add(fork_res);
-						fork.writeLog("final 2");
-						fork.closeLogFile();
-					};
+					writeLog("Join " + new Integer(fork.thNo).toString());
+					//noOfThread--; an das Ende von compute verschoben
+					add_res.add(fork_res);
+					fork.writeLog("final 2");
+					fork.closeLogFile();
 				} 
 		    	//noOfThread++;	
 		    } else {//parallel = false oder MaxNoOfThreads ist erreicht, sequentiell weiterarbeiten
@@ -1522,15 +1518,15 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				//NOCH NICHT korrekt PL 2018-10-12
 				//nextSetasList = nextSetasList.stream().filter(y -> couldBecorrect(reducedUndefResSubstGroundedBasePair, y))
 				//			.collect(Collectors.toCollection(ArrayList::new));
-				writeLog("res (undef): " + res.toString());
-				writeLog("abhSubst: " + abhSubst.toString());
-				writeLog("a2: " + rekTiefe + " " + a.toString());
-				writeLog("Durchschnitt: " + durchschnitt.toString());
-				writeLog("nextSet: " + nextSet.toString());
-				writeLog("nextSetasList: " + nextSetasList.toString());
-				writeLog("Number first erased Elements (undef): " + (len - nofstred));
-				writeLog("Number second erased Elements (undef): " + (nofstred- nextSetasList.size()));
-				writeLog("Number erased Elements (undef): " + (len - nextSetasList.size()));
+				writeLog("res (undef): " + res.toString() + "\n" +
+				"abhSubst: " + abhSubst.toString() + "\n" +
+				"a2: " + rekTiefe + " " + a.toString() + "\n" +
+				"Durchschnitt: " + durchschnitt.toString() + "\n" +
+				"nextSet: " + nextSet.toString() + "\n" +
+				"nextSetasList: " + nextSetasList.toString() + "\n" +
+				"Number first erased Elements (undef): " + (len - nofstred) + "\n" +
+				"Number second erased Elements (undef): " + (nofstred- nextSetasList.size()) + "\n" +
+				"Number erased Elements (undef): " + (len - nextSetasList.size()));
 				noAllErasedElements = noAllErasedElements + (len - nextSetasList.size());
 				writeLog("Number of all erased Elements (undef): " + noAllErasedElements.toString());
 				noBacktracking++;
@@ -1990,10 +1986,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			}
 		}
 		
-		writeLog("eq2s: " + eq2s.toString());
-		writeLog("eq2sAsListFst: " + eq2sAsListFst.toString());
-		writeLog("eq2sAsListSnd: " + eq2sAsListSnd.toString());
-		writeLog("eq2sAsListBack: " + eq2sAsListBack.toString());
+		writeLog("eq2s: " + eq2s.toString() + "\n" +
+		"eq2sAsListFst: " + eq2sAsListFst.toString() + "\n" +
+		"eq2sAsListSnd: " + eq2sAsListSnd.toString() + "\n" +
+		"eq2sAsListBack: " + eq2sAsListBack.toString());
 		
 		eq2sAsList.addAll(eq2sAsListFst);
 		eq2sAsList.addAll(eq2sAsListSnd);
@@ -2599,11 +2595,19 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	void writeLog(String str) {
 		if (log && finalresult) {
-			logFile.write("Thread no.:" + thNo + "\n"
-					+ "noOfThread:" + noOfThread + "\n"
-					+ "parallel:" + parallel + "\n"
-					+ str+"\n\n"
-			);
+			if(parallel){
+				logFile.write("Thread no.:" + thNo + "\n"
+						+ "noOfThread:" + noOfThread + "\n"
+						+ "parallel:" + parallel + "\n"
+						+ str+"\n\n"
+				);
+			}else{
+				logFile.writeNonThreaded("Thread no.:" + thNo + "\n"
+						+ "noOfThread:" + noOfThread + "\n"
+						+ "parallel:" + parallel + "\n"
+						+ str+"\n\n"
+				);
+			}
 		}
 	}
 	

src/main/java/de/dhbwstuttgart/typeinference/unify/WriterActiveObject.java

@@ -6,10 +6,11 @@ import java.util.concurrent.ForkJoinPool;
 
 public class WriterActiveObject {
     private Writer writer;
-    private ForkJoinPool pool = new ForkJoinPool(1, ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
+    private ForkJoinPool pool;
 
-    public WriterActiveObject(Writer writer){
+    public WriterActiveObject(Writer writer, ForkJoinPool pool){
         this.writer = writer;
+        this.pool = pool;
     }
 
     public void close(){
@@ -28,8 +29,25 @@ public class WriterActiveObject {
                 writer.write(message);
                 writer.flush();
             } catch (IOException e) {
-                System.out.println(e.getMessage());
+                throw new RuntimeException(e);
             }
         });
     }
+
+    public void writeNonThreaded(String message){
+        try {
+            writer.write(message);
+            writer.flush();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void closeNonThreaded(){
+        try {
+            writer.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

src/test/java/typeinference/UnifyTest.java

@@ -39,48 +39,58 @@ public class UnifyTest {
 
     public static final String rootDirectory = System.getProperty("user.dir")+"/resources/javFiles/";
 
+    private UnifyPair genPairListOfInteger(String name){
+
+        UnifyType type1 = new PlaceholderType(name);
+        UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("Integer")));
+        UnifyPair pair1 = new UnifyPair(type2, type1, PairOperator.SMALLERDOT);
+
+        return pair1;
+    }
+    private UnifyPair genPairListOfString(String name){
+
+        PlaceholderType type1 = new PlaceholderType(name);
+        UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("String")));
+        UnifyPair pair1 = new UnifyPair(type2, type1, PairOperator.SMALLERDOT);
+
+        return pair1;
+    }
     @Test
     public void unifyTest(){
-        UnifyType type1 = new PlaceholderType("a");
-        UnifyType type2 = new ReferenceType("List", new TypeParams(new PlaceholderType("b")));
-        UnifyPair pair1 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
-
-        type1 = new ReferenceType("List", new TypeParams(new PlaceholderType("c")));
-        type2 = new PlaceholderType("a");
-        UnifyPair pair2 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
-
-        type1 = new ReferenceType("String");
-        type2 = new PlaceholderType("b");
-        UnifyPair pair3 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
-
-        type1 = new ReferenceType("Integer");
-        type2 = new PlaceholderType("c");
-        UnifyPair pair4 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
+        UnifyType type1;
+        UnifyType type2;
 
         Set<UnifyPair> undConstraints = new HashSet<>();
-        undConstraints.add(pair1);
-        undConstraints.add(pair2);
-        undConstraints.add(pair3);
-        undConstraints.add(pair4);
+        undConstraints.add(genPairListOfInteger("a"));
+        undConstraints.add(genPairListOfString("a"));
+
+        undConstraints.add(genPairListOfInteger("b"));
+        undConstraints.add(genPairListOfString("b"));
+        undConstraints.add(genPairListOfInteger("c"));
+        undConstraints.add(genPairListOfString("c"));
+        undConstraints.add(genPairListOfInteger("d"));
+        undConstraints.add(genPairListOfString("d"));
+        undConstraints.add(genPairListOfInteger("e"));
+        undConstraints.add(genPairListOfString("e"));
+        undConstraints.add(genPairListOfInteger("e1"));
+        undConstraints.add(genPairListOfString("e1"));
+        undConstraints.add(genPairListOfInteger("e2"));
+        undConstraints.add(genPairListOfString("e2"));
+        undConstraints.add(genPairListOfInteger("e3"));
+        undConstraints.add(genPairListOfString("e3"));
 
         List<Set<Constraint<UnifyPair>>> oderConstraints = new ArrayList<>();
 
         Set<UnifyPair> constraints = new HashSet<>();
         type1 = new ReferenceType("Object");
-        type2 = new ReferenceType("String");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
-        type1 = new ReferenceType("Number");
-        type2 = new ReferenceType("Integer");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
-        type1 = new ReferenceType("Object");
-        type2 = new ReferenceType("Number");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
-        type1 = new ReferenceType("AbstractList", new TypeParams(new PlaceholderType("X")));
         type2 = new ReferenceType("List", new TypeParams(new PlaceholderType("X")));
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
         type1 = new ReferenceType("Object");
-        type2 = new ReferenceType("AbstractList", new TypeParams(new PlaceholderType("X")));
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        type2 = new ReferenceType("Integer");
+        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
+        type1 = new ReferenceType("Object");
+        type2 = new ReferenceType("String");
+        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
 
         IFiniteClosure finiteClosure = new FiniteClosure(constraints, new NullWriter());
 
@@ -90,6 +100,7 @@ public class UnifyTest {
         UnifyTaskModel tasks = new UnifyTaskModel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
+        System.out.println(solution);
     }
     /*
     @Test