no longer printing solutions to cmd

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;
    
@@ -82,8 +89,8 @@ public class JavaTXCompiler {
 	}
     public JavaTXCompiler(List<File> sources, List<File> contextPath) throws IOException, ClassNotFoundException {
     	//statistics = new FileWriter(new File(System.getProperty("user.dir") + "/" + sources.get(0).getName() + "_"+ new Timestamp(System.currentTimeMillis())));
-		statistics = new OutputStreamWriter(new NullOutputStream());
+    	statistics = new OutputStreamWriter(new NullOutputStream());
-    	statistics.write("test");
+		statistics.write("test");
         if(contextPath == null || contextPath.isEmpty()){
         	//When no contextPaths are given, the working directory is the sources root
 			contextPath = Lists.newArrayList(new File(System.getProperty("user.dir")));
@@ -369,7 +376,7 @@ public class JavaTXCompiler {
 	 * }
 	 */
 
-	public UnifyResultModelParallel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile)
+	public UnifyResultModel 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
@@ -382,7 +389,7 @@ public class JavaTXCompiler {
 
 		final ConstraintSet<Pair> cons = getConstraints();
 		Set<Set<UnifyPair>> results = new HashSet<>();
-		UnifyResultModelParallel urm = null;
+		UnifyResultModel urm = null;
 		// urm.addUnifyResultListener(resultListener);
 		try {
 			logFile = logFile == null
@@ -390,7 +397,7 @@ public class JavaTXCompiler {
 					: logFile;
 			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, classLoader);
 			System.out.println(finiteClosure);
-			urm = new UnifyResultModelParallel(cons, finiteClosure);
+			urm = new UnifyResultModel(cons, finiteClosure);
 			urm.addUnifyResultListener(resultListener);
 			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
 
@@ -720,7 +727,7 @@ public class JavaTXCompiler {
 			}).collect(Collectors.toCollection(ArrayList::new))*/;
 			if (resultmodel) {
 				/* UnifyResultModel Anfang */
-				UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
+				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
 				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
 				urm.addUnifyResultListener(li);
 				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm,
@@ -738,7 +745,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 UnifyResultModelParallel(cons, finiteClosure), usedTasks);
+						finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
 				System.out.println("RESULT: " + result);
 				logFile.write("RES: " + result.toString() + "\n");
 				logFile.flush();

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

@@ -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(); }
 								     } );
-		logFile.write("FUNgreater: " + pair + "\n");
+		try {
-		logFile.write("FUNred: " + result + "\n");
+			logFile.write("FUNgreater: " + pair + "\n");
+				logFile.write("FUNred: " + result + "\n");
+				logFile.flush();
+			}
+		catch (IOException e) {
+			System.out.println("logFile-Error");
+		}
 		return Optional.of(result);
 	}
 	
@@ -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: " + pair + "\n");
-		logFile.write("FUNgreater: " + result + "\n");
+			logFile.write("FUNgreater: " + result + "\n");
-
+			logFile.flush();
+		}
+	catch (IOException e) {
+		System.out.println("lofFile-Error");
+	}
 		return Optional.of(result);
 	}
 
@@ -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("FUNgreater: " + pair + "\n");
-		logFile.write("FUNsmaller: " + result + "\n");
+			logFile.write("FUNsmaller: " + result + "\n");
+			logFile.flush();
+		}
+	catch (IOException e) {
+		System.out.println("lofFile-Error");
+	}
 		return Optional.of(result);
 	}
 

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

@@ -1,12 +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 {
@@ -19,15 +26,21 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
+	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, 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();
-		resultModel.setPool(pool);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, resultModel, pool);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
+		try {
+			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements + "\n");
+			logFile.flush();
+		}
+		catch (IOException e) {
+			System.err.println("no log-File");
+		}
 		return res;
 	}
 	
@@ -38,15 +51,15 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
+	 * @param cons
+	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModelParallel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, 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();
-		resultModel.setPool(pool);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, resultModel, pool);
 		pool.invoke(unifyTask);
-		return resultModel;
+		return ret;
 	}
 	
 	/**
@@ -56,19 +69,26 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
+	 * @param cons
+	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModelParallel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, 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);
-		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, resultModel, pool, statistics);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks, statistics);
-
+		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
-		unifyTask.join();
+		Set<Set<UnifyPair>> res =  unifyTask.join();
-
+		try {
-		return resultModel;
+			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
+			logFile.flush();
+			unifyTask.statistics.write("Backtracking: " + unifyTask.noBacktracking);
+			unifyTask.statistics.write("\nLoops: " + unifyTask.noLoop);
+		}
+		catch (IOException e) {
+			System.err.println("no log-File");
+		}
+		return ret;
 	}
 	
 	/*
@@ -86,13 +106,20 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
+	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, 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) {
-		resultModel.setPool(ForkJoinPool.commonPool());
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, usedTasks);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, new WriterActiveObject(logFile, ForkJoinPool.commonPool()), log, resultModel, ForkJoinPool.commonPool());
+		unifyTask.statistics = statistics;
-		unifyTask.statisticsFile = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
+		try {
+			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");
+			logFile.flush();
+		}
+		catch (IOException e) {
+			System.err.println("no log-File");
+		}
 		return res;
 	}
 

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

@@ -1,11 +1,16 @@
 package de.dhbwstuttgart.typeinference.unify;
 
+import java.io.FileWriter;
+import java.io.IOException;
 import java.io.Writer;
+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;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
@@ -15,17 +20,17 @@ public class TypeUnify2Task extends TypeUnifyTask {
        Set<UnifyPair> methodSignatureConstraintUebergabe;
 
        //statistics
-       TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq,
+       TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, 
-                      List<Set<Constraint<UnifyPair>>> oderConstraints,
+    		   List<Set<Constraint<UnifyPair>>> oderConstraints, 
-                      Set<UnifyPair> nextSetElement,
+    		   Set<UnifyPair> nextSetElement, 
-                      IFiniteClosure fc, boolean parallel, WriterActiveObject logFile, Boolean log, UnifyResultModelParallel 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, 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, UnifyResultModelParallel 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, urm, pool);
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
                this.setToFlatten = setToFlatten;
                this.nextSetElement = nextSetElement;
                this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
@@ -37,21 +42,35 @@ public class TypeUnify2Task extends TypeUnifyTask {
        
        @Override
        protected Set<Set<UnifyPair>> compute() {
-               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, methodSignatureConstraintUebergabe);
+               if (one) {
+                       System.out.println("two");
+               }
+               one = true;
+               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, methodSignatureConstraintUebergabe);
                /*if (isUndefinedPairSetSet(res)) { 
                        return new HashSet<>(); }
                else
                */ 
                //writeLog("xxx");
                //noOfThread--;
-           return res;
+               synchronized (usedTasks) {
+            	   if (this.myIsCancelled()) {
+   						return new HashSet<>();
+   					}
+   					else {
+   						return res;
+   					}
+   				}
        	}
        
        public void closeLogFile() {
-           if(parallel){
+
-               logFile.close();
+           try {
-           }else{
+				logFile.close();
-               logFile.closeNonThreaded();
+			}
-           }
+			catch (IOException ioE) {
+				System.err.println("no log-File" + thNo);
+			}
+           
        }
 }

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

@@ -12,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.UnifyResultModelParallel;
+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,65 +34,6 @@ public class UnifyTest {
 
     public static final String rootDirectory = System.getProperty("user.dir")+"/resources/javFiles/";
 
-    @Test
-    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);
-
-        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<>();
-        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());
-    }
-
     private UnifyPair genPairListOfInteger(String name){
 
         UnifyType type1 = new PlaceholderType(name);
@@ -149,12 +90,12 @@ public class UnifyTest {
         IFiniteClosure finiteClosure = new FiniteClosure(constraints, new NullWriter());
 
         TypeUnify unifyAlgo = new TypeUnify();
-        ConstraintSet< Pair> cons = new ConstraintSet<>();
+        ConstraintSet<Pair> cons = new ConstraintSet<>();
-        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
+        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);
+        //System.out.println(solution);
     }
     /*
     @Test