Implement first version of Unify2 with simple test

pom.xml

@@ -118,7 +118,15 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 					</descriptorRefs>
 				</configuration>
 			</plugin>
-		</plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>9</source>
+                    <target>9</target>
+                </configuration>
+            </plugin>
+        </plugins>
 	</build>
 	<repositories>
 		<repository>

src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java

@@ -10,9 +10,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
@@ -33,9 +30,6 @@ import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
 import de.dhbwstuttgart.typeinference.result.ResultPair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
@@ -55,10 +49,6 @@ public class TPHExtractor extends AbstractASTWalker {
 	boolean inLocalOrParamOrReturn = false;
 
 	public final ArrayList<MethodAndTPH> ListOfMethodsAndTph = new ArrayList<>();
-    
-	// Alle Constraints in einer Menge (Und- & Oder-Constraints)
-	public Set<Pair> oldConstraints = new HashSet<>();
-	
 	final ArrayList<ResultPair<TypePlaceholder, TypePlaceholder>> allPairs = new ArrayList<>();
 	public final ArrayList<TPHConstraint> allCons = new ArrayList<>();
 	private ResultSet resultSet;
@@ -88,25 +78,15 @@ public class TPHExtractor extends AbstractASTWalker {
 	public void visit(TypePlaceholder tph) {
 		if (resultSet.resolveType(tph).resolvedType instanceof TypePlaceholder) {
 			TypePlaceholder resolvedTPH = (TypePlaceholder) resultSet.resolveType(tph).resolvedType;
-			String tphName = resolvedTPH.getName();
-			if (inMethod && !tphsClass.contains(tphName)) {
-				ArrayList<String> tphs = null;
-				if (!(tphs = methodAndTph.getTphs()).contains(tphName)) {
-					tphs.add(tphName);
-			    }
-				if (inLocalOrParamOrReturn) {
-					if (!(tphs = methodAndTph.getLocalTphs()).contains(tphName)) {
-						tphs.add(tphName);
-					}
-				}
-			} else {
-				if (!tphsClass.contains(tphName)) {
-					tphsClass.add(tphName);
-				}
-			}
-			if (!allTPHS.containsKey(tphName)) {
-				allTPHS.put(tphName, inMethod);
+			if (inMethod) {
+				methodAndTph.getTphs().add(resolvedTPH.getName());
+				if (inLocalOrParamOrReturn)
+					methodAndTph.getLocalTphs().add(resolvedTPH.getName());
+			}else {
+				tphsClass.add(resolvedTPH.getName());
 			}
+
+			allTPHS.put(resolvedTPH.getName(), inMethod);
 //			final List<TPHConstraint> cons = new ArrayList<>();
 //			resultSet.resolveType(tph).additionalGenerics.forEach(ag -> {
 //				TPHConstraint con = new ExtendsConstraint(ag.TA1.getName(), ag.TA2.getName(), Relation.EXTENDS);
@@ -195,31 +175,7 @@ public class TPHExtractor extends AbstractASTWalker {
 	public void visit(Method method) {
 		inMethod = true;
 		String id = MethodUtility.createID(resolver,method);
-		Predicate<Pair> filterUndConstraints =  cs -> ((cs.TA1 instanceof TypePlaceholder) && (cs.TA1 instanceof TypePlaceholder) &&
-				(resultSet.resolveType((TypePlaceholder)(cs.TA1)).resolvedType instanceof TypePlaceholder) &&
-				(resultSet.resolveType((TypePlaceholder)(cs.TA2)).resolvedType instanceof TypePlaceholder));
-		    
-		Function<ConstraintSet<Pair>, ConstraintSet<Pair>> filterConstrRemainingTVar =
-				csS -> { 
-					ConstraintSet<Pair> ret = new ConstraintSet<>();
-					ret.addAllUndConstraint(
-							csS.getUndConstraints()
-							   .stream().filter(filterUndConstraints)
-							   .collect(Collectors.toCollection(Constraint<Pair>::new)));
-					  
-					csS.getOderConstraints()
-					   .forEach(oConSSet -> { Set<Constraint<Pair>> setCons = new HashSet<>();
-					            oConSSet.forEach(OConS -> { setCons.add(
-					                             OConS.stream()
-					                                  .filter(filterUndConstraints)
-					                                  .collect(Collectors.toCollection(Constraint<Pair>::new)) ); 
-					                             } ); 
-					            ret.addOderConstraint(setCons);} );
-				return ret;
-				};
-		ConstraintSet<Pair> filteredConstraints = filterConstrRemainingTVar.apply(method.getConstraints());		
-		methodAndTph = new MethodAndTPH(id, filteredConstraints);
-		oldConstraints.addAll(filteredConstraints.getAll());
+		methodAndTph = new MethodAndTPH(id);
 
 		inLocalOrParamOrReturn = true;
 		method.getReturnType().accept(this);
@@ -228,7 +184,7 @@ public class TPHExtractor extends AbstractASTWalker {
         
         if(method.block != null)
             method.block.accept(this);
-		 
+		
 		inMethod = false;
 		ListOfMethodsAndTph.add(methodAndTph);
 	}

src/main/java/de/dhbwstuttgart/bytecode/constraint/TPHConstraint.java

@@ -4,7 +4,6 @@ public class TPHConstraint {
 	protected String left;
 	protected String right;
 	protected Relation rel;
-	protected int variance; //noch nicht benutzt
 	public enum Relation{
 		EXTENDS, EQUAL
 	}
@@ -49,23 +48,6 @@ public class TPHConstraint {
 		return rel == constraint.getRel() && left.equals(constraint.getLeft()) && right.equals(constraint.getRight());
 	}
 	
-	@Override
-	public int hashCode() {
-		return (left+right).hashCode();
-	}
-	
-	@Override
-	public boolean equals (Object o) {
-		if (o instanceof TPHConstraint) {
-			TPHConstraint o_tphcons = (TPHConstraint)o;
-			return (left+right).equals(o_tphcons.getLeft()+o_tphcons.getRight());
-		}
-		else {
-			return false;
-		}
-	}
-	
-	/*
 	@Override
 	public String toString() {
 		if(rel == Relation.EXTENDS) {
@@ -74,13 +56,4 @@ public class TPHConstraint {
 			return left + " = " + right;
 		}
 	}
-	*/
-	public String toString() {
-		if(rel == Relation.EXTENDS) {
-			return "new TPHConstraint(\"" + left + "\", \"" + right + "\", Relation.EXTENDS)";
-		}
-		else {
-			return "new TPHConstraint(\"" + left + "\", \"" + right + "\", Relation.EQUAL)";
-		}
-	}
 }

src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java

@@ -3,14 +3,16 @@
  */
 package de.dhbwstuttgart.bytecode.genericsGenerator;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 
 import de.dhbwstuttgart.bytecode.TPHExtractor;
-import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.*;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
 import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
+import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
+import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResultForClass;
+import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.MethodAndConstraints;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
 import de.dhbwstuttgart.bytecode.utilities.Resolver;
@@ -79,7 +81,6 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 	private JavaClassName className;
 	private Resolver resolver;
 
-	
 	/**
 	 * @param sf
 	 * @param listOfResultSets
@@ -94,14 +95,6 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 		return generatedGenericsForSF;
 	}
 	
-	/**
-	 * returns the family of Generated Generics
-	 * insbesondere fuer Testzwecke  
-	 */
-	public FamilyOfGeneratedGenerics getFogg() {
-		return fogg;
-	}
-	
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -134,7 +127,6 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 		
 		ConstraintsSimplierResult simplifiedConstraints = null;
 		GenericsGeneratorResultForClass ggResult = null;
-		GenericsGeneratorResultForClass ggResultAlternative = null;
 		
 		for (int i = 0; i < listOfResultSetsList.size(); i++) {
 			resultSet = listOfResultSetsList.get(i);
@@ -143,19 +135,9 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 			classOrInterface.accept(tphExtractor);
 			//PL 2020-10-16: Ab hier GGenerics implementieren durch Ali
 			//Rueckgabe an generatedGenericsForSF
-			fogg = new FamilyOfGeneratedGenerics(tphExtractor, resultSet);
-
-			System.out.println("fogg.allConstraints: "+ fogg.allConstraints);
-			System.out.println("fogg.posOfTPHs: "+ fogg.posOfTPHs);
-			System.out.println("fogg.classConstraints: "+ fogg.classConstraints);
-			System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition);
-			System.out.println(fogg);
-
-			///* 
-			//Fayez Ansatz Anfang
+			fogg = new FamilyOfGeneratedGenerics(tphExtractor);
+			
 			tphsClass = tphExtractor.tphsClass;
-			//PL 2020-01-15
-			//Es muss ggResult aus fogg gebildet werden
 			simplifiedConstraints = GenericsGenerator.simplifyConstraints(tphExtractor, tphsClass);
 			if(!isVisited) {
 				ggResult = GenericsGenerator.generateConstraints(className, tphExtractor, tphsClass,simplifiedConstraints);
@@ -164,45 +146,12 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 
 			for(Method m : classOrInterface.getMethods()) {
 				addMethodConstraints(simplifiedConstraints, ggResult, m);
-
+				
 			}
 			
-
-			if(ggResult != null) {  //Hinzufuegen von Fayez ggResult
+			if(ggResult != null)
 				generatedGenericsForSF.addGenericGeneratorResultClass(ggResult);
-			}
-			// Fayez Ansatz Ende 
-			//*/
-			
-			//Ali Ansatz Anfang
-			List<GenericsGeneratorResult> listOfClassCons = new ArrayList<>();
-			for(TPHConstraint clCons: fogg.classConstraints) {
-//				ExtendsConstraint ec = new ExtendsConstraint(clCons.getLeft(), clCons.getRight());
-				GenericsGeneratorResult ggR = new GenericsGeneratorResult(clCons, new HashSet<>());
-				listOfClassCons.add(ggR);
-			}
-
-			GenericGeneratorResultsForAllMethods ggRfaM = null;
-			List<MethodAndConstraints> listOfMethAndCons = new ArrayList<>();
-			for(String methID: fogg.methodConstraintsWithPosition.keySet()) {
-				List<GenericsGeneratorResult> listOfGGR = new ArrayList<>();
-				for(TPHConstraint methCons: fogg.methodConstraintsWithPosition.get(methID)) {
-//					ExtendsConstraint ec = new ExtendsConstraint(methCons.getLeft(),methCons.getRight());
-					GenericsGeneratorResult ggR = new GenericsGeneratorResult(methCons, new HashSet<>());
-					listOfGGR.add(ggR);
-				}
-				MethodAndConstraints mac = new MethodAndConstraints(methID, listOfGGR);
-				listOfMethAndCons.add(mac);
-			}
-			ggRfaM = new GenericGeneratorResultsForAllMethods(listOfMethAndCons);
-			ggResultAlternative = new GenericsGeneratorResultForClass(className, listOfClassCons, ggRfaM);
-
-			if(ggResultAlternative != null) {//hinzufuegen von Alis ggResult
-				//generatedGenericsForSF.addGenericGeneratorResultClass(ggResultAlternative);
-				System.out.println(generatedGenericsForSF);
-			}
-			System.out.println(ggResultAlternative);
-			//Ali Ansatz Ende
+				System.out.println("ddd");
 
 		}
 

src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/ClassConstraint.java

@@ -1,7 +1,6 @@
 package de.dhbwstuttgart.bytecode.insertGenerics;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 
 public class ClassConstraint extends TPHConstraint {
     //private TPHConstraint constraint;
@@ -13,12 +12,4 @@ public class ClassConstraint extends TPHConstraint {
     /*public ClassConstraint(TPHConstraint constraint) {
         this.constraint = constraint;
     }*/
-    public String toString() {
-		if(rel == Relation.EXTENDS) {
-			return "new ClassConstraint(\"" + left + "\", \"" + right + "\", Relation.EXTENDS)";
-		}
-		else {
-			return "new ClassConstraint(\"" + left + "\", \"" + right + "\", Relation.EQUAL)";
-		}
-	}
 }

src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java

@@ -1,44 +1,31 @@
 package de.dhbwstuttgart.bytecode.insertGenerics;
 
+import com.ibm.icu.text.CurrencyMetaInfo;
 import de.dhbwstuttgart.bytecode.TPHExtractor;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 
-import java.util.*;
-import java.util.function.Predicate;
-
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.result.ResultPair;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.objectweb.asm.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 public class FamilyOfGeneratedGenerics {
     public List<TPHConstraint> allConstraints = new ArrayList<>();
     // HashMap speichert ob TPH in einer Methode oder in der Klasse ist; und wenn es in der Methode ist, in welcher Methode
-    public HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTPHs = new HashMap<>();
+    public HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTPHs = new HashMap<>();
     public List<ClassConstraint> classConstraints = new ArrayList<>();
     public List<MethodConstraint> methodConstraints = new ArrayList<>();
-    public HashMap<String, List<MethodConstraint>> methodConstraintsWithPosition = new HashMap<>();
-    public ResultSet resSet;
-    public Set<Pair> oldCons = new HashSet<>();
 
-    private static final String objectType = Type.getInternalName(Object.class);
 
-    public FamilyOfGeneratedGenerics(TPHExtractor tphExtractor, ResultSet resultSet) {
-        this.resSet = resultSet;
-        this.oldCons = tphExtractor.oldConstraints;
+    public FamilyOfGeneratedGenerics(TPHExtractor tphExtractor) {
         this.allConstraints = tphExtractor.allCons;
         this.posOfTPHs = positionConverter(tphExtractor.allTPHS, tphExtractor.ListOfMethodsAndTph);
         this.classConstraints = getClassConstraints(allConstraints,posOfTPHs);
-        this.methodConstraints = getMethodConstraints(allConstraints,classConstraints,posOfTPHs, tphExtractor.ListOfMethodsAndTph);
-        this.methodConstraintsWithPosition = getMethodConstraintsWithPositionNew(allConstraints,classConstraints,posOfTPHs, tphExtractor.ListOfMethodsAndTph, resSet, oldCons);
+//        this.methodConstraints =
     }
 
-    public static List<ClassConstraint> getClassConstraints(List<TPHConstraint> cs, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs) { //Inputparameter List<TPHConstraint> constraintsSet weg
+    public static List<ClassConstraint> getClassConstraints(List<TPHConstraint> cs, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { //Inputparameter List<TPHConstraint> constraintsSet weg
         List<ClassConstraint> cs_cl = new ArrayList<>();
         List<ClassConstraint> classConstraints1 = typeOfANodeOfAField(cs, posOfTphs);
         for (ClassConstraint cons: classConstraints1) {
@@ -46,20 +33,12 @@ public class FamilyOfGeneratedGenerics {
                 cs_cl.add(cons);
             }
         }
-
-        // if sth new is added to cs_cl, then do same step again
-        boolean addedToConstraintsListForCC2 = false;
-        do {
-            addedToConstraintsListForCC2 = false;
-            List<ClassConstraint> classConstraints2 = transitiveSubtypeForClassTypes(cs, cs_cl); // in Klammer classConstraints1 oder constraintsSet? beides eher
-            for (ClassConstraint cons: classConstraints2) {
-                if (!checkForDuplicates(cons, cs_cl)) {
-                    cs_cl.add(cons);
-                    addedToConstraintsListForCC2 = true;
-                }
+        List<ClassConstraint> classConstraints2 = transitiveSubtypeForClassTypes(cs, cs_cl); // in Klammer classConstraints1 oder constraintsSet? beides eher
+        for (ClassConstraint cons: classConstraints2) {
+            if (!checkForDuplicates(cons, cs_cl)) {
+                cs_cl.add(cons);
             }
-        } while (addedToConstraintsListForCC2);
-
+        }
         List<ClassConstraint> classConstraints3 = hasNoSupertypeForClassTypes(cs, cs_cl, posOfTphs);
         for (ClassConstraint cons: classConstraints3) {
             if (!checkForDuplicates(cons, cs_cl)) {
@@ -69,7 +48,8 @@ public class FamilyOfGeneratedGenerics {
         return cs_cl;
     }
 
-    public static List<MethodConstraint> getMethodConstraints(List<TPHConstraint> cs, List<ClassConstraint> cs_cl, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, List<MethodAndTPH> listOfMethodsAndTph) {
+    public static List<MethodConstraint> getMethodConstraints(List<TPHConstraint> cs, List<ClassConstraint> cs_cl, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
+        //TODO: Regeln
         List<MethodConstraint> cs_m = new ArrayList<>();
         List<MethodConstraint> methodConstraints1 = typeOfTheMethodInClSigma(cs, posOfTphs);
         for (MethodConstraint cons: methodConstraints1) {
@@ -77,33 +57,19 @@ public class FamilyOfGeneratedGenerics {
                 cs_m.add(cons);
             }
         }
-
-        // if sth new is added to cs_cl, then do same step again
-        boolean addedToConstraintsListForMC2 = false;
-        do {
-            addedToConstraintsListForMC2 = false;
-            List<MethodConstraint> methodConstraints2 = firstTransitiveSubtypeForMethodTypes(cs, cs_m);
-            for (MethodConstraint cons : methodConstraints2) {
-                if (!checkForDuplicates(cons, cs_m)) {
-                    cs_m.add(cons);
-                    addedToConstraintsListForMC2 = true;
-                }
+        List<MethodConstraint> methodConstraints2 = firstTransitiveSubtypeForMethodTypes(cs, cs_m);
+        for (MethodConstraint cons: methodConstraints2) {
+            if (!checkForDuplicates(cons, cs_m)) {
+                cs_m.add(cons);
             }
-        } while (addedToConstraintsListForMC2);
-
-        // if sth new is added to cs_cl, then do same step again
-        boolean addedToConstraintsListForMC3 = false;
-        do {
-            addedToConstraintsListForMC3 = false;
-            List<MethodConstraint> methodConstraints3 = secondTransitiveSubtypeForMethodTypes(cs, cs_cl, cs_m);
-            for (MethodConstraint cons : methodConstraints3) {
-                if (!checkForDuplicates(cons, cs_m)) {
-                    cs_m.add(cons);
-                    addedToConstraintsListForMC3 = true;
-                }
+        }
+        List<MethodConstraint> methodConstraints3 = secondTransitiveSubtypeForMethodTypes(cs, cs_cl, cs_m);
+        for (MethodConstraint cons: methodConstraints3) {
+            if (!checkForDuplicates(cons, cs_m)) {
+                cs_m.add(cons);
             }
-        } while (addedToConstraintsListForMC3);
-        List<MethodConstraint> methodConstraints4 = hasNoSupertypeForMethodTypes(cs, cs_m, posOfTphs, listOfMethodsAndTph);
+        }
+        List<MethodConstraint> methodConstraints4 = hasNoSupertypeForMethodTypes(cs, posOfTphs);
         for (MethodConstraint cons: methodConstraints4) {
             if (!checkForDuplicates(cons, cs_m)) {
                 cs_m.add(cons);
@@ -114,78 +80,20 @@ public class FamilyOfGeneratedGenerics {
         return cs_m;
     }
 
-    public static HashMap<String, List<MethodConstraint>> getMethodConstraintsWithPosition(List<TPHConstraint> cs, List<ClassConstraint> cs_cl, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, List<MethodAndTPH> listOfMethodsAndTph, ResultSet resSet, Set<Pair> oldCons) {
-        HashMap<String, List<MethodConstraint>> tempMethodConstraintsWithPosition = new HashMap<>();
-        for(MethodAndTPH method: listOfMethodsAndTph){
-            List<String> methodsAddedToHashMap = new ArrayList<>();
-            String currentMethod = method.getId();
-            boolean containsCurrentMethod = false;
-            if(!containsCurrentMethod) {
-                methodsAddedToHashMap.add(currentMethod);
-                containsCurrentMethod = true;
-                List<MethodConstraint> listOfThisMethod = new ArrayList<>();
-                HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTPHsForThisMethod = new HashMap<>();
-                for(String s: posOfTphs.keySet()) {
-                    for(PairTphMethod pair: posOfTphs.get(s)) {
-                        if(pair.snd == currentMethod && pair.snd != null) {
-                            posOfTPHsForThisMethod.put(s,posOfTphs.get(s));
-                        }
-                    }
-                }
-                listOfThisMethod = getMethodConstraints(cs,cs_cl,posOfTPHsForThisMethod,listOfMethodsAndTph);
-                tempMethodConstraintsWithPosition.put(currentMethod, listOfThisMethod);
-
-                List<MethodConstraint> newMCList = firstLineMethodDefinition(cs, posOfTphs, method, resSet);
-                List<MethodConstraint> newMCList2 = secondLineMethodDefinition(cs, posOfTphs, method, resSet, oldCons);
-                System.out.println(newMCList);
-                System.out.println(newMCList2);
-            }
-        }
-
-        for(String curMeth: tempMethodConstraintsWithPosition.keySet()){
-            for(int i=0; i<tempMethodConstraintsWithPosition.get(curMeth).size(); i++) {
-                MethodConstraint currentMC = tempMethodConstraintsWithPosition.get(curMeth).get(i);
-                if(currentMC.getRight()!= objectType && !compareTphsOfConstraints(currentMC.getRight(), cs_cl) && !compareTphsOfConstraints(currentMC.getRight(), tempMethodConstraintsWithPosition.get(curMeth))) {
-                    MethodConstraint mc = new MethodConstraint(currentMC.getRight(), objectType, Relation.EXTENDS);
-                    tempMethodConstraintsWithPosition.get(curMeth).add(mc);
-                }
-            }
-        }
-        return tempMethodConstraintsWithPosition;
-    }
-
-    // Hilfsmethode um TPHs in den Methoden zu finden, die <. Object sein müssen
-    private static boolean compareTphsOfConstraints(String tph, List list) {
-        List<TPHConstraint> tempList = new ArrayList<>(list);
-        for(TPHConstraint tphC: tempList) {
-            if(tph == tphC.getLeft()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Def. FGG: erste Zeile von cs_cl
      * {T < .T' | T is a type variable in a type of a node of a field}
      */
-    public static List<ClassConstraint> typeOfANodeOfAField(List<TPHConstraint> allConstraints, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs) {
+    public static List<ClassConstraint> typeOfANodeOfAField(List<TPHConstraint> allConstraints, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
         //RuntimeException re = new RuntimeException("enthält EQUALS-Relation");
-        List<ClassConstraint> tempCC = new ArrayList<>();
+        List<ClassConstraint> tempCC= new ArrayList<>();
         for(TPHConstraint allCons: allConstraints){
             if(posOfTphs.containsKey(allCons.getLeft()) && allCons.getRight()!=null && allCons.getRel()==Relation.EXTENDS) {
                 for(String tph: posOfTphs.keySet()) {
-                    for(PairTphMethod pair: posOfTphs.get(tph)) {
-                        if(tph == allCons.getLeft() && pair.fst == PositionFinder.Position.FIELD) {
-                            ClassConstraint consToAdd = new ClassConstraint(tph, allCons.getRight(), allCons.getRel());
-                            if (!checkForDuplicates(consToAdd, tempCC)) {
-                                tempCC.add(consToAdd);
-                            }
-                        /*}else if(pair.fst == PositionFinder.Position.FIELD){
-                            ClassConstraint consToAdd = new ClassConstraint(tph, objectType, Relation.EXTENDS);
-                            if (!checkForDuplicates(consToAdd, tempCC)) {
-                                tempCC.add(consToAdd);
-                            }*/
+                    if(tph == allCons.getLeft() && posOfTphs.get(tph).fst == PositionFinder.Position.FIELD) {
+                        ClassConstraint consToAdd = new ClassConstraint(tph, allCons.getRight(), allCons.getRel());
+                        if (!checkForDuplicates(consToAdd, tempCC)) {
+                            tempCC.add(consToAdd);
                         }
                     }
                 }
@@ -202,13 +110,12 @@ public class FamilyOfGeneratedGenerics {
      * {T' <. T'' | \exists T: (T <. T') \in cs_cl, (T' <. T'') \in cs }
      */
     public static List<ClassConstraint> transitiveSubtypeForClassTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl) {
-        List<ClassConstraint> tempCC = new ArrayList<>();
-        ClassConstraint consToAdd;
+        List<ClassConstraint> tempCC= new ArrayList<>();
         for(ClassConstraint cCons: cs_cl) {
             if(cCons.getLeft() != null && cCons.getRel()==Relation.EXTENDS) {
                 for(TPHConstraint allCons: allConstraints) {
                     if(cCons.getRight() == allCons.getLeft() && allCons.getRight() != null && allCons.getRel()==Relation.EXTENDS){
-                        consToAdd = new ClassConstraint(allCons.getLeft(), allCons.getRight(), allCons.getRel());
+                        ClassConstraint consToAdd = new ClassConstraint(allCons.getLeft(), allCons.getRight(), allCons.getRel());
                         if (!checkForDuplicates(consToAdd, tempCC)) {
                             tempCC.add(consToAdd);
                         }
@@ -224,20 +131,18 @@ public class FamilyOfGeneratedGenerics {
      * {T <. Object | ((T is a type variable in a type of a node of a field
      *                  or (\exists T~: (T~ <. T) \in cs_cl)) and (\existsnot T': T <. T') \in cs)}
      */
-    public static List<ClassConstraint> hasNoSupertypeForClassTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs) {
+    public static List<ClassConstraint> hasNoSupertypeForClassTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
         List<ClassConstraint> tempCC= new ArrayList<>();
         for(TPHConstraint allCons: allConstraints) {
             for(ClassConstraint cCons: cs_cl) {
                 for(String tph: posOfTphs.keySet()) {
-                    for(PairTphMethod pair: posOfTphs.get(tph)) {
-                        boolean tvInField = pair.fst == PositionFinder.Position.FIELD;
-                        boolean hasSmallerTVInClCons = (posOfTphs.containsKey(cCons.getRight()) && cCons.getRight() == tph && cCons.getLeft() != null);
-                        if( ((tvInField || hasSmallerTVInClCons) && cCons.getRel()==Relation.EXTENDS) &&
-                                !checkUpperBound(allConstraints, tph)  && allCons.getRel()==Relation.EXTENDS) {
-                            ClassConstraint consToAdd = new ClassConstraint(tph, objectType, Relation.EXTENDS);
-                            if (!checkForDuplicates(consToAdd, tempCC)){
-                                tempCC.add(consToAdd);
-                            }
+                    boolean tvInField = posOfTphs.get(tph).fst == PositionFinder.Position.FIELD;
+                    boolean hasSmallerTVInClCons = (posOfTphs.containsKey(cCons.getRight()) && cCons.getRight() == tph && cCons.getLeft() != null);
+                    if( ((tvInField || hasSmallerTVInClCons) && cCons.getRel()==Relation.EXTENDS) &&
+                            checkUpperBound(allConstraints, tph)  && allCons.getRel()==Relation.EXTENDS) {
+                        ClassConstraint consToAdd = new ClassConstraint(tph, "Object", Relation.EXTENDS);
+                        if (!checkForDuplicates(consToAdd, tempCC)){
+                            tempCC.add(consToAdd);
                         }
                     }
                 }
@@ -250,18 +155,16 @@ public class FamilyOfGeneratedGenerics {
      * Def. FGG: erste Zeile von cs_m
      * {T < .T' | T is a type variable in a type of the method/constructor m in cl_\sigma, (T <. T') \in cs}
      */
-    public static List<MethodConstraint> typeOfTheMethodInClSigma(List<TPHConstraint> allConstraints, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs) { // cl_\sigma??
+    public static List<MethodConstraint> typeOfTheMethodInClSigma(List<TPHConstraint> allConstraints, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { // cl_\sigma??
         //TODO:
         List<MethodConstraint> tempMC= new ArrayList<>();
         for(TPHConstraint allCons: allConstraints){
             if(posOfTphs.containsKey(allCons.getLeft()) && allCons.getRight()!=null && allCons.getRel()==Relation.EXTENDS) {
                 for(String tph: posOfTphs.keySet()) {
-                    for(PairTphMethod pair: posOfTphs.get(tph)) {
-                        if(tph == allCons.getLeft() && (pair.fst == PositionFinder.Position.METHOD || pair.fst == PositionFinder.Position.CONSTRUCTOR)) {
-                            MethodConstraint consToAdd = new MethodConstraint(allCons.getLeft(), allCons.getRight(), allCons.getRel());
-                            if (!checkForDuplicates(consToAdd, tempMC)) {
-                                tempMC.add(consToAdd);
-                            }
+                    if(tph == allCons.getLeft() && (posOfTphs.get(tph).fst == PositionFinder.Position.METHOD || posOfTphs.get(tph).fst == PositionFinder.Position.CONSTRUCTOR)) {
+                        MethodConstraint consToAdd = new MethodConstraint(allCons.getLeft(), allCons.getRight(), allCons.getRel());
+                        if (!checkForDuplicates(consToAdd, tempMC)) {
+                            tempMC.add(consToAdd);
                         }
                     }
                 }
@@ -313,6 +216,7 @@ public class FamilyOfGeneratedGenerics {
                         MethodConstraint consToAdd = new MethodConstraint(tphC.getLeft(), tphC.getRight(), tphC.getRel());
                         if (!checkForDuplicates(consToAdd, tempMC)) {
                             tempMC.add(consToAdd);
+                            System.out.println(consToAdd);
                         }
 
                     }
@@ -327,32 +231,16 @@ public class FamilyOfGeneratedGenerics {
      * {T <. Object | (T is a type variable in a type of a node of the method/constructor m in cl_\sigma),
      *                  (\existsnot T': T <. T') \in cs)}
      */
-    public static List<MethodConstraint> hasNoSupertypeForMethodTypes(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, List<MethodAndTPH> listOfMethodsAndTph) {
+    public static List<MethodConstraint> hasNoSupertypeForMethodTypes(List<TPHConstraint> allConstraints, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
         //TODO:
         List<MethodConstraint> tempMC= new ArrayList<>();
         for(String tph: posOfTphs.keySet()) {
-            for(PairTphMethod pair: posOfTphs.get(tph)) {
-                for(TPHConstraint allCons: allConstraints) {
-                    if((pair.fst.equals(PositionFinder.Position.METHOD) || pair.fst.equals(PositionFinder.Position.CONSTRUCTOR)) && !checkUpperBound(allConstraints,tph)) {
-                        MethodConstraint consToAdd = new MethodConstraint(tph, objectType, Relation.EXTENDS);
-                        if (!checkForDuplicates(consToAdd, tempMC)) {
-                            tempMC.add(consToAdd);
-                        }
-                    }
-                }
-                List<TPHConstraint> tempMCObject1 = new ArrayList<>(cs_m);
-                String currentMethod = "";
-                for(MethodAndTPH mat: listOfMethodsAndTph) {
-                    if(mat.getId().equals(pair.snd)) {
-                        currentMethod = mat.getId();
-                    }
-                    for(TPHConstraint mc1: tempMCObject1) {
-                        if(tph==mc1.getRight() && !checkUpperBound(tempMCObject1,tph)) {
-                            MethodConstraint consToAdd = new MethodConstraint(tph, objectType, Relation.EXTENDS);
-                            if (!checkForDuplicates(consToAdd, tempMC)) {
-                                tempMC.add(consToAdd);
-                            }
-                        }
+            for(TPHConstraint allCons: allConstraints) {
+                if((posOfTphs.get(tph).fst.equals(PositionFinder.Position.METHOD) || posOfTphs.get(tph).fst.equals(PositionFinder.Position.CONSTRUCTOR)) && checkUpperBound(allConstraints,tph)) {
+                    MethodConstraint consToAdd = new MethodConstraint(tph, "Object", Relation.EXTENDS);
+                    if (!checkForDuplicates(consToAdd, tempMC)) {
+                        tempMC.add(consToAdd);
+                        System.out.println(consToAdd);
                     }
                 }
             }
@@ -364,15 +252,12 @@ public class FamilyOfGeneratedGenerics {
      * nimm die Menge cs_cl aus cs_m raus
      */
     public static List<MethodConstraint> methodTypesWithoutClassTypes(List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m) {
-        // erstelle Kopie der Liste cs_cl
+        //TODO:
         List<TPHConstraint> tempCC = new ArrayList<>();
         for(ClassConstraint cc: cs_cl) {
             TPHConstraint tphC = new TPHConstraint(cc.getLeft(), cc.getRight(), cc.getRel());
             tempCC.add(tphC);
         }
-        // Transitive Hülle von cs_cl
-        List<TPHConstraint> tcOfCsCl = buildTransitiveClosure(tempCC);
-
         List<TPHConstraint> tempMC = new ArrayList<>();
         for(MethodConstraint mc: cs_m) {
             TPHConstraint tphC = new TPHConstraint(mc.getLeft(), mc.getRight(), mc.getRel());
@@ -382,7 +267,7 @@ public class FamilyOfGeneratedGenerics {
         tempMC2.addAll(tempMC);
         List<MethodConstraint> tempMCToReturn = new ArrayList<>();
 
-        for(TPHConstraint cc: tcOfCsCl) {
+        for(TPHConstraint cc: tempCC) {
             for(TPHConstraint mc: tempMC) {
                 if(cc.getLeft().equals(mc.getLeft()) && cc.getRight().equals(mc.getRight())) {
                     tempMC2.remove(mc);
@@ -434,28 +319,25 @@ public class FamilyOfGeneratedGenerics {
     public static boolean checkUpperBound(List<TPHConstraint> cs, String tph) {
         for(int i=0; i<cs.size(); i++) {
             if(cs.get(i).getLeft() == tph) {
-                //has upper bound
-                return true;
+                return false;
             }
         }
-        return false;
+        return true;
     }
 
 
-    public static HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> positionConverter(HashMap<String, Boolean> allTphs, List<MethodAndTPH> listOfMethodsAndTphs) {
-        HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> convertedPositions = new HashMap<>();
+    public static HashMap<String, PairTphMethod<PositionFinder.Position, String>> positionConverter(HashMap<String, Boolean> allTphs, List<MethodAndTPH> listOfMethodsAndTphs) {
+        HashMap<String, PairTphMethod<PositionFinder.Position, String>> convertedPositions = new HashMap<>();
         for(String tph: allTphs.keySet()) {
-            List<PairTphMethod<PositionFinder.Position, String>> currMeth = new ArrayList<>();
             if(allTphs.get(tph)) {  //if true, then tph is a method-TPH
                 for(MethodAndTPH methTph: listOfMethodsAndTphs) {
                     if (methTph.getTphs().contains(tph)) {
-                        currMeth.add(new PairTphMethod<>(PositionFinder.Position.METHOD, methTph.getId()));
+                        convertedPositions.put(tph, new PairTphMethod<>(PositionFinder.Position.METHOD, methTph.getId()));
                     }
                 }
             } else { // else it is in the class-TPH
-                currMeth.add(new PairTphMethod<>(PositionFinder.Position.FIELD, null));
+                convertedPositions.put(tph, new PairTphMethod<>(PositionFinder.Position.FIELD, null));
             }
-            convertedPositions.put(tph, currMeth);
         }
         return convertedPositions;
     }
@@ -479,306 +361,4 @@ public class FamilyOfGeneratedGenerics {
     }
 */
 
-    public static List<MethodConstraint> firstLineMethodDefinition(List<TPHConstraint> allConstraints, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, MethodAndTPH methodAndTPH, ResultSet resSet) {
-        List<MethodConstraint> tempMC= new ArrayList<>();
-        MethodAndTPH methAndTphs = methodAndTPH;
-        Set<Pair> undCons =  methAndTphs.constraints.getUndConstraints();
-        List<Set<Constraint<Pair>>> orCons = methAndTphs.constraints.getOderConstraints();
-        Iterator<Pair> it = undCons.iterator();
-        while(it.hasNext()) {
-            Pair p = it.next();
-            String ta1 = ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA1)).resolvedType)).getName();
-            String ta2 = ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA2)).resolvedType)).getName();
-            Relation r = null;
-            if(p.GetOperator() == PairOperator.SMALLERDOT) {
-                r = Relation.EXTENDS;
-            } else if(p.GetOperator() == PairOperator.EQUALSDOT) {
-                r = Relation.EQUAL;
-            }
-            MethodConstraint mc = new MethodConstraint(ta1, ta2, r);
-            if(mc.getRel() != Relation.EQUAL) {
-                if(!checkForDuplicates(mc, tempMC)) {
-                    tempMC.add(mc);
-                }
-            }
-        }
-        return tempMC;
-    }
-
-    public static List<MethodConstraint> secondLineMethodDefinition(List<TPHConstraint> allConstraints, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, MethodAndTPH methodAndTPH, ResultSet resSet, Set<Pair> oldCons) {
-        List<MethodConstraint> tempMC = new ArrayList<>();
-        Set<Pair> tempSet = new HashSet<>();
-        Set<Pair> tcOfoldConsSet = buildTransitiveClosureForCP(oldCons, resSet);
-        MethodAndTPH methAndTphs = methodAndTPH;
-        List<Set<Constraint<Pair>>> orCons = methAndTphs.constraints.getOderConstraints();
-        List<List<Constraint<Pair>>> orConsList = new ArrayList<>();
-        List<HashMap<Relation, List<TPHConstraint>>> orConsListConverted = new ArrayList<>();
-        for(int i=0; i<orCons.size(); i++) {
-            HashMap<Relation, List<TPHConstraint>> orConsInternal = new HashMap<>();
-            List<TPHConstraint> orConsWithEQUAL = new ArrayList();
-            List<TPHConstraint> orConsWithEXTENDS = new ArrayList();
-            for(Constraint con: orCons.get(i)) {
-                Iterator<Pair> it = con.iterator();
-                while(it.hasNext()) {
-                    Pair p = it.next();
-                    Relation r = null;
-                    if(p.GetOperator() == PairOperator.SMALLERDOT) {
-                        r = Relation.EXTENDS;
-                        orConsWithEXTENDS.add(new TPHConstraint(((TypePlaceholder) p.TA1).getName(), ((TypePlaceholder) p.TA2).getName(), r));
-                        MethodConstraint mc = new MethodConstraint(((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA1)).resolvedType)).getName(), ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA2)).resolvedType)).getName(), r);
-                        if(!checkForDuplicates(mc, tempMC)) {
-                            tempMC.add(mc);
-                        }
-                    } else if(p.GetOperator() == PairOperator.EQUALSDOT) {
-                        r = Relation.EQUAL;
-                        orConsWithEQUAL.add(new TPHConstraint(((TypePlaceholder) p.TA1).getName(), ((TypePlaceholder) p.TA2).getName(), r));
-                        /*MethodConstraint mc = new MethodConstraint(((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA1)).resolvedType)).getName(), ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA2)).resolvedType)).getName(), r);
-                        if(!checkForDuplicates(mc, tempMC)) {
-                            tempMC.add(mc);
-                        }*/
-                    }
-                }
-            }
-            orConsInternal.put(Relation.EXTENDS, orConsWithEXTENDS);
-            orConsInternal.put(Relation.EQUAL, orConsWithEQUAL);
-            orConsListConverted.add(orConsInternal);
-        }
-
-        List<Pair> oldConsList = new ArrayList<>(oldCons);
-        List<TPHConstraint> oldConsListConverted = new ArrayList<>();
-        for(Pair pair: oldConsList) {
-            Relation r = null;
-            if(pair.GetOperator() == PairOperator.SMALLERDOT) {
-                r = Relation.EXTENDS;
-            } else if(pair.GetOperator() == PairOperator.EQUALSDOT) {
-                r = Relation.EQUAL;
-            }
-            oldConsListConverted.add(new TPHConstraint(((TypePlaceholder) pair.TA1).getName(), ((TypePlaceholder) pair.TA2).getName(), r));
-        }
-//        List<TPHConstraint> tcOfoldCons =  buildTransitiveClosure(oldConsListConverted);
-//        Set<Pair> tcOfoldConsSet = buildTransitiveClosureForCP(oldCons);
-
-//        for(int i=0; i<orConsListConverted.size(); i++) {
-        for(int i=0; i<orCons.size(); i++) {
-            Constraint<Pair> extendsSet = new Constraint<Pair>();
-            Constraint<Pair> equalSet = new Constraint<Pair>();
-            for(Constraint con: orCons.get(i)) {
-                Iterator<Pair> it = con.iterator();
-                while (it.hasNext()) {
-                    Pair p = it.next();
-//            List<TPHConstraint> extendsList = orConsListConverted.get(i).get(Relation.EXTENDS);
-//            List<TPHConstraint> equalList = orConsListConverted.get(i).get(Relation.EQUAL);
-                    if (p.OperatorSmallerDot()) {
-                        extendsSet.add(p);
-                    } else if (p.OperatorEqual()) {
-                        equalSet.add(p);
-                    }
-                }
-//                for (TPHConstraint ex : extendsList) {
-                Iterator<Pair> itExtends = extendsSet.iterator();
-                while(itExtends.hasNext()) {
-                    Pair pairExtends = itExtends.next();
-//                    for (TPHConstraint eq : equalList) {
-                    Iterator<Pair> itEqual = equalSet.iterator();
-                    while(itEqual.hasNext()) {
-                        Pair pairEqual = itEqual.next();
-//                        MethodConstraint mc = new MethodConstraint(ex.getRight(), eq.getLeft(), Relation.EXTENDS);
-                        Pair newPair = new Pair(resSet.resolveType((TypePlaceholder)(pairExtends.TA2)).resolvedType, resSet.resolveType((TypePlaceholder)(pairEqual.TA1)).resolvedType, PairOperator.SMALLERDOT);
-//                        for (TPHConstraint tc : tcOfoldCons) {
-                        Iterator<Pair> itTC = tcOfoldConsSet.iterator();
-                        while(itTC.hasNext()) {
-                            Pair pairTC = itTC.next();
-//                            if (tc.getLeft() == mc.getLeft() && tc.getRight() == mc.getRight() && tc.getRel() == mc.getRel()) {
-                            if(resSet.resolveType((TypePlaceholder)(pairTC.TA1)).resolvedType == newPair.TA1 && resSet.resolveType((TypePlaceholder)(pairTC.TA2)).resolvedType == newPair.TA2 && pairTC.OperatorSmallerDot() && newPair.OperatorSmallerDot()) { //hier bei pairTC resolvedType, damit Pairs aus oldCons in der Methode zur Berechnung von der transitiven Hülle nicht in eine Endlosschleife kommen (Cycles!)
-//                                if (!checkForDuplicates(mc, tempMC)) {
-                                if(newPair.TA1 != newPair.TA2) {
-                                    if (!checkForDuplicatesForSets(newPair, tempSet)) {
-                                        tempSet.add(newPair);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Iterator<Pair> itTemp = tempSet.iterator();
-        while(itTemp.hasNext()) {
-            Pair p = itTemp.next();
-            String ta1 = ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA1)).resolvedType)).getName();
-            String ta2 = ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA2)).resolvedType)).getName();
-            Relation r = null;
-            if(p.GetOperator() == PairOperator.SMALLERDOT) {
-                r = Relation.EXTENDS;
-            } else if(p.GetOperator() == PairOperator.EQUALSDOT) {
-                r = Relation.EQUAL;
-            }
-            MethodConstraint mc = new MethodConstraint(ta1, ta2, r);
-            if(mc.getRel() != Relation.EQUAL) {
-                if(!checkForDuplicates(mc, tempMC)) {
-                    tempMC.add(mc);
-                }
-            }
-        }
-
-        return tempMC;
-    }
-
-
-    public static Set<Pair> buildTransitiveClosureForCP(Set constraint, ResultSet resSet) {
-        Set<Pair> iterSet = new HashSet<>(constraint);
-        Set<Pair> runSet = new HashSet<>(constraint);
-        Set<Pair> tcSet = new HashSet<>(constraint);
-        boolean addedConToList = false;
-//        for (TPHConstraint cons: iterList) {
-        Iterator<Pair> itIterSet = iterSet.iterator();
-        while(itIterSet.hasNext()) {
-            Pair pairIterSet = itIterSet.next();
-//            for (TPHConstraint cons2: runList) {
-            Iterator<Pair> itRunSet = runSet.iterator();
-            while (itRunSet.hasNext()) {
-                Pair pairRunSet = itRunSet.next();
-//                if(cons.getRight() == cons2.getLeft()) {
-                if(pairIterSet.TA2 == pairRunSet.TA1 && pairIterSet.OperatorSmallerDot() && pairRunSet.OperatorSmallerDot()) {
-//                    TPHConstraint consToAdd = new TPHConstraint(cons.getLeft(), cons2.getRight(), Relation.EXTENDS);
-                    Pair p = new Pair(resSet.resolveType((TypePlaceholder)(pairIterSet.TA1)).resolvedType, resSet.resolveType((TypePlaceholder)(pairRunSet.TA2)).resolvedType, PairOperator.SMALLERDOT);
-//                    if (!checkForDuplicates(consToAdd,tcList)) {
-                    if(!checkForDuplicatesForSets(p, tcSet)) {
-//                        tcList.add(consToAdd);
-                        tcSet.add(p);
-                        addedConToList = true;
-                        if (addedConToList) {
-                            return buildTransitiveClosureForCP(tcSet, resSet);
-                        }
-                    }
-                }
-            }
-        }
-        System.out.println("tcSet: " + tcSet);
-        return tcSet;
-    }
-
-    public static boolean checkForDuplicatesForSets(Pair pair, Set set) {
-        Set<Pair> tempSet = set;
-        boolean hasSame = false;
-//        for (TPHConstraint tphC: tempList) {
-        Iterator<Pair> it = tempSet.iterator();
-        while (it.hasNext()) {
-            Pair p = it.next();
-//            hasSame = constraint.getLeft() == tphC.getLeft() &&
-//                    constraint.getRight() == tphC.getRight() &&
-//                    constraint.getRel() == tphC.getRel(); //constraint already in ArrayList if true
-            hasSame = pair.TA1 == p.TA1 &&
-                    pair.TA2 == p.TA2 &&
-                    pair.OperatorSmallerDot() && p.OperatorSmallerDot(); //constraint already in Set if true
-            if (hasSame)
-                return true;
-        }
-        return false;
-    }
-
-    public static List<MethodConstraint> hasNoSupertypeForMethodTypesNew(List<TPHConstraint> allConstraints, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, MethodAndTPH methodAndTPH) {
-        List<MethodConstraint> tempMC = new ArrayList<>();
-        List<TPHConstraint> allCons = allConstraints;
-        MethodAndTPH methAndTphs = methodAndTPH;
-        for(String tph: posOfTphs.keySet()) {
-            for(int i=0; i<posOfTphs.get(tph).size(); i++)
-            if(posOfTphs.get(tph).get(i).fst == PositionFinder.Position.METHOD && posOfTphs.get(tph).get(i).snd == methAndTphs.getId()) {
-                for(TPHConstraint ac: allCons) {
-                    if(tph==ac.getRight() && !checkUpperBound(allCons,tph)) {
-                        MethodConstraint mc2 = new MethodConstraint(tph, objectType, Relation.EXTENDS);
-                        if(!checkForDuplicates(mc2, tempMC)) {
-                            tempMC.add(mc2);
-                        }
-                    }
-                }
-            }
-        }
-        return tempMC;
-    }
-
-    public static HashMap<String, List<MethodConstraint>> getMethodConstraintsWithPositionNew(List<TPHConstraint> cs, List<ClassConstraint> cs_cl, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, List<MethodAndTPH> listOfMethodsAndTph, ResultSet resSet, Set<Pair> oldCons) {
-        HashMap<String, List<MethodConstraint>> tempMethodConstraintsWithPosition = new HashMap<>();
-        List<MethodConstraint> newMCList = new ArrayList<>();
-        List<MethodConstraint> newMCList2 = new ArrayList<>();
-        List<MethodConstraint> hasNoSupType = new ArrayList<>();
-        List<MethodConstraint> mcWithoutCc = new ArrayList<>();
-
-        List<String> methodsAddedToHashMap = new ArrayList<>();
-        for(MethodAndTPH method: listOfMethodsAndTph){
-            String currentMethod = method.getId();
-            boolean containsCurrentMethod = false;
-            if(!containsCurrentMethod) {
-                methodsAddedToHashMap.add(currentMethod);
-                containsCurrentMethod = true;
-                List<MethodConstraint> listToAdd = new ArrayList<>();
-                HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTPHsForThisMethod = new HashMap<>();
-                for(String s: posOfTphs.keySet()) {
-                    for(PairTphMethod pair: posOfTphs.get(s)) {
-                        if(pair.snd == currentMethod && pair.snd != null) {
-                            posOfTPHsForThisMethod.put(s,posOfTphs.get(s));
-                        }
-                    }
-                }
-
-                newMCList = firstLineMethodDefinition(cs, posOfTphs, method, resSet);
-                for(int i=0; i<newMCList.size(); i++) {
-                    listToAdd.add(newMCList.get(i));
-                }
-                newMCList2 = secondLineMethodDefinition(cs, posOfTphs, method, resSet, oldCons);
-                for(int i=0; i<newMCList2.size(); i++) {
-                    listToAdd.add(newMCList2.get(i));
-                }
-
-                /*if(!methodsAddedToHashMap.contains(currentMethod)) {
-                    tempMethodConstraintsWithPosition.put(currentMethod, newMCList);
-                    tempMethodConstraintsWithPosition.put(currentMethod, newMCList2);
-                }*/
-
-                hasNoSupType = hasNoSupertypeForMethodTypesNew(cs,posOfTphs,method);
-                for (MethodConstraint cons: hasNoSupType) {
-                    if (!checkForDuplicates(cons, listToAdd)) {
-                        listToAdd.add(cons);
-                    }
-                }
-
-                mcWithoutCc = methodTypesWithoutClassTypes(cs_cl, listToAdd);
-
-                tempMethodConstraintsWithPosition.put(currentMethod, mcWithoutCc);
-            }
-            for(String curMeth: tempMethodConstraintsWithPosition.keySet()){
-                for(int i=0; i<tempMethodConstraintsWithPosition.get(curMeth).size(); i++) {
-                    MethodConstraint currentMC = tempMethodConstraintsWithPosition.get(curMeth).get(i);
-                    if(currentMC.getRight()!= objectType && !compareTphsOfConstraints(currentMC.getRight(), cs_cl) && !compareTphsOfConstraints(currentMC.getRight(), tempMethodConstraintsWithPosition.get(curMeth))) {
-                        MethodConstraint mc = new MethodConstraint(currentMC.getRight(), objectType, Relation.EXTENDS);
-                        tempMethodConstraintsWithPosition.get(curMeth).add(mc);
-                    }
-                }
-            }
-        }
-
-        return tempMethodConstraintsWithPosition;
-    }
-    
-    public String toString() {
-    	String ret =
-    	"List<ClassConstraint> classConstraintsTest = new ArrayList<>();\n";
-    	for(ClassConstraint cC: classConstraints) {
-    		ret = ret + "classConstraintsTest.add(" + cC.toString() + ");\n";
-    	}
-    	ret = ret + "HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();\n";
-        ret = ret + "List<MethodConstraint> lmc;\n";
-    	for (String methName : methodConstraintsWithPosition.keySet()) {
-        	String consSet = "";
-        	ret = ret + "lmc = new ArrayList<>();\n";
-        	for (MethodConstraint methConstrs : methodConstraintsWithPosition.get(methName)) {
-        		consSet = consSet + "lmc.add(" + methConstrs + ");\n";
-        	}
-        	ret = ret + consSet + "methodConstraintsWithPositionTest.put(\""+ methName + "\",  lmc);\n";
-        }
-        return ret;
-    }
-
-
 }

src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/MethodConstraint.java

@@ -1,19 +1,9 @@
 package de.dhbwstuttgart.bytecode.insertGenerics;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 
 public class MethodConstraint extends TPHConstraint {
     public MethodConstraint(String left, String right, Relation rel) {
         super(left, right, rel);
     }
-    
-    public String toString() {
-		if(rel == Relation.EXTENDS) {
-			return "new MethodConstraint(\"" + left + "\", \"" + right + "\", Relation.EXTENDS)";
-		}
-		else {
-			return "new MethodConstraint(\"" + left + "\", \"" + right + "\", Relation.EQUAL)";
-		}
-	}
 }

src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PairMethodAndConstraint.java

@@ -1,47 +0,0 @@
-package de.dhbwstuttgart.bytecode.insertGenerics;
-
-import java.util.Objects;
-
-/** A generic class for pairs.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- */
-
-
-public class PairMethodAndConstraint<A, B> {
-    public final A fst;
-    public final B snd;
-
-    public PairMethodAndConstraint(A fst, B snd) {
-        this.fst = fst;
-        this.snd = snd;
-    }
-
-    public String toString() {
-        return "PairTphMethod[" + fst + "," + snd + "]";
-    }
-
-    public boolean equals(Object other) {
-        return
-                other instanceof PairMethodAndConstraint<?,?> &&
-                        Objects.equals(fst, ((PairMethodAndConstraint<?,?>)other).fst) &&
-                        Objects.equals(snd, ((PairMethodAndConstraint<?,?>)other).snd);
-    }
-
-    public int hashCode() {
-        if (fst == null) return (snd == null) ? 0 : snd.hashCode() + 1;
-        else if (snd == null) return fst.hashCode() + 2;
-        else return fst.hashCode() * 17 + snd.hashCode();
-    }
-
-    public static <A,B> PairMethodAndConstraint<A,B> of(A a, B b) {
-        return new PairMethodAndConstraint<>(a,b);
-    }
-
-    public PairMethodAndConstraint add(A fst, B snd){
-        return new PairMethodAndConstraint<>(fst,snd);
-    }
-}

src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodAndTPH.java

@@ -4,8 +4,6 @@ import java.util.ArrayList;
 
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
 import de.dhbwstuttgart.typeinference.result.ResultPair;
 
@@ -17,15 +15,9 @@ public class MethodAndTPH {
 	private final ArrayList<ResultPair<TypePlaceholder, TypePlaceholder>> pairs = new ArrayList<>();
 	// tphs of local variables and parameters
 	private final ArrayList<String> localTphs = new ArrayList<>();
-	/*
-	 * its Constraints
-	 * eingefuegt PL 2021-02-15
-	 */
-	public final ConstraintSet constraints;
 
-	public MethodAndTPH(String name, ConstraintSet<Pair> constraints) {
+	public MethodAndTPH(String name) {
 		this.id = name;
-		this.constraints = constraints;
 	}
 
 	public ArrayList<String> getTphs() {

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

@@ -6,7 +6,6 @@ import de.dhbwstuttgart.bytecode.BytecodeGen;
 import de.dhbwstuttgart.bytecode.Exception.BytecodeGeneratorError;
 import de.dhbwstuttgart.bytecode.genericsGenerator.GeneratedGenericsFinder;
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
 import de.dhbwstuttgart.environment.CompilationEnvironment;
 import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
@@ -79,12 +78,7 @@ public class JavaTXCompiler {
     Boolean log = true; //gibt an ob ein Log-File nach System.getProperty("user.dir")+"src/test/java/logFiles" geschrieben werden soll?
     public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
     private final ClassLoader classLoader;
-    
-    //nur fuer Testzwecke of Generated Generics
-    //wieder loeschen PL 2021-03-22
-    public FamilyOfGeneratedGenerics fogg;
 
-    
 	public JavaTXCompiler(File sourceFile) throws IOException, ClassNotFoundException {
 		this(Arrays.asList(sourceFile), null);
 	}
@@ -878,7 +872,6 @@ public class JavaTXCompiler {
 			SourceFile sf = sourceFiles.get(f);
 			GeneratedGenericsFinder sResFinder = new GeneratedGenericsFinder(sf, typeinferenceResult);
 			GenericGenratorResultForSourceFile simplifyResOfSF = sResFinder.findGeneratedGenerics();
-			this.fogg = sResFinder.getFogg();
 			result.add(simplifyResOfSF);
 		}
 		return result;

src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java

@@ -126,7 +126,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
     public void visit(Assign assign) {
         assign.lefSide.accept(this);
         assign.rightSide.accept(this);
-        assign.rightSide.getType().accept((ASTVisitor) this);
     }
 
     @Override
@@ -187,10 +186,8 @@ public abstract class AbstractASTWalker implements ASTVisitor{
     public void visit(MethodCall methodCall) {
         methodCall.receiver.accept(this);
         methodCall.getArgumentList().accept(this);
-        methodCall.getArgumentList().getArguments().forEach(a -> a.getType().accept((ASTVisitor) this));
     }
 
-    
     @Override
     public void visit(NewClass methodCall) {
         visit((MethodCall) methodCall);
@@ -214,7 +211,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
     @Override
     public void visit(Return aReturn) {
         aReturn.retexpr.accept(this);
-        aReturn.getType().accept((ASTVisitor) this);
     }
 
     @Override

src/main/java/de/dhbwstuttgart/syntaxtree/Method.java

@@ -31,14 +31,8 @@ public class Method extends SyntaxTreeNode implements IItemWithOffset, TypeScope
 	private ExceptionList exceptionlist;
 	private GenericDeclarationList generics;
 	private final RefTypeOrTPHOrWildcardOrGeneric returnType;
-	public final Boolean isInherited; 
-	
-	/*
-	 * its Constraints
-	 * eingefuegt PL 2021-02-15
-	 */
-	public final ConstraintSet constraints = new ConstraintSet();
-	
+	public final Boolean isInherited;  
+
 	public Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block block,
 				  GenericDeclarationList gtvDeclarations, Token offset) {
 		super(offset);
@@ -76,10 +70,6 @@ public class Method extends SyntaxTreeNode implements IItemWithOffset, TypeScope
 		return this.returnType;
 	}
 
-	public ConstraintSet getConstraints() {
-		return this.constraints;
-	}
-	
 	@Override
 	public void accept(ASTVisitor visitor) {
 		visitor.visit(this);

src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java

@@ -45,12 +45,6 @@ public class SourceFile extends SyntaxTreeNode{
   public List<ClassOrInterface> getClasses() {
     return KlassenVektor;
   }
-  
-  public List<Method> getAllMethods() {
-	  List<Method> ret = new ArrayList<>();
-	  getClasses().forEach(cl -> ret.addAll(cl.getMethods()));
-	  return ret;
-  }
 
   @Override
   public void accept(ASTVisitor visitor) {

src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java

@@ -154,7 +154,7 @@ public class UnifyTypeFactory {
     public static Constraint<UnifyPair> convert(Constraint<Pair> constraint){
     	Constraint<UnifyPair> unifyPairConstraint = constraint.stream()
     			.map(UnifyTypeFactory::convert)
-    			.collect(Collectors.toCollection( () -> new Constraint<UnifyPair> (constraint.isInherited(), convert(constraint.getExtendConstraint()))));
+    			.collect(Collectors.toCollection( () -> new Constraint<UnifyPair>(convert(constraint.getExtendConstraint()))));
     	return unifyPairConstraint;
     }
 
@@ -258,7 +258,6 @@ public class UnifyTypeFactory {
             ret = TypePlaceholder.fresh(new NullToken());
             tphs.put(t.getName(), ret);
         }
-        ret.setVariance(t.getVariance());
         return ret;
     }
 

src/main/java/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java

@@ -53,10 +53,4 @@ public class ExtendsWildcardType extends WildcardType{
 	public void accept(ResultSetVisitor visitor) {
 		visitor.visit(this);
 	}
-
-	@Override
-	public boolean equals(Object o) {
-		// TODO Auto-generated method stub
-		return false;
-	}
 }

src/main/java/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java

@@ -32,11 +32,5 @@ public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric
     public void accept(ResultSetVisitor visitor) {
         visitor.visit(this);
     }
-
-	@Override
-	public boolean equals(Object o) {
-		// TODO Auto-generated method stub
-		return false;
-	}
 }
 

src/main/java/de/dhbwstuttgart/syntaxtree/type/RefType.java

@@ -77,8 +77,8 @@ public class RefType extends RefTypeOrTPHOrWildcardOrGeneric
         if(obj instanceof RefType){
             boolean ret = true;
             
-            //if(!(super.equals(obj))) PL 2020-03-12 muss vll. einkommentiert werden   
-            //	return false;
+            if(!super.equals(obj))
+            	return false;
             
             if(parameter==null || parameter.size()==0){
                 ret &= (((RefType)obj).getParaList()==null || ((RefType)obj).getParaList().size()==0);

src/main/java/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java

@@ -16,7 +16,4 @@ public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode{
     public abstract <A> A acceptTV(TypeVisitor<A> visitor);
     public abstract void accept(ResultSetVisitor visitor);
     
-    @Override
-    public abstract boolean equals(Object o);
-    
 }

src/main/java/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java

@@ -64,10 +64,4 @@ public class SuperWildcardType extends WildcardType{
 	public void accept(ResultSetVisitor visitor) {
 		visitor.visit(this);
 	}
-
-	@Override
-	public boolean equals(Object o) {
-		// TODO Auto-generated method stub
-		return false;
-	}
 }

src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java

@@ -20,9 +20,10 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
 	private final String name;
 	
 	/**
-	 * wird im Generate Generics Teil nach der Rueckumwandlung nach dem Unify genutzt
+	 * wird bisher nicht genutzt
+	 * setVariance muss ggf. auskommentiert werden.
 	 */
-	private int variance = 0;
+	int variance = 0;
 
 
     /**
@@ -77,9 +78,11 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
         return name;
     }
 
+    /* wird bisher nicht genutzt
     public void setVariance(int variance) {
     	this.variance= variance;
     }
+    */
     
     public int getVariance() {
     	return this.variance;

src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java

@@ -17,15 +17,13 @@ public class MethodAssumption extends Assumption{
     private ClassOrInterface receiver;
     private RefTypeOrTPHOrWildcardOrGeneric retType;
     List<? extends RefTypeOrTPHOrWildcardOrGeneric> params;
-    private final Boolean isInherited;
 
     public MethodAssumption(ClassOrInterface receiver, RefTypeOrTPHOrWildcardOrGeneric retType,
-                            List<? extends RefTypeOrTPHOrWildcardOrGeneric> params, TypeScope scope, Boolean isInherited){
+                            List<? extends RefTypeOrTPHOrWildcardOrGeneric> params, TypeScope scope){
         super(scope);
         this.receiver = receiver;
         this.retType = retType;
         this.params = params;
-        this.isInherited = isInherited;
     }
 
     /*
@@ -72,8 +70,4 @@ public class MethodAssumption extends Assumption{
 
         return receiverType;
     }
-    
-    public Boolean isInherited() {
-    	return isInherited;
-    }
 }

src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java

@@ -6,32 +6,17 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+//TODO: Remove this class
 public class Constraint<A> extends HashSet<A> {
 	private static final long serialVersionUID = 1L;
-	private Boolean isInherited = false;//wird nur für die Method-Constraints benoetigt
 	private Constraint<A> extendConstraint = null;
+
+	public Constraint(){}
 	
-	public Constraint() {
-		super();
-	}
-	
-	public Constraint(Boolean isInherited) {
-		this.isInherited = isInherited;
-	}
-	
-	public Constraint(Boolean isInherited, Constraint<A> extendConstraint) {
-		this.isInherited = isInherited;
+	public Constraint(Constraint<A> extendConstraint) {
 		this.extendConstraint = extendConstraint;
 	}
 	
-	public void setIsInherited(Boolean isInherited) {
-		this.isInherited = isInherited;
-	}
-	
-	public Boolean isInherited() {
-		return isInherited;
-	}
-	
 	public Constraint<A> getExtendConstraint() {
 		return extendConstraint;
 	}
@@ -41,7 +26,7 @@ public class Constraint<A> extends HashSet<A> {
 	}
 
 	public String toString() {
-		return super.toString() + " isInherited = " + isInherited 
+		return super.toString()
 				//" + extendsContraint: "  + (extendConstraint != null ? extendConstraint.toStringBase() : "null" ) 
 				+ "\n" ;
 	}

src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java

@@ -23,17 +23,9 @@ public class ConstraintSet<A> {
         oderConstraints.add(methodConstraints);
     }
 
-    public void addAllUndConstraint(Constraint<A> allUndConstraints){
-        undConstraints.addAll(allUndConstraints);
-    }
-    
-    public void addAllOderConstraint(List<Set<Constraint<A>>> allOderConstraints){
-        this.oderConstraints.addAll(allOderConstraints);
-    }
-    
     public void addAll(ConstraintSet constraints) {
-        this.addAllUndConstraint(constraints.undConstraints);
-        this.addAllOderConstraint(constraints.oderConstraints);
+        this.undConstraints.addAll(constraints.undConstraints);
+        this.oderConstraints.addAll(constraints.oderConstraints);
     }
 
     @Override
@@ -76,9 +68,8 @@ public class ConstraintSet<A> {
                     	Constraint<B> newConst = as.stream()
                     			.map(o)
                     			.collect(Collectors.toCollection((as.getExtendConstraint() != null)
-                    					? () -> new Constraint<B> (as.isInherited(),
-                    							                   as.getExtendConstraint().stream().map(o).collect(Collectors.toCollection(Constraint::new))) 
-                    					: () -> new Constraint<B> (as.isInherited())
+                    					? () -> new Constraint<B> (as.getExtendConstraint().stream().map(o).collect(Collectors.toCollection(Constraint::new)))
+                    					: () -> new Constraint<B> ()
                     			));                    							
                     	
                     	//CSA2CSB.put(as, newConst);

src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet2.java

@@ -0,0 +1,107 @@
+package de.dhbwstuttgart.typeinference.constraints;
+
+
+import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public class ConstraintSet2 {
+    Set<OderConstraint> oderConstraints = new HashSet<>();
+
+    public ConstraintSet2(Set<OderConstraint> constraints){
+        if(constraints.isEmpty())throw new RuntimeException("Empty constraint set");
+        this.oderConstraints = constraints;
+    }
+
+    @Override
+    public String toString(){
+    	BinaryOperator<String> b = (x,y) -> x+y;
+        return "ODER:" + this.oderConstraints.stream().reduce("", (x,y) -> x.toString()+ "\n"  +y, b);
+    }
+
+    private class ConstraintSpliterator implements Spliterator<Set<Pair>> {
+        private List<OderConstraint> constraints;
+        private long i = 0;
+        private long max = 0;
+        private List<Integer> sizes;
+        private List<Long> bases = new ArrayList<>();
+
+        ConstraintSpliterator(List<OderConstraint> constraints){
+            this.constraints = constraints;
+            sizes = constraints.stream().map(OderConstraint::getSize).collect(Collectors.toList());
+            long base = 1;
+            for(int size : sizes){
+                bases.add(base);
+                base *= size;
+            }
+            i = 0;
+            max = estimateSize() - 1;
+        }
+
+        ConstraintSpliterator(List<OderConstraint> constraints, long start, long end){
+            this(constraints);
+            i = start;
+            max = end;
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer<? super Set<Pair>> consumer) {
+            if(i > max) return false;
+            consumer.accept(get(i));
+            i++;
+            return true;
+        }
+
+        private Set<Pair> get(long num){
+            Set<Pair> ret = new HashSet<>();
+            Iterator<Long> baseIt = bases.iterator();
+            for(OderConstraint constraint : constraints){
+                ret.addAll(constraint.get((int) ((num/baseIt.next())%constraint.getSize())));
+            }
+            return ret;
+        }
+
+        @Override
+        public Spliterator<Set<Pair>> trySplit() {
+            if(max - i < 2) return null;
+            long middle = i + ((max- i) / 2);
+            long maxOld = max;
+            max = middle - 1;
+            return new ConstraintSpliterator(constraints, middle, maxOld);
+        }
+
+        @Override
+        public long estimateSize() {
+            long ret = 1;
+            for (int size : sizes)ret*=size;
+            return ret;
+        }
+
+        @Override
+        public int characteristics() {
+            return ORDERED | SIZED | IMMUTABLE | NONNULL;
+        }
+    }
+
+    public Stream<Set<Pair>> cartesianProductParallel(){
+        return StreamSupport.stream(new ConstraintSpliterator(oderConstraints.stream().collect(Collectors.toList())), true);
+    }
+/*
+    public Map<String, TypePlaceholder> generateTPHMap() {
+        HashMap<String, TypePlaceholder> ret = new HashMap<>();
+        constraints.map((Pair p) -> {
+            if (p.TA1 instanceof TypePlaceholder) {
+                ret.put(((TypePlaceholder) p.TA1).getName(), (TypePlaceholder) p.TA1);
+            }
+            if (p.TA2 instanceof TypePlaceholder) {
+                ret.put(((TypePlaceholder) p.TA2).getName(), (TypePlaceholder) p.TA2);
+            }
+            return null;
+        });
+        return ret;
+    }
+*/
+}

src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSetBuilder.java

@@ -0,0 +1,26 @@
+package de.dhbwstuttgart.typeinference.constraints;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class ConstraintSetBuilder {
+    private Set<Pair> undConstraints = new HashSet<>();
+    private Set<OderConstraint> oderConstraints = new HashSet<>();
+    private boolean done = false;
+
+    public void addUndConstraint(Pair p){
+        undConstraints.add(p);
+    }
+
+    public void addOderConstraint(OderConstraint orConstraint) {
+        oderConstraints.add(orConstraint);
+    }
+
+    public ConstraintSet2 build(){
+        if(done)throw new RuntimeException("Trying to build cartesian product twice");
+        this.done = true;
+        if(!undConstraints.isEmpty())
+            oderConstraints.add(new OderConstraint(Set.of(undConstraints)));
+        return new ConstraintSet2(oderConstraints);
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/constraints/OderConstraint.java

@@ -0,0 +1,24 @@
+package de.dhbwstuttgart.typeinference.constraints;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class OderConstraint {
+    private final List<Set<Pair>> cons;
+    public OderConstraint(Set<Set<Pair>> orCons){
+        if(orCons.isEmpty())throw new RuntimeException("Empty constraint set");
+        for(Set<Pair> c : orCons){
+            if(c.isEmpty())throw new RuntimeException("Empty constraint set");
+        }
+        this.cons = orCons.stream().collect(Collectors.toList());
+    }
+
+    public int getSize(){
+        return cons.size();
+    }
+
+    public Set<Pair> get(int l) {
+        return cons.get(l);
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java

@@ -32,10 +32,8 @@ public class TYPE {
 
     private ConstraintSet getConstraintsClass(ClassOrInterface cl, TypeInferenceInformation info) {
         ConstraintSet ret = new ConstraintSet();
-        ConstraintSet methConstrains;
         for(Method m : cl.getMethods()){
-            ret.addAll(methConstrains = getConstraintsMethod(m,info, cl));
-            m.constraints.addAll(methConstrains);
+            ret.addAll(getConstraintsMethod(m,info, cl));
         }
         for(Constructor m : cl.getConstructors()){
             ret.addAll(getConstraintsConstructor(m,info, cl));

src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java

@@ -179,7 +179,7 @@ public class TYPEStmt implements StatementVisitor{
 					           !(x.TA2 instanceof TypePlaceholder))
 					        		   ? new Pair(x.TA1, new ExtendsWildcardType(x.TA2, x.TA2.getOffset()), PairOperator.EQUALSDOT)
 					        		   : x)
-            		.collect(Collectors.toCollection(() -> new Constraint<Pair>(oneMethodConstraint.isInherited())));
+            		.collect(Collectors.toCollection(() -> new Constraint<Pair>()));
             oneMethodConstraint.setExtendConstraint(extendsOneMethodConstraint);
             extendsOneMethodConstraint.setExtendConstraint(oneMethodConstraint);
             methodConstraints.add(extendsOneMethodConstraint);
@@ -490,7 +490,7 @@ public class TYPEStmt implements StatementVisitor{
     @Override
     public void visit(Return returnExpr) {
         returnExpr.retexpr.accept(this);
-        constraintsSet.addUndConstraint(new Pair(returnExpr.getType(),info.getCurrentTypeScope().getReturnType(), PairOperator.EQUALSDOT));
+        constraintsSet.addUndConstraint(new Pair(returnExpr.getType(),info.getCurrentTypeScope().getReturnType(), PairOperator.SMALLERDOT));
     }
 
     @Override
@@ -574,7 +574,7 @@ public class TYPEStmt implements StatementVisitor{
 
     protected Constraint<Pair> generateConstraint(MethodCall forMethod, MethodAssumption assumption,
                                                   TypeInferenceBlockInformation info, GenericsResolver resolver){
-        Constraint<Pair> methodConstraint = new Constraint<>(assumption.isInherited());
+        Constraint<Pair> methodConstraint = new Constraint<>();
         ClassOrInterface receiverCl = assumption.getReceiver();
         /*
         List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
@@ -587,13 +587,9 @@ public class TYPEStmt implements StatementVisitor{
         */
         
         RefTypeOrTPHOrWildcardOrGeneric retType = assumption.getReceiverType(resolver);
-        methodConstraint.add(new Pair(forMethod.receiver.getType(), retType,
-        		             PairOperator.EQUALSDOT));//PL 2020-03-17 SMALLERDOT in EQUALSDOT umgewandelt, weil alle geerbten Methoden in den jeweilen Klassen enthalten sind. 
-        		       
-        //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ANFANG
-        //methodConstraint.add(new Pair(forMethod.receiverType, retType,
-        //        PairOperator.EQUALSDOT));
-        //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ENDE
+        methodConstraint.add(forMethod.name.equals("apply") ? //PL 2019-11-29: Tenaerer Operator eingefügt, weil bei Lambda-Ausdrücken keine Suntype FunN$$ existiert 
+        		new Pair(forMethod.receiver.getType(), retType, PairOperator.EQUALSDOT)
+        		: new Pair(forMethod.receiver.getType(), retType, PairOperator.SMALLERDOT));
 
         methodConstraint.add(new Pair(assumption.getReturnType(resolver), forMethod.getType(),
                 PairOperator.EQUALSDOT));
@@ -640,7 +636,7 @@ public class TYPEStmt implements StatementVisitor{
                         public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
                             throw new NotImplementedException();
                         }
-                    }, false));
+                    }));
         }
         for(ClassOrInterface cl : info.getAvailableClasses()){
             for(Method m : cl.getMethods()){
@@ -649,7 +645,7 @@ public class TYPEStmt implements StatementVisitor{
                     RefTypeOrTPHOrWildcardOrGeneric retType = m.getReturnType();//info.checkGTV(m.getReturnType());
 
                     ret.add(new MethodAssumption(cl, retType, convertParams(m.getParameterList(),info),
-                           createTypeScope(cl, m), m.isInherited));
+                           createTypeScope(cl, m)));
                 }
             }
         }
@@ -684,7 +680,7 @@ public class TYPEStmt implements StatementVisitor{
                 for(Method m : cl.getConstructors()){
                     if(m.getParameterList().getFormalparalist().size() == argList.getArguments().size()){
                         ret.add(new MethodAssumption(cl, ofType, convertParams(m.getParameterList(),
-                                info), createTypeScope(cl, m), m.isInherited));
+                                info), createTypeScope(cl, m)));
                     }
                 }
             }

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

@@ -655,6 +655,7 @@ public class RuleSet implements IRuleSet{
 			else
 				t1.getTypeParams().forEach(x -> occuringTypes.push(x));	
 		}
+		
 		Queue<UnifyPair> result1 = new LinkedList<UnifyPair>(pairs);
 		ArrayList<UnifyPair> result = new ArrayList<UnifyPair>();
 		boolean applied = false;
@@ -668,7 +669,6 @@ public class RuleSet implements IRuleSet{
 					&& pair.getLhsType() instanceof PlaceholderType)
 				lhsType = (PlaceholderType) pair.getLhsType();
 				rhsType = pair.getRhsType(); //PL eingefuegt 2017-09-29 statt !((rhsType = pair.getRhsType()) instanceof PlaceholderType)
-			
 			if(lhsType != null 
 					//&& !((rhsType = pair.getRhsType()) instanceof PlaceholderType) //PL geloescht am 2017-09-29 Begründung: auch Typvariablen muessen ersetzt werden.
 					&& typeMap.get(lhsType) > 1  // The type occurs in more pairs in the set than just the recent pair.
@@ -682,9 +682,8 @@ public class RuleSet implements IRuleSet{
 				Function<? super Constraint<UnifyPair>,? extends Constraint<UnifyPair>> applyUni = b -> b.stream().map(
 						x -> uni.apply(pair,x)).collect(Collectors.toCollection((b.getExtendConstraint() != null)
 								? () -> new Constraint<UnifyPair>(
-										  b.isInherited(),
 										  b.getExtendConstraint().stream().map(x -> uni.apply(pair,x)).collect(Collectors.toCollection(Constraint::new)))
-								: () -> new Constraint<UnifyPair>(b.isInherited())
+								: () -> new Constraint<UnifyPair>()
 									));
 				oderConstraints.replaceAll(oc -> oc.stream().map(applyUni).collect(Collectors.toCollection(HashSet::new)));
 				/*

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

@@ -34,7 +34,7 @@ public class TypeUnify2Task extends TypeUnifyTask {
                        System.out.println("two");
                }
                one = true;
-               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField);
+               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, true);
                /*if (isUndefinedPairSetSet(res)) { 
                        return new HashSet<>(); }
                else

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

@@ -110,9 +110,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	protected boolean parallel;
 	
-    //Gives if unify is not called from checkA
-	private boolean finalresult = true;
-	
 	int rekTiefeField;
 	
 	Integer nOfUnify = 0;
@@ -260,7 +257,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		ArrayList<Set<Constraint<UnifyPair>>> remainingOderconstraints = oderConstraintsField.stream()
 				.filter(x -> x.size()>1)
 				.collect(Collectors.toCollection(ArrayList::new));
-		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefeField);
+		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefeField, true);
 		noOfThread--;
 		try {
 			logFile.close();
@@ -302,7 +299,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	 * @param fc The finite closure
 	 * @return The set of all principal type unifiers
 	 */
-	protected Set<Set<UnifyPair>> unify(final Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe)  {
+	protected Set<Set<UnifyPair>> unify(final Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe, Boolean finalresult)  {
 		//Set<UnifyPair> aas = eq.stream().filter(x -> x.getLhsType().getName().equals("AA") //&& x.getPairOp().equals(PairOperator.SMALLERDOT)
 		//		).collect(Collectors.toCollection(HashSet::new));
 		//writeLog(nOfUnify.toString() + " AA: " + aas.toString());
@@ -311,7 +308,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		//}
 
                 //.collect(Collectors.toCollection(HashSet::new)));
-		
+		/*
+		 * Step 1: Repeated application of reduce, adapt, erase, swap 
+		 */
 		synchronized (usedTasks) {
 			if (this.myIsCancelled()) {
 				return new HashSet<>();
@@ -340,29 +339,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			return ret;
 		}
 		
-		/*
-		 * Occurs-Check durchfuehren
-		 */
-		
-		Set<UnifyPair> ocurrPairs = eq.stream().filter(x -> {
-			UnifyType lhs, rhs;
-		    return (lhs = x.getLhsType()) instanceof PlaceholderType 
-				    && !((rhs = x.getRhsType()) instanceof PlaceholderType)
-				    && rhs.getTypeParams().occurs((PlaceholderType)lhs);})
-		.map(x -> { x.setUndefinedPair(); return x;})
-	    .collect(Collectors.toCollection(HashSet::new));
-		writeLog("ocurrPairs: " + ocurrPairs);
-		if (ocurrPairs.size() > 0) {
-			Set<Set<UnifyPair>> ret = new HashSet<>();
-			ret.add(ocurrPairs);
-			return ret;
-		}
-		
-		
-		
-		/*
-		 * Step 1: Repeated application of reduce, adapt, erase, swap 
-		 */
 		Set<UnifyPair> eq0; 
 		Set<UnifyPair> eq0Prime;
 		Optional<Set<UnifyPair>> eqSubst = Optional.of(eq);
@@ -481,12 +457,12 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		
 		//Aufruf von computeCartesianRecursive ANFANG
 		//writeLog("topLevelSets: " + topLevelSets.toString());
-		return computeCartesianRecursive(new ArrayList<>(topLevelSets), eq, oderConstraintsOutput, fc, parallel, rekTiefe);
+		return computeCartesianRecursive(new HashSet<>(), new ArrayList<>(topLevelSets), eq, oderConstraintsOutput, fc, parallel, rekTiefe, finalresult);
 	
 	}
 	
 	
-	Set<Set<UnifyPair>> unify2(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe) {
+	Set<Set<UnifyPair>> unify2(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe, Boolean finalresult) {
 		//Aufruf von computeCartesianRecursive ENDE
 		
 		//keine Ahnung woher das kommt
@@ -575,12 +551,12 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					}
 				}
 				else if(eqPrimePrime.isPresent()) {
-					Set<Set<UnifyPair>> unifyres = unifyres1 = unify(eqPrimePrime.get(), newOderConstraints, fc, parallel, rekTiefe);
+					Set<Set<UnifyPair>> unifyres = unifyres1 = unify(eqPrimePrime.get(), newOderConstraints, fc, parallel, rekTiefe, finalresult);
 					
 					eqPrimePrimeSet.addAll(unifyres);
 				}
 				else {
-					Set<Set<UnifyPair>> unifyres = unifyres2 = unify(eqPrime, newOderConstraints, fc, parallel, rekTiefe);
+					Set<Set<UnifyPair>> unifyres = unifyres2 = unify(eqPrime, newOderConstraints, fc, parallel, rekTiefe, finalresult);
 					
 					
 					eqPrimePrimeSet.addAll(unifyres);
@@ -611,36 +587,22 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	}
 	
 	
-	/**
-	 * Computes the cartesian product of topLevelSets step by step.
-	 * @param topLevelSets List of Sets of Sets, where a cartesian product have to be built
-	 *        Ex.: [{{a =. Integer}, {a = Object}}, {{a = Vector<b>, b =. Integer}, {a = Vector<b>, b =. Object}}]
-	 * @param eq Original set of equations which should be unified
-	 * @param oderConstraints Remaining or-constraints
-	 * @param fc The finite closure
-	 * @param parallel If the algorithm should be parallelized run
-	 * @param rekTiefe Deep of recursive calls
-	 * @return The set of all principal type unifiers
-	 */
-	Set<Set<UnifyPair>> computeCartesianRecursive(ArrayList<Set<? extends Set<UnifyPair>>> topLevelSets, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe) {
+	
+	Set<Set<UnifyPair>> computeCartesianRecursive(Set<Set<UnifyPair>> fstElems, ArrayList<Set<? extends Set<UnifyPair>>> topLevelSets, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe, Boolean finalresult) {
+		//ArrayList<Set<Set<UnifyPair>>> remainingSets = new ArrayList<>(topLevelSets);
 		
-		//oneElems: Alle 1-elementigen Mengen, die nur ein Paar 
-		//a <. theta, theta <. a oder a =. theta enthalten 
-		Set<Set<UnifyPair>> oneElems = new HashSet<>();
-		oneElems.addAll(topLevelSets.stream()
+		fstElems.addAll(topLevelSets.stream()
 				                    .filter(x -> x.size()==1)
 				                    .map(y -> y.stream().findFirst().get())
 				                    .collect(Collectors.toCollection(HashSet::new)));
-		
-		//optNextSet: Eine mehrelementige Menge, wenn vorhanden
-		Optional<Set<? extends Set<UnifyPair>>> optNextSet = topLevelSets.stream().filter(x -> x.size()>1).findAny();
-		
-		if (!optNextSet.isPresent()) {//Alle Elemente sind 1-elementig
-			Set<Set<UnifyPair>> result = unify2(oneElems, eq, oderConstraints, fc, parallel, rekTiefe);
+		ArrayList<Set<? extends Set<UnifyPair>>> remainingSets = topLevelSets.stream()
+				                                                   .filter(x -> x.size()>1)
+				                                                   .collect(Collectors.toCollection(ArrayList::new));
+		if (remainingSets.isEmpty()) {//Alle Elemente sind 1-elementig
+			Set<Set<UnifyPair>> result = unify2(fstElems, eq, oderConstraints, fc, parallel, rekTiefe, finalresult);
 			return result;
 		}
-		
-		Set<? extends Set<UnifyPair>> nextSet = optNextSet.get(); 
+		Set<? extends Set<UnifyPair>> nextSet = remainingSets.remove(0);
 		//writeLog("nextSet: " + nextSet.toString());
 		List<Set<UnifyPair>> nextSetasList =new ArrayList<>(nextSet);
 		/*
@@ -655,12 +617,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		Set<Set<UnifyPair>> result = new HashSet<>(); 
 		int variance = 0;
 		
-		/* Varianzbestimmung Anfang 
-		 * Oderconstraint, wenn entweder kein Basepair oder unterschiedliche Basepairs => oderConstraint = true;
-		 * Varianz = 1 => Argumentvariable
-		 * Varianz = -1 => Rückgabevariable
-		 * Varianz = 0 => unklar 
-		 * Varianz = 2 => Operatoren oderConstraints */
 		ArrayList<UnifyPair> zeroNextElem = new ArrayList<>(nextSetasList.get(0)); 
 		UnifyPair fstBasePair = zeroNextElem.remove(0).getBasePair();
 		Boolean oderConstraint = false;
@@ -683,15 +639,16 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 			}
 			else {
+				//variance = 2;
 				oderConstraint = true;
 			}
 		}
 		else {
+			//variance = 2;
 			oderConstraint = true;
 		}
 		
-		//Varianz-Bestimmung Oder-Constraints 
-		if (oderConstraint) {
+		if (oderConstraint) {//Varianz-Bestimmung Oder-Constraints
 			if (printtag) System.out.println("nextSetasList " + nextSetasList);
 			Optional<Integer> optVariance = 
 					nextSetasList.iterator()
@@ -704,22 +661,23 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				 			  	 ((PlaceholderType)x.getGroundBasePair().getLhsType()).getVariance())
 				 			  	 .findAny();
 			//Fuer Operatorenaufrufe wird variance auf 2 gesetzt.
-			//da kein Receiver existiert also kein x.getGroundBasePair().getLhsType() instanceof PlaceholderType
-			//Bei Varianz = 2 werden alle Elemente des Kartesischen Produkts abgearbeitet
+			//da kein Receiver existiert also keon x.getGroundBasePair().getLhsType() instanceof PlaceholderType
+			//Es werden alle Elemente des Kartesischen Produkts abgearbeitet
 			variance = optVariance.isPresent() ? optVariance.get() : 2;
 		}
-		/* Varianzbestimmung Ende */
 
+		if (!nextSetasList.iterator().hasNext())
+			System.out.print("");
+		if (nextSetasList.iterator().next().stream().filter(x -> x.getLhsType().getName().equals("D")).findFirst().isPresent() && nextSetasList.size()>1) 
+			System.out.print("");
 		//writeLog("nextSetasList: " + nextSetasList.toString());
 		Set<UnifyPair> nextSetElem =  nextSetasList.get(0);
 		//writeLog("BasePair1: " + nextSetElem + " " + nextSetElem.iterator().next().getBasePair());
 		
-		/* sameEqSet-Bestimmung: Wenn a = ty \in  nextSet dann enthaelt sameEqSet 
-		 * alle Paare a < ty1 oder ty2 < a aus oneElems */
+		/* sameEqSet-Bestimmung: Wenn a = ty \in  nextSet dann enthaelt sameEqSet alle Paare a < ty1 oder ty2 < a aus fstElems */
 		Set<UnifyPair> sameEqSet = new HashSet<>();
-		
-		//optOrigPair enthaelt ggf. das Paar a = ty \in  nextSet
 		Optional<UnifyPair> optOrigPair = null;
+		//if (variance != 2) {
 		if (!oderConstraint) {
 			optOrigPair = nextSetElem.stream().filter(x -> (
 					//x.getBasePair() != null && ist gegeben wenn variance != 2
@@ -743,7 +701,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					tyVar = origPair.getRhsType();
 				}
 				UnifyType tyVarEF = tyVar;
-				sameEqSet = oneElems.stream().map(xx -> xx.iterator().next())
+				sameEqSet = fstElems.stream().map(xx -> xx.iterator().next())
 					.filter(x -> (((x.getLhsType().equals(tyVarEF) && !(x.getRhsType() instanceof PlaceholderType)) 
 							|| (x.getRhsType().equals(tyVarEF) && !(x.getLhsType() instanceof PlaceholderType)))))
 					.collect(Collectors.toCollection(HashSet::new));
@@ -752,21 +710,14 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		/* sameEqSet-Bestimmung Ende */
 		
 		Set<UnifyPair> a = null;
-		while (nextSetasList.size() > 0) {
+		while (nextSetasList.size() > 0) {  //(nextSetasList.size() != 0) {
 			Set<UnifyPair> a_last = a;
 			
-			/* Liste der Faelle für die parallele Verarbeitung 
-			 * Enthaelt Elemente, die nicht in Relation zu aktuellem Fall in der 
-			 * Variablen a stehen. Diese muesse auf alle Faelle bearbeitet werden, 
-			 * Deshalb wird ihre Berechnung parallel angestossen.
-			 */ 
+			//Liste der Faelle für die parallele Verarbeitung
 			List<Set<UnifyPair>> nextSetasListRest = new ArrayList<>();
 			
-			/* Liste der Faelle, bei dem Receiver jeweils "? extends" enthaelt bzw. nicht enthaelt
-			 * In der Regel ist dies genau ein Element
-			 * Dieses Element wird später aus nextSetasList geloescht, wenn das jeweils andere Element zum Erfolg
-			 * gefuehrt hat.
-			 */
+			//Liste der Faelle, bei dem Receiver jeweils "? extends" enthaelt bzw. nicht enthaelt
+			//In der Regel ein Element
 			List<Set<UnifyPair>> nextSetasListOderConstraints = new ArrayList<>();
 			
 			writeLog("nextSet: " + nextSet.toString());
@@ -789,7 +740,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				
 				//Alle maximale Elemente in  nextSetasListRest bestimmen
-				//nur für diese wird parallele Berechnung angestossen.
 				nextSetasListRest = oup.maxElements(nextSetasListRest);
 			}
 			else if (variance == -1) {
@@ -810,13 +760,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					}
 				}
 				//Alle minimalen Elemente in  nextSetasListRest bestimmen
-				//nur für diese wird parallele Berechnung angestossen.
 				nextSetasListRest = oup.minElements(nextSetasListRest);
 			}
 			else if (variance == 2) {
 				a = nextSetasList.remove(0);
-				
-				//Fuer alle Elemente wird parallele Berechnung angestossen.
 				nextSetasListRest = new ArrayList<>(nextSetasList);
 			} 
 			else if (variance == 0) {
@@ -842,32 +789,54 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					}
 				}
 			}
+			//writeLog("nextSet: " + nextSetasList.toString()+ "\n");
+			//nextSetasList.remove(a);
 			
+			//PL 2018-03-01
+			//TODO: 1. Maximum und Minimum unterscheiden
+			//TODO: 2. compare noch für alle Elmemente die nicht X =. ty sind erweitern 
+		//for(Set<UnifyPair> a : newSet) {
 			i++;
-			Set<Set<UnifyPair>> elems = new HashSet<Set<UnifyPair>>(oneElems);
+			Set<Set<UnifyPair>> elems = new HashSet<Set<UnifyPair>>(fstElems);
 			writeLog("a1: " + rekTiefe + "  "+ "variance:  "+ variance + " " + a.toString()+ "\n");
-			
-			//Ergebnisvariable für den aktuelle Thread
+			//elems.add(a); PL 2019-01-20 Muss weg, weil das in jeweiligen Thread erfolgen muss. Fuer den sequentiellen Fall 
+			//im else-Zweig
+			//if (remainingSets.isEmpty()) {//muss immer gegeben sein, weil nur 1 Element der topLevelSets mehr als ein Elemet enthaelt
+				//writeLog("Vor unify2 Aufruf: " + elems.toString());
 			Set<Set<UnifyPair>> res = new HashSet<>();
-			
-			//Menge der Ergebnisse der geforkten Threads
 			Set<Set<Set<UnifyPair>>> add_res = new HashSet<>();
-			
-			
 			Set<Set<UnifyPair>> aParDef = new HashSet<>();
 			
-			/* Wenn bei (a \in theta) \in a zu Widerspruch in oneElems wird
-			 * a verworfen und zu nächstem Element von nextSetasList gegangen  
-			 */
-			if (!oderConstraint && !sameEqSet.isEmpty() && !checkNoContradiction(a, sameEqSet, result)) {
-				a = null;
-				noShortendElements++;
-				continue;
-			}
+			/* PL 2019-03-11 Anfang eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
+			if (!oderConstraint && !sameEqSet.isEmpty()) {
+				Optional<UnifyPair> optAPair = a.stream().filter(x -> (
+						//x.getBasePair() != null && ist gegeben wenn variance != 2
+						//x.getBasePair().getPairOp().equals(PairOperator.SMALLERDOT) &&
+						(x.getPairOp().equals(PairOperator.EQUALSDOT) 
+					/*			
+	                	(x.getBasePair().getLhsType() instanceof PlaceholderType 
+	                     && x.getLhsType().equals(x.getBasePair().getLhsType()))
+	                	|| (x.getBasePair().getRhsType() instanceof PlaceholderType 
+	                		&& x.getLhsType().equals(x.getBasePair().getRhsType())
+	                */		
+	                ))).filter(x -> //Sicherstellen, dass bei a = ty a auch wirklich die gesuchte Typvariable ist 
+	                	x.getLhsType().equals(x.getBasePair().getLhsType()) || 
+	                	x.getLhsType().equals(x.getBasePair().getRhsType())
+	                ).findFirst();
+			
+				if (optAPair.isPresent()) {//basepair ist entweder a <. Ty oder ty <. a
+					UnifyPair aPair = optAPair.get();
+					//writeLog("optOrigPair: " + optOrigPair + " " + "aPair: " + aPair+ " " + "aPair.basePair(): " + aPair.getBasePair());
+					writeLog("variance: " + new Integer(variance).toString() + "sameEqSet:" + sameEqSet);
+					if (!checkA(aPair, sameEqSet, elems, result)) {
+						a = null;
+						noShortendElements++;
+						continue;
+					}
+				}
+			}
+			/* PL 2019-03-11 Ende eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
 			
-			/* Wenn parallel gearbeitet wird, wird je nach Varianz ein neuer Thread
-			 * gestartet, der parallel weiterarbeitet.
-			 */
 			if(parallel && (variance == 1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
@@ -896,14 +865,35 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						writeLog("1 RM" + nSaL.toString());
 					}
 					
-					if (!oderConstraint) {
-						//ueberpruefung ob zu a =. ty \in nSaL in sameEqSet ein Widerspruch besteht
-						if (!sameEqSet.isEmpty() && !checkNoContradiction(nSaL, sameEqSet, result)) {
-							nSaL = null;
-							noShortendElements++;
-							continue;
+					/* PL 2019-03-13 Anfang eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
+					if (!oderConstraint) {//weiss nicht ob das wirklich stimmt 
+						Optional<UnifyPair> optAPair = nSaL.stream().filter(x -> (
+								//x.getBasePair() != null && ist gegeben wenn variance != 2
+								//x.getBasePair().getPairOp().equals(PairOperator.SMALLERDOT) &&
+								(x.getPairOp().equals(PairOperator.EQUALSDOT) 
+						/*			
+		                	(x.getBasePair().getLhsType() instanceof PlaceholderType 
+		                     && x.getLhsType().equals(x.getBasePair().getLhsType()))
+		                	|| (x.getBasePair().getRhsType() instanceof PlaceholderType 
+		                		&& x.getLhsType().equals(x.getBasePair().getRhsType())
+		                */		
+		                ))).filter(x -> //Sicherstellen, dass bei a = ty a auch wirklich die gesuchte Typvariable ist 
+		                	x.getLhsType().equals(x.getBasePair().getLhsType()) || 
+		                	x.getLhsType().equals(x.getBasePair().getRhsType())
+		                ).findFirst();
+					
+						if (optAPair.isPresent()) {//basepair ist entweder a <. Ty oder ty <. a
+							UnifyPair aPair = optAPair.get();
+							//writeLog("optOrigPair: " + optOrigPair + " " + "aPair: " + aPair+ " " + "aPair.basePair(): " + aPair.getBasePair());
+							writeLog("variance: " + new Integer(variance).toString() + "sameEqSet:" + sameEqSet);
+							if (!sameEqSet.isEmpty() && !checkA(aPair, sameEqSet, elems, result)) {
+								nSaL = null;
+								noShortendElements++;
+								continue;
+							}
 						}
 					}
+					/* PL 2019-03-13 Ende eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
 					else {
 						nextSetasListOderConstraints.add(((Constraint<UnifyPair>)nSaL).getExtendConstraint());
 					}
@@ -995,14 +985,35 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						writeLog("-1 RM" + nSaL.toString());
 					}
 					
-					if (!oderConstraint) {
-						//ueberpruefung ob zu a =. ty \in nSaL in sameEqSet ein Widerspruch besteht
-						if (!sameEqSet.isEmpty() && !checkNoContradiction(nSaL, sameEqSet, result)) {
-							nSaL = null;
-							noShortendElements++;
-							continue;
+					if (!oderConstraint) {//weiss nicht ob das wirklich stimmt 
+					/* PL 2019-03-13 Anfang eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
+						Optional<UnifyPair> optAPair = nSaL.stream().filter(x -> (
+							//x.getBasePair() != null && ist gegeben wenn variance != 2
+							//x.getBasePair().getPairOp().equals(PairOperator.SMALLERDOT) &&
+							(x.getPairOp().equals(PairOperator.EQUALSDOT) 
+						/*			
+		                	(x.getBasePair().getLhsType() instanceof PlaceholderType 
+		                     && x.getLhsType().equals(x.getBasePair().getLhsType()))
+		                	|| (x.getBasePair().getRhsType() instanceof PlaceholderType 
+		                		&& x.getLhsType().equals(x.getBasePair().getRhsType())
+		                */		
+		                ))).filter(x -> //Sicherstellen, dass bei a = ty a auch wirklich die gesuchte Typvariable ist 
+		                	x.getLhsType().equals(x.getBasePair().getLhsType()) || 
+		                	x.getLhsType().equals(x.getBasePair().getRhsType())
+		                ).findFirst();
+					
+						if (optAPair.isPresent()) {//basepair ist entweder a <. Ty oder ty <. a
+							UnifyPair aPair = optAPair.get();
+							//writeLog("optOrigPair: " + optOrigPair + " " + "aPair: " + aPair+ " " + "aPair.basePair(): " + aPair.getBasePair());
+							writeLog("variance: " + new Integer(variance).toString() + "sameEqSet:" + sameEqSet);
+							if (!sameEqSet.isEmpty() && !checkA(aPair, sameEqSet, elems, result)) {
+								nSaL = null;
+								noShortendElements++;
+								continue;
+							}
 						}
 					}
+					/* PL 2019-03-13 Ende eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
 					else {
 						nextSetasListOderConstraints.add(((Constraint<UnifyPair>)nSaL).getExtendConstraint());
 					}
@@ -1145,12 +1156,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					};
 				} 
 		    	//noOfThread++;	
-		    } else {//parallel = false oder MaxNoOfThreads ist erreicht, sequentiell weiterarbeiten
+		    } else {
+		    	//parallel = false; //Wenn MaxNoOfThreads erreicht ist, sequentiell weiterarbeiten
 				elems.add(a); //PL 2019-01-16 muss das wirklich hin steht schon in Zeile 859 ja braucht man siehe Zeile 859
-				res = unify2(elems, eq, oderConstraints, fc, parallel, rekTiefe);
+				res = unify2(elems, eq, oderConstraints, fc, parallel, rekTiefe, finalresult);
 		    }}}
-			
-			//Ab hier alle parallele Berechnungen wieder zusammengeführt.
 				if (!isUndefinedPairSetSet(res) && isUndefinedPairSetSet(result)) {
 					//wenn korrektes Ergebnis gefunden alle Fehlerfaelle loeschen
 					result = res;
@@ -1237,7 +1247,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						}
 						else {
 							//alle Fehlerfaelle und alle korrekten Ergebnis jeweils adden
-							writeLog("RES Fst: result: " + result.toString() + " res: " + res.toString());
+							writeLog("RES Fst: reuslt: " + result.toString() + " res: " + res.toString());
 							result.addAll(res);
 						}
 						}
@@ -1249,6 +1259,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					//}
 				}
 				
+			//}
+			//else {//duerfte gar nicht mehr vorkommen PL 2018-04-03
+				//result.addAll(computeCartesianRecursive(elems, remainingSets, eq, fc, parallel)); 
+			//}
 				if (parallel) {
 					for (Set<Set<UnifyPair>> par_res : add_res) {
 						if (!isUndefinedPairSetSet(par_res) && isUndefinedPairSetSet(result)) {
@@ -1290,7 +1304,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 							Set<UnifyPair> a_new = aParDefIt.next();
 							List<Set<UnifyPair>> smallerSetasList = oup.smallerThan(a_new, nextSetasList);
 							List<Set<UnifyPair>> notInherited = smallerSetasList.stream()
-								.filter(x -> !((Constraint<UnifyPair>)x).isInherited())
 								.collect(Collectors.toCollection(ArrayList::new));
 							List<Set<UnifyPair>> notErased = new ArrayList<>();
 							notInherited.stream().forEach(x -> { notErased.addAll(oup.smallerEqThan(x, smallerSetasList)); });
@@ -1332,11 +1345,10 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 							List<Set<UnifyPair>> greaterSetasList = oup.greaterThan(a_new, nextSetasList); 
 							
 							//a_new muss hingefuegt werden, wenn es nicht vererbt ist, dann wird es spaeter wieder geloescht
-							if (!((Constraint<UnifyPair>)a_new).isInherited()) {
-								greaterSetasList.add(a_new); 
-							}
+
+							greaterSetasList.add(a_new);
+
 							List<Set<UnifyPair>> notInherited = greaterSetasList.stream()
-								.filter(x -> !((Constraint<UnifyPair>)x).isInherited())
 								.collect(Collectors.toCollection(ArrayList::new));
 							List<Set<UnifyPair>> notErased = new ArrayList<>();
 							
@@ -1387,7 +1399,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						writeLog("Removed: " + nextSetasListOderConstraints);
 					    List<Set<UnifyPair>> smallerSetasList = oup.smallerThan(a, nextSetasList);
 						List<Set<UnifyPair>> notInherited = smallerSetasList.stream()
-							.filter(x -> !((Constraint<UnifyPair>)x).isInherited())
 							.collect(Collectors.toCollection(ArrayList::new));
 						List<Set<UnifyPair>> notErased = new ArrayList<>();
 						notInherited.stream().forEach(x -> { notErased.addAll(oup.smallerEqThan(x, smallerSetasList)); });
@@ -1485,29 +1496,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		return result;
 	}
 	
-	/**
-	 * checks if there is for (a = ty) \in a in sameEqSet a constradiction
-	 * @param a Set of actual element of constraints with a =. ty \in a
-	 * @param sameEqSet Set of constraints where a <. ty' and ty' <. a
-	 * @param result set of results which contains correct solution s and the
-	 *        the error constraints. Error constraints are added
-	 * @result contradiction of (a = ty) in sameEqSet
-	 */
-	protected Boolean checkNoContradiction(Set<UnifyPair> a, Set<UnifyPair> sameEqSet, Set<Set<UnifyPair>> result) {
-		
-			//optAPair enthaelt ggf. das Paar a = ty' \in a
-			//unterscheidet sich von optOrigPair, da dort a = ty
-			Optional<UnifyPair> optAPair = 
-				a.stream().filter(x -> (x.getPairOp().equals(PairOperator.EQUALSDOT)))
-				          .filter(x -> //Sicherstellen, dass bei a = ty a auch wirklich die gesuchte Typvariable ist 
-            	                  x.getLhsType().equals(x.getBasePair().getLhsType()) || 
-            	                  x.getLhsType().equals(x.getBasePair().getRhsType()))
-				          .findFirst();
-	
-		if (optAPair.isPresent()) {//basepair ist entweder a <. Ty oder ty <. a
-			UnifyPair aPair = optAPair.get();
-			//writeLog("optOrigPair: " + optOrigPair + " " + "aPair: " + aPair+ " " + "aPair.basePair(): " + aPair.getBasePair());
-			
+	protected Boolean checkA (UnifyPair aPair, Set<UnifyPair> sameEqSet, Set<Set<UnifyPair>> elems, Set<Set<UnifyPair>> result) {
 			writeLog("checkA: " + aPair + "sameEqSet: " + sameEqSet);
 			for (UnifyPair sameEq : sameEqSet) {
 				if (sameEq.getLhsType() instanceof PlaceholderType) {
@@ -1517,14 +1506,12 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					unitedSubst.addAll(sameEq.getAllSubstitutions());
 					unitedSubst.addAll(sameEq.getAllBases());
 					localEq.add(new UnifyPair(aPair.getRhsType(), sameEq.getRhsType(), sameEq.getPairOp(), unitedSubst, null));
-					finalresult = false;
-					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0);
-					finalresult = true;
+					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0, false);
 					if (isUndefinedPairSetSet(localRes)) {
 						if (result.isEmpty() || isUndefinedPairSetSet(result)) {
 							result.addAll(localRes);
 						}
-						writeLog("FALSE: " + aPair + "sameEqSet: " + sameEqSet);
+						//writeLog("FALSE: " + aPair + "sameEqSet: " + sameEqSet);
 						return false;
 					}
 				}
@@ -1535,25 +1522,20 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					unitedSubst.addAll(sameEq.getAllSubstitutions());
 					unitedSubst.addAll(sameEq.getAllBases());
 					localEq.add(new UnifyPair(sameEq.getLhsType(), aPair.getRhsType(), sameEq.getPairOp(), unitedSubst, null));
-					finalresult = false;
-					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0);
-					finalresult = true;
+					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0, false);
 					if (isUndefinedPairSetSet(localRes)) {
 						if (result.isEmpty() || isUndefinedPairSetSet(result)) {
 							result.addAll(localRes);
 						}
-						writeLog("FALSE: " + aPair + "sameEqSet: " + sameEqSet);
+						//writeLog("FALSE: " + aPair + "sameEqSet: " + sameEqSet);
 						return false;
 					}
 				}	
 			} 
-			writeLog("TRUE: " + aPair + "sameEqSet: " + sameEqSet);
-			return true;
-		}
+			//writeLog("TRUE: " + aPair + "sameEqSet: " + sameEqSet);
 		return true;
 	}
 	
-	
 	protected boolean couldBecorrect(Set<Pair<Set<UnifyPair>, UnifyPair>> reducedUndefResSubstGroundedBasePair, Set<UnifyPair> nextElem) {
 		return reducedUndefResSubstGroundedBasePair.stream()
 		.map(pair -> {
@@ -2520,7 +2502,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	void writeLog(String str) {
 		synchronized ( this ) { 
-		if (log && finalresult) {
+		if (log) {
 			try {
 				logFile.write("Thread no.:" + thNo + "\n");
 				logFile.write("noOfThread:" + noOfThread + "\n");

src/main/java/de/dhbwstuttgart/unify2/MartelliMontanariUnify.java

@@ -0,0 +1,108 @@
+package de.dhbwstuttgart.unify2;
+
+import de.dhbwstuttgart.typeinference.unify.interfaces.IUnify;
+import de.dhbwstuttgart.typeinference.unify.model.*;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Implementation of the Martelli-Montanari unification algorithm.
+ * @author Florian Steurer
+ */
+public class MartelliMontanariUnify {
+
+	/**
+	 * Finds the most general unifier sigma of the set {t1 =. t1',...,tn =. tn'} so that
+	 * sigma(t1) = sigma(t1') , ... sigma(tn) = sigma(tn').
+	 * @param terms The set of terms to be unified
+	 * @return An optional of the most general unifier if it exists or an empty optional if there is no unifier.
+	 */
+	public static Optional<Unifier> unify(UnifyType... terms) {
+		return unify(Arrays.stream(terms).collect(Collectors.toSet()));
+	}
+
+	public static Optional<Unifier> unify(Set<UnifyType> terms) {
+		// Sets with less than 2 terms are trivially unified
+		if(terms.size() < 2)
+			return Optional.of(Unifier.identity());
+		
+		// For the the set of terms {t1,...,tn},
+		// build a list of equations {(t1 = t2), (t2 = t3), (t3 = t4), ....}
+		ArrayList<UnifyPair> termsList = new ArrayList<UnifyPair>();
+		Iterator<UnifyType> iter = terms.iterator();
+		UnifyType prev = iter.next();
+		while(iter.hasNext()) {
+			UnifyType next = iter.next();
+			termsList.add(new UnifyPair(prev, next, PairOperator.EQUALSDOT));
+			prev = next;
+		}
+		
+		// Start with the identity unifier. Substitutions will be added later.
+		Unifier mgu = Unifier.identity();
+		
+		// Apply rules while possible
+		int idx = 0;
+		while(idx < termsList.size()) {
+			UnifyPair pair = termsList.get(idx);
+			UnifyType rhsType = pair.getRhsType();
+			UnifyType lhsType = pair.getLhsType();
+			TypeParams rhsTypeParams = rhsType.getTypeParams();
+			TypeParams lhsTypeParams = lhsType.getTypeParams();
+			
+			// REDUCE - Rule
+			if(!(rhsType instanceof PlaceholderType) && !(lhsType instanceof PlaceholderType)) {
+				Set<UnifyPair> result = new HashSet<>();
+				
+				// f<...> = g<...> with f != g are not unifiable
+				if(!rhsType.getName().equals(lhsType.getName()))
+					return Optional.empty(); // conflict
+				// f<t1,...,tn> = f<s1,...,sm> are not unifiable
+				if(rhsTypeParams.size() != lhsTypeParams.size())
+					return Optional.empty(); // conflict
+				// f = g is not unifiable (cannot be f = f because erase rule would have been applied)
+				//if(rhsTypeParams.size() == 0)
+					//return Optional.empty();
+					
+				// Unpack the arguments
+				for(int i = 0; i < rhsTypeParams.size(); i++)
+					result.add(new UnifyPair(rhsTypeParams.get(i), lhsTypeParams.get(i), PairOperator.EQUALSDOT));
+				
+				termsList.remove(idx);
+				termsList.addAll(result);
+				continue;
+			}
+			
+			// DELETE - Rule
+			if(pair.getRhsType().equals(pair.getLhsType())) {
+				termsList.remove(idx);
+				continue; 
+			}
+
+			// SWAP - Rule
+			if(!(lhsType instanceof PlaceholderType) && (rhsType instanceof PlaceholderType)) {
+				termsList.remove(idx);
+				termsList.add(new UnifyPair(rhsType, lhsType, PairOperator.EQUALSDOT));
+				continue;
+			}
+			
+			// OCCURS-CHECK
+			if(pair.getLhsType() instanceof PlaceholderType
+					&& pair.getRhsType().getTypeParams().occurs((PlaceholderType) pair.getLhsType())) 
+				return Optional.empty();
+			
+			// SUBST - Rule
+			if(lhsType instanceof PlaceholderType) {
+				mgu.add((PlaceholderType) lhsType, rhsType);
+				//PL 2018-04-01 nach checken, ob es richtig ist, dass keine Substitutionen uebergeben werden muessen. 
+				termsList = termsList.stream().map(x -> mgu.apply(x)).collect(Collectors.toCollection(ArrayList::new));
+				idx = idx+1 == termsList.size() ? 0 : idx+1;
+				continue;
+			}
+			
+			idx++;
+		}
+		
+		return Optional.of(mgu);
+	}
+}

src/main/java/de/dhbwstuttgart/unify2/RuleSet.java

@@ -0,0 +1,922 @@
+package de.dhbwstuttgart.unify2;
+
+import de.dhbwstuttgart.exceptions.DebugException;
+import de.dhbwstuttgart.typeinference.constraints.Constraint;
+import de.dhbwstuttgart.typeinference.unify.distributeVariance;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IRuleSet;
+import de.dhbwstuttgart.typeinference.unify.model.*;
+import org.antlr.v4.tool.Rule;
+import org.apache.commons.io.output.NullOutputStream;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Implementation of the type inference rules.
+ * @author Florian Steurer
+ *
+ */
+public class RuleSet {
+
+	/**
+	 * Repeatedly applies type unification rules to a set of equations.
+	 * This is step one of the unification algorithm.
+	 * @return The set of pairs that results from repeated application of the inference rules.
+	 */
+	public static Set<UnifyPair> applyTypeUnificationRules(Set<UnifyPair> eq, IFiniteClosure fc) {
+
+		/*
+		 * Rule Application Strategy:
+		 *
+		 * 1. 	Swap all pairs and erase all erasable pairs
+		 * 2. 	Apply all possible rules to a single pair, then move it to the result set.
+		 *    	Iterating over pairs first, then iterating over rules prevents the application
+		 *    	of rules to a "finished" pair over and over.
+		 * 2.1 	Apply all rules repeatedly except for erase rules. If
+		 * 		the application of a rule creates new pairs, check immediately
+		 * 		against the erase rules.
+		 */
+
+
+		LinkedHashSet<UnifyPair> targetSet = new LinkedHashSet<UnifyPair>();
+		LinkedList<UnifyPair> eqQueue = new LinkedList<>();
+
+		/*
+		 * Swap all pairs and erase all erasable pairs
+		 */
+		eq.forEach(x -> swapAddOrErase(x, fc, eqQueue));
+
+		/*
+		 * Apply rules until the queue is empty
+		 */
+		while(!eqQueue.isEmpty()) {
+			UnifyPair pair = eqQueue.pollFirst();
+
+			// ReduceUp, ReduceLow, ReduceUpLow
+			Optional<UnifyPair> opt = RuleSet.reduceUpLow(pair);
+			opt = opt.isPresent() ? opt : RuleSet.reduceLow(pair);
+			opt = opt.isPresent() ? opt : RuleSet.reduceUp(pair);
+			opt = opt.isPresent() ? opt : RuleSet.reduceWildcardLow(pair);
+			opt = opt.isPresent() ? opt : RuleSet.reduceWildcardLowRight(pair);
+			opt = opt.isPresent() ? opt : RuleSet.reduceWildcardUp(pair);
+			opt = opt.isPresent() ? opt : RuleSet.reduceWildcardUpRight(pair);
+			//PL 2018-03-06 auskommentiert muesste falsch sein vgl. JAVA_BSP/Wildcard6.java
+			//opt = opt.isPresent() ? opt : rules.reduceWildcardLowUp(pair);
+			//opt = opt.isPresent() ? opt : rules.reduceWildcardUpLow(pair);
+			//opt = opt.isPresent() ? opt : rules.reduceWildcardLeft(pair);
+
+			// Reduce TPH
+			opt = opt.isPresent() ? opt : RuleSet.reduceTph(pair);
+
+			// One of the rules has been applied
+			if(opt.isPresent()) {
+				swapAddOrErase(opt.get(), fc, eqQueue);
+				continue;
+			}
+
+			// Reduce1, Reduce2, ReduceExt, ReduceSup, ReduceEq
+			//try {
+			//	logFile.write("PAIR1 " + pair + "\n");
+			//	logFile.flush();
+			//}
+			//catch (IOException e) { }
+
+			Optional<Set<UnifyPair>> optSet = RuleSet.reduce1(pair, fc);
+			optSet = optSet.isPresent() ? optSet : RuleSet.reduce2(pair);
+			optSet = optSet.isPresent() ? optSet : RuleSet.reduceExt(pair, fc);
+			optSet = optSet.isPresent() ? optSet : RuleSet.reduceSup(pair, fc);
+			optSet = optSet.isPresent() ? optSet : RuleSet.reduceEq(pair);
+
+			// ReduceTphExt, ReduceTphSup
+			optSet = optSet.isPresent() ? optSet : RuleSet.reduceTphExt(pair);
+			optSet = optSet.isPresent() ? optSet : RuleSet.reduceTphSup(pair);
+
+
+			// FunN Rules
+			optSet = optSet.isPresent() ? optSet : RuleSet.reduceFunN(pair);
+			optSet = optSet.isPresent() ? optSet : RuleSet.greaterFunN(pair);
+			optSet = optSet.isPresent() ? optSet : RuleSet.smallerFunN(pair);
+
+			// One of the rules has been applied
+			if(optSet.isPresent()) {
+				optSet.get().forEach(x -> swapAddOrErase(x, fc, eqQueue));
+				continue;
+			}
+
+			// Adapt, AdaptExt, AdaptSup
+			//try {
+			//	logFile.write("PAIR2 " + pair + "\n");
+			//	logFile.flush();
+			//}
+			//catch (IOException e) { }
+			opt = RuleSet.adapt(pair, fc);
+			opt = opt.isPresent() ? opt : RuleSet.adaptExt(pair,  fc);
+			opt = opt.isPresent() ? opt : RuleSet.adaptSup(pair, fc);
+
+			// One of the rules has been applied
+			if(opt.isPresent()) {
+				swapAddOrErase(opt.get(), fc, eqQueue);
+				continue;
+			}
+
+			// None of the rules has been applied
+			targetSet.add(pair);
+		}
+
+		return targetSet;
+	}
+
+	/**
+	 * Applies the rule swap to a pair if possible. Then adds the pair to the set if no erase rule applies.
+	 * If an erase rule applies, the pair is not added (erased).
+	 * @param pair The pair to swap and add or erase.
+	 * @param collection The collection to which the pairs are added.
+	 */
+	static void swapAddOrErase(UnifyPair pair, IFiniteClosure fc, Collection<UnifyPair> collection) {
+		Optional<UnifyPair> opt = RuleSet.swap(pair);
+		UnifyPair pair2 = opt.isPresent() ? opt.get() : pair;
+
+		if(RuleSet.erase1(pair2, fc) || RuleSet.erase3(pair2) || RuleSet.erase2(pair2, fc))
+			return;
+
+		collection.add(pair2);
+	}
+
+	static Optional<UnifyPair> reduceUp(UnifyPair pair) {
+		// Check if reduce up is applicable 
+		if(pair.getPairOp() != PairOperator.SMALLERDOT)
+			return Optional.empty();
+		
+		UnifyType rhsType = pair.getRhsType();
+		if(!(rhsType instanceof SuperType))
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		if(!(lhsType instanceof ReferenceType) && !(lhsType instanceof PlaceholderType))
+			return Optional.empty();
+		
+		// Rule is applicable, unpack the SuperType 
+		return Optional.of(new UnifyPair(lhsType, ((SuperType) rhsType).getSuperedType(), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<UnifyPair> reduceLow(UnifyPair pair) {
+		// Check if rule is applicable
+		if(pair.getPairOp() != PairOperator.SMALLERDOT)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		if(!(lhsType instanceof ExtendsType))
+			return Optional.empty();
+		
+		UnifyType rhsType = pair.getRhsType();
+		if(!(rhsType instanceof ReferenceType) && !(rhsType instanceof PlaceholderType))
+			return Optional.empty();
+
+		// Rule is applicable, unpack the ExtendsType
+		return Optional.of(new UnifyPair(((ExtendsType) lhsType).getExtendedType(), rhsType, PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<UnifyPair> reduceUpLow(UnifyPair pair) {
+		// Check if rule is applicable
+		if(pair.getPairOp() != PairOperator.SMALLERDOT)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		if(!(lhsType instanceof ExtendsType))
+			return Optional.empty();
+		
+		UnifyType rhsType = pair.getRhsType();
+		if(!(rhsType instanceof SuperType))
+			return Optional.empty();
+		
+		// Rule is applicable, unpack both sides
+		return Optional.of(new UnifyPair(((ExtendsType) lhsType).getExtendedType(),((SuperType) rhsType).getSuperedType(), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<Set<UnifyPair>> reduceExt(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+
+		UnifyType x = pair.getLhsType();
+		UnifyType sTypeX;
+		
+		if(x instanceof ReferenceType)
+			sTypeX = x;
+		else if(x instanceof ExtendsType)
+			sTypeX = ((ExtendsType) x).getExtendedType();
+		else 
+			return Optional.empty();
+
+		UnifyType extY = pair.getRhsType();
+
+		if(!(extY instanceof ExtendsType))
+			return Optional.empty();
+
+		if(x.getTypeParams().empty() || extY.getTypeParams().size() != x.getTypeParams().size())
+			return Optional.empty();
+		
+		UnifyType xFromFc = fc.getLeftHandedType(sTypeX.getName()).orElse(null);
+		
+		if(xFromFc == null || !xFromFc.getTypeParams().arePlaceholders())
+			return Optional.empty();
+		
+		if(x instanceof ExtendsType)
+			xFromFc = new ExtendsType(xFromFc);
+		
+		UnifyType extYFromFc = fc.grArg(xFromFc, new HashSet<>()).stream().filter(t -> t.getName().equals(extY.getName())).filter(t -> t.getTypeParams().arePlaceholders()).findAny().orElse(null);
+		
+		if(extYFromFc == null || extYFromFc.getTypeParams() != xFromFc.getTypeParams())
+			return Optional.empty();
+
+		TypeParams extYParams = extY.getTypeParams();
+		TypeParams xParams = x.getTypeParams();
+		
+		int[] pi = pi(xParams, extYParams);
+		
+		if(pi.length == 0)
+			return Optional.empty();
+		
+		Set<UnifyPair> result = new HashSet<>();
+		
+		for(int rhsIdx = 0; rhsIdx < extYParams.size(); rhsIdx++)
+			result.add(new UnifyPair(xParams.get(pi[rhsIdx]), extYParams.get(rhsIdx), PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
+		
+		return Optional.of(result);
+	}
+
+	static Optional<Set<UnifyPair>> reduceSup(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType x = pair.getLhsType();
+		UnifyType sTypeX;
+		
+		if(x instanceof ReferenceType)
+			sTypeX = x;
+		else if(x instanceof SuperType)
+			sTypeX = ((SuperType) x).getSuperedType();
+		else
+			return Optional.empty();
+		
+		UnifyType supY = pair.getRhsType();
+		
+		if(!(supY instanceof SuperType))
+			return Optional.empty();
+
+		if(x.getTypeParams().empty() || supY.getTypeParams().size() != x.getTypeParams().size())
+			return Optional.empty();
+		
+		UnifyType xFromFc = fc.getLeftHandedType(sTypeX.getName()).orElse(null);
+		
+		if(xFromFc == null || !xFromFc.getTypeParams().arePlaceholders())
+			return Optional.empty();
+		
+		if(x instanceof SuperType)
+			xFromFc = new SuperType(xFromFc);
+		
+		UnifyType supYFromFc = fc.grArg(xFromFc, new HashSet<>()).stream().filter(t -> t.getName().equals(supY.getName())).filter(t -> t.getTypeParams().arePlaceholders()).findAny().orElse(null);
+		
+		if(supYFromFc == null || supYFromFc.getTypeParams() != xFromFc.getTypeParams())
+			return Optional.empty();
+		
+		TypeParams supYParams = supY.getTypeParams();
+		TypeParams xParams = x.getTypeParams();
+		Set<UnifyPair> result = new HashSet<>();
+		
+		int[] pi = pi(xParams, supYParams);
+		
+		if(pi.length == 0)
+			return Optional.empty();
+		
+		for(int rhsIdx = 0; rhsIdx < supYParams.size(); rhsIdx++)
+			result.add(new UnifyPair(supYParams.get(rhsIdx), xParams.get(pi[rhsIdx]), PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
+		
+		return Optional.of(result);
+	}
+
+	static Optional<Set<UnifyPair>> reduceEq(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		if(lhsType instanceof PlaceholderType || lhsType.getTypeParams().empty())
+			return Optional.empty();
+		
+		UnifyType rhsType = pair.getRhsType();
+		
+		if(!rhsType.getName().equals(lhsType.getName()))
+			return Optional.empty();
+		
+		if(rhsType instanceof PlaceholderType || lhsType instanceof PlaceholderType || rhsType.getTypeParams().empty())
+			return Optional.empty();
+		
+		if(rhsType.getTypeParams().size() != lhsType.getTypeParams().size())
+			return Optional.empty();
+		
+		// Keine Permutation wie im Paper nötig
+		Set<UnifyPair> result = new HashSet<>();
+		TypeParams lhsTypeParams = lhsType.getTypeParams();
+		TypeParams rhsTypeParams = rhsType.getTypeParams();
+		
+		for(int i = 0; i < lhsTypeParams.size(); i++)
+			result.add(new UnifyPair(lhsTypeParams.get(i), rhsTypeParams.get(i), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+		
+		return Optional.of(result);
+	}
+
+	static Optional<Set<UnifyPair>> reduce1(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOT)
+			return Optional.empty();
+		
+		UnifyType c = pair.getLhsType();
+		if(!(c instanceof ReferenceType))
+			return Optional.empty();
+		
+		UnifyType d = pair.getRhsType();
+		if(!(d instanceof ReferenceType))
+			return Optional.empty();
+		
+		ReferenceType lhsSType = (ReferenceType) c;
+		ReferenceType rhsSType = (ReferenceType) d;
+		
+		//try {
+		//	logFile.write("PAIR Rules: " + pair + "\n");
+		//	logFile.flush();
+		//}
+		//catch (IOException e) { }
+		
+		if(lhsSType.getTypeParams().empty() || lhsSType.getTypeParams().size() != rhsSType.getTypeParams().size())
+			return Optional.empty();
+		
+		UnifyType cFromFc = fc.getLeftHandedType(c.getName()).orElse(null);
+		//2018-02-23: liefert Vector<Vector<Integer>>: Das kann nicht sein.
+		
+		//NOCHMAL UEBERPRUEFEN
+		//PL 18-02-09 Eingfuegt Anfang
+		//C und D koennen auch gleich sein.
+		if (c.getName().equals(d.getName())) {
+			Set<UnifyPair> result = new HashSet<>();
+			TypeParams rhsTypeParams = d.getTypeParams();
+			TypeParams lhsTypeParams = c.getTypeParams();
+			for(int rhsIdx = 0; rhsIdx < c.getTypeParams().size(); rhsIdx++)
+				result.add(new UnifyPair(lhsTypeParams.get(rhsIdx), rhsTypeParams.get(rhsIdx), PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
+		
+			return Optional.of(result);
+		}
+		//PL 18-02-09 Eingfuegt ENDE
+		
+		//try {
+		//	logFile.write("cFromFc: " + cFromFc);
+		//	logFile.flush();
+		//}
+		//catch (IOException e) { }
+		
+		if(cFromFc == null || !cFromFc.getTypeParams().arePlaceholders())
+			return Optional.empty();
+		
+		UnifyType dFromFc = fc.getAncestors(cFromFc).stream().filter(x -> x.getName().equals(d.getName())).findAny().orElse(null);
+		
+		//try {
+		//	logFile.write("cFromFc: " + cFromFc);
+		//	logFile.flush();
+		//}
+		//catch (IOException e) { }
+		
+		if(dFromFc == null || !dFromFc.getTypeParams().arePlaceholders() || dFromFc.getTypeParams().size() != cFromFc.getTypeParams().size())
+			return Optional.empty();
+		//System.out.println("cFromFc: " + cFromFc);
+		//System.out.println("dFromFc: " + dFromFc);
+		int[] pi = pi(cFromFc.getTypeParams(), dFromFc.getTypeParams());
+		
+		if(pi.length == 0)
+			return Optional.empty();
+		
+		TypeParams rhsTypeParams = d.getTypeParams();
+		TypeParams lhsTypeParams = c.getTypeParams();
+		Set<UnifyPair> result = new HashSet<>();
+		
+		for(int rhsIdx = 0; rhsIdx < rhsTypeParams.size(); rhsIdx++)
+			result.add(new UnifyPair(lhsTypeParams.get(pi[rhsIdx]), rhsTypeParams.get(rhsIdx), PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
+		
+		return Optional.of(result);
+	}
+
+	static Optional<Set<UnifyPair>> reduce2(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.EQUALSDOT)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		ReferenceType lhsSType;
+		UnifyType rhsType = pair.getRhsType();
+		ReferenceType rhsSType;
+		
+		if ((lhsType instanceof ReferenceType) && (rhsType instanceof ReferenceType)) {
+			lhsSType = (ReferenceType) lhsType;
+			rhsSType = (ReferenceType) rhsType;
+		}
+		else if (((lhsType instanceof ExtendsType) && (rhsType instanceof ExtendsType)) 
+				|| ((lhsType instanceof SuperType) && (rhsType instanceof SuperType))) {
+			UnifyType lhsSTypeRaw = ((WildcardType) lhsType).getWildcardedType();
+			UnifyType rhsSTypeRaw = ((WildcardType) rhsType).getWildcardedType();
+			if ((lhsSTypeRaw instanceof ReferenceType) && (rhsSTypeRaw instanceof ReferenceType)) {
+				lhsSType = (ReferenceType) lhsSTypeRaw;
+				rhsSType = (ReferenceType) rhsSTypeRaw;
+			}
+			else
+				return Optional.empty();
+		}
+		else
+			return Optional.empty();
+		
+		if(lhsSType.getTypeParams().empty())
+			return Optional.empty();
+
+		if(!rhsSType.getName().equals(lhsSType.getName()))
+			return Optional.empty();
+		
+		if(!(lhsSType.getTypeParams().size()==rhsSType.getTypeParams().size()))throw new DebugException("Fehler in Unifizierung"+ " " + lhsSType.toString() + " " + rhsSType.toString());
+		//if(rhsSType.getTypeParams().size() != lhsSType.getTypeParams().size())
+		//	return Optional.empty();
+		
+		Set<UnifyPair> result = new HashSet<>();
+		
+		TypeParams rhsTypeParams = rhsSType.getTypeParams();
+		TypeParams lhsTypeParams = lhsSType.getTypeParams();
+		for(int i = 0; i < rhsTypeParams.size(); i++)
+			result.add(new UnifyPair(lhsTypeParams.get(i), rhsTypeParams.get(i), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+		
+		return Optional.of(result);
+	}
+
+	static boolean erase1(UnifyPair pair, IFiniteClosure fc) {
+		if((pair.getPairOp() != PairOperator.SMALLERDOT) && (pair.getPairOp() != PairOperator.SMALLERNEQDOT))
+			return false;
+		
+		if (pair.getPairOp() == PairOperator.SMALLERNEQDOT) {
+			UnifyType lhs = pair.getLhsType();
+			UnifyType rhs = pair.getRhsType();
+			if (lhs instanceof WildcardType) {
+				lhs = ((WildcardType)lhs).getWildcardedType();
+			}
+			if (rhs instanceof WildcardType) {
+				rhs = ((WildcardType)rhs).getWildcardedType();
+			}
+		
+			if	(lhs.equals(rhs)){
+				return false;
+			}
+		}
+		
+		UnifyType lhsType = pair.getLhsType();
+		if(!(lhsType instanceof ReferenceType) && !(lhsType instanceof PlaceholderType))
+			return false;
+		
+		UnifyType rhsType = pair.getRhsType();
+		if(!(rhsType instanceof ReferenceType) && !(rhsType instanceof PlaceholderType))
+			return false;
+		
+		return fc.greater(lhsType, new HashSet<>()).contains(rhsType);
+	}
+
+	static boolean erase2(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return false;
+		
+		UnifyType lhsType = pair.getLhsType();		
+		UnifyType rhsType = pair.getRhsType();
+		
+		return fc.grArg(lhsType, new HashSet<>()).contains(rhsType);
+	}
+
+	static boolean erase3(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.EQUALSDOT)
+			return false;
+		
+		return pair.getLhsType().equals(pair.getRhsType());
+	}
+
+	static Optional<UnifyPair> swap(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.EQUALSDOT)
+			return Optional.empty();
+		
+		if(pair.getLhsType() instanceof PlaceholderType)
+			return Optional.empty();
+		
+		if(!(pair.getRhsType() instanceof PlaceholderType))
+			return Optional.empty();
+		
+		return Optional.of(new UnifyPair(pair.getRhsType(), pair.getLhsType(), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<UnifyPair> adapt(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOT)
+			return Optional.empty();
+		
+		UnifyType typeD = pair.getLhsType();
+		if(!(typeD instanceof ReferenceType))
+			return Optional.empty();
+		
+		UnifyType typeDs = pair.getRhsType();
+		if(!(typeDs instanceof ReferenceType))
+			return Optional.empty();
+		
+		/*if(typeD.getTypeParams().size() == 0 || typeDs.getTypeParams().size() == 0)
+			return Optional.empty();*/
+		
+		if(typeD.getName().equals(typeDs.getName()))
+			return Optional.empty();
+		
+
+		Optional<UnifyType> opt = fc.getLeftHandedType(typeD.getName());
+		if(!opt.isPresent())
+			return Optional.empty();
+		
+		// The generic Version of Type D (D<a1, a2, a3, ... >)
+		UnifyType typeDgen = opt.get();
+	
+		// Actually greater+ because the types are ensured to have different names
+		Set<UnifyType> greater = fc.getAncestors(typeDgen);
+		opt = greater.stream().filter(x -> x.getName().equals(typeDs.getName())).findAny();
+
+		if(!opt.isPresent())
+			return Optional.empty();
+		
+		UnifyType newLhs = opt.get();
+		
+		TypeParams typeDParams = typeD.getTypeParams();
+		TypeParams typeDgenParams = typeDgen.getTypeParams();
+
+		Unifier unif = Unifier.identity();
+		for(int i = 0; i < typeDParams.size(); i++) { 
+			//System.out.println("ADAPT" +typeDgenParams);
+			if (typeDgenParams.get(i) instanceof PlaceholderType) 
+			unif.add((PlaceholderType) typeDgenParams.get(i), typeDParams.get(i));
+			else System.out.println("ERROR");
+		}
+		return Optional.of(new UnifyPair(unif.apply(newLhs), typeDs, PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<UnifyPair> adaptExt(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType typeD = pair.getLhsType();
+		if(!(typeD instanceof ReferenceType) && !(typeD instanceof ExtendsType))
+			return Optional.empty();
+		
+		UnifyType typeExtDs = pair.getRhsType();
+		if(!(typeExtDs instanceof ExtendsType))
+			return Optional.empty();
+		
+		if(typeD.getTypeParams().size() == 0 || typeExtDs.getTypeParams().size() == 0)
+			return Optional.empty();
+		
+		UnifyType typeDgen;
+		if(typeD instanceof ReferenceType)
+			typeDgen = fc.getLeftHandedType(typeD.getName()).orElse(null);
+		else {
+			Optional<UnifyType> opt = fc.getLeftHandedType(((ExtendsType) typeD).getExtendedType().getName());
+			typeDgen = opt.isPresent() ? new ExtendsType(opt.get()) : null;
+		}
+
+		if(typeDgen == null)
+			return Optional.empty();
+		
+		Set<UnifyType> grArg = fc.grArg(typeDgen, new HashSet<>());
+		
+		Optional<UnifyType> opt = grArg.stream().filter(x -> x.getName().equals(typeExtDs.getName())).findAny();
+
+		if(!opt.isPresent())
+			return Optional.empty();
+		
+		UnifyType newLhs = ((ExtendsType) opt.get()).getExtendedType();
+		
+		TypeParams typeDParams = typeD.getTypeParams();
+		TypeParams typeDgenParams = typeDgen.getTypeParams();
+		
+		Unifier unif = new Unifier((PlaceholderType) typeDgenParams.get(0), typeDParams.get(0));
+		for(int i = 1; i < typeDParams.size(); i++) 
+			unif.add((PlaceholderType) typeDgenParams.get(i), typeDParams.get(i));
+		
+		return Optional.of(new UnifyPair(unif.apply(newLhs), typeExtDs, PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<UnifyPair> adaptSup(UnifyPair pair, IFiniteClosure fc) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType typeDs = pair.getLhsType();
+		if(!(typeDs instanceof ReferenceType) && !(typeDs instanceof SuperType))
+			return Optional.empty();
+		
+		UnifyType typeSupD = pair.getRhsType();
+		if(!(typeSupD instanceof SuperType))
+			return Optional.empty();
+		
+		if(typeDs.getTypeParams().size() == 0 || typeSupD.getTypeParams().size() == 0)
+			return Optional.empty();
+		
+		
+		Optional<UnifyType> opt = fc.getLeftHandedType(((SuperType) typeSupD).getSuperedType().getName());
+		
+		if(!opt.isPresent()) 
+			return Optional.empty();
+		
+		UnifyType typeDgen = opt.get();
+		UnifyType typeSupDgen = new SuperType(typeDgen);
+
+		// Use of smArg instead of grArg because
+		// a in grArg(b) => b in smArg(a)
+		Set<UnifyType> smArg = fc.smArg(typeSupDgen, new HashSet<>());
+		opt = smArg.stream().filter(x -> x.getName().equals(typeDs.getName())).findAny();
+
+		if(!opt.isPresent())
+			return Optional.empty();
+		
+		// New RHS
+		UnifyType newRhs = null;
+		if(typeDs instanceof ReferenceType)
+			newRhs = new ExtendsType(typeDs);
+		else
+			newRhs = new ExtendsType(((SuperType) typeDs).getSuperedType());
+		
+		// New LHS
+		UnifyType newLhs = opt.get();
+		TypeParams typeDParams = typeSupD.getTypeParams();
+		TypeParams typeSupDsgenParams = typeSupDgen.getTypeParams();
+		
+		Unifier unif = new Unifier((PlaceholderType) typeSupDsgenParams.get(0), typeDParams.get(0));
+		for(int i = 1; i < typeDParams.size(); i++) 
+			unif.add((PlaceholderType) typeSupDsgenParams.get(i), typeDParams.get(i));
+		
+		return Optional.of(new UnifyPair(unif.apply(newLhs), newRhs, PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	/**
+	 * Finds the permutation pi of the type arguments of two types based on the finite closure
+	 * @param cArgs The type which arguments are permuted
+	 * @param dArgs The other type
+	 * @return An array containing the values of pi for every type argument of C or an empty array if the search failed.
+	 */
+	private static int[] pi(TypeParams cArgs, TypeParams dArgs) {
+		if(!(cArgs.size()==dArgs.size()))throw new DebugException("Fehler in Unifizierung");
+	
+		int[] permutation = new int[dArgs.size()];
+		
+		boolean succ = true;
+		for (int dArgIdx = 0; dArgIdx < dArgs.size() && succ; dArgIdx++) {
+			UnifyType dArg = dArgs.get(dArgIdx);
+			succ = false;
+			for (int pi = 0; pi < cArgs.size(); pi++)
+				if (cArgs.get(pi).getName().equals(dArg.getName())) {
+					permutation[dArgIdx] = pi;
+					succ = true;
+					break;
+				}
+		}
+
+		return succ ? permutation : new int[0];
+	}
+
+	static Optional<UnifyPair> reduceWildcardLow(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		if(!(lhsType instanceof ExtendsType) || !(rhsType instanceof ExtendsType))
+			return Optional.empty();
+		
+		return Optional.of(new UnifyPair(((ExtendsType) lhsType).getExtendedType(), ((ExtendsType) rhsType).getExtendedType(), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair())); 
+	}
+
+	static Optional<UnifyPair> reduceWildcardLowRight(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		if(!(lhsType instanceof ReferenceType) || !(rhsType instanceof ExtendsType))
+			return Optional.empty();
+		
+		return Optional.of(new UnifyPair(lhsType, ((ExtendsType) rhsType).getExtendedType(), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<UnifyPair> reduceWildcardUp(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		if(!(lhsType instanceof SuperType) || !(rhsType instanceof SuperType))
+			return Optional.empty();
+		
+		return Optional.of(new UnifyPair(((SuperType) rhsType).getSuperedType(), ((SuperType) lhsType).getSuperedType(), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<UnifyPair> reduceWildcardUpRight(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		if(!(lhsType instanceof ReferenceType) || !(rhsType instanceof SuperType))
+			return Optional.empty();
+		
+		return Optional.of(new UnifyPair(((SuperType) rhsType).getSuperedType(), lhsType, PairOperator.SMALLERDOTWC, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<Set<UnifyPair>> reduceFunN(UnifyPair pair) {
+		if((pair.getPairOp() != PairOperator.SMALLERDOT)  
+		  && (pair.getPairOp() != PairOperator.EQUALSDOT))     //PL 2017-10-03 hinzugefuegt  
+		                                                       //da Regel auch fuer EQUALSDOT anwendbar 
+			                                                   //TODO: fuer allen anderen Relationen noch pruefen
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		
+		if(!(lhsType instanceof FunNType) || !(rhsType instanceof FunNType))
+			return Optional.empty();
+
+		FunNType funNLhsType = (FunNType) lhsType;
+		FunNType funNRhsType = (FunNType) rhsType;
+		
+		if(funNLhsType.getN() != funNRhsType.getN())
+			return Optional.empty();
+		
+		Set<UnifyPair> result = new HashSet<UnifyPair>();
+		if (pair.getPairOp() == PairOperator.SMALLERDOT) { 
+			result.add(new UnifyPair(funNLhsType.getTypeParams().get(funNLhsType.getTypeParams().size()-1), funNRhsType.getTypeParams().get(funNRhsType.getTypeParams().size()-1), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+			for(int i = 0; i < funNLhsType.getTypeParams().size()-1; i++) {
+				result.add(new UnifyPair(funNRhsType.getTypeParams().get(i), funNLhsType.getTypeParams().get(i), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+			}
+		}
+		else {// pair.getPairOp() == PairOperator.EQUALDOT
+			result.add(new UnifyPair(funNLhsType.getTypeParams().get(funNLhsType.getTypeParams().size()-1), funNRhsType.getTypeParams().get(funNRhsType.getTypeParams().size()-1), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+			for(int i = 0; i < funNLhsType.getTypeParams().size()-1; i++) {
+				result.add(new UnifyPair(funNRhsType.getTypeParams().get(i), funNLhsType.getTypeParams().get(i), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+			}
+		}
+		result.stream().forEach(x -> { UnifyType l = x.getLhsType();
+        								   if (l instanceof PlaceholderType) { ((PlaceholderType)l).disableWildcardtable(); } 
+        								   UnifyType r = x.getRhsType();
+        								   if (r instanceof PlaceholderType) { ((PlaceholderType)r).disableWildcardtable(); }
+								     } );
+		return Optional.of(result);
+	}
+
+	static Optional<Set<UnifyPair>> greaterFunN(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOT)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		
+		if(!(lhsType instanceof FunNType) || !(rhsType instanceof PlaceholderType))
+			return Optional.empty();
+
+		FunNType funNLhsType = (FunNType) lhsType;
+
+		Set<UnifyPair> result = new HashSet<UnifyPair>();
+		
+		Integer variance = ((PlaceholderType)rhsType).getVariance();
+		Integer inversVariance = distributeVariance.inverseVariance(variance);
+		
+		UnifyType[] freshPlaceholders = new UnifyType[funNLhsType.getTypeParams().size()];
+		for(int i = 0; i < freshPlaceholders.length-1; i++) {
+			freshPlaceholders[i] = PlaceholderType.freshPlaceholder();
+			((PlaceholderType)freshPlaceholders[i]).setVariance(inversVariance);
+		}
+		freshPlaceholders[freshPlaceholders.length-1] = PlaceholderType.freshPlaceholder();
+		((PlaceholderType)freshPlaceholders[freshPlaceholders.length-1]).setVariance(variance);
+		result.add(new UnifyPair(funNLhsType.getTypeParams().get(funNLhsType.getTypeParams().size()-1), freshPlaceholders[funNLhsType.getTypeParams().size()-1], PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+		
+		for(int i = 0; i < funNLhsType.getTypeParams().size()-1; i++) {
+			result.add(new UnifyPair(freshPlaceholders[i], funNLhsType.getTypeParams().get(i), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+		}
+		
+		result.add(new UnifyPair(rhsType, funNLhsType.setTypeParams(new TypeParams(freshPlaceholders)), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+		
+		result.stream().forEach(x -> { UnifyType l = x.getLhsType();
+									   if (l instanceof PlaceholderType) { ((PlaceholderType)l).disableWildcardtable(); } 
+									   UnifyType r = x.getRhsType();
+									   if (r instanceof PlaceholderType) { ((PlaceholderType)r).disableWildcardtable(); }
+									 } );
+		return Optional.of(result);
+	}
+
+	static Optional<Set<UnifyPair>> smallerFunN(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOT)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		
+		if(!(lhsType instanceof PlaceholderType) || !(rhsType instanceof FunNType))
+			return Optional.empty();
+
+		FunNType funNRhsType = (FunNType) rhsType;
+
+		Set<UnifyPair> result = new HashSet<UnifyPair>();
+		
+		Integer variance = ((PlaceholderType)lhsType).getVariance();
+		Integer inversVariance = distributeVariance.inverseVariance(variance);
+		
+		UnifyType[] freshPlaceholders = new UnifyType[funNRhsType.getTypeParams().size()];
+		for(int i = 0; i < freshPlaceholders.length-1; i++) {
+			freshPlaceholders[i] = PlaceholderType.freshPlaceholder();
+			((PlaceholderType)freshPlaceholders[i]).setVariance(inversVariance);
+		}
+		freshPlaceholders[freshPlaceholders.length-1] = PlaceholderType.freshPlaceholder();
+		((PlaceholderType)freshPlaceholders[freshPlaceholders.length-1]).setVariance(variance);
+		
+		result.add(new UnifyPair(freshPlaceholders[funNRhsType.getTypeParams().size()-1], funNRhsType.getTypeParams().get(funNRhsType.getTypeParams().size()-1), PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+		
+		for(int i = 0; i < funNRhsType.getTypeParams().size()-1; i++) {
+			result.add(new UnifyPair(funNRhsType.getTypeParams().get(i), freshPlaceholders[i], PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+		}
+		
+		result.add(new UnifyPair(lhsType, funNRhsType.setTypeParams(new TypeParams(freshPlaceholders)), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+		
+		result.stream().forEach(x -> { UnifyType l = x.getLhsType();
+		   							   if (l instanceof PlaceholderType) { ((PlaceholderType)l).disableWildcardtable(); } 
+		   							   UnifyType r = x.getRhsType();
+		   							   if (r instanceof PlaceholderType) { ((PlaceholderType)r).disableWildcardtable(); }
+									 } );
+		return Optional.of(result);
+	}
+
+	static Optional<UnifyPair> reduceTph(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		if(!(lhsType instanceof PlaceholderType) || !(rhsType instanceof ReferenceType))
+			return Optional.empty();
+		
+		return Optional.of(new UnifyPair(lhsType, rhsType, PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+	}
+
+	static Optional<Set<UnifyPair>> reduceTphExt(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		if(!(lhsType instanceof ExtendsType) || !(rhsType instanceof PlaceholderType))
+			return Optional.empty();
+		
+		UnifyType extendedType = ((ExtendsType)lhsType).getExtendedType();
+		
+		if (extendedType.equals(rhsType)) return Optional.empty(); //PL 2019-02-18 eingefügt ? extends a <.? a
+		
+		boolean isGen = extendedType instanceof PlaceholderType && !((PlaceholderType) extendedType).isGenerated();
+		
+		Set<UnifyPair> result = new HashSet<>();
+		if(isGen)
+			result.add(new UnifyPair(rhsType, lhsType, PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+		else {
+			UnifyType freshTph = PlaceholderType.freshPlaceholder();
+			result.add(new UnifyPair(rhsType, new ExtendsType(freshTph), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+			result.add(new UnifyPair(extendedType, freshTph, PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair()));
+		}
+		
+		return Optional.of(result);
+	}
+
+	static Optional<Set<UnifyPair>> reduceTphSup(UnifyPair pair) {
+		if(pair.getPairOp() != PairOperator.SMALLERDOTWC)
+			return Optional.empty();
+		
+		UnifyType lhsType = pair.getLhsType();
+		UnifyType rhsType = pair.getRhsType();
+		if(!(lhsType instanceof SuperType) || !(rhsType instanceof PlaceholderType))
+			return Optional.empty();
+		
+		UnifyType superedType = ((SuperType)lhsType).getSuperedType();
+		
+		if (superedType.equals(rhsType)) return Optional.empty(); //PL 2019-02-18 eingefügt ? super a <.? a
+		
+		boolean isGen = superedType instanceof PlaceholderType && !((PlaceholderType) superedType).isGenerated();
+		
+		Set<UnifyPair> result = new HashSet<>();
+		if(isGen)
+			result.add(new UnifyPair(rhsType, lhsType, PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+		else {
+			UnifyType freshTph = PlaceholderType.freshPlaceholder();
+			result.add(new UnifyPair(rhsType, new SuperType(freshTph), PairOperator.EQUALSDOT, pair.getSubstitution(), pair.getBasePair()));
+			Set<UnifyType> fBounded = pair.getfBounded();
+			fBounded.add(lhsType);
+			result.add(new UnifyPair(freshTph, superedType, PairOperator.SMALLERDOT, pair.getSubstitution(), pair.getBasePair(), fBounded));
+		}
+		
+		return Optional.of(result);
+	}
+}

src/main/java/de/dhbwstuttgart/unify2/TypeUnify.java

@@ -0,0 +1,54 @@
+package de.dhbwstuttgart.unify2;
+
+import de.dhbwstuttgart.typeinference.unify.model.*;
+import de.dhbwstuttgart.unify2.model.UnifyConstraintSet;
+
+import java.util.*;
+
+public class TypeUnify {
+
+    public static Optional<Set<UnifyPair>> unifyOrConstraints(UnifyConstraintSet eq, FiniteClosure fc){
+        return eq.cartesianProductParallel().map(eqPrime -> unify(eqPrime, fc)).filter(Optional::isPresent).map(Optional::get).findAny();
+    }
+
+    public static Optional<Set<UnifyPair>> unify(Set<UnifyPair> eq, FiniteClosure fc){
+        /*
+        TODO: Hier könnte man prüfen, ob es überhaupt einen Sinn macht mit eq weiterzumachen
+        Es könnte eine über threads geteiltes Objekt geben (Feld in TypeUnify), welches unmögliche Klauseln lernt
+         */
+
+        //Apply Reduce und Apply rules
+        Set<UnifyPair> res = RuleSet.applyTypeUnificationRules(eq, fc);
+        //Split result
+
+        /*
+         * Step 2 and 3: Create a subset eq1s of pairs where both sides are TPH and eq2s of the other pairs
+         */
+        Set<UnifyPair> eq1s = new HashSet<>();
+        Set<UnifyPair> eq2s = new HashSet<>();
+        for(UnifyPair pair : res) {
+            if (pair.getLhsType() instanceof PlaceholderType && pair.getRhsType() instanceof PlaceholderType)
+                eq1s.add(pair);
+            else
+                eq2s.add(pair);
+        }
+
+        Optional<UnifyConstraintSet> step4Res = Unify.step4(eq1s, eq2s, fc);
+
+        //Falls step4 etwas liefert, dann subst und rekursiver unify aufruf anwenden:
+        return step4Res.flatMap(constraintSet ->
+                constraintSet.cartesianProductParallel().map(toSubst -> {
+                    Optional<Set<UnifyPair>> substitutionResult = Unify.subst(toSubst); //hier substituieren
+                    //if it changed:
+                    if (substitutionResult.isPresent()) {
+                        return unify(substitutionResult.get(), fc);
+                    }else{
+                        //TODO: return the result
+                        return Optional.of(toSubst);
+                    }
+                }).filter(it -> it.isPresent()).map(Optional::get).findAny());
+    }
+
+
+
+}

src/main/java/de/dhbwstuttgart/unify2/Unify.java

@@ -0,0 +1,340 @@
+package de.dhbwstuttgart.unify2;
+
+import de.dhbwstuttgart.typeinference.constraints.Constraint;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.*;
+import de.dhbwstuttgart.unify2.model.UnifyConstraintSet;
+import de.dhbwstuttgart.unify2.model.UnifyOderConstraint;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class Unify {
+
+    /**
+     * Creates sets of pairs specified in the fourth step. Does not calculate cartesian products.
+     * @return The set of the eight cases (without empty sets). Each case is a set, containing sets generated
+     * from the pairs that matched the case. Each generated set contains singleton sets or sets with few elements
+     * (as in case 1 where sigma is added to the innermost set).
+     */
+    public static Optional<UnifyConstraintSet> step4(Set<UnifyPair> eq1s, Set<UnifyPair> eq2s, FiniteClosure fc) {
+        Set<UnifyOderConstraint> result = new HashSet<>(8);
+
+        for(UnifyPair pair : eq2s) {
+            PairOperator pairOp = pair.getPairOp();
+            UnifyType lhsType = pair.getLhsType();
+            UnifyType rhsType = pair.getRhsType();
+
+            // Case 1: (a <. Theta')
+            if(pairOp == PairOperator.SMALLERDOT && lhsType instanceof PlaceholderType)
+                result.add(unifyCase1((PlaceholderType) pair.getLhsType(), pair.getRhsType(), fc));
+
+                // Case 2: (a <.? ? ext Theta')
+            else if(pairOp == PairOperator.SMALLERDOTWC && lhsType instanceof PlaceholderType && rhsType instanceof ExtendsType)
+                result.add(unifyCase2((PlaceholderType) pair.getLhsType(), (ExtendsType) pair.getRhsType(), fc));
+
+                // Case 3: (a <.? ? sup Theta')
+            else if(pairOp == PairOperator.SMALLERDOTWC && lhsType instanceof PlaceholderType && rhsType instanceof SuperType)
+                result.add(unifyCase3((PlaceholderType) lhsType, (SuperType) rhsType, fc));
+
+                // Case 4 was replaced by an inference rule
+                // Case 4: (a <.? Theta')
+                //else if(pairOp == PairOperator.SMALLERDOTWC && lhsType instanceof PlaceholderType)
+                //	result.get(3).add(unifyCase4((PlaceholderType) lhsType, rhsType, fc));
+
+                // Case 5: (Theta <. a)
+            else if(pairOp == PairOperator.SMALLERDOT && rhsType instanceof PlaceholderType)
+                result.add(unifyCase5(lhsType, (PlaceholderType) rhsType, fc));
+
+                // Case 6 was replaced by an inference rule.
+                // Case 6: (? ext Theta <.? a)
+                //else if(pairOp == PairOperator.SMALLERDOTWC && lhsType instanceof ExtendsType && rhsType instanceof PlaceholderType)
+                //	result.get(5).add(unifyCase6((ExtendsType) lhsType, (PlaceholderType) rhsType, fc));
+
+                // Case 7 was replaced by an inference rule
+                // Case 7: (? sup Theta <.? a)
+                //else if(pairOp == PairOperator.SMALLERDOTWC && lhsType instanceof SuperType && rhsType instanceof PlaceholderType)
+                //	result.get(6).add(unifyCase7((SuperType) lhsType, (PlaceholderType) rhsType, fc));
+
+                // Case 8: (Theta <.? a)
+            else if(pairOp == PairOperator.SMALLERDOTWC && rhsType instanceof PlaceholderType)
+                result.add(unifyCase8(lhsType, (PlaceholderType) rhsType, fc));
+                // Case unknown: If a pair fits no other case, then the type unification has failed.
+                // Through application of the rules, every pair should have one of the above forms.
+                // Pairs that do not have one of the aboves form are contradictory.
+            else {
+                return Optional.empty();
+            }
+        }
+        result.add(new UnifyOderConstraint(Set.of(eq1s)));
+        // Filter empty sets or sets that only contain an empty set.
+        //Andi: Why? Should they exist? this should be an error then
+        return Optional.of(new UnifyConstraintSet(result));
+    }
+
+
+    /**
+     * Cartesian product Case 1: (a <. Theta')
+     */
+    static UnifyOderConstraint unifyCase1(PlaceholderType a, UnifyType thetaPrime, FiniteClosure fc) {
+        Set<Set<UnifyPair>> result = new HashSet<>();
+
+        boolean allGen = thetaPrime.getTypeParams().size() > 0;
+        for(UnifyType t : thetaPrime.getTypeParams())
+            if(!(t instanceof PlaceholderType) || !((PlaceholderType) t).isGenerated()) {
+                allGen = false;
+                break;
+            }
+
+        Set<UnifyType> cs = fc.getAllTypesByName(thetaPrime.getName());
+        cs.add(thetaPrime);
+
+        for(UnifyType c : cs) {
+            Set<UnifyType> thetaQs = fc.getChildren(c).stream().collect(Collectors.toCollection(HashSet::new));
+            //thetaQs.add(thetaPrime);
+            Set<UnifyType> thetaQPrimes = new HashSet<>();
+            TypeParams cParams = c.getTypeParams();
+            if(cParams.size() == 0)
+                thetaQPrimes.add(c);
+            else {
+                ArrayList<Set<UnifyType>> candidateParams = new ArrayList<>();
+
+                for(UnifyType param : cParams)
+                    candidateParams.add(fc.grArg(param, new HashSet<>()));
+
+                for(TypeParams tp : permuteParams(candidateParams))
+                    thetaQPrimes.add(c.setTypeParams(tp));
+            }
+
+            for(UnifyType tqp : thetaQPrimes) {
+                Optional<Unifier> opt = MartelliMontanariUnify.unify(tqp, thetaPrime);
+                if (!opt.isPresent())
+                    continue;
+
+                Unifier unifier = opt.get();
+                unifier.swapPlaceholderSubstitutions(thetaPrime.getTypeParams());
+                Set<UnifyPair> substitutionSet = new HashSet<>();
+                for (Map.Entry<PlaceholderType, UnifyType> sigma : unifier)
+                    substitutionSet.add(new UnifyPair(sigma.getKey(), sigma.getValue(), PairOperator.EQUALSDOT));
+
+                List<UnifyType> freshTphs = new ArrayList<>();
+                for (UnifyType tq : thetaQs) {
+                    Set<UnifyType> smaller = fc.smaller(unifier.apply(tq), new HashSet<>());
+                    for(UnifyType theta : smaller) {
+                        Set<UnifyPair> resultPrime = new HashSet<>();
+
+                        for(int i = 0; !allGen && i < theta.getTypeParams().size(); i++) {
+                            if(freshTphs.size()-1 < i)
+                                freshTphs.add(PlaceholderType.freshPlaceholder());
+                            resultPrime.add(new UnifyPair(freshTphs.get(i), theta.getTypeParams().get(i), PairOperator.SMALLERDOTWC));
+                        }
+
+                        if(allGen)
+                            resultPrime.add(new UnifyPair(a, theta, PairOperator.EQUALSDOT));
+                        else
+                            resultPrime.add(new UnifyPair(a, theta.setTypeParams(new TypeParams(freshTphs.toArray(new UnifyType[0]))), PairOperator.EQUALSDOT));
+                        resultPrime.addAll(substitutionSet);
+                        result.add(resultPrime);
+                    }
+                }
+
+            }
+        }
+
+        return new UnifyOderConstraint(result);
+    }
+
+    /**
+     * Takes a set of candidates for each position and computes all possible permutations.
+     * @param candidates The length of the list determines the number of type params. Each set
+     * contains the candidates for the corresponding position.
+     */
+    static Set<TypeParams> permuteParams(ArrayList<Set<UnifyType>> candidates) {
+        Set<TypeParams> result = new HashSet<>();
+        permuteParams(candidates, 0, result, new UnifyType[candidates.size()]);
+        return result;
+    }
+
+    /**
+     * Takes a set of candidates for each position and computes all possible permutations.
+     * @param candidates The length of the list determines the number of type params. Each set
+     * contains the candidates for the corresponding position.
+     * @param idx Idx for the current permutatiton.
+     * @param result Set of all permutations found so far
+     * @param current The permutation of type params that is currently explored
+     */
+    static void permuteParams(ArrayList<Set<UnifyType>> candidates, int idx, Set<TypeParams> result, UnifyType[] current) {
+        if(candidates.size() == idx) {
+            result.add(new TypeParams(Arrays.copyOf(current, current.length)));
+            return;
+        }
+
+        Set<UnifyType> localCandidates = candidates.get(idx);
+
+        for(UnifyType t : localCandidates) {
+            current[idx] = t;
+            permuteParams(candidates, idx+1, result, current);
+        }
+    }
+
+    /**
+     * Cartesian Product Case 2: (a <.? ? ext Theta')
+     */
+    static UnifyOderConstraint unifyCase2(PlaceholderType a, ExtendsType extThetaPrime, IFiniteClosure fc) {
+        Set<Set<UnifyPair>> result = new HashSet<>();
+
+        UnifyType aPrime = PlaceholderType.freshPlaceholder();
+        UnifyType extAPrime = new ExtendsType(aPrime);
+        UnifyType thetaPrime = extThetaPrime.getExtendedType();
+        Set<UnifyPair> resultPrime = new HashSet<>();
+        resultPrime.add(new UnifyPair(a, thetaPrime, PairOperator.SMALLERDOT));
+        result.add(resultPrime);
+
+        resultPrime = new HashSet<>();
+        resultPrime.add(new UnifyPair(a, extAPrime, PairOperator.EQUALSDOT));
+        resultPrime.add(new UnifyPair(aPrime, thetaPrime, PairOperator.SMALLERDOT));
+        result.add(resultPrime);
+        return new UnifyOderConstraint(result);
+    }
+
+    /**
+     * Cartesian Product Case 3: (a <.? ? sup Theta')
+     */
+    static UnifyOderConstraint unifyCase3(PlaceholderType a, SuperType subThetaPrime, IFiniteClosure fc) {
+        Set<Set<UnifyPair>> result = new HashSet<>();
+
+        UnifyType aPrime = PlaceholderType.freshPlaceholder();
+        UnifyType supAPrime = new SuperType(aPrime);
+        UnifyType thetaPrime = subThetaPrime.getSuperedType();
+        Set<UnifyPair> resultPrime = new HashSet<>();
+        resultPrime.add(new UnifyPair(thetaPrime, a, PairOperator.SMALLERDOT));
+        result.add(resultPrime);
+
+        resultPrime = new HashSet<>();
+        resultPrime.add(new UnifyPair(a, supAPrime, PairOperator.EQUALSDOT));
+        resultPrime.add(new UnifyPair(thetaPrime, aPrime, PairOperator.SMALLERDOT));
+        result.add(resultPrime);
+
+        return new UnifyOderConstraint(result);
+    }
+
+    /**
+     * Cartesian Product Case 5: (Theta <. a)
+     */
+    static UnifyOderConstraint unifyCase5(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
+        Set<Set<UnifyPair>> result = new HashSet<>();
+
+        boolean allGen = theta.getTypeParams().size() > 0;
+        for(UnifyType t : theta.getTypeParams())
+            if(!(t instanceof PlaceholderType) || !((PlaceholderType) t).isGenerated()) {
+                allGen = false;
+                break;
+            }
+
+        for(UnifyType thetaS : fc.greater(theta, new HashSet<>())) {
+            Set<UnifyPair> resultPrime = new HashSet<>();
+
+            UnifyType[] freshTphs = new UnifyType[thetaS.getTypeParams().size()];
+            for(int i = 0; !allGen && i < freshTphs.length; i++) {
+                freshTphs[i] = PlaceholderType.freshPlaceholder();
+                resultPrime.add(new UnifyPair(thetaS.getTypeParams().get(i), freshTphs[i], PairOperator.SMALLERDOTWC));
+            }
+
+            if(allGen)
+                resultPrime.add(new UnifyPair(a, thetaS, PairOperator.EQUALSDOT));
+            else
+                resultPrime.add(new UnifyPair(a, thetaS.setTypeParams(new TypeParams(freshTphs)), PairOperator.EQUALSDOT));
+            result.add(resultPrime);
+        }
+
+        return new UnifyOderConstraint(result);
+    }
+
+    /**
+     * Cartesian Product Case 8: (Theta <.? a)
+     */
+    static UnifyOderConstraint unifyCase8(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
+        Set<Set<UnifyPair>> result = new HashSet<>();
+        //for(UnifyType thetaS : fc.grArg(theta)) {
+        Set<UnifyPair> resultPrime = new HashSet<>();
+        resultPrime.add(new UnifyPair(a, theta, PairOperator.EQUALSDOT));
+        result.add(resultPrime);
+
+        UnifyType freshTph = PlaceholderType.freshPlaceholder();
+        resultPrime = new HashSet<>();
+        resultPrime.add(new UnifyPair(a, new ExtendsType(freshTph), PairOperator.EQUALSDOT));
+        resultPrime.add(new UnifyPair(theta, freshTph, PairOperator.SMALLERDOT));
+        result.add(resultPrime);
+
+        resultPrime = new HashSet<>();
+        resultPrime.add(new UnifyPair(a, new SuperType(freshTph), PairOperator.EQUALSDOT));
+        resultPrime.add(new UnifyPair(freshTph, theta, PairOperator.SMALLERDOT));
+        result.add(resultPrime);
+        //}
+
+        return new UnifyOderConstraint(result);
+    }
+
+    static Optional<Set<UnifyPair>> subst(Set<UnifyPair> pairs) {
+        HashMap<UnifyType, Integer> typeMap = new HashMap<>();
+
+        Stack<UnifyType> occuringTypes = new Stack<>();
+
+        for(UnifyPair pair : pairs) {
+            occuringTypes.push(pair.getLhsType());
+            occuringTypes.push(pair.getRhsType());
+        }
+
+        while(!occuringTypes.isEmpty()) {
+            UnifyType t1 = occuringTypes.pop();
+            if(!typeMap.containsKey(t1))
+                typeMap.put(t1, 0);
+            typeMap.put(t1, typeMap.get(t1)+1);
+
+            if(t1 instanceof ExtendsType)
+                occuringTypes.push(((ExtendsType) t1).getExtendedType());
+            if(t1 instanceof SuperType)
+                occuringTypes.push(((SuperType) t1).getSuperedType());
+            else
+                t1.getTypeParams().forEach(x -> occuringTypes.push(x));
+        }
+
+        Queue<UnifyPair> result1 = new LinkedList<UnifyPair>(pairs);
+        ArrayList<UnifyPair> result = new ArrayList<UnifyPair>();
+        boolean applied = false;
+
+        while(!result1.isEmpty()) {
+            UnifyPair pair = result1.poll();
+            PlaceholderType lhsType = null;
+            UnifyType rhsType;
+
+            if(pair.getPairOp() == PairOperator.EQUALSDOT
+                    && pair.getLhsType() instanceof PlaceholderType)
+                lhsType = (PlaceholderType) pair.getLhsType();
+            rhsType = pair.getRhsType(); //PL eingefuegt 2017-09-29 statt !((rhsType = pair.getRhsType()) instanceof PlaceholderType)
+            if(lhsType != null
+                    //&& !((rhsType = pair.getRhsType()) instanceof PlaceholderType) //PL geloescht am 2017-09-29 Begründung: auch Typvariablen muessen ersetzt werden.
+                    && typeMap.get(lhsType) > 1  // The type occurs in more pairs in the set than just the recent pair.
+                    && !rhsType.getTypeParams().occurs(lhsType)
+                    && !((rhsType instanceof WildcardType) && ((WildcardType)rhsType).getWildcardedType().equals(lhsType))) //PL eigefuegt 2018-02-18
+            {
+                Unifier uni = new Unifier(lhsType,  rhsType);
+                result = result.stream().map(x -> uni.apply(pair,x)).collect(Collectors.toCollection(ArrayList::new));
+                result1 = result1.stream().map(x -> uni.apply(pair,x)).collect(Collectors.toCollection(LinkedList::new));
+
+                Function<? super Constraint<UnifyPair>,? extends Constraint<UnifyPair>> applyUni = b -> b.stream().map(
+                        x -> uni.apply(pair,x)).collect(Collectors.toCollection((b.getExtendConstraint() != null)
+                        ? () -> new Constraint<UnifyPair>(
+                        b.getExtendConstraint().stream().map(x -> uni.apply(pair,x)).collect(Collectors.toCollection(Constraint::new)))
+                        : () -> new Constraint<UnifyPair>()
+                ));
+                applied = true;
+            }
+            result.add(pair);
+        }
+
+        return applied ? Optional.of(new HashSet<>(result)) : Optional.empty();
+    }
+
+}

src/main/java/de/dhbwstuttgart/unify2/UnifyResult.java

@@ -0,0 +1,11 @@
+package de.dhbwstuttgart.unify2;
+
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+import java.util.Set;
+
+public class UnifyResult {
+    public UnifyResult(Set<UnifyPair> toSubst) {
+
+    }
+}

src/main/java/de/dhbwstuttgart/unify2/model/UnifyConstraintSet.java

@@ -0,0 +1,124 @@
+package de.dhbwstuttgart.unify2.model;
+
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+/*
+OrC1 OrC2 OrC3 -> Constraints
+                Step4: OrC1 OrC2/c OrC3 OrC4
+
+Tiefensuche, neue UnifyConstraints erstellen
+
+Wie wird ConstraintSet geändert?
+
+wird nicht gebraucht:
+( map -> bei subst
+    Alle Constraints ändern, neues ConstraintSet zurückgeben )
+
+Step 4 bildet anschließend das karthesische Produkt und muss über alle Möglichkeiten iterieren
+die erste möglichkeit vom karthesischen produkt nehmen, subst schritt ausführen und mit dem Ergebnis (einzelnes Constraint Set) weiterarbeiten
+
+ */
+
+public class UnifyConstraintSet {
+    Set<UnifyOderConstraint> oderConstraints = new HashSet<>();
+
+    public UnifyConstraintSet(Set<UnifyOderConstraint> constraints){
+        if(constraints.isEmpty())throw new RuntimeException("Empty constraint set");
+        this.oderConstraints = constraints;
+    }
+
+    @Override
+    public String toString(){
+        BinaryOperator<String> b = (x, y) -> x+y;
+        return "ODER:" + this.oderConstraints.stream().reduce("", (x,y) -> x.toString()+ "\n"  +y, b);
+    }
+
+    /*
+    Cartesian product als optimierter Stream
+
+    - Ein Split teilt das Set so auf, dass der zweite Thread jedes zweite Element behandelt
+            - Ein thread der jedes zweite element behandelt wird gesplittet indem
+
+    1 2 1 2 1 2 1 2 => (o = 0, n = 2), (o = 1, n = 2)
+    1 2 1 3 1 2 1 3 => (o = 0, n = 2), (o = 1, n = 4), (o = 3, n = 4)
+
+     */
+    private class ConstraintSpliterator implements Spliterator<Set<UnifyPair>> {
+        private List<UnifyOderConstraint> constraints;
+        private long i = 0;
+        private long iterationFactor = 1;
+        private long max = 0;
+        private List<Integer> sizes;
+        private List<Long> bases = new ArrayList<>();
+
+        ConstraintSpliterator(List<UnifyOderConstraint> constraints){
+            this.constraints = constraints;
+            sizes = constraints.stream().map(UnifyOderConstraint::getSize).collect(Collectors.toList());
+            long base = 1;
+            for(int size : sizes){
+                bases.add(base);
+                base *= size;
+            }
+            i = 0;
+            max = estimateSize() - 1;
+        }
+
+        ConstraintSpliterator(List<UnifyOderConstraint> constraints, long start, long factor){
+            this(constraints);
+            i = start;
+            this.iterationFactor = factor;
+        }
+
+        @Override
+        public boolean tryAdvance(Consumer<? super Set<UnifyPair>> consumer) {
+            if(i > max) return false;
+            consumer.accept(get(i));
+            i++;
+            return true;
+        }
+
+        private Set<UnifyPair> get(long num){
+            Set<UnifyPair> ret = new HashSet<>();
+            Iterator<Long> baseIt = bases.iterator();
+            for(UnifyOderConstraint constraint : constraints){
+                ret.addAll(constraint.get((int) ((num/baseIt.next())%constraint.getSize())));
+            }
+            return ret;
+        }
+
+        @Override
+        public Spliterator<Set<UnifyPair>> trySplit() {
+            if(max - (i+iterationFactor * 2) < 0) return null;
+            long iNext = i + iterationFactor;
+            iterationFactor *= 2;
+            return new UnifyConstraintSet.ConstraintSpliterator(constraints, iNext, iterationFactor);
+        }
+
+        @Override
+        public long estimateSize() {
+            long ret = 1;
+            for (int size : sizes)ret*=size;
+            return ret;
+        }
+
+        @Override
+        public int characteristics() {
+            return ORDERED | SIZED | IMMUTABLE | NONNULL;
+        }
+    }
+
+    public Stream<Set<UnifyPair>> cartesianProductParallel(){
+        return StreamSupport.stream(new UnifyConstraintSet.ConstraintSpliterator(oderConstraints.stream().collect(Collectors.toList())), true);
+    }
+
+    public Stream<Set<UnifyPair>> cartesianProductParallel(Comparator<Set<UnifyPair>> prioritiser){
+        return StreamSupport.stream(new UnifyConstraintSet.ConstraintSpliterator(oderConstraints.stream().collect(Collectors.toList())), true);
+    }
+}

src/main/java/de/dhbwstuttgart/unify2/model/UnifyConstraintSetBuilder.java

@@ -0,0 +1,30 @@
+package de.dhbwstuttgart.unify2.model;
+
+import de.dhbwstuttgart.typeinference.unify.model.Pair;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class UnifyConstraintSetBuilder {
+
+    private Set<UnifyPair> undConstraints = new HashSet<>();
+    private Set<UnifyOderConstraint> oderConstraints = new HashSet<>();
+    private boolean done = false;
+
+    public void addUndConstraint(UnifyPair p){
+        undConstraints.add(p);
+    }
+
+    public void addOderConstraint(UnifyOderConstraint orConstraint) {
+        oderConstraints.add(orConstraint);
+    }
+
+    public UnifyConstraintSet build(){
+        if(done)throw new RuntimeException("Trying to build cartesian product twice");
+        this.done = true;
+        if(!undConstraints.isEmpty())
+            oderConstraints.add(new UnifyOderConstraint(Set.of(undConstraints)));
+        return new UnifyConstraintSet(oderConstraints);
+    }
+}

src/main/java/de/dhbwstuttgart/unify2/model/UnifyOderConstraint.java

@@ -0,0 +1,27 @@
+package de.dhbwstuttgart.unify2.model;
+
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class UnifyOderConstraint {
+
+    private final List<Set<UnifyPair>> cons;
+    public UnifyOderConstraint(Set<Set<UnifyPair>> orCons){
+        if(orCons.isEmpty())throw new RuntimeException("Empty constraint set");
+        for(Set<UnifyPair> c : orCons){
+            if(c.isEmpty())throw new RuntimeException("Empty constraint set");
+        }
+        this.cons = orCons.stream().collect(Collectors.toList());
+    }
+
+    public int getSize(){
+        return cons.size();
+    }
+
+    public Set<UnifyPair> get(int l) {
+        return cons.get(l);
+    }
+}

src/test/java/AllgemeinTest.java

@@ -40,8 +40,7 @@ public class AllgemeinTest {
 		//String className = "FCTest3";
 		//String className = "Var";
 		//String className = "Put";
-		//String className = "Twice";
-		String className = "TestSubTypless";
+		String className = "Cycle";
 		//PL 2019-10-24: genutzt fuer unterschiedliche Tests
 		path = System.getProperty("user.dir")+"/src/test/resources/AllgemeinTest/" + className + ".jav";
 		//path = System.getProperty("user.dir")+"/src/test/resources/AllgemeinTest/Overloading_Generics.jav";

src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java

@@ -1,4 +1,3 @@
-/*
 package insertGenerics;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
@@ -13,13 +12,11 @@ import java.util.List;
 public class FamilyOfGeneratedGenericsTest extends TestCase {
 
     public void testIdentityMethod(){
-        */
-/*
+        /*
         Example method:
         A id(B i) return i;
         gives constraint: B <. A and A <. Object, which are method constraints
-         *//*
-
+         */
 
         List<TPHConstraint> inputConstraints = new ArrayList<>();
         inputConstraints.add(new TPHConstraint("B", "A", TPHConstraint.Relation.EXTENDS));
@@ -32,20 +29,17 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
         List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(inputConstraints, tphPositions);
         assertTrue(classConstraints.isEmpty());
 
-        */
-/*
+        /*
         MethodConstraints should be the same as the input constraint
-         *//*
-
-//        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, new ArrayList<ClassConstraint>(), tphPositions);
-//        assertTrue(methodConstraints.size() == 2);
-//        assertTrue(methodConstraints.get(0).getLeft().equals("B"));
-//        assertTrue(methodConstraints.get(0).getRight().equals("A"));
+         */
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, new ArrayList<ClassConstraint>(), tphPositions);
+        assertTrue(methodConstraints.size() == 2);
+        assertTrue(methodConstraints.get(0).getLeft().equals("B"));
+        assertTrue(methodConstraints.get(0).getRight().equals("A"));
     }
 
     public void testClassField(){
-        */
-/*
+        /*
         class Example{
             A f;
             B fReturn(){
@@ -53,8 +47,7 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
             }
         }
         gives constraint: A <. B and B <. Object which are class constraints
-         *//*
-
+         */
 
         List<TPHConstraint> inputConstraints = new ArrayList<>();
         inputConstraints.add(new TPHConstraint("A", "B", TPHConstraint.Relation.EXTENDS));
@@ -65,22 +58,18 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
         PairTphMethod<PositionFinder.Position, String> posOfB = new PairTphMethod<>(PositionFinder.Position.METHOD, "fReturn");
         tphPositions.put("B", posOfB);
 
-        */
-/*
+        /*
         ClassConstraints should not be the same as the input constraint
-         *//*
-
+         */
         List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(inputConstraints, tphPositions);
         System.out.println(classConstraints);
         assertTrue(classConstraints.size() == 2);
         //assertTrue(classConstraints.get(0).getLeft().equals("A"));
         //assertTrue(classConstraints.get(0).getRight().equals("B"));
-//        HashMap<String, List<MethodConstraint>> methodConstraintsWithPosition = FamilyOfGeneratedGenerics.getMethodConstraintsWithPosition(inputConstraints,classConstraints,tphPositions,)
     }
 
     public void testSecondLineOfClassConstraints() {
-        */
-/*
+        /*
         class Example() {
             A a;
             B b = a;
@@ -94,8 +83,7 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
                 return e;
             }
         }
-        *//*
-
+        */
 
         List<TPHConstraint> inputConstraints = new ArrayList<>();
         inputConstraints.add(new TPHConstraint("A", "B", TPHConstraint.Relation.EXTENDS));
@@ -121,18 +109,17 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
 
         List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(inputConstraints, tphPositions);
         System.out.println(classConstraints);
-//        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, classConstraints, tphPositions);
-//        System.out.println(methodConstraints);
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, classConstraints, tphPositions);
+        System.out.println(methodConstraints);
         assertFalse(classConstraints.isEmpty());
         assertTrue(classConstraints.size() == 6);
-//        assertFalse(methodConstraints.isEmpty());
-//        assertTrue(methodConstraints.size() == 2);
+        assertFalse(methodConstraints.isEmpty());
+        assertTrue(methodConstraints.size() == 5);
 
     }
 
     public void testTPHsAndGenerics() {
-        */
-/*
+        /*
         class TPHsAndGenerics {
             Fun1<A,B> id = x -> x;
             C id2 (D x) {
@@ -146,8 +133,7 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
                 return b;
             }
         }
-        *//*
-
+        */
 
         List<TPHConstraint> inputConstraints = new ArrayList<>();
         inputConstraints.add(new TPHConstraint("A","B", TPHConstraint.Relation.EXTENDS));
@@ -183,13 +169,13 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
 
         List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(inputConstraints, tphPositions);
         System.out.println(classConstraints);
-//        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, classConstraints, tphPositions);
-//        System.out.println(methodConstraints);
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, classConstraints, tphPositions);
+        System.out.println(methodConstraints);
 
         assertFalse(classConstraints.isEmpty());
         assertTrue(classConstraints.size() == 3);
-//        assertFalse(methodConstraints.isEmpty());
-//        assertTrue(methodConstraints.size()==9);
+        assertFalse(methodConstraints.isEmpty());
+        assertTrue(methodConstraints.size()==9);
     }
 
 
@@ -209,7 +195,7 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
 
 
 
-        HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> allTphsNew = FamilyOfGeneratedGenerics.positionConverter(allTphsOld, listOfMethodsAndTphs);
+        HashMap<String, PairTphMethod<PositionFinder.Position, String>> allTphsNew = FamilyOfGeneratedGenerics.positionConverter(allTphsOld, listOfMethodsAndTphs);
         System.out.println(allTphsNew);
         //was tun wenn zwei (oder mehr) Methoden gleiches TPH enthalten?
         //ist dies möglich oder werden die TPHs immer verschieden initialisiert und dann erst am Ende gemappt?
@@ -225,4 +211,4 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
 
     }
 
-}*/
+}

src/test/java/insertGenerics/MethodsTest.java

@@ -0,0 +1,30 @@
+package insertGenerics;
+
+import de.dhbwstuttgart.bytecode.genericsGenerator.GeneratedGenericsFinder;
+import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import junit.framework.TestResult;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+public class MethodsTest {
+    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
+    public static final String fileDirectory = rootDirectory + "TestGGFinder.jav";
+
+    @Test
+    public void testVisit(ClassOrInterface coi) throws IOException, ClassNotFoundException {
+        JavaTXCompiler compiler = new JavaTXCompiler(new File(fileDirectory));
+        SourceFile sf = compiler.sourceFiles.get(compiler.sourceFiles.keySet());
+        List<ResultSet> results = compiler.typeInference();
+
+        GeneratedGenericsFinder ggf = new GeneratedGenericsFinder(sf, results);
+        ClassOrInterface coiHere = coi;
+        ggf.visit(coiHere);
+        //assert results.size()>0;
+    }
+}

src/test/java/insertGenerics/TestAny.java

@@ -1,102 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestAny {
-
-    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-
-    @Test
-    public void ggFinder() throws IOException, ClassNotFoundException {
-        execute(new File(rootDirectory+"TestAny.jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-        }
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        
-        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-        classConstraintsTest.add(new ClassConstraint("N", "O", Relation.EXTENDS));
-        classConstraintsTest.add(new ClassConstraint("N", "U", Relation.EXTENDS));
-        classConstraintsTest.add(new ClassConstraint("U", "O", Relation.EXTENDS));
-        classConstraintsTest.add(new ClassConstraint("O", "java/lang/Object", Relation.EXTENDS));
-        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-        List<MethodConstraint> lmc;
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("R", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH RanyMethod()",  lmc);
-        lmc = new ArrayList<>();
-        methodConstraintsWithPositionTest.put("TPH UotherMethod(TPH U)",  lmc);
-        
-        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-        
-        //compiler.generateBytecode(rootDirectory+"xxx.class", results, simplifyResultsForAllSourceFiles);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-            System.out.println(ASTTypePrinter.print(sf));
-            System.out.println(ASTPrinter.print(sf));
-            //List<ResultSet> results = compiler.typeInference(); PL 2017-10-03 vor die For-Schleife gezogen
-            assert results.size()>0;
-            Set<String> insertedTypes = new HashSet<>();
-            for(ResultSet resultSet : results){
-                Set<TypeInsert> result = TypeInsertFactory.createTypeInsertPoints(sf, resultSet, results, simplifyResultsForAllSourceFiles);
-                assert result.size()>0;
-                String content = readFile(f.getPath(), StandardCharsets.UTF_8);
-                for(TypeInsert tip : result){
-                    insertedTypes.add(tip.insert(content));
-                }
-            }
-            for(String s : insertedTypes){
-                System.out.println(s);
-            }
-        }
-        return new TestResultSet();
-    }
-
-    static String readFile(String path, Charset encoding)
-            throws IOException
-    {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
-}

src/test/java/insertGenerics/TestClassField.java

@@ -1,72 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestClassField {
-
-    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-
-    @Test
-    public void ggFinder() throws IOException, ClassNotFoundException {
-        execute(new File(rootDirectory+"TestClassField.jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-        }
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        //compiler.generateBytecode(rootDirectory+"xxx.class", results, simplifyResultsForAllSourceFiles);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-            System.out.println(ASTTypePrinter.print(sf));
-            System.out.println(ASTPrinter.print(sf));
-            //List<ResultSet> results = compiler.typeInference(); PL 2017-10-03 vor die For-Schleife gezogen
-            assert results.size()>0;
-            Set<String> insertedTypes = new HashSet<>();
-            for(ResultSet resultSet : results){
-                Set<TypeInsert> result = TypeInsertFactory.createTypeInsertPoints(sf, resultSet, results, simplifyResultsForAllSourceFiles);
-                assert result.size()>0;
-                String content = readFile(f.getPath(), StandardCharsets.UTF_8);
-                for(TypeInsert tip : result){
-                    insertedTypes.add(tip.insert(content));
-                }
-            }
-            for(String s : insertedTypes){
-                System.out.println(s);
-            }
-        }
-        return new TestResultSet();
-    }
-
-    static String readFile(String path, Charset encoding)
-            throws IOException
-    {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
-}

src/test/java/insertGenerics/TestExample42.java

@@ -6,6 +6,7 @@ import de.dhbwstuttgart.bytecode.insertGenerics.*;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
+import java.io.BufferedReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -52,10 +53,10 @@ public class TestExample42 {
 
     @Test
     public void genericTest() {
-//        List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(fillConstraintsList(),fillPosOfTphs());
-//        System.out.println("ClassConstraints: " + classConstraints);
-//        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),classConstraints,fillPosOfTphs());
-//        System.out.println("MethodConstraints: " + methodConstraints);
+        List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(fillConstraintsList(),fillPosOfTphs());
+        System.out.println("ClassConstraints: " + classConstraints);
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),classConstraints,fillPosOfTphs());
+        System.out.println("MethodConstraints: " + methodConstraints);
 
         List<TPHConstraint> testCons;
     }

src/test/java/insertGenerics/TestExample42_allInOneMethod.java

@@ -51,10 +51,10 @@ public class TestExample42_allInOneMethod {
 
     @Test
     public void genericTest() {
-//        List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(fillConstraintsList(),fillPosOfTphs());
-//        System.out.println("ClassConstraints: " + classConstraints);
-//        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),classConstraints,fillPosOfTphs(),);
-//        System.out.println("MethodConstraints: " + methodConstraints);
+        List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(fillConstraintsList(),fillPosOfTphs());
+        System.out.println("ClassConstraints: " + classConstraints);
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),classConstraints,fillPosOfTphs());
+        System.out.println("MethodConstraints: " + methodConstraints);
 
         List<TPHConstraint> testCons;
     }

src/test/java/insertGenerics/TestGGFinder.java

@@ -1,89 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestGGFinder {
-
-    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-    private static ClassLoader loader;
-    private static Class<?> classToTest;
-	private static Object instanceOfClass;
-	private static String className = "TestGGFinder";
-	
-    @Test
-    public void ggFinder() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        execute(new File(rootDirectory+className+".jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        
-        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-        classConstraintsTest.add(new ClassConstraint("S", "java/lang/Object", Relation.EXTENDS));
-        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-        List<MethodConstraint> lmc;
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("P", "AC", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AC", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH ACid(TPH P)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("T", "S", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH SsetA(TPH T)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("AC", "Y", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("Z", "P", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("P", "AC", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("Y", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("voidm(TPH YTPH Z)",  lmc);
-        
-        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-        
-        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-        return new TestResultSet();
-    }
-}

src/test/java/insertGenerics/TestLocalVarLambda.java

@@ -1,90 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestLocalVarLambda {
-
-    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-    private static ClassLoader loader;
-    private static Class<?> classToTest;
-	private static Object instanceOfClass;
-	private static String className = "TestLocalVarLambda";
-	
-	@Test
-    public void ggFinder() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        execute(new File(rootDirectory+className+".jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        
-        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-        
-        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        
-        List<MethodConstraint> lmc;
-        lmc = new ArrayList<>();
-        
-        if (fogg.allConstraints.contains((new MethodConstraint("O", "ALU", Relation.EXTENDS)))) {
-        	lmc.add(new MethodConstraint("O", "ALU", Relation.EXTENDS));
-        	lmc.add(new MethodConstraint("DIU", "java/lang/Object", Relation.EXTENDS));
-        	lmc.add(new MethodConstraint("ALU", "DIU", Relation.EXTENDS));
-        }
-        else {
-        	lmc.add(new MethodConstraint("O", "DIU", Relation.EXTENDS));
-        	lmc.add(new MethodConstraint("N", "java/lang/Object", Relation.EXTENDS));
-        	lmc.add(new MethodConstraint("DIU", "N", Relation.EXTENDS));
-        }
-        methodConstraintsWithPositionTest.put("TPH DIUm(TPH O)",  lmc);
-        
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-        
-        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-        return new TestResultSet();
-    }
-}

src/test/java/insertGenerics/TestMutualRecursion.java

@@ -1,115 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestMutualRecursion {
-
-    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-    private static ClassLoader loader;
-    private static Class<?> classToTest;
-	private static Object instanceOfClass;
-	private static String className;
-	
-	@Test
-    public void TestMutualRecursion1() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        className = "TestMutualRecursion"; 
-        JavaTXCompiler compiler = new JavaTXCompiler(new File(rootDirectory+className+".jav"));
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-
-		
-		List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-		HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-		List<MethodConstraint> lmc;
-		lmc = new ArrayList<>();
-		lmc.add(new MethodConstraint("P", "Q", Relation.EXTENDS));
-		lmc.add(new MethodConstraint("Q", "java/lang/Object", Relation.EXTENDS));
-		lmc.add(new MethodConstraint("AL", "java/lang/Object", Relation.EXTENDS));
-		methodConstraintsWithPositionTest.put("TPH ALid(TPH P)",  lmc);
-		lmc = new ArrayList<>();
-		lmc.add(new MethodConstraint("AL", "java/lang/Object", Relation.EXTENDS));
-		lmc.add(new MethodConstraint("Z", "java/lang/Object", Relation.EXTENDS));
-		methodConstraintsWithPositionTest.put("TPH ALm(TPH ALTPH Z)",  lmc);
-		lmc = new ArrayList<>();
-		lmc.add(new MethodConstraint("AG", "java/lang/Object", Relation.EXTENDS));
-		lmc.add(new MethodConstraint("AH", "java/lang/Object", Relation.EXTENDS));
-		lmc.add(new MethodConstraint("AL", "java/lang/Object", Relation.EXTENDS));
-		methodConstraintsWithPositionTest.put("TPH ALmain(TPH AGTPH AH)",  lmc);
-		
-		FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-		
-		compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-    }
-	
-	@Test
-    public void TestMutualRecursionWithField() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        className = "TestMutualRecursionWithField"; 
-		execute(new File(rootDirectory+className+".jav"));
-    }
-	
-	@Test
-    public void TestMutualRecursionWithField2() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        className = "TestMutualRecursionWithField2"; 
-		execute(new File(rootDirectory+className+".jav"));
-    }
-
-	@Test
-    public void TestMutualRecursionWithField3() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        className = "TestMutualRecursionWithField3"; 
-		execute(new File(rootDirectory+className+".jav"));
-    }
-	
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-        return new TestResultSet();
-    }
-}

src/test/java/insertGenerics/TestReturnVar.java

@@ -1,72 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestReturnVar {
-
-    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-
-    @Test
-    public void ggFinder() throws IOException, ClassNotFoundException {
-        execute(new File(rootDirectory+"TestReturnVar.jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-        }
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        //compiler.generateBytecode(rootDirectory+"xxx.class", results, simplifyResultsForAllSourceFiles);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-            System.out.println(ASTTypePrinter.print(sf));
-            System.out.println(ASTPrinter.print(sf));
-            //List<ResultSet> results = compiler.typeInference(); PL 2017-10-03 vor die For-Schleife gezogen
-            assert results.size()>0;
-            Set<String> insertedTypes = new HashSet<>();
-            for(ResultSet resultSet : results){
-                Set<TypeInsert> result = TypeInsertFactory.createTypeInsertPoints(sf, resultSet, results, simplifyResultsForAllSourceFiles);
-                assert result.size()>0;
-                String content = readFile(f.getPath(), StandardCharsets.UTF_8);
-                for(TypeInsert tip : result){
-                    insertedTypes.add(tip.insert(content));
-                }
-            }
-            for(String s : insertedTypes){
-                System.out.println(s);
-            }
-        }
-        return new TestResultSet();
-    }
-
-    static String readFile(String path, Charset encoding)
-            throws IOException
-    {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
-}

src/test/java/insertGenerics/TestTPHsAndGenerics.java

@@ -1,119 +0,0 @@
-package insertGenerics;
-
-	import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-	import de.dhbwstuttgart.syntaxtree.SourceFile;
-	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.result.ResultSet;
-	import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-	import java.io.IOException;
-	import java.lang.reflect.InvocationTargetException;
-	import java.net.URL;
-	import java.net.URLClassLoader;
-	import java.nio.charset.Charset;
-	import java.nio.charset.StandardCharsets;
-	import java.nio.file.Files;
-	import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-	import java.util.List;
-	import java.util.Set;
-
-
-public class TestTPHsAndGenerics {
-
-	    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-	    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-	    private static ClassLoader loader;
-	    private static Class<?> classToTest;
-		private static Object instanceOfClass;
-		private static String className = "TestTPHsAndGenerics";
-		
-	    @Test
-	    public void ggFinder() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-	        execute(new File(rootDirectory+className+".jav"));
-	    }
-
-	    private static class TestResultSet{
-
-	    }
-
-	    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-	        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-	        List<ResultSet> results = compiler.typeInference();
-	        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-	        
-	        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-	        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-	        
-	        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-	        
-	        List<MethodConstraint> lmc;
-	        lmc = new ArrayList<>();
-	        
-	        if (fogg.allConstraints.contains((new MethodConstraint("DZP", "ETW", Relation.EXTENDS)))) {
-	        	classConstraintsTest.add(new ClassConstraint("UD", "DZP", Relation.EXTENDS));
-	        	classConstraintsTest.add(new ClassConstraint("DZP", "ETW", Relation.EXTENDS));
-	        	classConstraintsTest.add(new ClassConstraint("ETW", "java/lang/Object", Relation.EXTENDS));
-	        
-	        	lmc.add(new MethodConstraint("AI", "AE", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AD", "AI", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AB", "AM", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AE", "java/lang/Object", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AM", "java/lang/Object", Relation.EXTENDS));
-	        	methodConstraintsWithPositionTest.put("TPH ABm(TPH ABTPH AD)",  lmc);
-	        	lmc = new ArrayList<>();
-	        	lmc.add(new MethodConstraint("V", "UD", Relation.EXTENDS));
-	        	methodConstraintsWithPositionTest.put("TPH ETWid2(TPH V)",  lmc);
-	        	lmc = new ArrayList<>();
-	        	lmc.add(new MethodConstraint("AM", "java/lang/Object", Relation.EXTENDS));
-	        	methodConstraintsWithPositionTest.put("TPH AIm2(TPH AMTPH AI)",  lmc);
-	        }
-	        else {
-	        	classConstraintsTest.add(new ClassConstraint("ETW", "DZP", Relation.EXTENDS));
-	        	classConstraintsTest.add(new ClassConstraint("DZP", "U", Relation.EXTENDS));
-	        	classConstraintsTest.add(new ClassConstraint("ETW", "java/lang/Object", Relation.EXTENDS));
-	        
-	        	lmc.add(new MethodConstraint("AI", "AE", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AD", "AI", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AB", "AM", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AE", "java/lang/Object", Relation.EXTENDS));
-	        	lmc.add(new MethodConstraint("AM", "java/lang/Object", Relation.EXTENDS));
-	        	methodConstraintsWithPositionTest.put("TPH ABm(TPH ABTPH AD)",  lmc);
-	        	lmc = new ArrayList<>();
-	        	lmc.add(new MethodConstraint("V", "ETW", Relation.EXTENDS));
-	        	methodConstraintsWithPositionTest.put("TPH ETWid2(TPH V)",  lmc);
-	        	lmc = new ArrayList<>();
-	        	lmc.add(new MethodConstraint("AM", "java/lang/Object", Relation.EXTENDS));
-	        	methodConstraintsWithPositionTest.put("TPH AIm2(TPH AMTPH AI)",  lmc);
-	        }
-	        
-	        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-	        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-	        
-	        assertEquals(expectedClassCons, computedClassCons);
-	        
-	        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-	        
-	        /*
-	        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-	        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-	        classToTest = loader.loadClass(className);
-			instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-			*/
-	        return new TestResultSet();
-	        
-	    }
-	}

src/test/java/insertGenerics/TestTPHsAndGenerics2.java

@@ -1,72 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestTPHsAndGenerics2 {
-
-    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-
-    @Test
-    public void ggFinder() throws IOException, ClassNotFoundException {
-        execute(new File(rootDirectory+"TestTPHSAndGenerics2.jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-        }
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        //compiler.generateBytecode(rootDirectory+"xxx.class", results, simplifyResultsForAllSourceFiles);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-            System.out.println(ASTTypePrinter.print(sf));
-            System.out.println(ASTPrinter.print(sf));
-            //List<ResultSet> results = compiler.typeInference(); PL 2017-10-03 vor die For-Schleife gezogen
-            assert results.size()>0;
-            Set<String> insertedTypes = new HashSet<>();
-            for(ResultSet resultSet : results){
-                Set<TypeInsert> result = TypeInsertFactory.createTypeInsertPoints(sf, resultSet, results, simplifyResultsForAllSourceFiles);
-                assert result.size()>0;
-                String content = readFile(f.getPath(), StandardCharsets.UTF_8);
-                for(TypeInsert tip : result){
-                    insertedTypes.add(tip.insert(content));
-                }
-            }
-            for(String s : insertedTypes){
-                System.out.println(s);
-            }
-        }
-        return new TestResultSet();
-    }
-
-    static String readFile(String path, Charset encoding)
-            throws IOException
-    {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
-}

src/test/java/insertGenerics/TestTwoArgs.java

@@ -1,97 +0,0 @@
-package insertGenerics;
-
-import static org.junit.Assert.*;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestTwoArgs {
-
-    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-    private static ClassLoader loader;
-    private static Class<?> classToTest;
-	private static Object instanceOfClass;
-	private static String className = "TestTwoArgs";
-	
-	@Test
-    public void ggFinder() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        execute(new File(rootDirectory+className+".jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        
-        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-        classConstraintsTest.add(new ClassConstraint("AP", "Z", Relation.EXTENDS));
-        classConstraintsTest.add(new ClassConstraint("Z", "P", Relation.EXTENDS));
-        classConstraintsTest.add(new ClassConstraint("P", "AL", Relation.EXTENDS));
-        classConstraintsTest.add(new ClassConstraint("AL", "AF", Relation.EXTENDS));
-        classConstraintsTest.add(new ClassConstraint("AF", "java/lang/Object", Relation.EXTENDS));
-        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-        List<MethodConstraint> lmc;
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("P", "AL", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH ALid(TPH P)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("AL", "AF", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("Z", "P", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("P", "AL", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH AFm(TPH AFTPH Z)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("T", "AP", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH APsetA(TPH T)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("AG", "P", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AH", "T", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("T", "AP", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH AFmain(TPH AGTPH AH)",  lmc);
-        
-        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-        
-        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-        return new TestResultSet();
-    }
-}

src/test/java/insertGenerics/TestTwoArgs2.java

@@ -1,95 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestTwoArgs2 {
-
-    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-    private static ClassLoader loader;
-    private static Class<?> classToTest;
-	private static Object instanceOfClass;
-	private static String className = "TestTwoArgs2";
-	
-	@Test
-    public void ggFinder() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        execute(new File(rootDirectory+className+".jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        
-        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-        classConstraintsTest.add(new ClassConstraint("N", "java/lang/Object", Relation.EXTENDS));
-        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-        List<MethodConstraint> lmc;
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("AG", "AA", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("U", "P", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("P", "AG", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AA", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH AAm(TPH AATPH U)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("AB", "P", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AC", "U", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AB", "AA", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AA", "U", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AG", "AA", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("U", "AA", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("P", "AG", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH AAmain(TPH ABTPH AC)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("P", "AG", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("AG", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH AGid(TPH P)",  lmc);
-
-        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-        
-        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-        return new TestResultSet();
-    }
-}

src/test/java/insertGenerics/TestTwoCalls.java

@@ -1,83 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestTwoCalls {
-
-    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-    private static ClassLoader loader;
-    private static Class<?> classToTest;
-	private static Object instanceOfClass;
-	private static String className = "TestTwoCalls";
-	
-	@Test
-    public void ggFinder() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        execute(new File(rootDirectory+className+".jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        
-        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-        List<MethodConstraint> lmc;
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("O", "R", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("R", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH Rid(TPH O)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("T", "O", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("O", "R", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("R", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH Rmain(TPH STPH T)",  lmc);
-        
-        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-        return new TestResultSet();
-    }
-}

src/test/java/insertGenerics/TestVector.java

@@ -1,82 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestVector {
-
-    private static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-    private String pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
-    private static ClassLoader loader;
-    private static Class<?> classToTest;
-	private static Object instanceOfClass;
-	private static String className = "TestVector";
-	
-    @Test
-    public void ggFinder() throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        execute(new File(rootDirectory+className+".jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        
-        List<ClassConstraint> classConstraintsTest = new ArrayList<>();
-        HashMap<String, List<MethodConstraint>> methodConstraintsWithPositionTest = new HashMap<>();
-        List<MethodConstraint> lmc;
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("T", "W", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("W", "ZU", Relation.EXTENDS));
-        lmc.add(new MethodConstraint("ZU", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("voidm(java/util/Vectorjava/util/Vector)",  lmc);
-        lmc = new ArrayList<>();
-        lmc.add(new MethodConstraint("W", "java/lang/Object", Relation.EXTENDS));
-        methodConstraintsWithPositionTest.put("TPH Wid(TPH W)",  lmc);
-        
-        FamilyOfGeneratedGenerics fogg = compiler.fogg;
-        Set<ClassConstraint> computedClassCons = new HashSet<>(fogg.classConstraints);
-        Set<ClassConstraint> expectedClassCons = new HashSet<>(classConstraintsTest);
-        
-        assertEquals(expectedClassCons, computedClassCons);
-        
-        assertEquals(methodConstraintsWithPositionTest, fogg.methodConstraintsWithPosition);
-        compiler.generateBytecode(new File(pathToClassFile), results, simplifyResultsForAllSourceFiles);
-        loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-        classToTest = loader.loadClass(className);
-		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
-        return new TestResultSet();
-    }
-}

src/test/java/insertGenerics/TestVoidMeth.java

@@ -1,72 +0,0 @@
-package insertGenerics;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-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.result.ResultSet;
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TestVoidMeth {
-
-    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
-
-    @Test
-    public void ggFinder() throws IOException, ClassNotFoundException {
-        execute(new File(rootDirectory+"TestVoidMeth.jav"));
-    }
-
-    private static class TestResultSet{
-
-    }
-
-    public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException {
-        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-        }
-        List<ResultSet> results = compiler.typeInference();
-        List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
-        //compiler.generateBytecode(rootDirectory+"xxx.class", results, simplifyResultsForAllSourceFiles);
-        for(File f : compiler.sourceFiles.keySet()){
-            SourceFile sf = compiler.sourceFiles.get(f);
-            System.out.println(ASTTypePrinter.print(sf));
-            System.out.println(ASTPrinter.print(sf));
-            //List<ResultSet> results = compiler.typeInference(); PL 2017-10-03 vor die For-Schleife gezogen
-            assert results.size()>0;
-            Set<String> insertedTypes = new HashSet<>();
-            for(ResultSet resultSet : results){
-                Set<TypeInsert> result = TypeInsertFactory.createTypeInsertPoints(sf, resultSet, results, simplifyResultsForAllSourceFiles);
-                assert result.size()>0;
-                String content = readFile(f.getPath(), StandardCharsets.UTF_8);
-                for(TypeInsert tip : result){
-                    insertedTypes.add(tip.insert(content));
-                }
-            }
-            for(String s : insertedTypes){
-                System.out.println(s);
-            }
-        }
-        return new TestResultSet();
-    }
-
-    static String readFile(String path, Charset encoding)
-            throws IOException
-    {
-        byte[] encoded = Files.readAllBytes(Paths.get(path));
-        return new String(encoded, encoding);
-    }
-}

src/test/java/insertGenerics/TryTest.java

@@ -20,13 +20,13 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class TestSecondLineOfClassConstraints {
+public class TryTest {
 
     public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/insertGenericsJav/";
 
     @Test
     public void ggFinder() throws IOException, ClassNotFoundException {
-        execute(new File(rootDirectory+"TestSecondLineOfClassConstraints.jav"));
+        execute(new File(rootDirectory+"TestGGFinder.jav"));
     }
 
     private static class TestResultSet{
@@ -34,9 +34,25 @@ public class TestSecondLineOfClassConstraints {
     }
 
     public TestResultSet execute(File fileToTest) throws IOException, ClassNotFoundException {
+        //filesToTest.add(new File(rootDirectory+"fc.jav"));
+        //filesToTest.add(new File(rootDirectory+"Lambda.jav"));
+        //filesToTest.add(new File(rootDirectory+"Lambda2.jav"));
+        //filesToTest.add(new File(rootDirectory+"Lambda3.jav"));
+        //filesToTest.add(new File(rootDirectory+"Vector.jav"));
+        //filesToTest.add(new File(rootDirectory+"Generics.jav"));
+        //filesToTest.add(new File(rootDirectory+"MethodsEasy.jav"));
+        //filesToTest.add(new File(rootDirectory+"Matrix.jav"));
+        //filesToTest.add(new File(rootDirectory+"Import.jav"));
+        //        //filesToTest.add(new File(rootDirectory+"Faculty.jav"));
+        //        //filesToTest.add(new File(rootDirectory+"mathStruc.jav"));
+        //        //filesToTest.add(new File(rootDirectory+"test.jav"));
         JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
         for(File f : compiler.sourceFiles.keySet()){
             SourceFile sf = compiler.sourceFiles.get(f);
+//            System.out.println(ASTTypePrinter.print(sf));
+//            System.out.println("---------------------------1");
+//            System.out.println(ASTPrinter.print(sf));
+//            System.out.println("---------------------------2");
         }
         List<ResultSet> results = compiler.typeInference();
         List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = compiler.getGeneratedGenericResultsForAllSourceFiles(results);
@@ -44,7 +60,9 @@ public class TestSecondLineOfClassConstraints {
         for(File f : compiler.sourceFiles.keySet()){
             SourceFile sf = compiler.sourceFiles.get(f);
             System.out.println(ASTTypePrinter.print(sf));
+//            System.out.println("---------------------------3");
             System.out.println(ASTPrinter.print(sf));
+//            System.out.println("---------------------------4");
             //List<ResultSet> results = compiler.typeInference(); PL 2017-10-03 vor die For-Schleife gezogen
             assert results.size()>0;
             Set<String> insertedTypes = new HashSet<>();
@@ -57,7 +75,9 @@ public class TestSecondLineOfClassConstraints {
                 }
             }
             for(String s : insertedTypes){
+                System.out.println("---------------------------51");
                 System.out.println(s);
+                System.out.println("---------------------------52");
             }
         }
         return new TestResultSet();

src/test/java/typeinference/ConstraintSetTests.java

@@ -0,0 +1,62 @@
+package typeinference;
+
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSetBuilder;
+import de.dhbwstuttgart.typeinference.constraints.OderConstraint;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class ConstraintSetTests {
+    @Test
+    public void cartesianProductTestSingleConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 1;
+    }
+
+    @Test
+    public void cartesianProductTestSingleOderConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 2;
+    }
+
+    @Test
+    public void cartesianProductTestTwoOderConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 4;
+    }
+
+    @Test
+    public void cartesianProductTestThreeOderConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 4;
+
+        ConstraintSetBuilder builder2 = new ConstraintSetBuilder();
+        builder2.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder2.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder2.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        List<Set<Pair>> result2 = builder2.build().cartesianProductParallel().collect(Collectors.toList());
+        
+        assert result2.stream().map( a -> a.stream().map(p -> p.TA1.toString()).reduce("", (x, y)-> x+" "+y)).collect(Collectors.toSet()).size() == 8;
+        assert result2.size() == 8;
+    }
+
+    public Pair generatePair(){
+        return new Pair(TypePlaceholder.fresh(new NullToken()), TypePlaceholder.fresh(new NullToken()));
+    }
+}

src/test/java/typeinference/UnifyConstraintSetTests.java

@@ -0,0 +1,62 @@
+package typeinference;
+
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSetBuilder;
+import de.dhbwstuttgart.typeinference.constraints.OderConstraint;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
+import org.junit.Test;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class UnifyConstraintSetTests {
+    @Test
+    public void cartesianProductTestSingleConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 1;
+    }
+
+    @Test
+    public void cartesianProductTestSingleOderConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 2;
+    }
+
+    @Test
+    public void cartesianProductTestTwoOderConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 4;
+    }
+
+    @Test
+    public void cartesianProductTestThreeOderConstraint(){
+        ConstraintSetBuilder builder = new ConstraintSetBuilder();
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()))));
+        List<Set<Pair>> result = builder.build().cartesianProductParallel().collect(Collectors.toList());
+        assert result.size() == 4;
+
+        ConstraintSetBuilder builder2 = new ConstraintSetBuilder();
+        builder2.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder2.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        builder2.addOderConstraint(new OderConstraint(Set.of(Set.of(generatePair()), Set.of(generatePair()))));
+        List<Set<Pair>> result2 = builder2.build().cartesianProductParallel().collect(Collectors.toList());
+        
+        assert result2.stream().map( a -> a.stream().map(p -> p.TA1.toString()).reduce("", (x, y)-> x+" "+y)).collect(Collectors.toSet()).size() == 8;
+        assert result2.size() == 8;
+    }
+
+    public Pair generatePair(){
+        return new Pair(TypePlaceholder.fresh(new NullToken()), TypePlaceholder.fresh(new NullToken()));
+    }
+}

src/test/java/unify/RuleSetTest.java

@@ -0,0 +1,4 @@
+package unify;
+
+public class RuleSetTest {
+}

src/test/java/unify/TypeUnifyTest.java

@@ -0,0 +1,47 @@
+package unify;
+
+import de.dhbwstuttgart.typeinference.unify.model.FiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+import de.dhbwstuttgart.unify2.TypeUnify;
+import de.dhbwstuttgart.unify2.model.UnifyConstraintSet;
+import de.dhbwstuttgart.unify2.model.UnifyOderConstraint;
+import org.junit.Test;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+public class TypeUnifyTest {
+    @Test
+    public void emptyInput(){
+        UnifyConstraintSet empty = new UnifyConstraintSet(new HashSet<>());
+        TypeUnify.unifyOrConstraints(empty, emptyFC());
+    }
+
+    @Test
+    public void singleOrConstraintOnlyTPHs(){
+        Set<UnifyPair> pairs = Set.of(new UnifyPair(PlaceholderType.freshPlaceholder(), PlaceholderType.freshPlaceholder(), PairOperator.EQUALSDOT));
+        UnifyOderConstraint orConstraint = new UnifyOderConstraint(Set.of(pairs));
+        UnifyConstraintSet input = new UnifyConstraintSet(Set.of(orConstraint));
+        Optional<Set<UnifyPair>> res = TypeUnify.unifyOrConstraints(input, emptyFC());
+        assert res.isPresent();
+    }
+
+    @Test
+    public void unifyTest1(){
+        PlaceholderType tph1 = PlaceholderType.freshPlaceholder();
+        PlaceholderType tph2 = PlaceholderType.freshPlaceholder();
+        UnifyPair p1 = new UnifyPair(tph1, tph2, PairOperator.SMALLERDOT);
+        Set<UnifyPair> pairs = Set.of(p1);
+        UnifyOderConstraint orConstraint = new UnifyOderConstraint(Set.of(pairs));
+        UnifyConstraintSet input = new UnifyConstraintSet(Set.of(orConstraint));
+        Optional<Set<UnifyPair>> res = TypeUnify.unifyOrConstraints(input, emptyFC());
+        assert res.isPresent();
+    }
+
+    private FiniteClosure emptyFC(){
+        return new FiniteClosure(new HashSet<>(), null);
+    }
+}

src/test/resources/AllgemeinTest/Cycle.jav

@@ -0,0 +1,11 @@
+class Cycle{
+
+    <A> A und(A a, A b){
+        return a;
+    }
+
+    m(a){
+        return und(m(m(a)), a);
+    }
+
+}

src/test/resources/AllgemeinTest/Twice.jav

@@ -0,0 +1,5 @@
+class Twice{
+    m(x, f){
+        return f.apply(f.apply(x));
+    }
+}

src/test/resources/insertGenericsJav/TestAny.jav

@@ -1,13 +0,0 @@
-class TestAny {
-    a;
-    b = a;
-    anyMethod() {
-        var f;
-        return f;
-    }
-    otherMethod(e) {
-        b = e;
-        e = a;
-        return e;
-    }
-}

src/test/resources/insertGenericsJav/TestClassField.jav

@@ -1,6 +0,0 @@
-class Example{
-    f;
-    fReturn(){
-        return f;
-    }
-}

src/test/resources/insertGenericsJav/TestGGFinder.jav

@@ -1,4 +1,4 @@
-public class TestGGFinder {
+class Generics{
     a;
 
     id(b) {

src/test/resources/insertGenericsJav/TestLocalVarLambda.jav

@@ -1,7 +0,0 @@
-public class TestLocalVarLambda {
-
-m(x) {
-  var id = z -> z;
-  return id.apply(x);
-  }
-} 

src/test/resources/insertGenericsJav/TestMutualRecursion.jav

@@ -1,17 +0,0 @@
-public class TestMutualRecursion {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),y);
-    }
-}

src/test/resources/insertGenericsJav/TestMutualRecursionWithField.jav

@@ -1,22 +0,0 @@
-public class TestMutualRecursionWithField {
-    a;
-
-    id(b) {
-        var c = b;
-        return main(b,c);
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),setA(y));
-    }
-}

src/test/resources/insertGenericsJav/TestReturnVar.jav

@@ -1,6 +0,0 @@
-class VarReturn {
-    anyMethod() {
-        var f;
-        return f;
-    }
-}

src/test/resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav

@@ -1,12 +0,0 @@
-class Example {
-    a;
-    b = a;
-    anyMethod() {
-        var f;
-        return f;
-    }
-    otherMethod(e) {
-        e = a;
-        return e;
-    }
-}

src/test/resources/insertGenericsJav/TestTPHsAndGenerics.jav

@@ -1,13 +0,0 @@
-class TPHsAndGenerics {
-    id = x -> x;
-    id2 (x) {
-        return id.apply(x);
-    }
-    m(a, b){
-        var c = m2(a,b);
-        return a;
-    }
-    m2(a, b){
-        return b;
-    }
-}

src/test/resources/insertGenericsJav/TestTPHsAndGenerics2.jav

@@ -1,13 +0,0 @@
-class TPHsAndGenerics2 {
-    id = x -> x;
-    id2 (x) {
-        return id.apply(x);
-    }
-    m(a, b){
-        var c = m2(a,b);
-        return a;
-    }
-    m2(a, b){
-        return b;
-    }
-}

src/test/resources/insertGenericsJav/TestThreeArgs.jav

@@ -1,15 +0,0 @@
-public class TestThreeArgs {
-    a;
-
-    id(b) {
-        var a /* = null */;
-        var c = b;
-        m(a,a,b);
-        return c;
-    }
-
-    m(x,y, z) {
-        x = id(y);
-        return x;
-    }
-}

src/test/resources/insertGenericsJav/TestTwoArgs.jav

@@ -1,22 +0,0 @@
-public class TestTwoArgs {
-    a;
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-
-    setA(x) {
-        a = x;
-        return a;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),setA(y));
-    }
-}

src/test/resources/insertGenericsJav/TestTwoArgs2.jav

@@ -1,17 +0,0 @@
-public class TestTwoArgs2 {
-    a;
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-
-    m(x,y) {
-        x = id(y);
-        return x;
-    }
-    
-    main(x,y) {
-    	return m(id(x),m(x,y));
-    }
-}

src/test/resources/insertGenericsJav/TestTwoCalls.jav

@@ -1,12 +0,0 @@
-public class TestTwoCalls {
-
-    id(b) {
-        var c = b;
-        return c;
-    }
-    
-    main(x,y) {
-    	id(x);
-    	return id(y);
-    }
-}

src/test/resources/insertGenericsJav/TestVector.jav

@@ -1,12 +0,0 @@
-import java.util.Vector;
-
-public class TestVector {
-
-	m(v, w) {
-		w.addElement(id(v.elementAt(0)));
-	}
-	
-	id(x) {
-		return x;
-	}
-}

src/test/resources/insertGenericsJav/TestVoidMeth.jav

@@ -1,4 +0,0 @@
-class VoidMeth {
-    anyMethod() {
-    }
-}