fixed unifyresultmodelparallel for standalone type unify

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

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

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

@@ -7,17 +7,18 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IUnifyResultListener;
 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;
+
+	private ConstraintSet<de.dhbwstuttgart.typeinference.constraints.Pair> cons;
+	private IFiniteClosure fc;
+	private List<IUnifyResultListener> listeners = new ArrayList<>();
+
 	
 	public UnifyResultModel(ConstraintSet<de.dhbwstuttgart.typeinference.constraints.Pair> cons,
 					 IFiniteClosure fc) {
@@ -26,6 +27,19 @@ public class UnifyResultModel {
 	}
 	
 	public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet) {
-		throw new DebugException("Not implemented");
+		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/UnifyResultModelParallel.java

@@ -1,10 +1,9 @@
 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.interfaces.IUnifyResultListener;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
@@ -16,7 +15,7 @@ public class UnifyResultModelParallel {
     private ForkJoinPool pool;
     private ConstraintSet<Pair> cons;
     private IFiniteClosure fc;
-    private List<UnifyResultListener> listeners = new ArrayList<>();
+    private List<IUnifyResultListener> listeners = new ArrayList<>();
 
     public UnifyResultModelParallel(ConstraintSet<Pair> cons, IFiniteClosure fc){
         this.cons = cons;
@@ -26,10 +25,10 @@ public class UnifyResultModelParallel {
     public void setPool(ForkJoinPool pool){
         this.pool = pool;
     }
-    public void addUnifyResultListener(UnifyResultListener listenerToAdd) {
+    public void addUnifyResultListener(IUnifyResultListener listenerToAdd) {
         listeners.add(listenerToAdd);
     }
-    public void removeUnifyResultListener(UnifyResultListener listenerToRemove) {
+    public void removeUnifyResultListener(IUnifyResultListener listenerToRemove) {
         listeners.remove(listenerToRemove);
     }
     public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet){
@@ -45,13 +44,9 @@ public class UnifyResultModelParallel {
                 }
                 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);
+            for (IUnifyResultListener listener : listeners) {
+                listener.onNewTypeResultFound(eqPrimePrimeSetRet);
             }
         });
     }

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

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