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

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

Makefile

@@ -1,11 +1,3 @@
-full:
+NoOptParallel:
 	mvn -DskipTests package
-	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_full.jar
-
-NoMinMax:
-	mvn -DskipTests package
-	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_NoMinMax.jar
-
-NoOpt:
-	mvn -DskipTests package
-	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_NoOpt.jar
+	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_NoOptParallel.jar

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

@@ -70,7 +70,7 @@ public class JavaTXCompiler {
 
 	//public static JavaTXCompiler INSTANCE;
     final CompilationEnvironment environment;
-	Boolean resultmodel = false;
+	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 volatile UnifyTaskModel usedTasks = new UnifyTaskModel();

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

@@ -82,6 +82,8 @@ public class TypeUnify {
 		try {
 			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");

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

@@ -82,7 +82,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	private static int totalnoOfThread = 0;
 	int thNo;
 	protected boolean one = false;
-	Integer MaxNoOfThreads = 8;
+	Integer MaxNoOfThreads = 128;
 
 	public static final String rootDirectory = System.getProperty("user.dir")+"/test/logFiles/";
 	Writer logFile;
@@ -258,7 +258,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	protected Set<Set<UnifyPair>> compute() {
 		if (one) {
-			System.out.println("two");
+			//System.out.println("two");
 		}
 		one = true;
 		Set<UnifyPair> neweq = new HashSet<>(eq);
@@ -659,7 +659,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		//a <. theta, theta <. a oder a =. theta enthalten 
 		
 		//statistics
-		writeStatistics("\nNumber of Constraints (" + rekTiefe + "): " + topLevelSets.size());
+		//writeStatistics("\nNumber of Constraints (" + rekTiefe + "): " + topLevelSets.size());
 		
 		Set<Set<UnifyPair>> oneElems = new HashSet<>();
 		oneElems.addAll(topLevelSets.stream()
@@ -679,7 +679,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		//writeLog("nextSet: " + nextSet.toString());
 		List<Set<UnifyPair>> nextSetasList =new ArrayList<>(nextSet);
 		
-		writeStatistics(" Start Number of elements ( " /* + nextSetasList.get(0).stream().findFirst().get().getBasePair()*/  +"): (" + rekTiefe + "): " + nextSetasList.size());
+		//writeStatistics(" Start Number of elements ( " /* + nextSetasList.get(0).stream().findFirst().get().getBasePair()*/  +"): (" + rekTiefe + "): " + nextSetasList.size());
 
 		/*
 		try {
@@ -797,7 +797,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		while (nextSetasList.size() > 0) {
 			
 			//statistics
-			writeStatistics(" Actual Number of elements( " + nextSetasList.get(0).stream().findFirst().get().getBasePair() +"): (" + rekTiefe + "): " + nextSetasList.size());
+			//writeStatistics(" Actual Number of elements( " + nextSetasList.get(0).stream().findFirst().get().getBasePair() +"): (" + rekTiefe + "): " + nextSetasList.size());
 			Set<UnifyPair> a_last = a;
 			
 			/* Liste der Faelle für die parallele Verarbeitung 
@@ -892,7 +892,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			Nextvar an Hand Varianzbestimmung auskommentieren Ende */
 			a = nextSetasList.remove(0); //statisticsList
 			
-			writeStatistics(a.toString());
+			//writeStatistics(a.toString());
 			if (oderConstraint) {//Methodconstraints werden abgespeichert für die Bytecodegenerierung von Methodenaufrufen
 				methodSignatureConstraint.addAll(((Constraint<UnifyPair>)a).getmethodSignatureConstraint());
 				//System.out.println("ERSTELLUNG: " +methodSignatureConstraint);
@@ -947,9 +947,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					writeLog("a in " + variance + " "+ a);
 					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
 				}
-				while (!nextSetasListRest.isEmpty()) {
-					Set<UnifyPair> nSaL = nextSetasListRest.remove(0);
-					synchronized (this) { nextSetasList.remove(nSaL);
+				while (!nextSetasList.isEmpty()) {
+					Set<UnifyPair> nSaL = nextSetasList.remove(0);
+					synchronized (this) { //nextSetasList.remove(nSaL);
 						writeLog("1 RM" + nSaL.toString());
 					}
 					
@@ -1049,9 +1049,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					writeLog("a in " + variance + " "+ a);
 					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
 				}
-				while (!nextSetasListRest.isEmpty()) {
-					Set<UnifyPair> nSaL = nextSetasListRest.remove(0);
-					synchronized (this) { nextSetasList.remove(nSaL);
+				while (!nextSetasList.isEmpty()) {
+					Set<UnifyPair> nSaL = nextSetasList.remove(0);
+					synchronized (this) { //nextSetasList.remove(nSaL);
 						writeLog("-1 RM" + nSaL.toString());
 					}
 					
@@ -1151,9 +1151,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					writeLog("a in " + variance + " "+ a);
 					writeLog("nextSetasListRest: " + nextSetasListRest.toString());
 				}
-		    	while (!nextSetasListRest.isEmpty()) {
-		    		Set<UnifyPair> nSaL = nextSetasListRest.remove(0);
-		    		nextSetasList.remove(nSaL); //PL einkommentiert 20-02-03
+		    	while (!nextSetasList.isEmpty()) {
+		    		Set<UnifyPair> nSaL = nextSetasList.remove(0);
+		    		//nextSetasList.remove(nSaL); //PL einkommentiert 20-02-03
 		    		Set<UnifyPair> newEq = new HashSet<>(eq);
 		    		Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 		    		List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
@@ -1213,9 +1213,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    }}}
 			
 			//Ab hier alle parallele Berechnungen wieder zusammengeführt.
-			if (hilf == 1)
-				System.out.println();
-			writeStatistics("Zusammengeführt(" + rekTiefe + "): " +  nextSetasList.size());
+			//if (hilf == 1)
+				//System.out.println();
+			//writeStatistics("Zusammengeführt(" + rekTiefe + "): " +  nextSetasList.size());
 			if (oderConstraint) {//Wenn weiteres Element nextSetasList genommen wird, muss die vorherige methodsignatur geloescht werden
 				methodSignatureConstraint.removeAll(((Constraint<UnifyPair>)a).getmethodSignatureConstraint());
 				//System.out.println("REMOVE: " +methodSignatureConstraint);
@@ -1327,7 +1327,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 							//wenn korrektes Ergebnis gefunden alle Fehlerfaelle loeschen
 							result = par_res;
 							if (!par_res.isEmpty() && par_res.iterator().next() instanceof WildcardType) {
-								System.out.println("");
+								//System.out.println("");
 							}
 						}
 						else { 
@@ -1513,7 +1513,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 									return new Pair<>(su, x.getGroundBasePair());})
 						.collect(Collectors.toCollection(HashSet::new));
 				if (res.size() > 1) {
-					System.out.println();
+					//System.out.println();
 				}
 				/* statistics no erase
 				writeLog("nextSetasList vor filter-Aufruf: " + nextSetasList);
@@ -1546,11 +1546,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				writeLog("Number of all erased Elements (undef): " + noAllErasedElements.toString());
 				noBacktracking++;
 				writeLog("Number of Backtracking: " + noBacktracking);
-				writeStatistics("Number of erased elements: " + (len - nextSetasList.size()));
-				writeStatistics("Number of Backtracking: " + noBacktracking);
-				System.out.println("");
+				//writeStatistics("Number of erased elements: " + (len - nextSetasList.size()));
+				//writeStatistics("Number of Backtracking: " + noBacktracking);
+				//System.out.println("");
 			}
-			else writeStatistics("res: " + res.toString());
+			else //writeStatistics("res: " + res.toString());
 			//if (nextSetasList.size() == 0 && isUndefinedPairSetSet(result) && nextSet.size() > 1) { 
 			//	return result;
 			//}
@@ -1559,9 +1559,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			//}
 			//else result.stream().filter(y -> !isUndefinedPairSet(y));
 			writeLog("res: " + res.toString());
-			writeStatistics("  End Number of Elements (" + rekTiefe + "): " + nextSetasList.size());
+			//writeStatistics("  End Number of Elements (" + rekTiefe + "): " + nextSetasList.size());
 			noLoop++;
-			writeStatistics("Number of Loops: " + noLoop);
+			//writeStatistics("Number of Loops: " + noLoop);
 		}
 		//2020-02-02: if (variance ==2) Hier Aufruf von filterOverriding einfuegen
 		writeLog("Return computeCR: " + result.toString());
@@ -2057,7 +2057,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				//System.out.println(pair);
 				if (first) { //writeLog(pair.toString()+"\n");
 					if (((PlaceholderType)(pair.getLhsType())).getName().equals("AR")) {
-						System.out.println("AR");
+						//System.out.println("AR");
 					}
 					Set<Set<UnifyPair>> x1 = unifyCase1(pair, fc);
 					if (pairOp == PairOperator.SMALLERNEQDOT) {
@@ -2630,7 +2630,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		if (finalresult) {
 		synchronized ( this ) { 
 			try {
-				statistics.write(str + "\n");
+				statistics.write("Thread No. " + thNo + ": " + str + "\n");
 				statistics.flush();
 			
 			}