implemented unify test

This reverts commit 5aadb7545e.

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

@@ -89,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.write("test");
+		statistics = new OutputStreamWriter(new NullOutputStream());
+    	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")));

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

@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.RecursiveTask;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
@@ -57,7 +56,6 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 
 import com.google.common.collect.Ordering;
-import org.apache.commons.io.output.NullWriter;
 
 
 /**
@@ -80,9 +78,11 @@ 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/";
 	Writer logFile;
@@ -161,10 +161,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		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();
-            }
+		synchronized (this) { 
 			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 -> {
@@ -183,7 +180,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			this.parallel = parallel;
 			this.logFile = logFile;
 			this.log = log;
-
+			
+			noOfThread++; 
 			totalnoOfThread++;
 			//writeLog("thNo1 " + thNo);
 			thNo = totalnoOfThread;
@@ -272,6 +270,7 @@ 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 {
 			logFile.close();
 		}
@@ -926,7 +925,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)) {
+			if(parallel && (variance == 1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -986,6 +985,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				/* FORK ANFANG */
 				synchronized (this) {
 					writeLog("wait "+ forkOrig.thNo);
+					noOfThread--;
 					res = forkOrig.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1005,6 +1005,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
+						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						synchronized (usedTasks) {
 							if (this.myIsCancelled()) {
@@ -1026,7 +1027,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				//noOfThread++;
 			} else {
-			if(parallel && (variance == -1)) {
+			if(parallel && (variance == -1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -1085,6 +1086,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				/* FORK ANFANG */
 				synchronized (this) {
 					writeLog("wait "+ forkOrig.thNo);
+					noOfThread--;
 					res = forkOrig.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1104,6 +1106,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
+						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						synchronized (usedTasks) {
 							if (this.myIsCancelled()) {
@@ -1125,7 +1128,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				//noOfThread++;
 		    } else {
-		    if(parallel && (variance == 2)) {
+		    if(parallel && (variance == 2) && noOfThread <= MaxNoOfThreads) {
 		    	writeLog("var2einstieg");
 		    	Set<TypeUnify2Task> forks = new HashSet<>();
 		    	Set<UnifyPair> newEqOrig = new HashSet<>(eq);
@@ -1169,6 +1172,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	/* FORK ANFANG */
 		    	synchronized (this) {
 		    		writeLog("wait "+ forkOrig.thNo);
+		    		noOfThread--;
 					res = forkOrig.join();
 					synchronized (usedTasks) {
 						if (this.myIsCancelled()) {
@@ -1187,6 +1191,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
 		    	for(TypeUnify2Task fork : forks) {
 		    		synchronized (this) {
+		    			noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						synchronized (usedTasks) {
 							if (this.myIsCancelled()) {
@@ -2608,6 +2613,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		if (log && finalresult) {
 			try {
 				logFile.write("Thread no.:" + thNo + "\n");
+				logFile.write("noOfThread:" + noOfThread + "\n");
 				logFile.write("parallel:" + parallel + "\n");
 				logFile.write(str+"\n\n");
 				logFile.flush();

src/test/java/typeinference/UnifyTest.java

@@ -1,8 +1,13 @@
 package typeinference;
 
+import com.google.common.base.Optional;
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
 import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
 import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
 import de.dhbwstuttgart.typedeployment.TypeInsert;
@@ -34,68 +39,56 @@ public class UnifyTest {
 
     public static final String rootDirectory = System.getProperty("user.dir")+"/resources/javFiles/";
 
-    private UnifyPair genPairListOfInteger(String name){
-
-        UnifyType type1 = new PlaceholderType(name);
-        UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("Integer")));
-        UnifyPair pair1 = new UnifyPair(type2, type1, PairOperator.SMALLERDOT);
-
-        return pair1;
-    }
-    private UnifyPair genPairListOfString(String name){
-
-        PlaceholderType type1 = new PlaceholderType(name);
-        UnifyType type2 = new ReferenceType("List", new TypeParams(new ReferenceType("String")));
-        UnifyPair pair1 = new UnifyPair(type2, type1, PairOperator.SMALLERDOT);
-
-        return pair1;
-    }
     @Test
     public void unifyTest(){
-        UnifyType type1;
-        UnifyType type2;
+        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(genPairListOfInteger("a"));
-        undConstraints.add(genPairListOfString("a"));
-
-        undConstraints.add(genPairListOfInteger("b"));
-        undConstraints.add(genPairListOfString("b"));
-        undConstraints.add(genPairListOfInteger("c"));
-        undConstraints.add(genPairListOfString("c"));
-        undConstraints.add(genPairListOfInteger("d"));
-        undConstraints.add(genPairListOfString("d"));
-        undConstraints.add(genPairListOfInteger("e"));
-        undConstraints.add(genPairListOfString("e"));
-        undConstraints.add(genPairListOfInteger("e1"));
-        undConstraints.add(genPairListOfString("e1"));
-        undConstraints.add(genPairListOfInteger("e2"));
-        undConstraints.add(genPairListOfString("e2"));
-        undConstraints.add(genPairListOfInteger("e3"));
-        undConstraints.add(genPairListOfString("e3"));
+        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("List", new TypeParams(new PlaceholderType("X")));
-        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
-        type1 = new ReferenceType("Object");
-        type2 = new ReferenceType("Integer");
-        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
-        type1 = new ReferenceType("Object");
         type2 = new ReferenceType("String");
-        constraints.add(new UnifyPair(type2, type1, PairOperator.SMALLER));
+        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        type1 = new ReferenceType("Number");
+        type2 = new ReferenceType("Integer");
+        constraints.add(new UnifyPair(type1, type2, PairOperator.SMALLER));
+        type1 = new ReferenceType("Object");
+        type2 = new ReferenceType("Number");
+        constraints.add(new UnifyPair(type1, type2, 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));
 
         IFiniteClosure finiteClosure = new FiniteClosure(constraints, new NullWriter());
 
         TypeUnify unifyAlgo = new TypeUnify();
-        ConstraintSet<Pair> cons = new ConstraintSet<>();
+        ConstraintSet< Pair> cons = new ConstraintSet<>();
         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);
+        urm = unifyAlgo.unifyParallel(undConstraints, oderConstraints, finiteClosure, new NullWriter(), false, urm, tasks);
     }
     /*
     @Test