removed ThreadCounter from TypeUnifyTask

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

@@ -37,13 +37,20 @@ 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.*;
+import de.dhbwstuttgart.typeinference.unify.RuleSet;
+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;
@@ -66,7 +73,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 UnifyTaskModelParallel usedTasks = new UnifyTaskModelParallel();
+    public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
     private final DirectoryClassLoader classLoader;
     static Writer statistics;
    

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

@@ -9,7 +9,6 @@ import java.util.Optional;
 import java.util.Queue;
 import java.util.Set;
 import java.util.Stack;
-import java.util.concurrent.ForkJoinPool;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -45,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()), ForkJoinPool.commonPool());
+		logFile = new OutputStreamWriter(new NullOutputStream());
 	}
 	
-	RuleSet(WriterActiveObject logFile) {
+	RuleSet(Writer logFile) {
 		this.logFile = logFile;
 	}
 	
@@ -868,8 +867,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("FUNred: " + result + "\n");
+				logFile.flush();
+			}
+		catch (IOException e) {
+			System.out.println("logFile-Error");
+		}
 		return Optional.of(result);
 	}
 	
@@ -912,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: " + result + "\n");
-
+			logFile.flush();
+		}
+	catch (IOException e) {
+		System.out.println("lofFile-Error");
+	}
 		return Optional.of(result);
 	}
 
@@ -958,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("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,10 +29,9 @@ 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, UnifyTaskModelParallel taskModel) {
+	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		taskModel.setPool(pool);
+		ForkJoinPool pool = new ForkJoinPool();
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -50,10 +55,9 @@ 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, UnifyTaskModelParallel taskModel) {
+	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
-		taskModel.setPool(pool);
+		ForkJoinPool pool = new ForkJoinPool();
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, pool);
 		pool.invoke(unifyTask);
 		return ret;
 	}
@@ -69,19 +73,17 @@ 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, UnifyTaskModelParallel taskModel) {
+	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
-		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
-		taskModel.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, pool, statistics);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks, statistics);
-
+		ForkJoinPool pool = new ForkJoinPool();
 		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");
@@ -107,9 +109,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, UnifyTaskModelParallel taskModel) {
+	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, ForkJoinPool.commonPool());
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, 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

@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.ForkJoinPool;
 
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
@@ -24,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,
+    		   IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, 
-                      Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool, Writer statistics) {
+    		   Set<UnifyPair> methodSignatureConstraintUebergabe, Writer statistics) {
-    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, methodSignatureConstraintUebergabe, pool );
+    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, 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, Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool) {
+       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe) {
-               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, pool);
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
                this.setToFlatten = setToFlatten;
                this.nextSetElement = nextSetElement;
                this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
@@ -54,14 +53,24 @@ public class TypeUnify2Task extends TypeUnifyTask {
                */ 
                //writeLog("xxx");
                //noOfThread--;
+               synchronized (usedTasks) {
+            	   if (this.myIsCancelled()) {
+   						return new HashSet<>();
+   					}
+   					else {
    						return res;
    					}
+   				}
+       	}
        
        public void closeLogFile() {
-           if(parallel){
+
+           try {
 				logFile.close();
-           }else{
+			}
-               logFile.closeNonThreaded();
+			catch (IOException ioE) {
-           }
+				System.err.println("no log-File" + thNo);
+			}
+           
        }
 }

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

@@ -18,12 +18,17 @@ import java.util.concurrent.RecursiveTask;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.io.output.NullOutputStream;
 
+import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IMatch;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IRuleSet;
@@ -43,7 +48,7 @@ import de.dhbwstuttgart.typeinference.unify.model.UnifyType;
 import de.dhbwstuttgart.typeinference.unify.model.WildcardType;
 import de.dhbwstuttgart.util.Pair;
 import de.dhbwstuttgart.typeinference.unify.model.OrderingUnifyPair;
-import org.apache.commons.io.output.NullWriter;
+import de.dhbwstuttgart.core.JavaTXCompiler;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -51,6 +56,9 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
+import com.google.common.collect.Ordering;
+import org.apache.commons.io.output.NullWriter;
+
 
 /**
  * Implementation of the type unification algorithm
@@ -72,15 +80,13 @@ 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/";
-	protected WriterActiveObject logFile;
+	Writer logFile;
-	protected ForkJoinPool pool;
+
 	/**
 	 * The implementation of setOps that will be used during the unification
 	 */
@@ -125,7 +131,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	static Integer  noShortendElements = 0;
 	
-	static Writer statisticsFile = new NullWriter();
+	Boolean myIsCanceled = false;
+	
+	volatile UnifyTaskModel usedTasks;
+	
+	static Writer statistics;
 	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
@@ -146,11 +156,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, ForkJoinPool pool, Writer statisticsFile) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Writer statistics) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm, pool);
+		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm,  usedTasks);
-		this.statisticsFile = statisticsFile;
+		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) {
+		synchronized (this) {
+            if(statistics==null){
+                statistics = new NullWriter();
             }
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, int rekTiefe, UnifyResultModel 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 -> {
@@ -169,19 +183,15 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			this.parallel = parallel;
 			this.logFile = logFile;
 			this.log = log;
-			this.pool = pool;
 
-			noOfThread++; 
 			totalnoOfThread++;
 			//writeLog("thNo1 " + thNo);
 			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)), pool);
+			                       : new OutputStreamWriter(new NullOutputStream());
-				}else{
+				logFile.write("");
-					this.logFile = new WriterActiveObject(new OutputStreamWriter(new NullOutputStream()), pool);
-				}
 			}
 			catch (IOException e) { 
 				System.err.println("log-File nicht vorhanden");
@@ -203,6 +213,9 @@ 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);
+		}
 	}
 	
 	/**
@@ -237,6 +250,13 @@ 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) {
@@ -252,24 +272,29 @@ 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 {
-
-		if(parallel){
 			logFile.close();
-		}else{
-			logFile.closeNonThreaded();
 		}
-
+		catch (IOException ioE) {
+			System.err.println("no log-File");
+		}
 		if (isUndefinedPairSetSet(res)) { 
 			//fuer debug-Zwecke
 			ArrayList al = res.stream().map(x -> x.stream().collect(Collectors.toCollection(ArrayList::new)))
 					          .collect(Collectors.toCollection(ArrayList::new));
 				throw new TypeinferenceException("Unresolved constraints: " + res.toString(), new NullToken()); //return new HashSet<>(); 
 			}
+		else {
+			synchronized (usedTasks) {
+				if (this.myIsCancelled()) {
+					return new HashSet<>();
+				}
 				else {
 					return res;
 				}
 			}
+		}
+	}
 /*	
 	@Override
 	protected Set<Set<UnifyPair>> compute() {
@@ -300,6 +325,12 @@ 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());
@@ -356,8 +387,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		
 		eq0.forEach(x -> x.disableCondWildcards());
 		
-		writeLog(nOfUnify.toString() + " Unifikation nach applyTypeUnificationRules: " + eq.toString() + "\n"
+		writeLog(nOfUnify.toString() + " Unifikation nach applyTypeUnificationRules: " + eq.toString());
-				+ nOfUnify.toString() + " Oderconstraints nach applyTypeUnificationRules: " + oderConstraints.toString());
+        writeLog(nOfUnify.toString() + " Oderconstraints nach applyTypeUnificationRules: " + oderConstraints.toString());
 
 		/*
 		 * Step 2 and 3: Create a subset eq1s of pairs where both sides are TPH and eq2s of the other pairs
@@ -416,8 +447,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		if(!undefinedPairs.isEmpty()) {
 			noUndefPair++;
 			for (UnifyPair up : undefinedPairs) {
-				writeLog(noUndefPair.toString() + " UndefinedPairs; " + up + "\n"
+				writeLog(noUndefPair.toString() + " UndefinedPairs; " + up);
-					+ "BasePair; " + up.getBasePair());
+				writeLog("BasePair; " + up.getBasePair());
 			}
 			Set<Set<UnifyPair>> error = new HashSet<>();
 			undefinedPairs = undefinedPairs.stream().map(x -> { x.setUndefinedPair(); return x;}).collect(Collectors.toCollection(HashSet::new));
@@ -481,6 +512,12 @@ 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<>();
@@ -778,8 +815,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			 */
 			List<Set<UnifyPair>> nextSetasListOderConstraints = new ArrayList<>();
 			
-			writeLog("nextSet: " + nextSet.toString() + "\n"
+			writeLog("nextSet: " + nextSet.toString());
-				+ "nextSetasList: " + nextSetasList.toString());
+			writeLog("nextSetasList: " + nextSetasList.toString());
 			
 			/* staistics Nextvar an Hand Varianzbestimmung auskommentieren Anfang 
 			if (variance == 1) {
@@ -889,7 +926,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) && noOfThread <= MaxNoOfThreads) {
+			if(parallel && (variance == 1)) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -897,20 +934,25 @@ 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, methodSignatureConstraint, this.pool);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint);
 				//forks.add(forkOrig);
+				synchronized(usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
 					forkOrig.fork();
-
+				}
 				/* FORK ENDE */
 				
-				writeLog("a in " + variance + " "+ a + "\n" +
+				synchronized (this) {
-				"nextSetasListRest: " + nextSetasListRest.toString());
+					writeLog("a in " + variance + " "+ a);
-
+					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
+				}
 				while (!nextSetasList.isEmpty()) {
 					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					//nextSetasList.remove(nSaL);
+					synchronized (this) { //nextSetasList.remove(nSaL);
 						writeLog("1 RM" + nSaL.toString());
-
+					}
 					
 					if (!oderConstraint) {
 						
@@ -930,18 +972,26 @@ 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, new HashSet<>(methodSignatureConstraint), this.pool);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
 					forks.add(fork);
+					synchronized(usedTasks) {
+						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();
@@ -949,28 +999,34 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
 					//noOfThread--; an das Ende von compute verschoben 
 					//add_res.add(fork_res);
+				};
 				/* FORK ENDE */
 				
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
-					noOfThread--;
+					synchronized (this) {
 						Set<Set<UnifyPair>> fork_res = fork.join();
-
+						synchronized (usedTasks) {
+							if (this.myIsCancelled()) {
+								return new HashSet<>();
+							}
+						}
 						//noOfThread++;
+						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben
-					writeLog("Join " + new Integer(fork.thNo).toString() + "\n" +
+						writeLog("fork_res: " + fork_res.toString());
-					"fork_res: " + fork_res.toString() + "\n" +
+						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
-					new Boolean((isUndefinedPairSetSet(fork_res))).toString());
 						add_res.add(fork_res);
 						if (!isUndefinedPairSetSet(fork_res)) {
 							aParDef.add(fork.getNextSetElement());
 						}
 						fork.writeLog("final 1");
 						fork.closeLogFile();
+					};
 				}
 				//noOfThread++;
 			} else {
-			if(parallel && (variance == -1) && noOfThread <= MaxNoOfThreads) {
+			if(parallel && (variance == -1)) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -978,20 +1034,25 @@ 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, new HashSet<>(methodSignatureConstraint), this.pool);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
 				//forks.add(forkOrig);
+				synchronized(usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
 					forkOrig.fork();
-
+				}
 				/* FORK ENDE */
 				
-
+				synchronized (this) {
-				writeLog("a in " + variance + " "+ a + "\n" +
+					writeLog("a in " + variance + " "+ a);
-						"nextSetasListRest: " + nextSetasListRest.toString());
+					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
-
+				}
 				while (!nextSetasList.isEmpty()) {
 					Set<UnifyPair> nSaL = nextSetasList.remove(0);
-					//nextSetasList.remove(nSaL);
+					synchronized (this) { //nextSetasList.remove(nSaL);
 						writeLog("-1 RM" + nSaL.toString());
+					}
 					
 					if (!oderConstraint) {
 						/* statistics sameEq wird nicht betrachtet ANGFANG
@@ -1010,17 +1071,26 @@ 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, new HashSet<>(methodSignatureConstraint), this.pool);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
 					forks.add(fork);
+					synchronized(usedTasks) {
+						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();
@@ -1028,13 +1098,18 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
 					//noOfThread--; an das Ende von compute verschoben 
 					//add_res.add(fork_res);
+				};
 				/* FORK ENDE */
 				
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
-					noOfThread--;
+					synchronized (this) {
 						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 
@@ -1047,10 +1122,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						fork.writeLog("final -1");
 						fork.closeLogFile();
 					};
-
+				}
 				//noOfThread++;
 		    } else {
-		    if(parallel && (variance == 2) && noOfThread <= MaxNoOfThreads) {
+		    if(parallel && (variance == 2)) {
 		    	writeLog("var2einstieg");
 		    	Set<TypeUnify2Task> forks = new HashSet<>();
 		    	Set<UnifyPair> newEqOrig = new HashSet<>(eq);
@@ -1059,14 +1134,20 @@ 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, new HashSet<>(methodSignatureConstraint), this.pool);
+		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
 		    	//forks.add(forkOrig);
+		    	synchronized(usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
 					forkOrig.fork();
+		    	}
 		    	/* FORK ENDE */
 		    	
-				writeLog("a in " + variance + " "+ a + "\n" +
+		    	synchronized (this) {
-					"nextSetasListRest: " + nextSetasListRest.toString());
+					writeLog("a in " + variance + " "+ a);
-
+					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
+				}
 		    	while (!nextSetasList.isEmpty()) {
 		    		Set<UnifyPair> nSaL = nextSetasList.remove(0);
 		    		//nextSetasList.remove(nSaL); //PL einkommentiert 20-02-03
@@ -1074,18 +1155,26 @@ 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, methodSignatureConstraint, this.pool);
+		    		TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint);
 		    		forks.add(fork);
+		    		synchronized(usedTasks) {
+						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();
@@ -1093,19 +1182,24 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
 					//noOfThread--; an das Ende von compute verschoben 
 					//add_res.add(fork_res); //vermutlich falsch
-
+				};
 				/* FORK ENDE */
 		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
 		    	for(TypeUnify2Task fork : forks) {
-					noOfThread--;
+		    		synchronized (this) {
 						Set<Set<UnifyPair>> fork_res = fork.join();
-
+						synchronized (usedTasks) {
+							if (this.myIsCancelled()) {
+								return new HashSet<>();
+							}
+						}
 						//noOfThread++;
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben 
 						add_res.add(fork_res);
 						fork.writeLog("final 2");
 						fork.closeLogFile();
+					};
 				} 
 		    	//noOfThread++;	
 		    } else {//parallel = false oder MaxNoOfThreads ist erreicht, sequentiell weiterarbeiten
@@ -1434,15 +1528,15 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				//NOCH NICHT korrekt PL 2018-10-12
 				//nextSetasList = nextSetasList.stream().filter(y -> couldBecorrect(reducedUndefResSubstGroundedBasePair, y))
 				//			.collect(Collectors.toCollection(ArrayList::new));
-				writeLog("res (undef): " + res.toString() + "\n" +
+				writeLog("res (undef): " + res.toString());
-				"abhSubst: " + abhSubst.toString() + "\n" +
+				writeLog("abhSubst: " + abhSubst.toString());
-				"a2: " + rekTiefe + " " + a.toString() + "\n" +
+				writeLog("a2: " + rekTiefe + " " + a.toString());
-				"Durchschnitt: " + durchschnitt.toString() + "\n" +
+				writeLog("Durchschnitt: " + durchschnitt.toString());
-				"nextSet: " + nextSet.toString() + "\n" +
+				writeLog("nextSet: " + nextSet.toString());
-				"nextSetasList: " + nextSetasList.toString() + "\n" +
+				writeLog("nextSetasList: " + nextSetasList.toString());
-				"Number first erased Elements (undef): " + (len - nofstred) + "\n" +
+				writeLog("Number first erased Elements (undef): " + (len - nofstred));
-				"Number second erased Elements (undef): " + (nofstred- nextSetasList.size()) + "\n" +
+				writeLog("Number second erased Elements (undef): " + (nofstred- nextSetasList.size()));
-				"Number erased Elements (undef): " + (len - nextSetasList.size()));
+				writeLog("Number erased Elements (undef): " + (len - nextSetasList.size()));
 				noAllErasedElements = noAllErasedElements + (len - nextSetasList.size());
 				writeLog("Number of all erased Elements (undef): " + noAllErasedElements.toString());
 				noBacktracking++;
@@ -1902,10 +1996,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			}
 		}
 		
-		writeLog("eq2s: " + eq2s.toString() + "\n" +
+		writeLog("eq2s: " + eq2s.toString());
-		"eq2sAsListFst: " + eq2sAsListFst.toString() + "\n" +
+		writeLog("eq2sAsListFst: " + eq2sAsListFst.toString());
-		"eq2sAsListSnd: " + eq2sAsListSnd.toString() + "\n" +
+		writeLog("eq2sAsListSnd: " + eq2sAsListSnd.toString());
-		"eq2sAsListBack: " + eq2sAsListBack.toString());
+		writeLog("eq2sAsListBack: " + eq2sAsListBack.toString());
 		
 		eq2sAsList.addAll(eq2sAsListFst);
 		eq2sAsList.addAll(eq2sAsListSnd);
@@ -2510,33 +2604,33 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	}
 	
 	void writeLog(String str) {
+		synchronized ( this ) { 
 		if (log && finalresult) {
-			if(parallel){
+			try {
-				logFile.write("Thread no.:" + thNo + "\n"
+				logFile.write("Thread no.:" + thNo + "\n");
-						+ "noOfThread:" + noOfThread + "\n"
+				logFile.write("parallel:" + parallel + "\n");
-						+ "parallel:" + parallel + "\n"
+				logFile.write(str+"\n\n");
-						+ str+"\n\n"
+				logFile.flush();
-				);
+			
-			}else{
+			}
-				logFile.writeNonThreaded("Thread no.:" + thNo + "\n"
+			catch (IOException e) { 
-						+ "noOfThread:" + noOfThread + "\n"
+				System.err.println("kein LogFile");
-						+ "parallel:" + parallel + "\n"
+			}
-						+ str+"\n\n"
-				);
 			}
 	}
 	}
 	
 	void writeStatistics(String str) {
 		if (finalresult) {
+		synchronized ( this ) { 
 			try {
-				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

@@ -1,57 +0,0 @@
-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

@@ -0,0 +1,18 @@
+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

@@ -1,17 +0,0 @@
-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/main/java/de/dhbwstuttgart/typeinference/unify/WriterActiveObject.java

@@ -1,53 +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;
-
-    public WriterActiveObject(Writer writer, ForkJoinPool pool){
-        this.writer = writer;
-        this.pool = pool;
-    }
-
-    public void close(){
-        pool.execute(()->{
-            try {
-                writer.close();
-            } catch (IOException e) {
-                System.out.println(e.getMessage());
-            }
-        });
-    }
-
-    public void write(String message){
-        pool.execute(()->{
-            try {
-                writer.write(message);
-                writer.flush();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-    }
-
-    public void writeNonThreaded(String message){
-        try {
-            writer.write(message);
-            writer.flush();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void closeNonThreaded(){
-        try {
-            writer.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

src/test/java/typeinference/UnifyTest.java

@@ -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.UnifyTaskModelParallel;
+import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.*;
 import org.apache.commons.io.output.NullWriter;
@@ -34,66 +34,7 @@ public class UnifyTest {
 
     public static final String rootDirectory = System.getProperty("user.dir")+"/resources/javFiles/";
 
-    @Test
+    private UnifyPair genPairListOfInteger(String name){
-    public void unifyTest(){
-        UnifyType type1 = new PlaceholderType("a");
-        UnifyType type2 = new ReferenceType("List", new TypeParams(new PlaceholderType("b")));
-        UnifyPair pair1 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
-
-        type1 = new ReferenceType("List", new TypeParams(new PlaceholderType("c")));
-        type2 = new PlaceholderType("a");
-        UnifyPair pair2 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
-
-        type1 = new ReferenceType("String");
-        type2 = new PlaceholderType("b");
-        UnifyPair pair3 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
-
-        type1 = new ReferenceType("Integer");
-        type2 = new PlaceholderType("c");
-        UnifyPair pair4 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
-
-        Set<UnifyPair> undConstraints = new HashSet<>();
-        undConstraints.add(pair1);
-        undConstraints.add(pair2);
-        undConstraints.add(pair3);
-        undConstraints.add(pair4);
-
-        List<Set<Constraint<UnifyPair>>> oderConstraints = new ArrayList<>();
-
-        Set<UnifyPair> constraints = new HashSet<>();
-        type1 = new ReferenceType("Object");
-        type2 = new ReferenceType("String");
-        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
-        type1 = new ReferenceType("Number");
-        type2 = new ReferenceType("Integer");
-        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
-        type1 = new ReferenceType("Object");
-        type2 = new ReferenceType("Number");
-        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", 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", 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);
-        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
-        Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
-        System.out.println(solution.size());
-    }
-
-    private UnifyPair genPair(String name){
 
         UnifyType type1 = new PlaceholderType(name);
         UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("Integer")));
@@ -101,39 +42,37 @@ public class UnifyTest {
 
         return pair1;
     }
-    private UnifyPair genPair2(String name){
+    private UnifyPair genPairListOfString(String name){
 
         PlaceholderType type1 = new PlaceholderType(name);
-        type1.setVariance(1);
         UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("String")));
         UnifyPair pair1 = new UnifyPair(type2, type1, PairOperator.SMALLERDOT);
 
         return pair1;
     }
     @Test
-    public void smallUnifyTest(){
+    public void unifyTest(){
-        UnifyType type1 = new PlaceholderType("a");
+        UnifyType type1;
-        UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("Integer")));
+        UnifyType type2;
-        UnifyPair pair1 = new UnifyPair(type1, type2, PairOperator.SMALLERDOT);
 
         Set<UnifyPair> undConstraints = new HashSet<>();
-        undConstraints.add(genPair("a"));
+        undConstraints.add(genPairListOfInteger("a"));
-        undConstraints.add(genPair2("a"));
+        undConstraints.add(genPairListOfString("a"));
 
-        undConstraints.add(genPair("b"));
+        undConstraints.add(genPairListOfInteger("b"));
-        undConstraints.add(genPair2("b"));
+        undConstraints.add(genPairListOfString("b"));
-        undConstraints.add(genPair("c"));
+        undConstraints.add(genPairListOfInteger("c"));
-        undConstraints.add(genPair2("c"));
+        undConstraints.add(genPairListOfString("c"));
-        undConstraints.add(genPair("d"));
+        undConstraints.add(genPairListOfInteger("d"));
-        undConstraints.add(genPair2("d"));
+        undConstraints.add(genPairListOfString("d"));
-        undConstraints.add(genPair("e"));
+        undConstraints.add(genPairListOfInteger("e"));
-        undConstraints.add(genPair2("e"));
+        undConstraints.add(genPairListOfString("e"));
-        undConstraints.add(genPair("e1"));
+        undConstraints.add(genPairListOfInteger("e1"));
-        undConstraints.add(genPair2("e1"));
+        undConstraints.add(genPairListOfString("e1"));
-        undConstraints.add(genPair("e2"));
+        undConstraints.add(genPairListOfInteger("e2"));
-        undConstraints.add(genPair2("e2"));
+        undConstraints.add(genPairListOfString("e2"));
-        undConstraints.add(genPair("e3"));
+        undConstraints.add(genPairListOfInteger("e3"));
-        undConstraints.add(genPair2("e3"));
+        undConstraints.add(genPairListOfString("e3"));
 
         List<Set<Constraint<UnifyPair>>> oderConstraints = new ArrayList<>();
 
@@ -153,7 +92,7 @@ public class UnifyTest {
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet<Pair> cons = new ConstraintSet<>();
         UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
+        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);