added unifyTest

This reverts commit 5aadb7545e.

pom.xml

@@ -54,8 +54,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<version>3.8.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>19</source>
+                    <source>21</source>
-                    <target>19</target>
+                    <target>21</target>
                 </configuration>
 			</plugin>
 			<plugin>

src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java

@@ -88,7 +88,8 @@ public class JavaTXCompiler {
 		this(sourceFiles, null);
 	}
     public JavaTXCompiler(List<File> sources, List<File> contextPath) throws IOException, ClassNotFoundException {
-    	statistics = new FileWriter(new File(System.getProperty("user.dir") + "/" + sources.get(0).getName() + "_"+ new Timestamp(System.currentTimeMillis())));
+    	//statistics = new FileWriter(new File(System.getProperty("user.dir") + "/" + sources.get(0).getName() + "_"+ new Timestamp(System.currentTimeMillis())));
+		statistics = new OutputStreamWriter(new NullOutputStream());
     	statistics.write("test");
         if(contextPath == null || contextPath.isEmpty()){
         	//When no contextPaths are given, the working directory is the sources root

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;
 
@@ -44,14 +45,14 @@ import org.apache.commons.io.output.NullOutputStream;
  */
 public class RuleSet implements IRuleSet{
 	
-	Writer logFile;
+	WriterActiveObject logFile;
 	
 	public RuleSet() {
 		super();
-		logFile = new OutputStreamWriter(new NullOutputStream());
+		logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()), ForkJoinPool.commonPool());
 	}
 	
-	RuleSet(Writer logFile) {
+	RuleSet(WriterActiveObject logFile) {
 		this.logFile = logFile;
 	}
 	
@@ -867,14 +868,8 @@ public class RuleSet implements IRuleSet{
         								   UnifyType r = x.getRhsType();
         								   if (r instanceof PlaceholderType) { ((PlaceholderType)r).disableWildcardtable(); }
 								     } );
-		try {
 		logFile.write("FUNgreater: " + pair + "\n");
 		logFile.write("FUNred: " + result + "\n");
-				logFile.flush();
-			}
-		catch (IOException e) {
-			System.out.println("logFile-Error");
-		}
 		return Optional.of(result);
 	}
 	
@@ -917,14 +912,10 @@ public class RuleSet implements IRuleSet{
 									   UnifyType r = x.getRhsType();
 									   if (r instanceof PlaceholderType) { ((PlaceholderType)r).disableWildcardtable(); }
 									 } );
-		try {
+
 		logFile.write("FUNgreater: " + pair + "\n");
 		logFile.write("FUNgreater: " + result + "\n");
-			logFile.flush();
+
-		}
-	catch (IOException e) {
-		System.out.println("lofFile-Error");
-	}
 		return Optional.of(result);
 	}
 
@@ -967,14 +958,9 @@ public class RuleSet implements IRuleSet{
 		   							   UnifyType r = x.getRhsType();
 		   							   if (r instanceof PlaceholderType) { ((PlaceholderType)r).disableWildcardtable(); }
 									 } );
-		try {
+
 		logFile.write("FUNgreater: " + pair + "\n");
 		logFile.write("FUNsmaller: " + result + "\n");
-			logFile.flush();
-		}
-	catch (IOException e) {
-		System.out.println("lofFile-Error");
-	}
 		return Optional.of(result);
 	}
 

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

@@ -1,19 +1,13 @@
 package de.dhbwstuttgart.typeinference.unify;
 
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 public class TypeUnify {
@@ -30,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, logFile, log, 0, ret, usedTasks);
+		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
-		ForkJoinPool pool = new ForkJoinPool();
+		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 {
@@ -56,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, logFile, log, 0, ret, usedTasks);
+		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
-		ForkJoinPool pool = new ForkJoinPool();
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, usedTasks, pool);
 		pool.invoke(unifyTask);
 		return ret;
 	}
@@ -74,16 +68,17 @@ 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, logFile, log, 0, ret, usedTasks, statistics);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, usedTasks, pool, statistics);
-		ForkJoinPool pool = new ForkJoinPool();
+
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
 			logFile.flush();
-			unifyTask.statistics.write("Backtracking: " + unifyTask.noBacktracking);
+			unifyTask.statisticsFile.write("Backtracking: " + unifyTask.noBacktracking);
-			unifyTask.statistics.write("\nLoops: " + unifyTask.noLoop);
+			unifyTask.statisticsFile.write("\nLoops: " + unifyTask.noLoop);
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
@@ -110,8 +105,8 @@ 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, 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.statistics = statistics;
+		unifyTask.statisticsFile = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");

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;
@@ -23,14 +24,14 @@ public class TypeUnify2Task extends TypeUnifyTask {
        TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq,
                       List<Set<Constraint<UnifyPair>>> oderConstraints,
                       Set<UnifyPair> nextSetElement,
-    		   IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, 
+                      IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks,
-    		   Set<UnifyPair> methodSignatureConstraintUebergabe, Writer statistics) {
+                      Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool, Writer statistics) {
-    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraintUebergabe );
+    	   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, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe) {
+       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);
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, pool);
                this.setToFlatten = setToFlatten;
                this.nextSetElement = nextSetElement;
                this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
@@ -64,13 +65,10 @@ public class TypeUnify2Task extends TypeUnifyTask {
        	}
        
        public void closeLogFile() {
-
+           if(parallel){
-           try {
                logFile.close();
-			}
+           }else{
-			catch (IOException ioE) {
+               logFile.closeNonThreaded();
-				System.err.println("no log-File" + thNo);
+           }
-			}
-           
        }
 }

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

@@ -13,21 +13,17 @@ 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;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.apache.commons.io.output.NullOutputStream;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IMatch;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IRuleSet;
@@ -47,7 +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 de.dhbwstuttgart.core.JavaTXCompiler;
+import org.apache.commons.io.output.NullWriter;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -55,8 +51,6 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
-import com.google.common.collect.Ordering;
-
 
 /**
  * Implementation of the type unification algorithm
@@ -85,8 +79,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	Integer MaxNoOfThreads = 128;
 
 	public static final String rootDirectory = System.getProperty("user.dir")+"/test/logFiles/";
-	Writer logFile;
+	protected WriterActiveObject logFile;
-
+	protected ForkJoinPool pool;
 	/**
 	 * The implementation of setOps that will be used during the unification
 	 */
@@ -135,7 +129,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	volatile UnifyTaskModel usedTasks;
 	
-	static Writer statistics;
+	static Writer statisticsFile = new NullWriter();
 	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
@@ -156,12 +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, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Writer 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, ForkJoinPool pool, Writer statisticsFile) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks);
+		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks, pool);
-		this.statistics = statistics;
+		this.statisticsFile = statisticsFile;
 	}
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer 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) {
-		synchronized (this) { 
 			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 -> {
@@ -180,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++;
@@ -187,9 +181,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			thNo = totalnoOfThread;
 			writeLog("thNo2 " + thNo);
 			try {
-				this.logFile = log ? new FileWriter(new File(System.getProperty("user.dir") + "/logFiles/" + "Thread_"+thNo))
+				if(log){
-			                       : new OutputStreamWriter(new NullOutputStream());
+					this.logFile = new WriterActiveObject(new FileWriter(new File(System.getProperty("user.dir") + "/logFiles/" + "Thread_"+thNo)), pool);
-				logFile.write("");
+				}else{
+					this.logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()), pool);
+				}
 			}
 			catch (IOException e) { 
 				System.err.println("log-File nicht vorhanden");
@@ -214,7 +210,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			this.usedTasks = usedTasks;
 			this.usedTasks.add(this);
 	}
-	}
 	
 	/**
 	 * Vererbt alle Variancen
@@ -271,12 +266,13 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				.collect(Collectors.toCollection(ArrayList::new));
 		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefeField, new HashSet<>());
 		noOfThread--;
-		try {
+
+		if(parallel){
 			logFile.close();
+		}else{
+			logFile.closeNonThreaded();
 		}
-		catch (IOException ioE) {
+
-			System.err.println("no log-File");
-		}
 		if (isUndefinedPairSetSet(res)) { 
 			//fuer debug-Zwecke
 			ArrayList al = res.stream().map(x -> x.stream().collect(Collectors.toCollection(ArrayList::new)))
@@ -386,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() + " Unifikation nach applyTypeUnificationRules: " + eq.toString() + "\n"
-        writeLog(nOfUnify.toString() + " Oderconstraints nach applyTypeUnificationRules: " + oderConstraints.toString());
+				+ 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
@@ -446,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(noUndefPair.toString() + " UndefinedPairs; " + up + "\n"
-				writeLog("BasePair; " + up.getBasePair());
+					+ "BasePair; " + up.getBasePair());
 			}
 			Set<Set<UnifyPair>> error = new HashSet<>();
 			undefinedPairs = undefinedPairs.stream().map(x -> { x.setUndefinedPair(); return x;}).collect(Collectors.toCollection(HashSet::new));
@@ -814,8 +810,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			 */
 			List<Set<UnifyPair>> nextSetasListOderConstraints = new ArrayList<>();
 			
-			writeLog("nextSet: " + nextSet.toString());
+			writeLog("nextSet: " + nextSet.toString() + "\n"
-			writeLog("nextSetasList: " + nextSetasList.toString());
+				+ "nextSetasList: " + nextSetasList.toString());
 			
 			/* staistics Nextvar an Hand Varianzbestimmung auskommentieren Anfang 
 			if (variance == 1) {
@@ -933,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()) {
@@ -943,15 +939,14 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				/* FORK ENDE */
 
-				synchronized (this) {
+				writeLog("a in " + variance + " "+ a + "\n" +
-					writeLog("a in " + variance + " "+ a);
+				"nextSetasListRest: " + nextSetasListRest.toString());
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
+
-				}
 				while (!nextSetasList.isEmpty()) {
 					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					synchronized (this) { //nextSetasList.remove(nSaL);
+					//nextSetasList.remove(nSaL);
 					writeLog("1 RM" + nSaL.toString());
-					}
+
 					
 					if (!oderConstraint) {
 						
@@ -971,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()) {
@@ -983,7 +978,7 @@ 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();
@@ -999,12 +994,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				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) {
@@ -1013,17 +1006,16 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						}
 					}
 					//noOfThread++;
-						writeLog("Join " + new Integer(fork.thNo).toString());
 					//noOfThread--; an das Ende von compute verschoben
-						writeLog("fork_res: " + fork_res.toString());
+					writeLog("Join " + new Integer(fork.thNo).toString() + "\n" +
-						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
+					"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 {
@@ -1035,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()) {
@@ -1045,15 +1037,14 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				/* FORK ENDE */
 				
-				synchronized (this) {
+
-					writeLog("a in " + variance + " "+ a);
+				writeLog("a in " + variance + " "+ a + "\n" +
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
+						"nextSetasListRest: " + nextSetasListRest.toString());
-				}
+
 				while (!nextSetasList.isEmpty()) {
 					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					synchronized (this) { //nextSetasList.remove(nSaL);
+					//nextSetasList.remove(nSaL);
 					writeLog("-1 RM" + nSaL.toString());
-					}
 					
 					if (!oderConstraint) {
 						/* statistics sameEq wird nicht betrachtet ANGFANG
@@ -1072,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()) {
@@ -1084,7 +1075,6 @@ 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();
@@ -1100,12 +1090,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				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) {
@@ -1125,7 +1113,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					fork.writeLog("final -1");
 					fork.closeLogFile();
 				};
-				}
+
 				//noOfThread++;
 		    } else {
 		    if(parallel && (variance == 2) && noOfThread <= MaxNoOfThreads) {
@@ -1137,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()) {
@@ -1147,10 +1135,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	}
 		    	/* FORK ENDE */
 
-		    	synchronized (this) {
+				writeLog("a in " + variance + " "+ a + "\n" +
-					writeLog("a in " + variance + " "+ a);
+					"nextSetasListRest: " + nextSetasListRest.toString());
-					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
+
-				}
 		    	while (!nextSetasList.isEmpty()) {
 		    		Set<UnifyPair> nSaL = nextSetasList.remove(0);
 		    		//nextSetasList.remove(nSaL); //PL einkommentiert 20-02-03
@@ -1158,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()) {
@@ -1170,7 +1157,7 @@ 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();
@@ -1186,11 +1173,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				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) {
@@ -1204,7 +1190,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					add_res.add(fork_res);
 					fork.writeLog("final 2");
 					fork.closeLogFile();
-					};
 				} 
 		    	//noOfThread++;	
 		    } else {//parallel = false oder MaxNoOfThreads ist erreicht, sequentiell weiterarbeiten
@@ -1533,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("res (undef): " + res.toString() + "\n" +
-				writeLog("abhSubst: " + abhSubst.toString());
+				"abhSubst: " + abhSubst.toString() + "\n" +
-				writeLog("a2: " + rekTiefe + " " + a.toString());
+				"a2: " + rekTiefe + " " + a.toString() + "\n" +
-				writeLog("Durchschnitt: " + durchschnitt.toString());
+				"Durchschnitt: " + durchschnitt.toString() + "\n" +
-				writeLog("nextSet: " + nextSet.toString());
+				"nextSet: " + nextSet.toString() + "\n" +
-				writeLog("nextSetasList: " + nextSetasList.toString());
+				"nextSetasList: " + nextSetasList.toString() + "\n" +
-				writeLog("Number first erased Elements (undef): " + (len - nofstred));
+				"Number first erased Elements (undef): " + (len - nofstred) + "\n" +
-				writeLog("Number second erased Elements (undef): " + (nofstred- nextSetasList.size()));
+				"Number second erased Elements (undef): " + (nofstred- nextSetasList.size()) + "\n" +
-				writeLog("Number erased Elements (undef): " + (len - nextSetasList.size()));
+				"Number erased Elements (undef): " + (len - nextSetasList.size()));
 				noAllErasedElements = noAllErasedElements + (len - nextSetasList.size());
 				writeLog("Number of all erased Elements (undef): " + noAllErasedElements.toString());
 				noBacktracking++;
@@ -2001,10 +1986,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			}
 		}
 		
-		writeLog("eq2s: " + eq2s.toString());
+		writeLog("eq2s: " + eq2s.toString() + "\n" +
-		writeLog("eq2sAsListFst: " + eq2sAsListFst.toString());
+		"eq2sAsListFst: " + eq2sAsListFst.toString() + "\n" +
-		writeLog("eq2sAsListSnd: " + eq2sAsListSnd.toString());
+		"eq2sAsListSnd: " + eq2sAsListSnd.toString() + "\n" +
-		writeLog("eq2sAsListBack: " + eq2sAsListBack.toString());
+		"eq2sAsListBack: " + eq2sAsListBack.toString());
 		
 		eq2sAsList.addAll(eq2sAsListFst);
 		eq2sAsList.addAll(eq2sAsListSnd);
@@ -2609,34 +2594,33 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	}
 	
 	void writeLog(String str) {
-		synchronized ( this ) { 
 		if (log && finalresult) {
-			try {
+			if(parallel){
-				logFile.write("Thread no.:" + thNo + "\n");
+				logFile.write("Thread no.:" + thNo + "\n"
-				logFile.write("noOfThread:" + noOfThread + "\n");
+						+ "noOfThread:" + noOfThread + "\n"
-				logFile.write("parallel:" + parallel + "\n");
+						+ "parallel:" + parallel + "\n"
-				logFile.write(str+"\n\n");
+						+ str+"\n\n"
-				logFile.flush();
+				);
-			
+			}else{
-			}
+				logFile.writeNonThreaded("Thread no.:" + thNo + "\n"
-			catch (IOException e) { 
+						+ "noOfThread:" + noOfThread + "\n"
-				System.err.println("kein LogFile");
+						+ "parallel:" + parallel + "\n"
-			}
+						+ str+"\n\n"
+				);
 			}
 		}
 	}
 	
 	void writeStatistics(String str) {
 		if (finalresult) {
-		synchronized ( this ) { 
 			try {
-				statistics.write("Thread No. " + thNo + ": " + str + "\n");
+				statisticsFile.write("Thread No. " + thNo + ": " + str + "\n");
-				statistics.flush();
+				statisticsFile.flush();
 			
 			}
 			catch (IOException e) { 
 				System.err.println("kein StatisticsFile");
 			}
-	}}
+	}
 	}
 }

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

@@ -0,0 +1,53 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.concurrent.ForkJoinPool;
+
+public class WriterActiveObject {
+    private Writer writer;
+    private ForkJoinPool pool;
+
+    public WriterActiveObject(Writer writer, ForkJoinPool pool){
+        this.writer = writer;
+        this.pool = pool;
+    }
+
+    public void close(){
+        pool.execute(()->{
+            try {
+                writer.close();
+            } catch (IOException e) {
+                System.out.println(e.getMessage());
+            }
+        });
+    }
+
+    public void write(String message){
+        pool.execute(()->{
+            try {
+                writer.write(message);
+                writer.flush();
+            } catch (IOException e) {
+                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

@@ -1,13 +1,27 @@
 package typeinference;
 
+import com.google.common.base.Optional;
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
 import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
 import de.dhbwstuttgart.typedeployment.TypeInsert;
 import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
+import de.dhbwstuttgart.typeinference.constraints.Constraint;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.unify.TypeUnify;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
+import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.*;
+import org.apache.commons.io.output.NullWriter;
 import org.junit.Test;
 
 import java.io.File;
@@ -24,6 +38,70 @@ import java.util.Set;
 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;
+        UnifyType type2;
+
+        Set<UnifyPair> undConstraints = new HashSet<>();
+        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("List", new TypeParams(new PlaceholderType("X")));
+        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
+        type1 = new ReferenceType("Object");
+        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());
+
+        TypeUnify unifyAlgo = new TypeUnify();
+        ConstraintSet< Pair> cons = new ConstraintSet<>();
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        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
     public void finiteClosure() throws IOException, ClassNotFoundException {