removed unused code

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

@@ -369,7 +369,7 @@ public class JavaTXCompiler {
 	 * }
 	 */
 
-	public UnifyResultModel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile)
+	public UnifyResultModelParallel 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 +382,7 @@ public class JavaTXCompiler {
 
 		final ConstraintSet<Pair> cons = getConstraints();
 		Set<Set<UnifyPair>> results = new HashSet<>();
-		UnifyResultModel urm = null;
+		UnifyResultModelParallel urm = null;
 		// urm.addUnifyResultListener(resultListener);
 		try {
 			logFile = logFile == null
@@ -390,7 +390,7 @@ public class JavaTXCompiler {
 					: logFile;
 			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, classLoader);
 			System.out.println(finiteClosure);
-			urm = new UnifyResultModel(cons, finiteClosure);
+			urm = new UnifyResultModelParallel(cons, finiteClosure);
 			urm.addUnifyResultListener(resultListener);
 			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
 
@@ -720,7 +720,7 @@ public class JavaTXCompiler {
 			}).collect(Collectors.toCollection(ArrayList::new))*/;
 			if (resultmodel) {
 				/* UnifyResultModel Anfang */
-				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+				UnifyResultModelParallel urm = new UnifyResultModelParallel(cons, finiteClosure);
 				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
 				urm.addUnifyResultListener(li);
 				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm,
@@ -738,7 +738,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 UnifyResultModel(cons, finiteClosure), usedTasks);
+						finiteClosure, logFile, log, new UnifyResultModelParallel(cons, finiteClosure), usedTasks);
 				System.out.println("RESULT: " + result);
 				logFile.write("RES: " + result.toString() + "\n");
 				logFile.flush();

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

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.typeinference.unify;
 
-import java.io.IOException;
 import java.io.Writer;
 import java.util.List;
 import java.util.Set;
@@ -20,22 +19,15 @@ 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, UnifyResultModel ret, UnifyTaskModelParallel taskModel) {
+	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModelParallel taskModel) {
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
 		taskModel.setPool(pool);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, pool);
+		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;
 	}
 	
@@ -46,16 +38,15 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
-	 * @param cons
-	 * @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 UnifyResultModelParallel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModelParallel taskModel) {
 		ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
 		taskModel.setPool(pool);
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, 0, ret, pool);
+		resultModel.setPool(pool);
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, resultModel, pool);
 		pool.invoke(unifyTask);
-		return ret;
+		return resultModel;
 	}
 	
 	/**
@@ -65,28 +56,19 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
-	 * @param cons
-	 * @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 UnifyResultModelParallel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModelParallel taskModel) {
 		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, 0, ret, pool, statistics);
+				new TypeUnifyTask(undConstrains, oderConstraints, fc, true, new WriterActiveObject(logFile, pool), log, resultModel, pool, statistics);
 
 		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.statisticsFile.write("\nLoops: " + unifyTask.noLoop);
-		}
-		catch (IOException e) {
-			System.err.println("no log-File");
-		}
-		return ret;
+		unifyTask.join();
+
+		return resultModel;
 	}
 	
 	/*
@@ -104,20 +86,13 @@ 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, UnifyResultModel ret, UnifyTaskModelParallel taskModel) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, new WriterActiveObject(logFile, ForkJoinPool.commonPool()), log, 0, ret, ForkJoinPool.commonPool());
+	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModelParallel resultModel, UnifyTaskModelParallel taskModel) {
+		resultModel.setPool(ForkJoinPool.commonPool());
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, new WriterActiveObject(logFile, ForkJoinPool.commonPool()), log, resultModel, ForkJoinPool.commonPool());
 		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,17 +1,11 @@
 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;
 
@@ -24,14 +18,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, WriterActiveObject logFile, Boolean log, UnifyResultModelParallel urm,
                       Set<UnifyPair> methodSignatureConstraintUebergabe, ForkJoinPool pool, Writer statistics) {
-    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, rekTiefe, urm, methodSignatureConstraintUebergabe, pool );
+    	   this(setToFlatten, eq, oderConstraints, nextSetElement, fc, parallel, logFile, log, urm, methodSignatureConstraintUebergabe, pool );
     	   
        }
        
-       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) {
-               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, pool);
+       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) {
+               super(eq, oderConstraints, fc, parallel, logFile, log, urm, pool);
                this.setToFlatten = setToFlatten;
                this.nextSetElement = nextSetElement;
                this.methodSignatureConstraintUebergabe = methodSignatureConstraintUebergabe;
@@ -43,11 +37,7 @@ public class TypeUnify2Task extends TypeUnifyTask {
        
        @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);
+               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, methodSignatureConstraintUebergabe);
                /*if (isUndefinedPairSetSet(res)) { 
                        return new HashSet<>(); }
                else

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

@@ -0,0 +1,57 @@
+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/test/java/typeinference/UnifyTest.java

@@ -12,7 +12,7 @@ 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.UnifyResultModel;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultModelParallel;
 import de.dhbwstuttgart.typeinference.unify.UnifyTaskModelParallel;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
 import de.dhbwstuttgart.typeinference.unify.model.*;
@@ -87,7 +87,7 @@ public class UnifyTest {
 
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet< Pair> cons = new ConstraintSet<>();
-        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        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());
@@ -150,7 +150,7 @@ public class UnifyTest {
 
         TypeUnify unifyAlgo = new TypeUnify();
         ConstraintSet< Pair> cons = new ConstraintSet<>();
-        UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
+        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());