changed unifyTest to use UnifyResultModelParallel

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

@@ -37,20 +37,13 @@ import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
-import de.dhbwstuttgart.typeinference.unify.RuleSet;
+import de.dhbwstuttgart.typeinference.unify.*;
-import de.dhbwstuttgart.typeinference.unify.TypeUnify;
-import de.dhbwstuttgart.typeinference.unify.distributeVariance;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
 import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyType;
 import de.dhbwstuttgart.util.BiRelation;
-import de.dhbwstuttgart.typeinference.unify.TypeUnifyTask;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultListener;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultListenerImpl;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
-import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -89,8 +82,8 @@ public class JavaTXCompiler {
 	}
     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 OutputStreamWriter(new NullOutputStream());
+    	statistics = new OutputStreamWriter(new NullOutputStream());
-    	statistics.write("test");
+		statistics.write("test");
         if(contextPath == null || contextPath.isEmpty()){
         	//When no contextPaths are given, the working directory is the sources root
 			contextPath = Lists.newArrayList(new File(System.getProperty("user.dir")));
@@ -376,7 +369,7 @@ public class JavaTXCompiler {
 	 * }
 	 */
 
-	public UnifyResultModel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile)
+	public UnifyResultModelParallel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile)
 			throws ClassNotFoundException, IOException {
 		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
 		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
@@ -389,7 +382,7 @@ public class JavaTXCompiler {
 
 		final ConstraintSet<Pair> cons = getConstraints();
 		Set<Set<UnifyPair>> results = new HashSet<>();
-		UnifyResultModel urm = null;
+		UnifyResultModelParallel urm = null;
 		// urm.addUnifyResultListener(resultListener);
 		try {
 			logFile = logFile == null
@@ -397,7 +390,7 @@ public class JavaTXCompiler {
 					: logFile;
 			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, classLoader);
 			System.out.println(finiteClosure);
-			urm = new UnifyResultModel(cons, finiteClosure);
+			urm = new UnifyResultModelParallel(cons, finiteClosure);
 			urm.addUnifyResultListener(resultListener);
 			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
 
@@ -727,7 +720,7 @@ public class JavaTXCompiler {
 			}).collect(Collectors.toCollection(ArrayList::new))*/;
 			if (resultmodel) {
 				/* UnifyResultModel Anfang */
-				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+				UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
 				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
 				urm.addUnifyResultListener(li);
 				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm,
@@ -745,7 +738,7 @@ public class JavaTXCompiler {
 				// oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons,
 				// finiteClosure));
 				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints,
-						finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
+						finiteClosure, logFile, log, new UnifyResultModelParallel(cons, finiteClosure), usedTasks);
 				System.out.println("RESULT: " + result);
 				logFile.write("RES: " + result.toString() + "\n");
 				logFile.flush();

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

@@ -44,14 +44,14 @@ import org.apache.commons.io.output.NullOutputStream;
  */
 public class RuleSet implements IRuleSet{
 	
-	WriterActiveObject logFile;
+	Writer logFile;
 	
 	public RuleSet() {
 		super();
-		logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()));
+		logFile = new OutputStreamWriter(new NullOutputStream());
 	}
 	
-	RuleSet(WriterActiveObject logFile) {
+	RuleSet(Writer logFile) {
 		this.logFile = logFile;
 	}
 	
@@ -867,8 +867,14 @@ public class RuleSet implements IRuleSet{
         								   UnifyType r = x.getRhsType();
         								   if (r instanceof PlaceholderType) { ((PlaceholderType)r).disableWildcardtable(); }
 								     } );
-		logFile.write("FUNgreater: " + pair + "\n");
+		try {
-		logFile.write("FUNred: " + result + "\n");
+			logFile.write("FUNgreater: " + pair + "\n");
+				logFile.write("FUNred: " + result + "\n");
+				logFile.flush();
+			}
+		catch (IOException e) {
+			System.out.println("logFile-Error");
+		}
 		return Optional.of(result);
 	}
 	
@@ -911,10 +917,14 @@ 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: " + pair + "\n");
-		logFile.write("FUNgreater: " + result + "\n");
+			logFile.write("FUNgreater: " + result + "\n");
-
+			logFile.flush();
+		}
+	catch (IOException e) {
+		System.out.println("lofFile-Error");
+	}
 		return Optional.of(result);
 	}
 
@@ -957,9 +967,14 @@ 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: " + pair + "\n");
-		logFile.write("FUNsmaller: " + result + "\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,13 +1,19 @@
 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 {
@@ -23,9 +29,10 @@ public class TypeUnify {
 	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile), log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, resultModel, usedTasks);
 		ForkJoinPool pool = new ForkJoinPool();
+		resultModel.setPool(pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -49,11 +56,12 @@ public class TypeUnify {
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+	public UnifyResultModelParallel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile), log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, resultModel, usedTasks);
 		ForkJoinPool pool = new ForkJoinPool();
+		resultModel.setPool(pool);
 		pool.invoke(unifyTask);
-		return ret;
+		return resultModel;
 	}
 	
 	/**
@@ -67,22 +75,23 @@ public class TypeUnify {
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+	public UnifyResultModelParallel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModel usedTasks) {
 		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);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, resultModel, usedTasks, statistics);
 		ForkJoinPool pool = new ForkJoinPool();
+		resultModel.setPool(pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
 			logFile.flush();
-			unifyTask.statisticsFile.write("Backtracking: " + unifyTask.noBacktracking);
+			unifyTask.statistics.write("Backtracking: " + unifyTask.noBacktracking);
-			unifyTask.statisticsFile.write("\nLoops: " + unifyTask.noLoop);
+			unifyTask.statistics.write("\nLoops: " + unifyTask.noLoop);
 		}
 		catch (IOException e) {
 			System.err.println("no log-File");
 		}
-		return ret;
+		return resultModel;
 	}
 	
 	/*
@@ -103,9 +112,9 @@ public class TypeUnify {
 	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, 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, logFile, log, 0, resultModel, usedTasks);
-		unifyTask.statisticsFile = statistics;
+		unifyTask.statistics = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");

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

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

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

@@ -49,6 +49,8 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
+import org.apache.commons.io.output.NullWriter;
+
 
 /**
  * Implementation of the type unification algorithm
@@ -69,7 +71,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	/**
 	 * Fuer die Threads
 	 */
-	UnifyResultModel urm;
+	protected UnifyResultModelParallel resultModel;
 	protected static int noOfThread = 0;
 	private static int totalnoOfThread = 0;
 	int thNo;
@@ -77,7 +79,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	Integer MaxNoOfThreads = 128;
 
 	public static final String rootDirectory = System.getProperty("user.dir")+"/test/logFiles/";
-	protected WriterActiveObject logFile;
+	Writer logFile;
+
 	/**
 	 * 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 statistics;
 	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
@@ -147,11 +150,15 @@ 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) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModelParallel resultModel, UnifyTaskModel usedTasks, Writer statistics) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks);
+		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe, resultModel,  usedTasks);
-		this.statisticsFile = statisticsFile;
+		this.statistics = 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) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModelParallel resultModel, UnifyTaskModel usedTasks) {
+		synchronized (this) {
+            if(statistics==null){
+                statistics = new NullWriter();
+            }
 			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 -> {
@@ -177,11 +184,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			thNo = totalnoOfThread;
 			writeLog("thNo2 " + thNo);
 			try {
-				if(log){
+				this.logFile = log ? 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)));
+			                       : new OutputStreamWriter(new NullOutputStream());
-				}else{
-					this.logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()));
-				}
 				logFile.write("");
 			}
 			catch (IOException e) { 
@@ -203,9 +207,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			*/
 			rules = new RuleSet(logFile);
 			this.rekTiefeField = rekTiefe;
-			this.urm = urm;
+			this.resultModel = resultModel;
 			this.usedTasks = usedTasks;
 			this.usedTasks.add(this);
+		}
 	}
 	
 	/**
@@ -263,9 +268,12 @@ 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 {
-		logFile.close();
+			logFile.close();
-
+		}
+		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)))
@@ -590,7 +598,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						 */
 						
 							
-						urm.notify(eqPrimePrimeSet);
+						resultModel.notify(eqPrimePrimeSet);
 						writeStatistics("Result: " + eqPrimePrimeSet.toString());
 					}
 				}
@@ -922,7 +930,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, resultModel, usedTasks, methodSignatureConstraint);
 				//forks.add(forkOrig);
 				synchronized(usedTasks) {
 					if (this.myIsCancelled()) {
@@ -960,7 +968,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, resultModel, usedTasks, new HashSet<>(methodSignatureConstraint));
 					forks.add(fork);
 					synchronized(usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1024,7 +1032,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, resultModel, usedTasks, new HashSet<>(methodSignatureConstraint));
 				//forks.add(forkOrig);
 				synchronized(usedTasks) {
 					if (this.myIsCancelled()) {
@@ -1061,7 +1069,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, resultModel, usedTasks, new HashSet<>(methodSignatureConstraint));
 					forks.add(fork);
 					synchronized(usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1126,7 +1134,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, resultModel, usedTasks, new HashSet<>(methodSignatureConstraint));
 		    	//forks.add(forkOrig);
 		    	synchronized(usedTasks) {
 					if (this.myIsCancelled()) {
@@ -1147,7 +1155,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, resultModel, usedTasks, methodSignatureConstraint);
 		    		forks.add(fork);
 		    		synchronized(usedTasks) {
 						if (this.myIsCancelled()) {
@@ -2598,25 +2606,34 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	}
 	
 	void writeLog(String str) {
+		synchronized ( this ) { 
 		if (log && finalresult) {
-			logFile.write("Thread no.:" + thNo + "\n"
+			try {
-					+ "noOfThread:" + noOfThread + "\n"
+				logFile.write("Thread no.:" + thNo + "\n");
-					+ "parallel:" + parallel + "\n"
+				logFile.write("noOfThread:" + noOfThread + "\n");
-					+ str+"\n\n"
+				logFile.write("parallel:" + parallel + "\n");
-			);
+				logFile.write(str+"\n\n");
-		}
+				logFile.flush();
+			
+			}
+			catch (IOException e) { 
+				System.err.println("kein LogFile");
+			}
+			}
+	}
 	}
 	
 	void writeStatistics(String str) {
 		if (finalresult) {
+		synchronized ( this ) { 
 			try {
-				statisticsFile.write("Thread No. " + thNo + ": " + str + "\n");
+				statistics.write("Thread No. " + thNo + ": " + str + "\n");
-				statisticsFile.flush();
+				statistics.flush();
 			
 			}
 			catch (IOException e) { 
 				System.err.println("kein StatisticsFile");
 			}
-	}
+	}}
 	}
 }

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

@@ -0,0 +1,58 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+import java.util.*;
+import java.util.concurrent.ForkJoinPool;
+import java.util.stream.Collectors;
+
+public class UnifyResultModelParallel {
+    private ForkJoinPool pool;
+    private ConstraintSet<Pair> cons;
+    private IFiniteClosure fc;
+    private List<UnifyResultListener> listeners = new ArrayList<>();
+
+    public UnifyResultModelParallel(ConstraintSet<Pair> cons, IFiniteClosure fc){
+        this.cons = cons;
+        this.fc = fc;
+    }
+
+    public void setPool(ForkJoinPool pool){
+        this.pool = pool;
+    }
+    public void addUnifyResultListener(UnifyResultListener listenerToAdd) {
+        listeners.add(listenerToAdd);
+    }
+    public void removeUnifyResultListener(UnifyResultListener listenerToRemove) {
+        listeners.remove(listenerToRemove);
+    }
+    public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet){
+        pool.execute(()->{
+            Object HashSet;
+            Set<Set<UnifyPair>> eqPrimePrimeSetRet = eqPrimePrimeSet.stream().map(x -> {
+                Optional<Set<UnifyPair>> res = new RuleSet().subst(x.stream().map(y -> {
+                    if (y.getPairOp() == PairOperator.SMALLERDOTWC) y.setPairOp(PairOperator.EQUALSDOT);
+                    return y; //alle Paare a <.? b erden durch a =. b ersetzt
+                }).collect(Collectors.toCollection(HashSet::new)));
+                if (res.isPresent()) {//wenn subst ein Erg liefert wurde was veraendert
+                    return new TypeUnifyTask().applyTypeUnificationRules(res.get(), fc);
+                }
+                else return x; //wenn nichts veraendert wurde wird x zurueckgegeben
+            }).collect(Collectors.toCollection(HashSet::new));
+            List<ResultSet> newResult = eqPrimePrimeSetRet.stream().map(unifyPairs ->
+                            new ResultSet(UnifyTypeFactory.convert(unifyPairs, de.dhbwstuttgart.typeinference.constraints.Pair.generateTPHMap(cons))))
+                    .collect(Collectors.toList());
+            UnifyResultEvent evt = new UnifyResultEvent(newResult);
+
+            for (UnifyResultListener listener : listeners) {
+                listener.onNewTypeResultFound(evt);
+            }
+        });
+    }
+}

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

@@ -1,35 +0,0 @@
-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 = new ForkJoinPool(1, ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
-
-    public WriterActiveObject(Writer writer){
-        this.writer = writer;
-    }
-
-    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) {
-                System.out.println(e.getMessage());
-            }
-        });
-    }
-}

src/test/java/typeinference/UnifyTest.java

@@ -1,13 +1,8 @@
 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;
@@ -18,6 +13,7 @@ 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.UnifyResultModelParallel;
 import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.*;
@@ -39,57 +35,68 @@ 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 type1;
-        UnifyType type2 = new ReferenceType("List", new TypeParams(new PlaceholderType("b")));
+        UnifyType type2;
-        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);
 
         Set<UnifyPair> undConstraints = new HashSet<>();
-        undConstraints.add(pair1);
+        undConstraints.add(genPairListOfInteger("a"));
-        undConstraints.add(pair2);
+        undConstraints.add(genPairListOfString("a"));
-        undConstraints.add(pair3);
+
-        undConstraints.add(pair4);
+        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")));
+        type2 = new ReferenceType("Integer");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        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<>();
+        ConstraintSet<Pair> cons = new ConstraintSet<>();
-        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyResultModelParallel urm = new UnifyResultModelParallel(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