removed unused code out of UnifyTaskModel

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;
@@ -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;
    

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

@@ -29,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, UnifyResultModel ret, UnifyTaskModelParallel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
 		ForkJoinPool pool = new ForkJoinPool();
+		usedTasks.setPool(pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -55,9 +56,10 @@ 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 UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModelParallel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
 		ForkJoinPool pool = new ForkJoinPool();
+		usedTasks.setPool(pool);
 		pool.invoke(unifyTask);
 		return ret;
 	}
@@ -73,10 +75,11 @@ 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 UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModelParallel usedTasks) {
 		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, logFile, log, 0, ret, statistics);
 		ForkJoinPool pool = new ForkJoinPool();
+		usedTasks.setPool(pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -109,8 +112,8 @@ 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, UnifyResultModel ret, UnifyTaskModelParallel usedTasks) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, usedTasks);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret);
 		unifyTask.statistics = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {

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

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

@@ -13,7 +13,6 @@ 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;
@@ -80,9 +79,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	 * Fuer die Threads
 	 */
 	UnifyResultModel urm;
+	protected static int noOfThread = 0;
 	private static int totalnoOfThread = 0;
 	int thNo;
 	protected boolean one = false;
+	Integer MaxNoOfThreads = 128;
 
 	public static final String rootDirectory = System.getProperty("user.dir")+"/test/logFiles/";
 	Writer logFile;
@@ -131,10 +132,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	static Integer  noShortendElements = 0;
 	
-	Boolean myIsCanceled = false;
-	
-	volatile UnifyTaskModel usedTasks;
-	
 	static Writer statistics;
 	
 	public TypeUnifyTask() { 
@@ -156,11 +153,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, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, Writer statistics) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks);
+		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm);
 		this.statistics = 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) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm) {
 		synchronized (this) {
             if(statistics==null){
                 statistics = new NullWriter();
@@ -183,7 +180,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			this.parallel = parallel;
 			this.logFile = logFile;
 			this.log = log;
-
+			
+			noOfThread++; 
 			totalnoOfThread++;
 			//writeLog("thNo1 " + thNo);
 			thNo = totalnoOfThread;
@@ -213,8 +211,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);
 		}
 	}
 	
@@ -250,13 +246,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) {
@@ -272,6 +261,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				.filter(x -> x.size()>1)
 				.collect(Collectors.toCollection(ArrayList::new));
 		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefeField, new HashSet<>());
+		noOfThread--;
 		try {
 			logFile.close();
 		}
@@ -285,14 +275,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				throw new TypeinferenceException("Unresolved constraints: " + res.toString(), new NullToken()); //return new HashSet<>(); 
 			}
 		else {
-			synchronized (usedTasks) {
+			return res;
-				if (this.myIsCancelled()) {
-					return new HashSet<>();
-				}
-				else {
-					return res;
-				}
-			}
 		}
 	}
 /*	
@@ -325,12 +308,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());
@@ -512,12 +489,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<>();
@@ -926,7 +897,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			/* Wenn parallel gearbeitet wird, wird je nach Varianz ein neuer Thread
 			 * gestartet, der parallel weiterarbeitet.
 			 */
-			if(parallel && (variance == 1)) {
+			if(parallel && (variance == 1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -934,14 +905,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, methodSignatureConstraint);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, methodSignatureConstraint);
 				//forks.add(forkOrig);
-				synchronized(usedTasks) {
+				forkOrig.fork();
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-				}
 				/* FORK ENDE */
 				
 				synchronized (this) {
@@ -972,26 +938,17 @@ 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, new HashSet<>(methodSignatureConstraint));
 					forks.add(fork);
-					synchronized(usedTasks) {
+					fork.fork();
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
-					}
 				}
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
 				/* FORK ANFANG */
 				synchronized (this) {
 					writeLog("wait "+ forkOrig.thNo);
+					noOfThread--;
 					res = forkOrig.join();
-					synchronized (usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-					}
 					//noOfThread++;
 					forkOrig.writeLog("final Orig 1");
 					forkOrig.closeLogFile();
@@ -1005,12 +962,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
+						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
 						//noOfThread++;
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben
@@ -1026,7 +979,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				//noOfThread++;
 			} else {
-			if(parallel && (variance == -1)) {
+			if(parallel && (variance == -1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -1034,14 +987,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));
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, new HashSet<>(methodSignatureConstraint));
 				//forks.add(forkOrig);
-				synchronized(usedTasks) {
+				forkOrig.fork();
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-				}
 				/* FORK ENDE */
 				
 				synchronized (this) {
@@ -1071,26 +1019,17 @@ 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, new HashSet<>(methodSignatureConstraint));
 					forks.add(fork);
-					synchronized(usedTasks) {
+					fork.fork();
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-						fork.fork();
-					}
 				}
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
 				/* FORK ANFANG */
 				synchronized (this) {
 					writeLog("wait "+ forkOrig.thNo);
+					noOfThread--;
 					res = forkOrig.join();
-					synchronized (usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-					}
 					//noOfThread++;
 					forkOrig.writeLog("final Orig -1");
 					forkOrig.closeLogFile();
@@ -1104,12 +1043,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
+						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
 						//noOfThread++;
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben 
@@ -1125,7 +1060,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				//noOfThread++;
 		    } else {
-		    if(parallel && (variance == 2)) {
+		    if(parallel && (variance == 2) && noOfThread <= MaxNoOfThreads) {
 		    	writeLog("var2einstieg");
 		    	Set<TypeUnify2Task> forks = new HashSet<>();
 		    	Set<UnifyPair> newEqOrig = new HashSet<>(eq);
@@ -1134,14 +1069,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));
+		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, new HashSet<>(methodSignatureConstraint));
 		    	//forks.add(forkOrig);
-		    	synchronized(usedTasks) {
+				forkOrig.fork();
-					if (this.myIsCancelled()) {
+
-						return new HashSet<>();
-					}
-					forkOrig.fork();
-		    	}
 		    	/* FORK ENDE */
 		    	
 		    	synchronized (this) {
@@ -1155,26 +1086,18 @@ 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, methodSignatureConstraint);
 		    		forks.add(fork);
-		    		synchronized(usedTasks) {
+					fork.fork();
-						if (this.myIsCancelled()) {
+
-							return new HashSet<>();
-						}
-						fork.fork();
-		    		}
 		    	}
 		    	//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 		    	
 		    	/* FORK ANFANG */
 		    	synchronized (this) {
 		    		writeLog("wait "+ forkOrig.thNo);
+		    		noOfThread--;
 					res = forkOrig.join();
-					synchronized (usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
-					}
 					//noOfThread++;
 					forkOrig.writeLog("final Orig 2");
 					forkOrig.closeLogFile();
@@ -1187,12 +1110,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
 		    	for(TypeUnify2Task fork : forks) {
 		    		synchronized (this) {
+		    			noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
-						synchronized (usedTasks) {
-							if (this.myIsCancelled()) {
-								return new HashSet<>();
-							}
-						}
 						//noOfThread++;
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben 
@@ -2608,6 +2527,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		if (log && finalresult) {
 			try {
 				logFile.write("Thread no.:" + thNo + "\n");
+				logFile.write("noOfThread:" + noOfThread + "\n");
 				logFile.write("parallel:" + parallel + "\n");
 				logFile.write(str+"\n\n");
 				logFile.flush();

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

@@ -11,8 +11,8 @@ public class UnifyTaskModel {
 	}
     
     public synchronized void cancel() {
-    	for(TypeUnifyTask t : usedTasks) {
+    	/*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

@@ -13,7 +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.UnifyTaskModel;
+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;
@@ -92,7 +92,7 @@ public class UnifyTest {
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet<Pair> cons = new ConstraintSet<>();
         UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-        UnifyTaskModel tasks = new UnifyTaskModel();
+        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);