added unifyTest

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

Makefile

@@ -1,16 +1,3 @@
-full:
-	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
-
 NoOptParallel:
 	mvn -DskipTests package
 	cp target/JavaTXcompiler-0.1-jar-with-dependencies.jar target/JavaTXcompiler-0.1-jar-with-dependencies_NoOptParallel.jar
-

pom.xml

@@ -54,8 +54,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<version>3.8.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>19</source>
-                    <target>19</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
 			</plugin>
 			<plugin>

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();
@@ -88,8 +88,9 @@ public class JavaTXCompiler {
 		this(sourceFiles, null);
 	}
     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.write("test");
+    	//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");
         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/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

@@ -56,6 +56,7 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 
 import com.google.common.collect.Ordering;
+import org.apache.commons.io.output.NullWriter;
 
 
 /**
@@ -82,7 +83,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;
@@ -161,7 +162,10 @@ 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) { 
+		synchronized (this) {
+            if(statistics==null){
+                statistics = new NullWriter();
+            }
 			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 -> {
@@ -258,7 +262,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 +663,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 +683,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 +801,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 
@@ -817,7 +821,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			writeLog("nextSet: " + nextSet.toString());
 			writeLog("nextSetasList: " + nextSetasList.toString());
 			
-			///* staistics Nextvar an Hand Varianzbestimmung auskommentieren Anfang 
+			/* staistics Nextvar an Hand Varianzbestimmung auskommentieren Anfang 
 			if (variance == 1) {
 				a = oup.max(nextSetasList.iterator());
 				nextSetasList.remove(a);
@@ -889,10 +893,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					}
 				}
 			}
-			//Nextvar an Hand Varianzbestimmung auskommentieren Ende */
-			//a = nextSetasList.remove(0); //statisticsList
+			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 +951,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 +1053,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 +1155,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 +1217,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 +1331,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 { 
@@ -1343,7 +1347,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					//break;
 				}
 				
-			// /* auskommentiert um alle Max und min Betrachtung auszuschalten ANFANG 
+			/* auskommentiert um alle Max und min Betrachtung auszuschalten ANFANG 
 			if (!result.isEmpty() && (!isUndefinedPairSetSet(res) || !aParDef.isEmpty())) {
 				if (nextSetasList.iterator().hasNext() && nextSetasList.iterator().next().stream().filter(x -> x.getLhsType().getName().equals("B")).findFirst().isPresent() && nextSetasList.size()>1) 
 					System.out.print("");
@@ -1480,7 +1484,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				writeLog("a: " + rekTiefe + " variance: " + variance + a.toString());
 				}
 			}
-			 //auskommentiert um alle Max und min Betrachtung auszuschalten ENDE */ 
+			 auskommentiert um alle Max und min Betrachtung auszuschalten ENDE */ 
 			
 			if (isUndefinedPairSetSet(res) && aParDef.isEmpty()) {
 				int nofstred= 0;
@@ -1513,9 +1517,9 @@ 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
+				/* statistics no erase
 				writeLog("nextSetasList vor filter-Aufruf: " + nextSetasList);
 				if (!oderConstraint) {//PL 2023-02-08 eingefuegt: Bei oderconstraints sind Subststitutionen nicht als Substitutionen in idesem Sinne zu sehen
 					nextSetasList = nextSetasList.stream().filter(x -> {
@@ -1528,7 +1532,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 							.collect(Collectors.toCollection(ArrayList::new));
 				}
 				writeLog("nextSetasList nach filter-Aufruf: " + nextSetasList);
-				// */
+				*/
 				nofstred = nextSetasList.size();
 				//NOCH NICHT korrekt PL 2018-10-12
 				//nextSetasList = nextSetasList.stream().filter(y -> couldBecorrect(reducedUndefResSubstGroundedBasePair, y))
@@ -1546,11 +1550,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 +1563,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 +2061,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 +2634,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();
 			
 			}

src/test/java/typeinference/UnifyTest.java

@@ -7,7 +7,16 @@ import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
 import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
 import de.dhbwstuttgart.typedeployment.TypeInsert;
 import de.dhbwstuttgart.typedeployment.TypeInsertFactory;
+import de.dhbwstuttgart.typeinference.constraints.Constraint;
+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.UnifyTaskModel;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.*;
+import org.apache.commons.io.output.NullWriter;
 import org.junit.Test;
 
 import java.io.File;
@@ -24,7 +33,71 @@ import java.util.Set;
 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;
+
+        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"));
+
+        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));
+
+        IFiniteClosure finiteClosure = new FiniteClosure(constraints, new NullWriter());
+
+        TypeUnify unifyAlgo = new TypeUnify();
+        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);
+    }
+    /*
     @Test
     public void finiteClosure() throws IOException, ClassNotFoundException {
         execute(new File(rootDirectory+"fc.jav"));