fixed matrixk2 test

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

@@ -1,21 +0,0 @@
-package de.dhbwstuttgart.typeinference.unify;
-
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class ConstraintSetRepository {
-    private Set<Integer> sets = new HashSet<>();
-
-    public boolean containsSet(Set<Set<UnifyPair>> set){
-        Integer hash = Integer.valueOf(set.hashCode());
-
-        if(sets.contains(hash)){
-            return true;
-        }else{
-            sets.add(hash);
-            return false;
-        }
-    }
-}

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

@@ -1,11 +0,0 @@
-package de.dhbwstuttgart.typeinference.unify;
-
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
-
-import java.util.Set;
-
-public interface IUnifyResultListener {
-
-	void onNewTypeResultFound(Set<Set<UnifyPair>> evt);
-
-}

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

@@ -3,12 +3,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.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.FiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 public class TypeUnify {
@@ -24,12 +28,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, UnifyResultModelParallel ret, UnifyTaskModelParallel usedTasks) {
+	public Set<Set<UnifyPair>> unify(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, true, logFile, log, 0, ret, usedTasks);
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
-		ConstraintSetRepository constraintSetRepository = new ConstraintSetRepository();
-		usedTasks.setPool(pool);
-		ret.setPool(pool);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, constraintSetRepository);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -53,12 +54,9 @@ public class TypeUnify {
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModelParallel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel ret, UnifyTaskModelParallel usedTasks) {
+	public UnifyResultModel unifyAsync(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, true, logFile, log, 0, ret, usedTasks);
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
-		ConstraintSetRepository constraintSetRepository = new ConstraintSetRepository();
-		usedTasks.setPool(pool);
-		ret.setPool(pool);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, constraintSetRepository);
 		pool.invoke(unifyTask);
 		return ret;
 	}
@@ -74,12 +72,10 @@ public class TypeUnify {
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModelParallel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel ret, UnifyTaskModelParallel usedTasks) {
+	public UnifyResultModel unifyParallel(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, true, logFile, log, 0, ret, usedTasks);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks, statistics);
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
-		ConstraintSetRepository constraintSetRepository = new ConstraintSetRepository();
-		usedTasks.setPool(pool);
-		ret.setPool(pool);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, constraintSetRepository, statistics);
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
 		try {
@@ -112,9 +108,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, UnifyResultModelParallel ret, UnifyTaskModelParallel usedTasks) {
-		ConstraintSetRepository constraintSetRepository = new ConstraintSetRepository();
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, constraintSetRepository);
+	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, logFile, log, 0, ret, usedTasks);
 		unifyTask.statistics = statistics;
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {

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

@@ -15,58 +15,62 @@ import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 public class TypeUnify2Task extends TypeUnifyTask {
+       
+       Set<Set<UnifyPair>> setToFlatten;
+       Set<UnifyPair> methodSignatureConstraintUebergabe;
 
-    Set<Set<UnifyPair>> setToFlatten;
-    Set<UnifyPair> methodSignatureConstraintUebergabe;
-
-    //statistics
-    TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq,
-                   List<Set<Constraint<UnifyPair>>> oderConstraints,
-                   Set<UnifyPair> nextSetElement,
-                   IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModelParallel urm,
-                   Set<UnifyPair> methodSignatureConstraintUebergabe, ConstraintSetRepository constraintSetRepository, Writer statistics) {
-        this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, methodSignatureConstraintUebergabe, constraintSetRepository);
-
-    }
-
-    public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModelParallel urm, Set<UnifyPair> methodSignatureConstraintUebergabe, ConstraintSetRepository constraintSetRepository) {
-        super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, constraintSetRepository);
-        this.setToFlatten = setToFlatten;
-        this.nextSetElement = nextSetElement;
-        this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
-    }
-
-    Set<UnifyPair> getNextSetElement() {
-        return nextSetElement;
-    }
-
-    @Override
-    protected Set<Set<UnifyPair>> compute() {
-        if (one) {
-            System.out.println("two");
-        }
-        one = true;
-        Set<Set<UnifyPair>> res = new HashSet<>();
-
-        if (!constraintSetRepository.containsSet(setToFlatten)) {
-            res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, methodSignatureConstraintUebergabe);
-        }
+       //statistics
+       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, Writer statistics) {
+    	   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, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks, Set<UnifyPair> methodSignatureConstraintUebergabe) {
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+               this.setToFlatten = setToFlatten;
+               this.nextSetElement = nextSetElement;
+               this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
+       }
+       
+       Set<UnifyPair> getNextSetElement() {
+    	   return nextSetElement;
+       }
+       
+       @Override
+       protected Set<Set<UnifyPair>> compute() {
+               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;
-    }
+               */ 
+               //writeLog("xxx");
+               //noOfThread--;
+               synchronized (usedTasks) {
+            	   if (this.myIsCancelled()) {
+   						return new HashSet<>();
+   					}
+   					else {
+   						return res;
+   					}
+   				}
+       	}
+       
+       public void closeLogFile() {
 
-    public void closeLogFile() {
-
-        try {
-            logFile.close();
-        } catch (IOException ioE) {
-            System.err.println("no log-File" + thNo);
-        }
-
-    }
+           try {
+				logFile.close();
+			}
+			catch (IOException ioE) {
+				System.err.println("no log-File" + thNo);
+			}
+           
+       }
 }

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

@@ -73,7 +73,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	/**
 	 * Fuer die Threads
 	 */
-	UnifyResultModelParallel urm;
+	UnifyResultModel urm;
 	private static int totalnoOfThread = 0;
 	int thNo;
 	protected boolean one = false;
@@ -125,8 +125,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	static Integer  noShortendElements = 0;
 	
+	Boolean myIsCanceled = false;
+	
+	volatile UnifyTaskModel usedTasks;
+	
 	static Writer statistics;
-	protected ConstraintSetRepository constraintSetRepository;
 	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
@@ -147,11 +150,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, UnifyResultModelParallel urm, ConstraintSetRepository constraintSetRepository, Writer statistics) {
-		this(eq,oderConstraints,  fc,  parallel,  logFile,  log,  rekTiefe,  urm, constraintSetRepository);
+	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,  usedTasks);
 		this.statistics = statistics;
 	}
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModelParallel urm, ConstraintSetRepository constraintSetRepository) {
+	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();
@@ -204,7 +207,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			rules = new RuleSet(logFile);
 			this.rekTiefeField = rekTiefe;
 			this.urm = urm;
-			this.constraintSetRepository = constraintSetRepository;
+			this.usedTasks = usedTasks;
+			this.usedTasks.add(this);
 		}
 	}
 	
@@ -240,6 +244,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) {
@@ -268,7 +279,14 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				throw new DebugException("Unresolved constraints: " + res.toString()); //return new HashSet<>();
 			}
 		else {
-			return res;
+			synchronized (usedTasks) {
+				if (this.myIsCancelled()) {
+					return new HashSet<>();
+				}
+				else {
+					return res;
+				}
+			}
 		}
 	}
 /*	
@@ -301,6 +319,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());
@@ -482,6 +506,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<>();
@@ -789,7 +819,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
 				List<Set<Constraint<UnifyPair>>> newOderConstraintsOrig = new ArrayList<>(oderConstraints);
 				newElemsOrig.add(a);
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, methodSignatureConstraint, constraintSetRepository);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, methodSignatureConstraint);
 				//Überprüfen, ob das Set bereits berechnet wurde
 				forkOrig.fork();
 
@@ -804,8 +834,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 					List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, new HashSet<>(methodSignatureConstraint), constraintSetRepository);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks, new HashSet<>(methodSignatureConstraint));
 					forks.add(fork);
+					//Überprüfen, ob das Set bereits berechnet wurde
 					fork.fork();
 				}
 
@@ -823,9 +854,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			}else{
 				elems.add(a);
 				//Überprüfen ob das Set bereits berechnet wurde
-				if(!constraintSetRepository.containsSet(elems)){
-					res = unify2(elems, eq, oderConstraints, fc, parallel, rekTiefe, new HashSet<>(methodSignatureConstraint));
-				}
+				res = unify2(elems, eq, oderConstraints, fc, parallel, rekTiefe, new HashSet<>(methodSignatureConstraint));
 			}
 			
 			//Ab hier alle parallele Berechnungen wieder zusammengeführt.

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

@@ -0,0 +1,7 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+public interface UnifyResultListener {
+
+	void onNewTypeResultFound(UnifyResultEvent evt);
+
+}

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

@@ -0,0 +1,21 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+public class UnifyResultListenerImpl implements UnifyResultListener {
+
+	List<ResultSet> results = new ArrayList<>();
+	
+	public synchronized void onNewTypeResultFound(UnifyResultEvent evt) {
+		results.addAll(evt.getNewTypeResult());
+	}
+	
+	public List<ResultSet> getResults() {
+		return results;
+	}
+
+}

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

@@ -0,0 +1,41 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+public class UnifyResultModel {
+	
+	ConstraintSet<de.dhbwstuttgart.typeinference.constraints.Pair> cons;
+	
+	IFiniteClosure fc;
+	
+	public UnifyResultModel(ConstraintSet<de.dhbwstuttgart.typeinference.constraints.Pair> cons,
+					 IFiniteClosure fc) {
+		this.cons = cons;
+		this.fc = fc;
+	}
+	
+	private List<UnifyResultListener> listeners = new ArrayList<>();
+	
+	public void addUnifyResultListener(UnifyResultListener listenerToAdd) {
+		listeners.add(listenerToAdd);
+	}
+
+	public void removeUnifyResultListener(UnifyResultListener listenerToRemove) {
+		listeners.remove(listenerToRemove);
+	}
+	
+	public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet) {
+
+	}
+}

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

@@ -1,51 +0,0 @@
-package de.dhbwstuttgart.typeinference.unify;
-
-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.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<IUnifyResultListener> 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(IUnifyResultListener listenerToAdd) {
-        listeners.add(listenerToAdd);
-    }
-    public void removeUnifyResultListener(IUnifyResultListener 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));
-
-            for (IUnifyResultListener listener : listeners) {
-                listener.onNewTypeResultFound(eqPrimePrimeSetRet);
-            }
-        });
-    }
-}

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,18 +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/test/java/UnifyTest.java

@@ -2,8 +2,8 @@ import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.TypeUnify;
-import de.dhbwstuttgart.typeinference.unify.UnifyResultModelParallel;
-import de.dhbwstuttgart.typeinference.unify.UnifyTaskModelParallel;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
+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;
@@ -76,12 +76,13 @@ public class UnifyTest {
 
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet<Pair> cons = new ConstraintSet<>();
-        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
-        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyTaskModel tasks = new UnifyTaskModel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
         //System.out.println(solution);
     }
+
     @Test
     public void basicMatrixTest(){
         UnifyType type1;
@@ -184,7 +185,7 @@ public class UnifyTest {
         type2 = new ReferenceType("Vector", new TypeParams(new ReferenceType("Vector", new TypeParams(new ReferenceType("Integer")))));
         constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
         //Vector<X> extends Object
-        type1 = new ReferenceType("Vector", new TypeParams(new PlaceholderType("X")));
+        type1 = new ReferenceType("Vector", new TypeParams(new ReferenceType("X")));
         type2 = new ReferenceType("Object");
         constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
         //Integer extends Object
@@ -195,8 +196,8 @@ public class UnifyTest {
 
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet< Pair> cons = new ConstraintSet<>();
-        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
-        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyTaskModel tasks = new UnifyTaskModel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
     }
@@ -671,8 +672,8 @@ public class UnifyTest {
         FiniteClosure finiteClosure = new FiniteClosure(fcConstraints, new NullWriter());
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet< Pair> cons = new ConstraintSet<>();
-        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
-        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyTaskModel tasks = new UnifyTaskModel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
     }
@@ -1232,8 +1233,8 @@ public class UnifyTest {
         FiniteClosure finiteClosure = new FiniteClosure(fcConstraints, new NullWriter());
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet< Pair> cons = new ConstraintSet<>();
-        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
-        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyTaskModel tasks = new UnifyTaskModel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
     }
@@ -2097,8 +2098,8 @@ public class UnifyTest {
         FiniteClosure finiteClosure = new FiniteClosure(fcConstraints, new NullWriter());
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet< Pair> cons = new ConstraintSet<>();
-        UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
-        UnifyTaskModelParallel tasks = new UnifyTaskModelParallel();
+        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        UnifyTaskModel tasks = new UnifyTaskModel();
         Set<Set<UnifyPair>> solution = unifyAlgo.unify(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
         System.out.println(solution.size());
     }