Merge branch 'parallelUnifyResultModel' into unif23NoOptParallel_Lehmann

Reviewed-on: #1

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.TypeUnify;
-import de.dhbwstuttgart.typeinference.unify.distributeVariance;
+import de.dhbwstuttgart.typeinference.unify.*;
 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;
@@ -73,7 +66,7 @@ public class JavaTXCompiler {
 	Boolean resultmodel = true;
     public final Map<File, SourceFile> sourceFiles = new HashMap<>();
     Boolean log = false; //gibt an ob ein Log-File nach System.getProperty("user.dir")+""/logFiles/"" geschrieben werden soll?
-    public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
+    public UnifyTaskModelParallel usedTasks = new UnifyTaskModelParallel();
     private final DirectoryClassLoader classLoader;
     static Writer statistics;
    
@@ -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/TypeUnify.java

@@ -23,9 +23,11 @@ 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, UnifyTaskModelParallel taskModel) {
 		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);
+		taskModel.setPool(pool);
+		resultModel.setPool(pool);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, resultModel, pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -49,11 +51,13 @@ 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, UnifyTaskModelParallel taskModel) {
 		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);
+		taskModel.setPool(pool);
+		resultModel.setPool(pool);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, resultModel, pool);
 		pool.invoke(unifyTask);
-		return ret;
+		return resultModel;
 	}
 	
 	/**
@@ -67,10 +71,12 @@ 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, UnifyTaskModelParallel taskModel) {
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
+		taskModel.setPool(pool);
+		resultModel.setPool(pool);
 		TypeUnifyTask unifyTask = //new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, usedTasks, pool, statistics);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, resultModel, pool, statistics);
 
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
@@ -83,7 +89,7 @@ public class TypeUnify {
 		catch (IOException e) {
 			System.err.println("no log-File");
 		}
-		return ret;
+		return resultModel;
 	}
 	
 	/*
@@ -104,8 +110,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) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, new WriterActiveObject(logFile, ForkJoinPool.commonPool()), log, 0, ret, usedTasks, ForkJoinPool.commonPool());
+	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModelParallel taskModel) {
+		resultModel.setPool(ForkJoinPool.commonPool());
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, new WriterActiveObject(logFile, ForkJoinPool.commonPool()), log, 0, resultModel, ForkJoinPool.commonPool());
 		unifyTask.statisticsFile = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {

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

@@ -24,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, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks,
+                      IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModelParallel urm,
                       Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool, Writer statistics) {
-    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraintUebergabe, pool );
+    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, 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, ForkJoinPool pool) {
-               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, 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, UnifyResultModelParallel urm, Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool) {
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, pool);
                this.setToFlatten = setToFlatten;
                this.nextSetElement = nextSetElement;
                this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
@@ -54,14 +54,7 @@ public class TypeUnify2Task extends TypeUnifyTask {
                */ 
                //writeLog("xxx");
                //noOfThread--;
-               synchronized (usedTasks) {
-            	   if (this.myIsCancelled()) {
-   						return new HashSet<>();
-   					}
-   					else {
-   						return res;
-   					}
-   				}
+           return res;
        	}
        
        public void closeLogFile() {

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

@@ -71,7 +71,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	/**
 	 * Fuer die Threads
 	 */
-	UnifyResultModel urm;
+	protected UnifyResultModelParallel urm;
 	protected static int noOfThread = 0;
 	private static int totalnoOfThread = 0;
 	int thNo;
@@ -125,10 +125,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	static Integer  noShortendElements = 0;
 	
-	Boolean myIsCanceled = false;
-	
-	volatile UnifyTaskModel usedTasks;
-	
 	static Writer statisticsFile = new NullWriter();
 	
 	public TypeUnifyTask() { 
@@ -150,11 +146,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, ForkJoinPool pool, Writer statisticsFile) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks, pool);
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModelParallel urm, ForkJoinPool pool, Writer statisticsFile) {
+		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm, 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, ForkJoinPool pool) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModelParallel urm, 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 -> {
@@ -207,8 +203,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			rules = new RuleSet(logFile);
 			this.rekTiefeField = rekTiefe;
 			this.urm = urm;
-			this.usedTasks = usedTasks;
-			this.usedTasks.add(this);
 	}
 	
 	/**
@@ -243,13 +237,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		}		
 }
 */
-	void myCancel(Boolean b) {
-		myIsCanceled = true;
-	}
-	
-	public boolean myIsCancelled() {
-		return myIsCanceled;
-	}
 	
 	protected Set<Set<UnifyPair>> compute() {
 		if (one) {
@@ -280,14 +267,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				throw new TypeinferenceException("Unresolved constraints: " + res.toString(), new NullToken()); //return new HashSet<>(); 
 			}
 		else {
-			synchronized (usedTasks) {
-				if (this.myIsCancelled()) {
-					return new HashSet<>();
-				}
-				else {
-					return res;
-				}
-			}
+			return  res;
 		}
 	}
 /*	
@@ -320,12 +300,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 
                 //.collect(Collectors.toCollection(HashSet::new)));
 		
-		synchronized (usedTasks) {
-			if (this.myIsCancelled()) {
-				return new HashSet<>();
-			}
-		}
-		
 		rekTiefe++;
 		nOfUnify++;
         writeLog(nOfUnify.toString() + " Unifikation: " + eq.toString());
@@ -507,12 +481,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		//		.collect(Collectors.toCollection(HashSet::new));
 		//Muss auskommentiert werden, wenn computeCartesianRecursive ENDE
 		
-		synchronized (usedTasks) {
-			if (this.myIsCancelled()) {
-				return new HashSet<>();
-			}
-		}
-		
 		Set<Set<UnifyPair>> eqPrimePrimeSet = new HashSet<>();
 		
 		Set<TypeUnifyTask> forks = new HashSet<>();
@@ -929,14 +897,10 @@ 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, this.pool);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, methodSignatureConstraint, this.pool);
 				//forks.add(forkOrig);
-				synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-				}
+				forkOrig.fork();
+
 				/* FORK ENDE */
 
 				writeLog("a in " + variance + " "+ a + "\n" +
@@ -966,14 +930,9 @@ 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), this.pool);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, new HashSet<>(methodSignatureConstraint), this.pool);
 					forks.add(fork);
-					synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
-					}
+					fork.fork();
 				}
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
@@ -982,11 +941,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				writeLog("wait "+ forkOrig.thNo);
 				noOfThread--;
 				res = forkOrig.join();
-				synchronized (usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-				}
+
 				//noOfThread++;
 				forkOrig.writeLog("final Orig 1");
 				forkOrig.closeLogFile();
@@ -1000,11 +955,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				for(TypeUnify2Task fork : forks) {
 					noOfThread--;
 					Set<Set<UnifyPair>> fork_res = fork.join();
-					synchronized (usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-					}
+
 					//noOfThread++;
 					//noOfThread--; an das Ende von compute verschoben
 					writeLog("Join " + new Integer(fork.thNo).toString() + "\n" +
@@ -1027,14 +978,10 @@ 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), this.pool);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, new HashSet<>(methodSignatureConstraint), this.pool);
 				//forks.add(forkOrig);
-				synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-				}
+				forkOrig.fork();
+
 				/* FORK ENDE */
 				
 
@@ -1063,14 +1010,9 @@ 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), this.pool);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, new HashSet<>(methodSignatureConstraint), this.pool);
 					forks.add(fork);
-					synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
-					}
+					fork.fork();
 				}
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
@@ -1078,11 +1020,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				writeLog("wait "+ forkOrig.thNo);
 				noOfThread--;
 				res = forkOrig.join();
-				synchronized (usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-				}
+
 				//noOfThread++;
 				forkOrig.writeLog("final Orig -1");
 				forkOrig.closeLogFile();
@@ -1096,11 +1034,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				for(TypeUnify2Task fork : forks) {
 					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
@@ -1125,14 +1059,9 @@ 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), this.pool);
+		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, new HashSet<>(methodSignatureConstraint), this.pool);
 		    	//forks.add(forkOrig);
-		    	synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-		    	}
+		    	forkOrig.fork();
 		    	/* FORK ENDE */
 
 				writeLog("a in " + variance + " "+ a + "\n" +
@@ -1145,14 +1074,9 @@ 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, this.pool);
+		    		TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, methodSignatureConstraint, this.pool);
 		    		forks.add(fork);
-		    		synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
-		    		}
+					fork.fork();
 		    	}
 		    	//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 		    	
@@ -1161,11 +1085,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				writeLog("wait "+ forkOrig.thNo);
 				noOfThread--;
 				res = forkOrig.join();
-				synchronized (usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-				}
+
 				//noOfThread++;
 				forkOrig.writeLog("final Orig 2");
 				forkOrig.closeLogFile();
@@ -1179,11 +1099,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	for(TypeUnify2Task fork : forks) {
 					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

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

@@ -0,0 +1,57 @@
+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(()->{
+            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/UnifyTaskModel.java

@@ -1,18 +0,0 @@
-package de.dhbwstuttgart.typeinference.unify;
-
-import java.util.ArrayList;
-
-public class UnifyTaskModel {
-
-	ArrayList<TypeUnifyTask> usedTasks = new ArrayList<>();
-	
-	public synchronized void add(TypeUnifyTask t) {
-		usedTasks.add(t);
-	}
-    
-    public synchronized void cancel() {
-    	for(TypeUnifyTask t : usedTasks) {
-    		t.myCancel(true);
-    	}
-    }
-}

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

@@ -0,0 +1,17 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.util.concurrent.ForkJoinPool;
+
+public class UnifyTaskModelParallel {
+    private ForkJoinPool pool;
+
+    public void setPool(ForkJoinPool pool){
+        this.pool = pool;
+    }
+
+    public void cancel(){
+        if(this.pool != null) {
+            this.pool.shutdown();
+        }
+    }
+}

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;
@@ -17,8 +12,8 @@ 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.UnifyResultModelParallel;
+import de.dhbwstuttgart.typeinference.unify.UnifyTaskModelParallel;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.*;
 import org.apache.commons.io.output.NullWriter;
@@ -40,7 +35,7 @@ public class UnifyTest {
     public static final String rootDirectory = System.getProperty("user.dir")+"/resources/javFiles/";
 
     @Test
-    public void unifyTest(){
+    public void smallUnifyTest(){
         UnifyType type1 = new PlaceholderType("a");
         UnifyType type2 = new ReferenceType("List", new TypeParams(new PlaceholderType("b")));
         UnifyPair pair1 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
@@ -68,61 +63,95 @@ public class UnifyTest {
         Set<UnifyPair> constraints = new HashSet<>();
         type1 = new ReferenceType("Object");
         type2 = new ReferenceType("String");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
         type1 = new ReferenceType("Number");
         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("Number");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        constraints.add(new UnifyPair(type2, type1, 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));
         type1 = new ReferenceType("Object");
         type2 = new ReferenceType("AbstractList", new TypeParams(new PlaceholderType("X")));
         constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));*/
-        type1 = new ReferenceType("AbstractList");
-        type2 = new ReferenceType("List");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        type1 = new ReferenceType("AbstractList", new PlaceholderType("X"));
+        type2 = new ReferenceType("List", new PlaceholderType("X"));
+        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
         type1 = new ReferenceType("Object");
-        type2 = new ReferenceType("AbstractList");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        type2 = new ReferenceType("AbstractList", new PlaceholderType("X"));
+        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();
+        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
+        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
     }
 
-    @Test
-    public void smallUnifyTest(){
-        UnifyType type1 = new PlaceholderType("a");
+    private UnifyPair genPairListOfInteger(String name){
+
+        UnifyType type1 = new PlaceholderType(name);
         UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("Integer")));
-        UnifyPair pair1 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
+        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(pair1);
+        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");
-        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        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(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<>();
-        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-        UnifyTaskModel tasks = new UnifyTaskModel();
+        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
+        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
         System.out.println(solution);