renamed: src/test/java/insertGenerics/AllTests.java -> src/test/java/insertGenerics/TestMutualRecursion.java

modified:   src/test/java/insertGenerics/TestTPHsAndGenerics.java
	modified:   src/test/java/insertGenerics/TestVector.java
Tests angepasst an die GeneratedGenerics

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

@@ -10,6 +10,9 @@ 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;
@@ -30,6 +33,9 @@ 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;
@@ -49,6 +55,10 @@ 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;
@@ -78,15 +88,25 @@ public class TPHExtractor extends AbstractASTWalker {
 	public void visit(TypePlaceholder tph) {
 		if (resultSet.resolveType(tph).resolvedType instanceof TypePlaceholder) {
 			TypePlaceholder resolvedTPH = (TypePlaceholder) resultSet.resolveType(tph).resolvedType;
-			if (inMethod) {
-				methodAndTph.getTphs().add(resolvedTPH.getName());
-				if (inLocalOrParamOrReturn)
-					methodAndTph.getLocalTphs().add(resolvedTPH.getName());
-			}else {
-				tphsClass.add(resolvedTPH.getName());
+			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);
 			}
-
-			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);
@@ -175,7 +195,31 @@ public class TPHExtractor extends AbstractASTWalker {
 	public void visit(Method method) {
 		inMethod = true;
 		String id = MethodUtility.createID(resolver,method);
-		methodAndTph = new MethodAndTPH(id);
+		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());
 
 		inLocalOrParamOrReturn = true;
 		method.getReturnType().accept(this);
@@ -184,7 +228,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,6 +4,7 @@ public class TPHConstraint {
 	protected String left;
 	protected String right;
 	protected Relation rel;
+	protected int variance; //noch nicht benutzt
 	public enum Relation{
 		EXTENDS, EQUAL
 	}
@@ -48,6 +49,23 @@ 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) {
@@ -56,4 +74,13 @@ 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,16 +3,14 @@
  */
 package de.dhbwstuttgart.bytecode.genericsGenerator;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 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;
@@ -81,6 +79,7 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 	private JavaClassName className;
 	private Resolver resolver;
 
+	
 	/**
 	 * @param sf
 	 * @param listOfResultSets
@@ -95,6 +94,14 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 		return generatedGenericsForSF;
 	}
 	
+	/**
+	 * returns the family of Generated Generics
+	 * insbesondere fuer Testzwecke  
+	 */
+	public FamilyOfGeneratedGenerics getFogg() {
+		return fogg;
+	}
+	
 	/*
 	 * (non-Javadoc)
 	 * 
@@ -127,6 +134,7 @@ 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);
@@ -135,9 +143,19 @@ 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);
-			
+			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
 			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);
@@ -146,12 +164,45 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 
 			for(Method m : classOrInterface.getMethods()) {
 				addMethodConstraints(simplifiedConstraints, ggResult, m);
-				
+
 			}
 			
-			if(ggResult != null)
+
+			if(ggResult != null) {  //Hinzufuegen von Fayez ggResult
 				generatedGenericsForSF.addGenericGeneratorResultClass(ggResult);
-				System.out.println("ddd");
+			}
+			// 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
 
 		}
 

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

@@ -1,6 +1,7 @@
 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;
@@ -12,4 +13,12 @@ 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

@@ -3,28 +3,42 @@ package de.dhbwstuttgart.bytecode.insertGenerics;
 import de.dhbwstuttgart.bytecode.TPHExtractor;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+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;
 
 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, PairTphMethod<PositionFinder.Position, String>> posOfTPHs = new HashMap<>();
+    public HashMap<String, List<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<>();
 
-    public FamilyOfGeneratedGenerics(TPHExtractor tphExtractor) {
+    private static final String objectType = Type.getInternalName(Object.class);
+
+    public FamilyOfGeneratedGenerics(TPHExtractor tphExtractor, ResultSet resultSet) {
+        this.resSet = resultSet;
+        this.oldCons = tphExtractor.oldConstraints;
         this.allConstraints = tphExtractor.allCons;
         this.posOfTPHs = positionConverter(tphExtractor.allTPHS, tphExtractor.ListOfMethodsAndTph);
         this.classConstraints = getClassConstraints(allConstraints,posOfTPHs);
-//        this.methodConstraints =
+        this.methodConstraints = getMethodConstraints(allConstraints,classConstraints,posOfTPHs, tphExtractor.ListOfMethodsAndTph);
+        this.methodConstraintsWithPosition = getMethodConstraintsWithPositionNew(allConstraints,classConstraints,posOfTPHs, tphExtractor.ListOfMethodsAndTph, resSet, oldCons);
     }
 
-    public static List<ClassConstraint> getClassConstraints(List<TPHConstraint> cs, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { //Inputparameter List<TPHConstraint> constraintsSet weg
+    public static List<ClassConstraint> getClassConstraints(List<TPHConstraint> cs, HashMap<String, List<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) {
@@ -32,12 +46,20 @@ public class FamilyOfGeneratedGenerics {
                 cs_cl.add(cons);
             }
         }
-        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);
+
+        // 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;
+                }
             }
-        }
+        } while (addedToConstraintsListForCC2);
+
         List<ClassConstraint> classConstraints3 = hasNoSupertypeForClassTypes(cs, cs_cl, posOfTphs);
         for (ClassConstraint cons: classConstraints3) {
             if (!checkForDuplicates(cons, cs_cl)) {
@@ -47,33 +69,123 @@ public class FamilyOfGeneratedGenerics {
         return cs_cl;
     }
 
-    public static List<MethodConstraint> getMethodConstraints(List<TPHConstraint> cs, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
-        //TODO: Regeln
+    public static List<MethodConstraint> getMethodConstraints(List<TPHConstraint> cs, List<ClassConstraint> cs_cl, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, List<MethodAndTPH> listOfMethodsAndTph) {
         List<MethodConstraint> cs_m = new ArrayList<>();
-        List<MethodConstraint> methodConstraints1 = typeOfTheMethodInClSigma(cs, cs_m, posOfTphs);
+        List<MethodConstraint> methodConstraints1 = typeOfTheMethodInClSigma(cs, posOfTphs);
         for (MethodConstraint cons: methodConstraints1) {
             if (!checkForDuplicates(cons, cs_m)) {
                 cs_m.add(cons);
             }
         }
-        //List<MethodConstraint> methodConstraints2 = firstTransitiveSubtypeForMethodTypes();
+
+        // 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;
+                }
+            }
+        } 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;
+                }
+            }
+        } while (addedToConstraintsListForMC3);
+        List<MethodConstraint> methodConstraints4 = hasNoSupertypeForMethodTypes(cs, cs_m, posOfTphs, listOfMethodsAndTph);
+        for (MethodConstraint cons: methodConstraints4) {
+            if (!checkForDuplicates(cons, cs_m)) {
+                cs_m.add(cons);
+            }
+        }
+        List<MethodConstraint> methodConstraints5 = methodTypesWithoutClassTypes(cs_cl, cs_m);
+        cs_m = methodConstraints5;
         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, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
+    public static List<ClassConstraint> typeOfANodeOfAField(List<TPHConstraint> allConstraints, HashMap<String, List<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()) {
-                    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);
+                    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);
+                            }*/
                         }
                     }
                 }
@@ -90,12 +202,13 @@ 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<>();
+        List<ClassConstraint> tempCC = new ArrayList<>();
+        ClassConstraint consToAdd;
         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){
-                        ClassConstraint consToAdd = new ClassConstraint(allCons.getLeft(), allCons.getRight(), allCons.getRel());
+                        consToAdd = new ClassConstraint(allCons.getLeft(), allCons.getRight(), allCons.getRel());
                         if (!checkForDuplicates(consToAdd, tempCC)) {
                             tempCC.add(consToAdd);
                         }
@@ -111,18 +224,20 @@ 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, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
+    public static List<ClassConstraint> hasNoSupertypeForClassTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs) {
         List<ClassConstraint> tempCC= new ArrayList<>();
         for(TPHConstraint allCons: allConstraints) {
             for(ClassConstraint cCons: cs_cl) {
                 for(String tph: posOfTphs.keySet()) {
-                    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);
+                    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);
+                            }
                         }
                     }
                 }
@@ -131,83 +246,80 @@ public class FamilyOfGeneratedGenerics {
         return tempCC;
     }
 
-    public static boolean checkUpperBound(List<TPHConstraint> cs, String tph) {
-        for(int i=0; i<cs.size(); i++) {
-            if(cs.get(i).getLeft() == tph) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-/**
+    /**
      * 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, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { // cl_\sigma??
+    public static List<MethodConstraint> typeOfTheMethodInClSigma(List<TPHConstraint> allConstraints, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs) { // cl_\sigma??
         //TODO:
-        List<MethodConstraint> tempCC= new ArrayList<>();
+        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()) {
-                    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, tempCC)) {
-                            tempCC.add(consToAdd);
+                    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);
+                            }
                         }
                     }
                 }
             }
         }
-        return tempCC;
+        return tempMC;
     }
 
 
-/**
+    /**
      * Def. FGG: zweite Zeile von cs_m
      * {R' <. S | (R <. R'), (S <. S') \in cs_m and (R',S) is in the transitive closure of cs}
      */
-
-    public static List<MethodConstraint> firstTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { //transitive closure of cs
+    public static List<MethodConstraint> firstTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m) { //transitive closure of cs
         //TODO:
-        List<MethodConstraint> tempCC= new ArrayList<>();
+        List<MethodConstraint> tempMC= new ArrayList<>();
         List<TPHConstraint> tcOfCs =  buildTransitiveClosure(allConstraints);
-        for(MethodConstraint mC1 : cs_m) {
-            for(MethodConstraint mC2 : cs_m) {
-                String rightSide = mC1.getRight();
-                String leftSide = mC2.getLeft();
+        for(MethodConstraint mC1 : cs_m) {          //(R <. R')
+            for(MethodConstraint mC2 : cs_m) {      //(S <. S')
+                String lSide = mC1.getRight();      //R'
+                String rSide = mC2.getLeft();       //S
                 for(TPHConstraint tphC : tcOfCs) {
-                    if(tphC.getLeft().equals(leftSide)&&tphC.getRight().equals(rightSide)) {
-                        tempCC.add((MethodConstraint) tphC);
+                    if(tphC.getLeft().equals(lSide)&&tphC.getRight().equals(rSide)) { //is it (R',S)
+                        MethodConstraint consToAdd = new MethodConstraint(lSide, rSide, tphC.getRel()); //create (R'<.S)
+                        if (!checkForDuplicates(consToAdd, tempMC)) {
+                            tempMC.add(consToAdd);
+                        }
                     }
                 }
             }
         }
-        return tempCC;
+        return tempMC;
     }
 
-/**
+    /**
      * Def. FGG: dritte Zeile von cs_m
      * {R' <. S | (R <. R') \in cs_m, (S <. S') \in cs_cl and (R',S) is in the transitive closure of cs}
      */
-
-    public static List<MethodConstraint> secondTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
+    public static List<MethodConstraint> secondTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m) {
         //TODO:
-        List<MethodConstraint> tempCC= new ArrayList<>();
+        List<MethodConstraint> tempMC= new ArrayList<>();
         List<TPHConstraint> tcOfCs =  buildTransitiveClosure(allConstraints);
         for(ClassConstraint cC : cs_cl) {
             for(MethodConstraint mC : cs_m) {
-                String rightSide = mC.getRight();
-                String leftSide = cC.getLeft();
+                String leftSide = mC.getRight();
+                String rightSide = cC.getLeft();
                 for(TPHConstraint tphC : tcOfCs) {
                     if(tphC.getLeft().equals(leftSide)&&tphC.getRight().equals(rightSide)) {
-                        tempCC.add((MethodConstraint) tphC);
+                        MethodConstraint consToAdd = new MethodConstraint(tphC.getLeft(), tphC.getRight(), tphC.getRel());
+                        if (!checkForDuplicates(consToAdd, tempMC)) {
+                            tempMC.add(consToAdd);
+                        }
+
                     }
                 }
             }
         }
-        return tempCC;
+        return tempMC;
     }
 
 /**
@@ -215,18 +327,73 @@ 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() {
+    public static List<MethodConstraint> hasNoSupertypeForMethodTypes(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m, HashMap<String, List<PairTphMethod<PositionFinder.Position, String>>> posOfTphs, List<MethodAndTPH> listOfMethodsAndTph) {
         //TODO:
-        return null;
+        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);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return tempMC;
     }
 
 /**
      * nimm die Menge cs_cl aus cs_m raus
      */
-    public static List<MethodConstraint> methodTypesWithoutClassTypes() {
-        //TODO:
-        return null;
+    public static List<MethodConstraint> methodTypesWithoutClassTypes(List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m) {
+        // erstelle Kopie der Liste cs_cl
+        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());
+            tempMC.add(tphC);
+        }
+        List<TPHConstraint> tempMC2 = new ArrayList<>();
+        tempMC2.addAll(tempMC);
+        List<MethodConstraint> tempMCToReturn = new ArrayList<>();
+
+        for(TPHConstraint cc: tcOfCsCl) {
+            for(TPHConstraint mc: tempMC) {
+                if(cc.getLeft().equals(mc.getLeft()) && cc.getRight().equals(mc.getRight())) {
+                    tempMC2.remove(mc);
+                }
+            }
+        }
+        for(TPHConstraint tphC: tempMC2) {
+            MethodConstraint mCons = new MethodConstraint(tphC.getLeft(), tphC.getRight(), tphC.getRel());
+            tempMCToReturn.add(mCons);
+        }
+        return tempMCToReturn;
     }
 
     public static boolean checkForDuplicates(TPHConstraint constraint, List list) {
@@ -264,19 +431,31 @@ public class FamilyOfGeneratedGenerics {
         return tcList;
     }
 
+    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;
+    }
 
-    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<>();
+
+    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<>();
         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)) {
-                        convertedPositions.put(tph, new PairTphMethod<>(PositionFinder.Position.METHOD, methTph.getId()));
+                        currMeth.add(new PairTphMethod<>(PositionFinder.Position.METHOD, methTph.getId()));
                     }
                 }
             } else { // else it is in the class-TPH
-                convertedPositions.put(tph, new PairTphMethod<>(PositionFinder.Position.FIELD, null));
+                currMeth.add(new PairTphMethod<>(PositionFinder.Position.FIELD, null));
             }
+            convertedPositions.put(tph, currMeth);
         }
         return convertedPositions;
     }
@@ -300,4 +479,306 @@ 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,9 +1,19 @@
 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

@@ -0,0 +1,47 @@
+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,6 +4,8 @@ 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;
 
@@ -15,9 +17,15 @@ 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) {
+	public MethodAndTPH(String name, ConstraintSet<Pair> constraints) {
 		this.id = name;
+		this.constraints = constraints;
 	}
 
 	public ArrayList<String> getTphs() {

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

@@ -6,6 +6,7 @@ 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;
@@ -20,10 +21,12 @@ import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
 import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.syntaxtree.TypeScope;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
+import de.dhbwstuttgart.syntaxtree.statement.Block;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
@@ -46,16 +49,26 @@ import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyType;
 import de.dhbwstuttgart.typeinference.unify.TypeUnifyTask;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultListener;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultListenerImpl;
+import de.dhbwstuttgart.typeinference.unify.UnifyResultModel;
+import de.dhbwstuttgart.typeinference.unify.UnifyTaskModel;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.antlr.v4.runtime.Token;
+import org.apache.commons.io.output.NullOutputStream;
+
 
 public class JavaTXCompiler {
 
@@ -64,8 +77,14 @@ public class JavaTXCompiler {
 	Boolean resultmodel = true;
     public final Map<File, SourceFile> sourceFiles = new HashMap<>();
     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);
 	}
@@ -181,7 +200,7 @@ public class JavaTXCompiler {
    
 
     public List<ClassOrInterface> getAvailableClasses(SourceFile forSourceFile) throws ClassNotFoundException {
-        //PL 2018-09-18: List durch Set ersetzt, damit die Klassen nur einmal hinzugefuegt werden
+        //PL 2018-09-18: List durch Set ersetzt, damit die Klassen nur einmal hinzugefuegt werden 
     	//List<ClassOrInterface> allClasses = new ArrayList<>();//environment.getAllAvailableClasses();
         Set<ClassOrInterface> allClasses = new HashSet<>();
     	
@@ -216,6 +235,321 @@ public class JavaTXCompiler {
 		return new ArrayList<>(allClasses);
 	}
 
+	/*
+	 * public List<ResultSet> typeInferenceOld() throws ClassNotFoundException {
+	 * List<ClassOrInterface> allClasses = new
+	 * ArrayList<>();//environment.getAllAvailableClasses(); //Alle Importierten
+	 * Klassen in allen geparsten Sourcefiles kommen ins FC for(SourceFile sf :
+	 * this.sourceFiles.values()) { allClasses.addAll(getAvailableClasses(sf));
+	 * allClasses.addAll(sf.getClasses()); }
+	 *
+	 * final ConstraintSet<Pair> cons = getConstraints();
+	 *
+	 * FiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses);
+	 * System.out.println(finiteClosure); ConstraintSet<UnifyPair> unifyCons =
+	 * UnifyTypeFactory.convert(cons);
+	 *
+	 * TypeUnify unify = new TypeUnify(); Set<Set<UnifyPair>> results = new
+	 * HashSet<>(); try { File logPath = new
+	 * File(System.getProperty("user.dir")+"/target/logFiles/"); logPath.mkdirs();
+	 * FileWriter logFile = new FileWriter(new File(logPath, "log"));
+	 * logFile.write("FC:\\" + finiteClosure.toString()+"\n"); for(SourceFile sf :
+	 * this.sourceFiles.values()) { logFile.write(ASTTypePrinter.print(sf)); }
+	 * logFile.flush(); Set<List<Constraint<UnifyPair>>> cardProd =
+	 * unifyCons.cartesianProduct(); for (List<Constraint<UnifyPair>> xCons :
+	 * cardProd ){ Set<UnifyPair> xConsSet = new HashSet<>(); for
+	 * (Constraint<UnifyPair> constraint : xCons) { xConsSet.addAll(constraint); }
+	 * //.collect(Collectors.toCollection(ArrayList::new))))
+	 * System.out.println(xConsSet); Set<String> methodParaTypeVarNames =
+	 * allClasses.stream().map(x -> x.getMethods().stream().map(y ->
+	 * y.getParameterList().getFormalparalist() .stream().filter(z -> z.getType()
+	 * instanceof TypePlaceholder) .map(z ->
+	 * ((TypePlaceholder)z.getType()).getName()).collect(Collectors.toCollection(
+	 * HashSet::new))) .reduce(new HashSet<String>(), (a,b) -> { a.addAll(b); return
+	 * a;}, (a,b) -> { a.addAll(b); return a;} ) ) .reduce(new HashSet<String>(),
+	 * (a,b) -> { a.addAll(b); return a;} );
+	 *
+	 * Set<String> constructorParaTypeVarNames = allClasses.stream().map(x ->
+	 * x.getConstructors().stream().map(y ->
+	 * y.getParameterList().getFormalparalist() .stream().filter(z -> z.getType()
+	 * instanceof TypePlaceholder) .map(z ->
+	 * ((TypePlaceholder)z.getType()).getName()).collect(Collectors.toCollection(
+	 * HashSet::new))) .reduce(new HashSet<String>(), (a,b) -> { a.addAll(b); return
+	 * a;}, (a,b) -> { a.addAll(b); return a;} ) ) .reduce(new HashSet<String>(),
+	 * (a,b) -> { a.addAll(b); return a;} );
+	 *
+	 * Set<String> paraTypeVarNames = methodParaTypeVarNames;
+	 * paraTypeVarNames.addAll(constructorParaTypeVarNames);
+	 *
+	 * Set<String> returnTypeVarNames = allClasses.stream().map(x ->
+	 * x.getMethods().stream().filter(y -> y.getReturnType() instanceof
+	 * TypePlaceholder) .map(z ->
+	 * ((TypePlaceholder)z.getReturnType()).getName()).collect(Collectors.
+	 * toCollection(HashSet::new))).reduce((a,b) -> { a.addAll(b); return a;}
+	 * ).get();
+	 *
+	 * Set<String> fieldTypeVarNames = allClasses.stream().map(x ->
+	 * x.getFieldDecl().stream().filter(y -> y.getReturnType() instanceof
+	 * TypePlaceholder) .map(z ->
+	 * ((TypePlaceholder)z.getReturnType()).getName()).collect(Collectors.
+	 * toCollection(HashSet::new))).reduce((a,b) -> { a.addAll(b); return a;}
+	 * ).get();
+	 *
+	 * returnTypeVarNames.addAll(fieldTypeVarNames);
+	 *
+	 * xConsSet = xConsSet.stream().map(x -> { //Hier muss ueberlegt werden, ob //1.
+	 * alle Argument- und Retuntyp-Variablen in allen UnifyPairs // mit
+	 * disableWildcardtable() werden. //2. alle Typvariablen mit Argument- oder
+	 * Retuntyp-Variablen //in Beziehung auch auf disableWildcardtable() gesetzt
+	 * werden muessen //PL 2018-04-23 if ((x.getLhsType() instanceof
+	 * PlaceholderType)) { if (paraTypeVarNames.contains(x.getLhsType().getName()))
+	 * { ((PlaceholderType)x.getLhsType()).setVariance((byte)1);
+	 * ((PlaceholderType)x.getLhsType()).disableWildcardtable(); } if
+	 * (returnTypeVarNames.contains(x.getLhsType().getName())) {
+	 * ((PlaceholderType)x.getLhsType()).setVariance((byte)-1);
+	 * ((PlaceholderType)x.getLhsType()).disableWildcardtable(); } } if
+	 * ((x.getRhsType() instanceof PlaceholderType)) { if
+	 * (paraTypeVarNames.contains(x.getRhsType().getName())) {
+	 * ((PlaceholderType)x.getRhsType()).setVariance((byte)1);
+	 * ((PlaceholderType)x.getRhsType()).disableWildcardtable(); } if
+	 * (returnTypeVarNames.contains(x.getRhsType().getName())) {
+	 * ((PlaceholderType)x.getRhsType()).setVariance((byte)-1);
+	 * ((PlaceholderType)x.getRhsType()).disableWildcardtable(); } } return x;//HIER
+	 * DIE JEWEILS RECHT BZW. LINKE SEITE AUF GLEICHE VARIANZ SETZEN WIE DIE JEWEILS
+	 * ANDERE SEITE }).map( y -> { if ((y.getLhsType() instanceof PlaceholderType)
+	 * && (y.getRhsType() instanceof PlaceholderType)) { if
+	 * (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
+	 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) {
+	 * ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType(
+	 * )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0
+	 * && ((PlaceholderType)y.getRhsType()).getVariance() != 0) {
+	 * ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType(
+	 * )).getVariance()); } } return y; } )
+	 * .collect(Collectors.toCollection(HashSet::new));
+	 * varianceInheritance(xConsSet); Set<Set<UnifyPair>> result =
+	 * unify.unifySequential(xConsSet, finiteClosure, logFile, log);
+	 * //Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+	 * System.out.println("RESULT: " + result); logFile.write("RES: " +
+	 * result.toString()+"\n"); logFile.flush(); results.addAll(result); }
+	 *
+	 * results = results.stream().map(x -> { Optional<Set<UnifyPair>> res = new
+	 * RuleSet().subst(x.stream().map(y -> { if (y.getPairOp() ==
+	 * PairOperator.SMALLERDOTWC) y.setPairOp(PairOperator.EQUALSDOT); return y;
+	 * //alle Paare a <.? b erden durch a =. b ersetzt
+	 * }).collect(Collectors.toCollection(HashSet::new))); if (res.isPresent())
+	 * {//wenn subst ein Erg liefert wurde was veraendert return new
+	 * TypeUnifyTask().applyTypeUnificationRules(res.get(), finiteClosure); } else
+	 * return x; //wenn nichts veraendert wurde wird x zurueckgegeben
+	 * }).collect(Collectors.toCollection(HashSet::new));
+	 * System.out.println("RESULT Final: " + results); logFile.write("RES_FINAL: " +
+	 * results.toString()+"\n"); logFile.flush(); logFile.write("PLACEHOLDERS: " +
+	 * PlaceholderType.EXISTING_PLACEHOLDERS); logFile.flush(); } catch (IOException
+	 * e) { e.printStackTrace(); } return results.stream().map((unifyPairs -> new
+	 * ResultSet(UnifyTypeFactory.convert(unifyPairs,
+	 * generateTPHMap(cons))))).collect(Collectors.toList()); }
+	 */
+	/**
+	 * Vererbt alle Variancen bei Paaren (a <. theta) oder (Theta <. a) wenn a eine
+	 * Variance !=0 hat auf alle Typvariablen in Theta.
+	 *
+	 *
+	 */
+	/*
+	 * private void varianceInheritance(Set<UnifyPair> eq) { Set<PlaceholderType>
+	 * usedTPH = new HashSet<>(); Set<PlaceholderType> phSet = eq.stream().map(x ->
+	 * { Set<PlaceholderType> pair = new HashSet<>(); if (x.getLhsType() instanceof
+	 * PlaceholderType) pair.add((PlaceholderType)x.getLhsType()); if
+	 * (x.getRhsType() instanceof PlaceholderType)
+	 * pair.add((PlaceholderType)x.getRhsType()); return pair; }).reduce(new
+	 * HashSet<>(), (a,b) -> { a.addAll(b); return a;} , (c,d) -> { c.addAll(d);
+	 * return c;});
+	 *
+	 * ArrayList<PlaceholderType> phSetVariance = new ArrayList<>(phSet);
+	 * phSetVariance.removeIf(x -> (x.getVariance() == 0));
+	 * while(!phSetVariance.isEmpty()) { PlaceholderType a =
+	 * phSetVariance.remove(0); usedTPH.add(a); //HashMap<PlaceholderType,Integer>
+	 * ht = new HashMap<>(); //ht.put(a, a.getVariance()); Set<UnifyPair> eq1 = new
+	 * HashSet<>(eq); eq1.removeIf(x -> !(x.getLhsType() instanceof PlaceholderType
+	 * && ((PlaceholderType)x.getLhsType()).equals(a))); eq1.stream().forEach(x -> {
+	 * x.getRhsType().accept(new distributeVariance(), a.getVariance());}); eq1 =
+	 * new HashSet<>(eq); eq1.removeIf(x -> !(x.getRhsType() instanceof
+	 * PlaceholderType && ((PlaceholderType)x.getRhsType()).equals(a)));
+	 * eq1.stream().forEach(x -> { x.getLhsType().accept(new distributeVariance(),
+	 * a.getVariance());}); phSetVariance = new ArrayList<>(phSet);
+	 * phSetVariance.removeIf(x -> (x.getVariance() == 0 || usedTPH.contains(x))); }
+	 * }
+	 */
+
+	public UnifyResultModel typeInferenceAsync(UnifyResultListener resultListener, Writer logFile)
+			throws ClassNotFoundException, IOException {
+		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
+		// Alle Importierten Klassen in allen geparsten Sourcefiles kommen ins FC
+		for (File f : this.sourceFiles.keySet()) {
+			SourceFile sf = sourceFiles.get(f);
+			allClasses.addAll(getAvailableClasses(sf));
+			allClasses.addAll(sf.getClasses());
+			allClasses.addAll(CompilationEnvironment.loadDefaultPackageClasses(f,classLoader).stream().map(ASTFactory::createClass).collect(Collectors.toList()));
+		}
+
+		final ConstraintSet<Pair> cons = getConstraints();
+		Set<Set<UnifyPair>> results = new HashSet<>();
+		UnifyResultModel urm = null;
+		// urm.addUnifyResultListener(resultListener);
+		try {
+			logFile = logFile == null
+					? new FileWriter(new File("log_" + sourceFiles.keySet().iterator().next().getName()))
+					: logFile;
+			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses, logFile, classLoader);
+			System.out.println(finiteClosure);
+			urm = new UnifyResultModel(cons, finiteClosure);
+			urm.addUnifyResultListener(resultListener);
+			ConstraintSet<UnifyPair> unifyCons = UnifyTypeFactory.convert(cons);
+
+			Function<UnifyPair, UnifyPair> distributeInnerVars = x -> {
+				UnifyType lhs, rhs;
+				if (((lhs = x.getLhsType()) instanceof PlaceholderType)
+						&& ((rhs = x.getRhsType()) instanceof PlaceholderType)
+						&& (((PlaceholderType) lhs).isInnerType() || ((PlaceholderType) rhs).isInnerType())) {
+					((PlaceholderType) lhs).setInnerType(true);
+					((PlaceholderType) rhs).setInnerType(true);
+				}
+				return x;
+
+			};
+			logFile.write(unifyCons.toString());
+			unifyCons = unifyCons.map(distributeInnerVars);
+			logFile.write(unifyCons.toString());
+			TypeUnify unify = new TypeUnify();
+			// Set<Set<UnifyPair>> results = new HashSet<>(); Nach vorne gezogen
+			logFile.write("FC:\\" + finiteClosure.toString() + "\n");
+			for (SourceFile sf : this.sourceFiles.values()) {
+				logFile.write(ASTTypePrinter.print(sf));
+			}
+			logFile.flush();
+
+			Set<String> methodParaTypeVarNames = allClasses.stream().map(x -> x.getMethods().stream()
+					.map(y -> y.getParameterList().getFormalparalist().stream()
+							.filter(z -> z.getType() instanceof TypePlaceholder)
+							.map(z -> ((TypePlaceholder) z.getType()).getName())
+							.collect(Collectors.toCollection(HashSet::new)))
+					.reduce(new HashSet<String>(), (a, b) -> {
+						a.addAll(b);
+						return a;
+					}, (a, b) -> {
+						a.addAll(b);
+						return a;
+					})).reduce(new HashSet<String>(), (a, b) -> {
+						a.addAll(b);
+						return a;
+					});
+
+			Set<String> constructorParaTypeVarNames = allClasses.stream().map(x -> x.getConstructors().stream()
+					.map(y -> y.getParameterList().getFormalparalist().stream()
+							.filter(z -> z.getType() instanceof TypePlaceholder)
+							.map(z -> ((TypePlaceholder) z.getType()).getName())
+							.collect(Collectors.toCollection(HashSet::new)))
+					.reduce(new HashSet<String>(), (a, b) -> {
+						a.addAll(b);
+						return a;
+					}, (a, b) -> {
+						a.addAll(b);
+						return a;
+					})).reduce(new HashSet<String>(), (a, b) -> {
+						a.addAll(b);
+						return a;
+					});
+
+			Set<String> paraTypeVarNames = methodParaTypeVarNames;
+			paraTypeVarNames.addAll(constructorParaTypeVarNames);
+
+			Set<String> returnTypeVarNames = allClasses.stream()
+					.map(x -> x.getMethods().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
+							.map(z -> ((TypePlaceholder) z.getReturnType()).getName())
+							.collect(Collectors.toCollection(HashSet::new)))
+					.reduce((a, b) -> {
+						a.addAll(b);
+						return a;
+					}).get();
+
+			Set<String> fieldTypeVarNames = allClasses.stream()
+					.map(x -> x.getFieldDecl().stream().filter(y -> y.getReturnType() instanceof TypePlaceholder)
+							.map(z -> ((TypePlaceholder) z.getReturnType()).getName())
+							.collect(Collectors.toCollection(HashSet::new)))
+					.reduce((a, b) -> {
+						a.addAll(b);
+						return a;
+					}).get();
+
+			returnTypeVarNames.addAll(fieldTypeVarNames);
+
+			unifyCons = unifyCons.map(x -> {
+				// Hier muss ueberlegt werden, ob
+				// 1. alle Argument- und Retuntyp-Variablen in allen UnifyPairs
+				// mit disableWildcardtable() werden.
+				// 2. alle Typvariablen mit Argument- oder Retuntyp-Variablen
+				// in Beziehung auch auf disableWildcardtable() gesetzt werden muessen
+				// PL 2018-04-23
+				if ((x.getLhsType() instanceof PlaceholderType)) {
+					if (paraTypeVarNames.contains(x.getLhsType().getName())) {
+						((PlaceholderType) x.getLhsType()).setVariance((byte) 1);
+						((PlaceholderType) x.getLhsType()).disableWildcardtable();
+					}
+					if (returnTypeVarNames.contains(x.getLhsType().getName())) {
+						((PlaceholderType) x.getLhsType()).setVariance((byte) -1);
+						((PlaceholderType) x.getLhsType()).disableWildcardtable();
+					}
+				}
+				if ((x.getRhsType() instanceof PlaceholderType)) {
+					if (paraTypeVarNames.contains(x.getRhsType().getName())) {
+						((PlaceholderType) x.getRhsType()).setVariance((byte) 1);
+						((PlaceholderType) x.getRhsType()).disableWildcardtable();
+					}
+					if (returnTypeVarNames.contains(x.getRhsType().getName())) {
+						((PlaceholderType) x.getRhsType()).setVariance((byte) -1);
+						((PlaceholderType) x.getRhsType()).disableWildcardtable();
+					}
+				}
+				return x;// HIER DIE JEWEILS RECHT BZW. LINKE SEITE AUF GLEICHE VARIANZ SETZEN WIE DIE
+							// JEWEILS ANDERE SEITE
+			});
+			Set<PlaceholderType> varianceTPHold;
+			Set<PlaceholderType> varianceTPH = new HashSet<>();
+			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
+
+			/*
+			 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL
+			 * 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen
+			 * //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH);
+			 * varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y
+			 * -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType()
+			 * instanceof PlaceholderType)) { if
+			 * (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
+			 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) {
+			 * ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType(
+			 * )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0
+			 * && ((PlaceholderType)y.getRhsType()).getVariance() != 0) {
+			 * ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType(
+			 * )).getVariance()); } } return y; } ); } while
+			 * (!varianceTPHold.equals(varianceTPH));
+			 */
+
+			// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
+			// logFile, log);
+			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()/*.stream().map(x -> {
+				Set<Set<UnifyPair>> ret = new HashSet<>();
+				for (Constraint<UnifyPair> y : x) {
+					ret.add(new HashSet<>(y));
+				}
+				return ret;
+			}).collect(Collectors.toCollection(ArrayList::new))*/;
+			unify.unifyAsync(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm,
+					usedTasks);
+		} catch (IOException e) {
+			System.err.println("kein LogFile");
+		}
+		return urm;
+	}
 
 	public List<ResultSet> typeInference() throws ClassNotFoundException, IOException {
 		List<ClassOrInterface> allClasses = new ArrayList<>();// environment.getAllAvailableClasses();
@@ -364,12 +698,46 @@ public class JavaTXCompiler {
 				}
 				})));
 			*/
+			
+			System.out.println("Unify nach Oder-Constraints-Anpassung:" + unifyCons.toString());
+			Set<PlaceholderType> varianceTPHold;
+			Set<PlaceholderType> varianceTPH = new HashSet<>();
+			varianceTPH = varianceInheritanceConstraintSet(unifyCons);
 
-			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints();
+			/*
+			 * PL 2018-11-07 wird in varianceInheritanceConstraintSet erledigt do { //PL
+			 * 2018-11-05 Huellenbildung Variance auf alle TPHs der Terme auf der jeweiligen
+			 * //anderen Seite übertragen varianceTPHold = new HashSet<>(varianceTPH);
+			 * varianceTPH = varianceInheritanceConstraintSet(unifyCons); unifyCons.map( y
+			 * -> { if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType()
+			 * instanceof PlaceholderType)) { if
+			 * (((PlaceholderType)y.getLhsType()).getVariance() != 0 &&
+			 * ((PlaceholderType)y.getRhsType()).getVariance() == 0) {
+			 * ((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType(
+			 * )).getVariance()); } if (((PlaceholderType)y.getLhsType()).getVariance() == 0
+			 * && ((PlaceholderType)y.getRhsType()).getVariance() != 0) {
+			 * ((PlaceholderType)y.getLhsType()).setVariance(((PlaceholderType)y.getRhsType(
+			 * )).getVariance()); } } return y; } ); } while
+			 * (!varianceTPHold.equals(varianceTPH));
+			 */
+
+			// Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure,
+			// logFile, log);
+			// Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+			List<Set<Constraint<UnifyPair>>> oderConstraints = unifyCons.getOderConstraints()//.stream().map(x -> {
+				/*Set<Set<UnifyPair>> ret = new HashSet<>();
+				for (Constraint<UnifyPair> y : x) {
+					ret.add(new HashSet<>(y));
+				}
+				return ret;
+			}).collect(Collectors.toCollection(ArrayList::new))*/;
 			if (resultmodel) {
 				/* UnifyResultModel Anfang */
 				UnifyResultModel urm = new UnifyResultModel(cons, finiteClosure);
-				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm);
+				UnifyResultListenerImpl li = new UnifyResultListenerImpl();
+				urm.addUnifyResultListener(li);
+				unify.unifyParallel(unifyCons.getUndConstraints(), oderConstraints, finiteClosure, logFile, log, urm,
+						usedTasks);
 				System.out.println("RESULT Final: " + li.getResults());
 				logFile.write("RES_FINAL: " + li.getResults().toString() + "\n");
 				logFile.flush();
@@ -381,7 +749,7 @@ public class JavaTXCompiler {
 				// oderConstraints, finiteClosure, logFile, log, new UnifyResultModel(cons,
 				// finiteClosure));
 				Set<Set<UnifyPair>> result = unify.unifyOderConstraints(unifyCons.getUndConstraints(), oderConstraints,
-						finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure));
+						finiteClosure, logFile, log, new UnifyResultModel(cons, finiteClosure), usedTasks);
 				System.out.println("RESULT: " + result);
 				logFile.write("RES: " + result.toString() + "\n");
 				logFile.flush();
@@ -510,6 +878,7 @@ 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;
@@ -532,10 +901,6 @@ public class JavaTXCompiler {
 	/**
 	 * @param path - can be null, then class file output is in the same directory as the parsed source files
 	 */
-		List<ResultSet> typeinferenceResult = this.typeInference();
-		List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = getGeneratedGenericResultsForAllSourceFiles(
-				typeinferenceResult);
-		generateBytecode(path, typeinferenceResult, simplifyResultsForAllSourceFiles);
 	public void generateBytecode(File path) throws ClassNotFoundException, IOException, BytecodeGeneratorError {
 		List<ResultSet> typeinferenceResult = this.typeInference();
 		List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles = getGeneratedGenericResultsForAllSourceFiles(

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

@@ -126,6 +126,7 @@ 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
@@ -186,8 +187,10 @@ 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);
@@ -211,6 +214,7 @@ 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,8 +31,14 @@ public class Method extends SyntaxTreeNode implements IItemWithOffset, TypeScope
 	private ExceptionList exceptionlist;
 	private GenericDeclarationList generics;
 	private final RefTypeOrTPHOrWildcardOrGeneric returnType;
-	public final Boolean isInherited;  
-
+	public final Boolean isInherited; 
+	
+	/*
+	 * its Constraints
+	 * eingefuegt PL 2021-02-15
+	 */
+	public final ConstraintSet constraints = new ConstraintSet();
+	
 	public Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block block,
 				  GenericDeclarationList gtvDeclarations, Token offset) {
 		super(offset);
@@ -70,6 +76,10 @@ 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,6 +45,12 @@ 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

@@ -258,6 +258,7 @@ 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,4 +53,10 @@ 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,5 +32,11 @@ 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))
-            	return false;
+            //if(!(super.equals(obj))) PL 2020-03-12 muss vll. einkommentiert werden   
+            //	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,4 +16,7 @@ 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,4 +64,10 @@ 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,10 +20,9 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
 	private final String name;
 	
 	/**
-	 * wird bisher nicht genutzt
-	 * setVariance muss ggf. auskommentiert werden.
+	 * wird im Generate Generics Teil nach der Rueckumwandlung nach dem Unify genutzt
 	 */
-	int variance = 0;
+	private int variance = 0;
 
 
     /**
@@ -78,11 +77,9 @@ 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/constraints/ConstraintSet.java

@@ -23,9 +23,17 @@ 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.undConstraints.addAll(constraints.undConstraints);
-        this.oderConstraints.addAll(constraints.oderConstraints);
+        this.addAllUndConstraint(constraints.undConstraints);
+        this.addAllOderConstraint(constraints.oderConstraints);
     }
 
     @Override

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

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

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

@@ -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.SMALLERDOT));
+        constraintsSet.addUndConstraint(new Pair(returnExpr.getType(),info.getCurrentTypeScope().getReturnType(), PairOperator.EQUALSDOT));
     }
 
     @Override
@@ -587,9 +587,13 @@ public class TYPEStmt implements StatementVisitor{
         */
         
         RefTypeOrTPHOrWildcardOrGeneric retType = assumption.getReceiverType(resolver);
-        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(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(new Pair(assumption.getReturnType(resolver), forMethod.getType(),
                 PairOperator.EQUALSDOT));

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

@@ -655,7 +655,6 @@ 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;
@@ -669,6 +668,7 @@ 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.

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

@@ -28,8 +28,8 @@ public class TypeUnify {
 	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
+	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
 		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
@@ -54,8 +54,8 @@ public class TypeUnify {
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
+	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
 		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		return ret;
@@ -68,11 +68,12 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
+	 * @param cons
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
+	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret, usedTasks);
 		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
@@ -101,10 +102,11 @@ public class TypeUnify {
 	 * @param fc
 	 * @param logFile
 	 * @param log
+	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
-		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret);
+	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret, UnifyTaskModel usedTasks) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret, usedTasks);
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");

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

@@ -1,30 +0,0 @@
-package de.dhbwstuttgart.typeinference.unify;
-
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
-
-import java.io.Writer;
-import java.util.List;
-import java.util.Set;
-
-public class TypeUnify2Future {
-
-    Set<Set<UnifyPair>> setToFlatten;
-
-    public TypeUnify2Future(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm) {
-        super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm);
-        this.setToFlatten = setToFlatten;
-        this.nextSetElement = nextSetElement;
-    }
-
-    Set<UnifyPair> getNextSetElement() {
-        return nextSetElement;
-    }
-
-    @Override
-    protected Set<Set<UnifyPair>> compute() {
-        Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, true);
-        return res;
-    }
-}

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

@@ -18,8 +18,8 @@ public class TypeUnify2Task extends TypeUnifyTask {
        
        Set<Set<UnifyPair>> setToFlatten;
 
-       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm) {
-               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm);
+       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, Set<UnifyPair> nextSetElement, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks) {
+               super(eq, oderConstraints, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
                this.setToFlatten = setToFlatten;
                this.nextSetElement = nextSetElement;
        }
@@ -30,7 +30,35 @@ public class TypeUnify2Task extends TypeUnifyTask {
        
        @Override
        protected Set<Set<UnifyPair>> compute() {
-               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField, true);
-                return res;
+               if (one) {
+                       System.out.println("two");
+               }
+               one = true;
+               Set<Set<UnifyPair>> res = unify2(setToFlatten, eq, oderConstraintsField, fc, parallel, rekTiefeField);
+               /*if (isUndefinedPairSetSet(res)) { 
+                       return new HashSet<>(); }
+               else
+               */ 
+               //writeLog("xxx");
+               //noOfThread--;
+               synchronized (usedTasks) {
+            	   if (this.myIsCancelled()) {
+   						return new HashSet<>();
+   					}
+   					else {
+   						return res;
+   					}
+   				}
        	}
+       
+       public void closeLogFile() {
+
+           try {
+				logFile.close();
+			}
+			catch (IOException ioE) {
+				System.err.println("no log-File" + thNo);
+			}
+           
+       }
 }

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

@@ -60,33 +60,7 @@ import com.google.common.collect.Ordering;
  * Implementation of the type unification algorithm
  * @author Florian Steurer
  */
-public class TypeUnifyTask {
-
-	public static Set<Set<UnifyPair>> typeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm){
-		Set<UnifyPair> neweq = new HashSet<>(eq);
-		/* 1-elementige Oder-Constraints werden in und-Constraints umgewandelt */
-		oderConstraints.stream()
-				.filter(x -> x.size()==1)
-				.map(y -> y.stream().findFirst().get()).forEach(x -> neweq.addAll(x));
-		ArrayList<Set<Constraint<UnifyPair>>> remainingOderconstraints = oderConstraints.stream()
-				.filter(x -> x.size()>1)
-				.collect(Collectors.toCollection(ArrayList::new));
-		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefe, true);
-		try {
-			logFile.close();
-		}
-		catch (IOException ioE) {
-			System.err.println("no log-File");
-		}
-		if (isUndefinedPairSetSet(res)) {
-			throw new TypeinferenceException("Unresolved constraints: " + res.toString(), new NullToken()); //return new HashSet<>();
-		}
-		else {
-			return res;
-		}
-
-
-	}
+public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 
 	private static final long serialVersionUID = 1L;
 	private static int i = 0;
@@ -97,11 +71,16 @@ public class TypeUnifyTask {
 	 * Element, das aus dem nextSet den Gleichunen dieses Threads hinzugefuegt wurde
 	 */
 	Set<UnifyPair> nextSetElement;
-	Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm
+	
 	/**
 	 * Fuer die Threads
 	 */
 	UnifyResultModel urm;
+	protected static int noOfThread = 0;
+	private static int totalnoOfThread = 0;
+	int thNo;
+	protected boolean one = false;
+	Integer MaxNoOfThreads = 8;
 
 	public static final String rootDirectory = System.getProperty("user.dir")+"/test/logFiles/";
 	Writer logFile;
@@ -131,6 +110,9 @@ public class TypeUnifyTask {
 	
 	protected boolean parallel;
 	
+    //Gives if unify is not called from checkA
+	private boolean finalresult = true;
+	
 	int rekTiefeField;
 	
 	Integer nOfUnify = 0;
@@ -144,13 +126,31 @@ public class TypeUnifyTask {
 	static int noBacktracking;
 	
 	static Integer  noShortendElements = 0;
-
+	
+	Boolean myIsCanceled = false;
+	
+	volatile UnifyTaskModel usedTasks;
+	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
 	}
 	
+	/*
+	public TypeUnifyTask(Set<UnifyPair> eq, IFiniteClosure fc, boolean parallel, FileWriter logFile, Boolean log) {
+		this.eq = eq;
+		this.fc = fc;
+		this.oup = new OrderingUnifyPair(fc);
+		this.parallel = parallel;
+		this.logFile = logFile;
+		this.log = log;
+		rules = new RuleSet(logFile);
+		noOfThread++;
+		thNo = noOfThread;
+	}
+	*/
+	
 
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks) {
 		synchronized (this) { 
 			this.eq = eq;
 			//this.oderConstraints = oderConstraints.stream().map(x -> x.stream().map(y -> new HashSet<>(y)).collect(Collectors.toSet(HashSet::new))).collect(Collectors.toList(ArrayList::new));
@@ -170,7 +170,21 @@ public class TypeUnifyTask {
 			this.parallel = parallel;
 			this.logFile = logFile;
 			this.log = log;
-
+			
+			noOfThread++; 
+			totalnoOfThread++;
+			//writeLog("thNo1 " + thNo);
+			thNo = totalnoOfThread;
+			writeLog("thNo2 " + thNo);
+			try {
+				this.logFile = //new OutputStreamWriter(new NullOutputStream());
+				//new FileWriter(new File(System.getProperty("user.dir")+"/src/test/resources/logFiles/"+"Thread_"+thNo));
+				new FileWriter(new File(System.getProperty("user.dir")+"/logFiles/"+"Thread_"+thNo));
+				logFile.write("");
+			}
+			catch (IOException e) { 
+				System.err.println("log-File nicht vorhanden");
+			}
 			/*Abbruchtest
 			if (thNo > 10) {
 				System.out.println("cancel");
@@ -188,10 +202,56 @@ public class TypeUnifyTask {
 			rules = new RuleSet(logFile);
 			this.rekTiefeField = rekTiefe;
 			this.urm = urm;
+			this.usedTasks = usedTasks;
+			this.usedTasks.add(this);
 		}
 	}
 	
+	/**
+	 * Vererbt alle Variancen
+	 * @param eq The set of constraints
+	 */
+	/* PL 2018-05- 17 verschoben nach JavaTXCompiler
+	private void varianceInheritance(Set<UnifyPair> eq) {
+		Set<PlaceholderType> usedTPH = new HashSet<>();
+		Set<PlaceholderType> phSet = eq.stream().map(x -> { 
+			Set<PlaceholderType> pair = new HashSet<>();
+			if (x.getLhsType() instanceof PlaceholderType) pair.add((PlaceholderType)x.getLhsType());
+			if (x.getRhsType() instanceof PlaceholderType) pair.add((PlaceholderType)x.getRhsType());
+			return pair;
+		}).reduce(new HashSet<>(), (a,b) -> { a.addAll(b); return a;} , (c,d) -> { c.addAll(d); return c;});
+		
+		ArrayList<PlaceholderType> phSetVariance =  new ArrayList<>(phSet);
+		phSetVariance.removeIf(x -> (x.getVariance() == 0));
+		while(!phSetVariance.isEmpty()) {
+			PlaceholderType a = phSetVariance.remove(0);
+			usedTPH.add(a);
+			//HashMap<PlaceholderType,Integer> ht = new HashMap<>();
+			//ht.put(a, a.getVariance());
+			Set<UnifyPair> eq1 = new HashSet<>(eq); 
+			eq1.removeIf(x -> !(x.getLhsType() instanceof PlaceholderType && ((PlaceholderType)x.getLhsType()).equals(a)));
+			eq1.stream().forEach(x -> { x.getRhsType().accept(new distributeVariance(), a.getVariance());});
+			eq1 = new HashSet<>(eq); 
+			eq1.removeIf(x -> !(x.getRhsType() instanceof PlaceholderType && ((PlaceholderType)x.getRhsType()).equals(a)));
+			eq1.stream().forEach(x -> { x.getLhsType().accept(new distributeVariance(), a.getVariance());});
+			phSetVariance =  new ArrayList<>(phSet);
+			phSetVariance.removeIf(x -> (x.getVariance() == 0 || usedTPH.contains(x)));
+		}		
+}
+*/
+	void myCancel(Boolean b) {
+		myIsCanceled = true;
+	}
+	
+	public boolean myIsCancelled() {
+		return myIsCanceled;
+	}
+	
 	protected Set<Set<UnifyPair>> compute() {
+		if (one) {
+			System.out.println("two");
+		}
+		one = true;
 		Set<UnifyPair> neweq = new HashSet<>(eq);
 		/* 1-elementige Oder-Constraints werden in und-Constraints umgewandelt */
 		oderConstraintsField.stream()
@@ -200,7 +260,8 @@ public class TypeUnifyTask {
 		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, true);
+		Set<Set<UnifyPair>> res = unify(neweq, remainingOderconstraints, fc, parallel, rekTiefeField);
+		noOfThread--;
 		try {
 			logFile.close();
 		}
@@ -211,10 +272,15 @@ public class TypeUnifyTask {
 				throw new TypeinferenceException("Unresolved constraints: " + res.toString(), new NullToken()); //return new HashSet<>(); 
 			}
 		else {
+			synchronized (usedTasks) {
+				if (this.myIsCancelled()) {
+					return new HashSet<>();
+				}
+				else {
 					return res;
 				}
-
-
+			}
+		}
 	}
 /*	
 	@Override
@@ -236,9 +302,26 @@ public class TypeUnifyTask {
 	 * @param fc The finite closure
 	 * @return The set of all principal type unifiers
 	 */
-	protected static Set<Set<UnifyPair>> unify(final Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe, Boolean finalresult)  {
+	protected Set<Set<UnifyPair>> unify(final Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe)  {
+		//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());
+		//if (aas.isEmpty()) {
+		//	System.out.println("");
+		//}
 
+                //.collect(Collectors.toCollection(HashSet::new)));
+		
+		synchronized (usedTasks) {
+			if (this.myIsCancelled()) {
+				return new HashSet<>();
+			}
+		}
+		
 		rekTiefe++;
+		nOfUnify++;
+        writeLog(nOfUnify.toString() + " Unifikation: " + eq.toString());
+        writeLog(nOfUnify.toString() + " Oderconstraints: " + oderConstraints.toString());
 			
 		/*
 		 * Variancen auf alle Gleichungen vererben
@@ -257,6 +340,29 @@ public class TypeUnifyTask {
 			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);
@@ -375,15 +481,30 @@ public class TypeUnifyTask {
 		
 		//Aufruf von computeCartesianRecursive ANFANG
 		//writeLog("topLevelSets: " + topLevelSets.toString());
-		return computeCartesianRecursive(new HashSet<>(), new ArrayList<>(topLevelSets), eq, oderConstraintsOutput, fc, rekTiefe, finalresult);
+		return computeCartesianRecursive(new ArrayList<>(topLevelSets), eq, oderConstraintsOutput, fc, parallel, 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) {
+	Set<Set<UnifyPair>> unify2(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe) {
 		//Aufruf von computeCartesianRecursive ENDE
 		
-
+		//keine Ahnung woher das kommt
+		//Set<Set<UnifyPair>> setToFlatten = topLevelSets.stream().map(x -> x.iterator().next()).collect(Collectors.toCollection(HashSet::new));
+		
+		//Muss auskommentiert werden, wenn computeCartesianRecursive ANFANG
+		// Cartesian product over all (up to 10) top level sets 
+		//Set<Set<Set<UnifyPair>>> eqPrimeSet = setOps.cartesianProduct(topLevelSets)
+		//		.stream().map(x -> new HashSet<>(x))
+		//		.collect(Collectors.toCollection(HashSet::new));
+		//Muss auskommentiert werden, wenn computeCartesianRecursive ENDE
+		
+		synchronized (usedTasks) {
+			if (this.myIsCancelled()) {
+				return new HashSet<>();
+			}
+		}
+		
 		Set<Set<UnifyPair>> eqPrimePrimeSet = new HashSet<>();
 		
 		Set<TypeUnifyTask> forks = new HashSet<>();
@@ -406,9 +527,47 @@ public class TypeUnifyTask {
 			Set<Set<UnifyPair>> unifyres1 = null;
 			Set<Set<UnifyPair>> unifyres2 = null;
 			if (!ocString.equals(newOderConstraints.toString())) writeLog("nach Subst: " + newOderConstraints);
-			{// sequentiell (Step 6b is included)
+			//writeLog("nach Subst: " + eqPrimePrime);
+			/*
+			 * Step 6 a) Restart (fork) for pairs where subst was applied
+			 */
+			/*
+			if(parallel) {
 				if (eqPrime.equals(eq) && !eqPrimePrime.isPresent()
-					&& oderConstraints.isEmpty()) {
+				    && oderConstraints.isEmpty())         				    //PL 2017-09-29 //(!eqPrimePrime.isPresent()) auskommentiert und durch 
+				                              								//PL 2017-09-29 dies ersetzt //(!eqPrimePrime.isPresent()) 
+																			//PL 2018-05-18 beide Bedingungen muessen gelten, da eqPrime Veränderungen in allem ausser subst
+																			//eqPrimePrime Veraenderungen in subst repraesentieren.
+					eqPrimePrimeSet.add(eqPrime);
+				else if(eqPrimePrime.isPresent()) {
+					//System.out.println("nextStep: " + eqPrimePrime.get());
+					TypeUnifyTask fork = new TypeUnifyTask(eqPrimePrime.get(), fc, true, logFile, log);
+					forks.add(fork);
+					fork.fork();
+				}
+				else {
+					//System.out.println("nextStep: " + eqPrime);
+					TypeUnifyTask fork = new TypeUnifyTask(eqPrime, fc, true, logFile, log);
+					forks.add(fork);
+					fork.fork();
+				}
+			}
+			else */
+			{// sequentiell (Step 6b is included)
+				if (printtag) System.out.println("nextStep: " + eqPrimePrime);
+				if (eqPrime.equals(eq) && !eqPrimePrime.isPresent()
+					&& oderConstraints.isEmpty()) {        					  //PL 2017-09-29 //(!eqPrimePrime.isPresent()) auskommentiert und durch 
+																			  //PL 2017-09-29 dies ersetzt //(!eqPrimePrime.isPresent()) 
+																			  //PL 2018-05-18 beide Bedingungen muessen gelten, da eqPrime Veränderungen in allem ausser subst
+																			  //eqPrimePrime Veraenderungen in subst repraesentieren.
+					//try {
+						//if (isSolvedForm(eqPrime)) {
+						//	writeLog("eqPrime:" + eqPrime.toString()+"\n");
+						//}
+					//}
+					//catch (IOException e) { 
+					//	System.err.println("log-File nicht vorhanden");
+					//}
 					eqPrimePrimeSet.add(eqPrime);
 					if (finalresult && isSolvedForm(eqPrime)) { 
 						writeLog("eqPrime:" + eqPrime.toString()+"\n");
@@ -416,17 +575,34 @@ public class TypeUnifyTask {
 					}
 				}
 				else if(eqPrimePrime.isPresent()) {
-					Set<Set<UnifyPair>> unifyres = unifyres1 = unify(eqPrimePrime.get(), newOderConstraints, fc, parallel, rekTiefe, finalresult);
+					Set<Set<UnifyPair>> unifyres = unifyres1 = unify(eqPrimePrime.get(), newOderConstraints, fc, parallel, rekTiefe);
 					
 					eqPrimePrimeSet.addAll(unifyres);
 				}
 				else {
-					Set<Set<UnifyPair>> unifyres = unifyres2 = unify(eqPrime, newOderConstraints, fc, parallel, rekTiefe, finalresult);
+					Set<Set<UnifyPair>> unifyres = unifyres2 = unify(eqPrime, newOderConstraints, fc, parallel, rekTiefe);
 					
 					
 					eqPrimePrimeSet.addAll(unifyres);
 				}
 			}
+		//Muss auskommentiert werden, wenn computeCartesianRecursive ANFANG
+		//}
+		//Muss auskommentiert werden, wenn computeCartesianRecursive ENDE
+		
+		/*
+		 * 	Step 6 b) Build the union over everything.
+		 */
+		/*
+		 * PL 2019-01-22: geloescht
+		
+		if(parallel)
+			for(TypeUnifyTask fork : forks) 
+				eqPrimePrimeSet.addAll(fork.join());
+		*/
+		 /*
+		  * Step 7: Filter empty sets;
+		  */
 		eqPrimePrimeSet = eqPrimePrimeSet.stream().filter(x -> isSolvedForm(x) || this.isUndefinedPairSet(x)).collect(Collectors.toCollection(HashSet::new));
 		if (!eqPrimePrimeSet.isEmpty() && !isUndefinedPairSetSet(eqPrimePrimeSet)) {
 			writeLog("Result1 " + eqPrimePrimeSet.toString());
@@ -435,25 +611,56 @@ public class TypeUnifyTask {
 	}
 	
 	
-	
-	Set<Set<UnifyPair>> computeCartesianRecursive(Set<Set<UnifyPair>> fstElems, ArrayList<Set<? extends Set<UnifyPair>>> topLevelSets, Set<UnifyPair> eq, List<Set<Constraint<UnifyPair>>> oderConstraints, IFiniteClosure fc, int rekTiefe, Boolean finalresult) {
-		fstElems.addAll(topLevelSets.stream()
+	/**
+	 * 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) {
+		
+		//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()
 				                    .filter(x -> x.size()==1)
 				                    .map(y -> y.stream().findFirst().get())
 				                    .collect(Collectors.toCollection(HashSet::new)));
-		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);
+		
+		//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);
 			return result;
 		}
-		Set<? extends Set<UnifyPair>> nextSet = remainingSets.remove(0);
+		
+		Set<? extends Set<UnifyPair>> nextSet = optNextSet.get(); 
+		//writeLog("nextSet: " + nextSet.toString());
 		List<Set<UnifyPair>> nextSetasList =new ArrayList<>(nextSet);
-
+		/*
+		try {
+		//List<Set<UnifyPair>> 
+			//nextSetasList = oup.sortedCopy(nextSet);//new ArrayList<>(nextSet);
+		}
+		catch (java.lang.IllegalArgumentException e) {
+			System.out.print("");
+		}
+		*/
 		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;
@@ -476,16 +683,15 @@ public class TypeUnifyTask {
 				}
 			}
 			else {
-				//variance = 2;
 				oderConstraint = true;
 			}
 		}
 		else {
-			//variance = 2;
 			oderConstraint = true;
 		}
 		
-		if (oderConstraint) {//Varianz-Bestimmung Oder-Constraints
+		//Varianz-Bestimmung Oder-Constraints 
+		if (oderConstraint) {
 			if (printtag) System.out.println("nextSetasList " + nextSetasList);
 			Optional<Integer> optVariance = 
 					nextSetasList.iterator()
@@ -498,24 +704,33 @@ public class TypeUnifyTask {
 				 			  	 ((PlaceholderType)x.getGroundBasePair().getLhsType()).getVariance())
 				 			  	 .findAny();
 			//Fuer Operatorenaufrufe wird variance auf 2 gesetzt.
-			//da kein Receiver existiert also keon x.getGroundBasePair().getLhsType() instanceof PlaceholderType
-			//Es werden alle Elemente des Kartesischen Produkts abgearbeitet
+			//da kein Receiver existiert also kein x.getGroundBasePair().getLhsType() instanceof PlaceholderType
+			//Bei Varianz = 2 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);
-		/* sameEqSet-Bestimmung: Wenn a = ty \in  nextSet dann enthaelt sameEqSet alle Paare a < ty1 oder ty2 < a aus fstElems */
+		//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 */
 		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.getPairOp().equals(PairOperator.EQUALSDOT)
+					//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())
@@ -528,7 +743,7 @@ public class TypeUnifyTask {
 					tyVar = origPair.getRhsType();
 				}
 				UnifyType tyVarEF = tyVar;
-				sameEqSet = fstElems.stream().map(xx -> xx.iterator().next())
+				sameEqSet = oneElems.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));
@@ -537,14 +752,21 @@ public class TypeUnifyTask {
 		/* sameEqSet-Bestimmung Ende */
 		
 		Set<UnifyPair> a = null;
-		while (nextSetasList.size() > 0) {  //(nextSetasList.size() != 0) {
+		while (nextSetasList.size() > 0) {
 			Set<UnifyPair> a_last = a;
 			
-			//Liste der Faelle für die parallele Verarbeitung
+			/* 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.
+			 */ 
 			List<Set<UnifyPair>> nextSetasListRest = new ArrayList<>();
 			
-			//Liste der Faelle, bei dem Receiver jeweils "? extends" enthaelt bzw. nicht enthaelt
-			//In der Regel ein Element
+			/* 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.
+			 */
 			List<Set<UnifyPair>> nextSetasListOderConstraints = new ArrayList<>();
 			
 			writeLog("nextSet: " + nextSet.toString());
@@ -567,6 +789,7 @@ public class TypeUnifyTask {
 				}
 				
 				//Alle maximale Elemente in  nextSetasListRest bestimmen
+				//nur für diese wird parallele Berechnung angestossen.
 				nextSetasListRest = oup.maxElements(nextSetasListRest);
 			}
 			else if (variance == -1) {
@@ -587,10 +810,13 @@ public class TypeUnifyTask {
 					}
 				}
 				//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) {
@@ -616,55 +842,33 @@ public class TypeUnifyTask {
 					}
 				}
 			}
-			//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>>(fstElems);
+			Set<Set<UnifyPair>> elems = new HashSet<Set<UnifyPair>>(oneElems);
 			writeLog("a1: " + rekTiefe + "  "+ "variance:  "+ variance + " " + a.toString()+ "\n");
-			//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());
+			
+			//Ergebnisvariable für den aktuelle Thread
 			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<>();
 			
-			/* 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;
-					}
-				}
+			/* 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 Ende eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
 			
-			if(parallel && (variance == 1)) {
+			/* 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);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
@@ -672,8 +876,14 @@ public class TypeUnifyTask {
 				newElemsOrig.add(a);
 				
 				/* FORK ANFANG */
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
 				//forks.add(forkOrig);
+				synchronized(usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
+					forkOrig.fork();
+				}
 				/* FORK ENDE */
 				
 				synchronized (this) {
@@ -686,35 +896,14 @@ public class TypeUnifyTask {
 						writeLog("1 RM" + nSaL.toString());
 					}
 					
-					/* 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;
-							}
+					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 Ende eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
 					else {
 						nextSetasListOderConstraints.add(((Constraint<UnifyPair>)nSaL).getExtendConstraint());
 					}
@@ -722,14 +911,41 @@ public class TypeUnifyTask {
 					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 					List<Set<Constraint<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+					forks.add(fork);
+					synchronized(usedTasks) {
+						if (this.myIsCancelled()) {
+							return new HashSet<>();
+						}
+						fork.fork();
+					}
 				}
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
-
-				res = forkOrig.join();
-
+				
+				/* FORK ANFANG */
+				synchronized (this) {
+					writeLog("wait "+ forkOrig.thNo);
+					noOfThread--;
+					res = forkOrig.join();
+					synchronized (usedTasks) {
+						if (this.myIsCancelled()) {
+							return new HashSet<>();
+						}
+					}
+					//noOfThread++;
+					forkOrig.writeLog("final Orig 1");
+					forkOrig.closeLogFile();
+					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
+					writeLog("JoinOrig " + new Integer(forkOrig.thNo).toString());
+					//noOfThread--; an das Ende von compute verschoben 
+					//add_res.add(fork_res);
+				};
+				/* FORK ENDE */
+				
+				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
+						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						synchronized (usedTasks) {
 							if (this.myIsCancelled()) {
@@ -746,18 +962,28 @@ public class TypeUnifyTask {
 							aParDef.add(fork.getNextSetElement());
 						}
 						fork.writeLog("final 1");
+						fork.closeLogFile();
 					};
 				}
 				//noOfThread++;
 			} else {
-			if((variance == -1)) {
+			if(parallel && (variance == -1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
 				Set<UnifyPair> newEqOrig = new HashSet<>(eq);
 				Set<Set<UnifyPair>> newElemsOrig = new HashSet<>(elems);
 				List<Set<Constraint<UnifyPair>>> newOderConstraintsOrig = new ArrayList<>(oderConstraints);
 				newElemsOrig.add(a);
-
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm);
+				
+				/* FORK ANFANG */
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+				//forks.add(forkOrig);
+				synchronized(usedTasks) {
+					if (this.myIsCancelled()) {
+						return new HashSet<>();
+					}
+					forkOrig.fork();
+				}
+				/* FORK ENDE */
 				
 				synchronized (this) {
 					writeLog("a in " + variance + " "+ a);
@@ -769,35 +995,14 @@ public class TypeUnifyTask {
 						writeLog("-1 RM" + nSaL.toString());
 					}
 					
-					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;
-							}
+					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 Ende eingefuegt Vergleich mit anderen Paaren ggf. loeschen */
 					else {
 						nextSetasListOderConstraints.add(((Constraint<UnifyPair>)nSaL).getExtendConstraint());
 					}
@@ -940,11 +1145,12 @@ public class TypeUnifyTask {
 					};
 				} 
 		    	//noOfThread++;	
-		    } else {
-		    	//parallel = false; //Wenn MaxNoOfThreads erreicht ist, sequentiell weiterarbeiten
+		    } else {//parallel = false oder MaxNoOfThreads ist erreicht, 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, finalresult);
+				res = unify2(elems, eq, oderConstraints, fc, parallel, rekTiefe);
 		    }}}
+			
+			//Ab hier alle parallele Berechnungen wieder zusammengeführt.
 				if (!isUndefinedPairSetSet(res) && isUndefinedPairSetSet(result)) {
 					//wenn korrektes Ergebnis gefunden alle Fehlerfaelle loeschen
 					result = res;
@@ -1031,7 +1237,7 @@ public class TypeUnifyTask {
 						}
 						else {
 							//alle Fehlerfaelle und alle korrekten Ergebnis jeweils adden
-							writeLog("RES Fst: reuslt: " + result.toString() + " res: " + res.toString());
+							writeLog("RES Fst: result: " + result.toString() + " res: " + res.toString());
 							result.addAll(res);
 						}
 						}
@@ -1043,10 +1249,6 @@ public class TypeUnifyTask {
 					//}
 				}
 				
-			//}
-			//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)) {
@@ -1283,7 +1485,29 @@ public class TypeUnifyTask {
 		return result;
 	}
 	
-	protected Boolean checkA (UnifyPair aPair, Set<UnifyPair> sameEqSet, Set<Set<UnifyPair>> elems, Set<Set<UnifyPair>> 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());
+			
 			writeLog("checkA: " + aPair + "sameEqSet: " + sameEqSet);
 			for (UnifyPair sameEq : sameEqSet) {
 				if (sameEq.getLhsType() instanceof PlaceholderType) {
@@ -1293,12 +1517,14 @@ public class TypeUnifyTask {
 					unitedSubst.addAll(sameEq.getAllSubstitutions());
 					unitedSubst.addAll(sameEq.getAllBases());
 					localEq.add(new UnifyPair(aPair.getRhsType(), sameEq.getRhsType(), sameEq.getPairOp(), unitedSubst, null));
-					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0, false);
+					finalresult = false;
+					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0);
+					finalresult = true;
 					if (isUndefinedPairSetSet(localRes)) {
 						if (result.isEmpty() || isUndefinedPairSetSet(result)) {
 							result.addAll(localRes);
 						}
-						//writeLog("FALSE: " + aPair + "sameEqSet: " + sameEqSet);
+						writeLog("FALSE: " + aPair + "sameEqSet: " + sameEqSet);
 						return false;
 					}
 				}
@@ -1309,20 +1535,25 @@ public class TypeUnifyTask {
 					unitedSubst.addAll(sameEq.getAllSubstitutions());
 					unitedSubst.addAll(sameEq.getAllBases());
 					localEq.add(new UnifyPair(sameEq.getLhsType(), aPair.getRhsType(), sameEq.getPairOp(), unitedSubst, null));
-					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0, false);
+					finalresult = false;
+					Set<Set<UnifyPair>> localRes = unify(localEq, new ArrayList<>(), fc, false, 0);
+					finalresult = true;
 					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);
+			writeLog("TRUE: " + aPair + "sameEqSet: " + sameEqSet);
+			return true;
+		}
 		return true;
 	}
 	
+	
 	protected boolean couldBecorrect(Set<Pair<Set<UnifyPair>, UnifyPair>> reducedUndefResSubstGroundedBasePair, Set<UnifyPair> nextElem) {
 		return reducedUndefResSubstGroundedBasePair.stream()
 		.map(pair -> {
@@ -1412,7 +1643,7 @@ public class TypeUnifyTask {
 			return true;}).reduce((xx, yy) -> xx || yy).get();
 	}
 	
-	protected static boolean isUndefinedPairSet(Set<UnifyPair> s) {
+	protected boolean isUndefinedPairSet(Set<UnifyPair> s) {
 		if (s.size() >= 1 ) {
 			Boolean ret = s.stream().map(x -> x.isUndefinedPair()).reduce(true, (x,y)-> (x && y));
 			return ret;
@@ -1422,7 +1653,7 @@ public class TypeUnifyTask {
 		}
 	}
 	
-	protected static boolean isUndefinedPairSetSet(Set<Set<UnifyPair>> s) {
+	protected boolean isUndefinedPairSetSet(Set<Set<UnifyPair>> s) {
 		if (s.size() >= 1) {
 			Boolean ret = s.stream(). map(x -> isUndefinedPairSet(x)).reduce(true, (x,y)-> (x && y));
 			return ret;
@@ -1481,7 +1712,7 @@ public class TypeUnifyTask {
 		/*
 		 * Apply rules until the queue is empty
 		 */
-		while(!eqQueue.isEmpty())		 {
+		while(!eqQueue.isEmpty()) {
 			UnifyPair pair = eqQueue.pollFirst();
 
 			// ReduceUp, ReduceLow, ReduceUpLow
@@ -2289,7 +2520,7 @@ public class TypeUnifyTask {
 	
 	void writeLog(String str) {
 		synchronized ( this ) { 
-		if (log) {
+		if (log && finalresult) {
 			try {
 				logFile.write("Thread no.:" + thNo + "\n");
 				logFile.write("noOfThread:" + noOfThread + "\n");

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

@@ -0,0 +1,18 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.util.List;
+
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+
+public class UnifyResultEvent {
+	
+	private List<ResultSet> newTypeResult;
+
+	public UnifyResultEvent(List<ResultSet> newTypeResult) {
+		this.newTypeResult = newTypeResult;
+	}
+
+	public List<ResultSet> getNewTypeResult() {
+		return newTypeResult;
+	}
+}

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

@@ -0,0 +1,7 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+public interface UnifyResultListener {
+
+	void onNewTypeResultFound(UnifyResultEvent evt);
+
+}

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

@@ -0,0 +1,21 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+public class UnifyResultListenerImpl implements UnifyResultListener {
+
+	List<ResultSet> results = new ArrayList<>();
+	
+	public synchronized void onNewTypeResultFound(UnifyResultEvent evt) {
+		results.addAll(evt.getNewTypeResult());
+	}
+	
+	public List<ResultSet> getResults() {
+		return results;
+	}
+
+}

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

@@ -0,0 +1,59 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
+
+public class UnifyResultModel {
+	
+	ConstraintSet<de.dhbwstuttgart.typeinference.constraints.Pair> cons;
+	
+	IFiniteClosure fc;
+	
+	public UnifyResultModel(ConstraintSet<de.dhbwstuttgart.typeinference.constraints.Pair> cons,
+					 IFiniteClosure fc) {
+		this.cons = cons;
+		this.fc = fc;
+	}
+	
+	private List<UnifyResultListener> listeners = new ArrayList<>();
+	
+	public void addUnifyResultListener(UnifyResultListener listenerToAdd) {
+		listeners.add(listenerToAdd);
+	}
+
+	public void removeUnifyResultListener(UnifyResultListener listenerToRemove) {
+		listeners.remove(listenerToRemove);
+	}
+	
+	public void notify(Set<Set<UnifyPair>> eqPrimePrimeSet) {
+		Set<Set<UnifyPair>> eqPrimePrimeSetRet = eqPrimePrimeSet.stream().map(x -> {
+			Optional<Set<UnifyPair>> res = new RuleSet().subst(x.stream().map(y -> { 
+				if (y.getPairOp() == PairOperator.SMALLERDOTWC) y.setPairOp(PairOperator.EQUALSDOT);
+				return y; //alle Paare a <.? b erden durch a =. b ersetzt
+			}).collect(Collectors.toCollection(HashSet::new)));
+			if (res.isPresent()) {//wenn subst ein Erg liefert wurde was veraendert
+				return new TypeUnifyTask().applyTypeUnificationRules(res.get(), fc);
+			}
+			else return x; //wenn nichts veraendert wurde wird x zurueckgegeben
+		}).collect(Collectors.toCollection(HashSet::new));
+		List<ResultSet> newResult = eqPrimePrimeSetRet.stream().map(unifyPairs ->
+           new ResultSet(UnifyTypeFactory.convert(unifyPairs, de.dhbwstuttgart.typeinference.constraints.Pair.generateTPHMap(cons))))
+           .collect(Collectors.toList());
+		UnifyResultEvent evt = new UnifyResultEvent(newResult);
+		
+		for (UnifyResultListener listener : listeners) {
+			listener.onNewTypeResultFound(evt);
+		}
+	}
+}

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

@@ -0,0 +1,18 @@
+package de.dhbwstuttgart.typeinference.unify;
+
+import java.util.ArrayList;
+
+public class UnifyTaskModel {
+
+	ArrayList<TypeUnifyTask> usedTasks = new ArrayList<>();
+	
+	public synchronized void add(TypeUnifyTask t) {
+		usedTasks.add(t);
+	}
+    
+    public synchronized void cancel() {
+    	for(TypeUnifyTask t : usedTasks) {
+    		t.myCancel(true);
+    	}
+    }
+}

src/main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java

@@ -29,6 +29,8 @@ public class UnifyPair {
 	 */
 	private PairOperator pairOp;
     
+    private boolean undefinedPair = false;
+    
     /**
      * Unifier/substitute that generated this pair
      * PL 2018-03-15
@@ -112,7 +114,10 @@ public class UnifyPair {
 	public void addSubstitutions(Set<UnifyPair> sup) {
 		substitution.addAll(sup);
 	}
-
+	
+	public void setUndefinedPair() {
+		undefinedPair = true;
+	}
 	public Set<UnifyPair> getSubstitution() {
 		return new HashSet<>(substitution);
 	}
@@ -120,6 +125,10 @@ public class UnifyPair {
 	public UnifyPair getBasePair() {
 		return basePair;
 	}
+	public boolean isUndefinedPair() {
+		return undefinedPair;
+	}
+	
 	public Set<UnifyPair> getAllSubstitutions () {
 		Set<UnifyPair> ret = new HashSet<>();
 		ret.addAll(new ArrayList<>(getSubstitution()));

src/test/java/AllgemeinTest.java

@@ -40,7 +40,8 @@ public class AllgemeinTest {
 		//String className = "FCTest3";
 		//String className = "Var";
 		//String className = "Put";
-		String className = "Cycle";
+		//String className = "Twice";
+		String className = "TestSubTypless";
 		//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,3 +1,4 @@
+/*
 package insertGenerics;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
@@ -12,11 +13,13 @@ import java.util.List;
 public class FamilyOfGeneratedGenericsTest extends TestCase {
 
     public void testIdentityMethod(){
-        /*
+        */
+/*
         Example method:
         A id(B i) return i;
-        gives constraint: B <. A, which is a method constraint
-         */
+        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));
@@ -29,25 +32,29 @@ 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, tphPositions);
-        assertTrue(methodConstraints.size() == 1);
-        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(){
                 return f;
             }
         }
-        gives constraint: A <. B, which is a class constraint
-         */
+        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));
@@ -58,18 +65,22 @@ 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;
@@ -83,7 +94,8 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
                 return e;
             }
         }
-        */
+        *//*
+
 
         List<TPHConstraint> inputConstraints = new ArrayList<>();
         inputConstraints.add(new TPHConstraint("A", "B", TPHConstraint.Relation.EXTENDS));
@@ -109,13 +121,18 @@ 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);
         assertFalse(classConstraints.isEmpty());
         assertTrue(classConstraints.size() == 6);
+//        assertFalse(methodConstraints.isEmpty());
+//        assertTrue(methodConstraints.size() == 2);
 
     }
 
     public void testTPHsAndGenerics() {
-        /*
+        */
+/*
         class TPHsAndGenerics {
             Fun1<A,B> id = x -> x;
             C id2 (D x) {
@@ -129,7 +146,8 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
                 return b;
             }
         }
-        */
+        *//*
+
 
         List<TPHConstraint> inputConstraints = new ArrayList<>();
         inputConstraints.add(new TPHConstraint("A","B", TPHConstraint.Relation.EXTENDS));
@@ -165,9 +183,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);
 
         assertFalse(classConstraints.isEmpty());
         assertTrue(classConstraints.size() == 3);
+//        assertFalse(methodConstraints.isEmpty());
+//        assertTrue(methodConstraints.size()==9);
     }
 
 
@@ -187,7 +209,7 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
 
 
 
-        HashMap<String, PairTphMethod<PositionFinder.Position, String>> allTphsNew = FamilyOfGeneratedGenerics.positionConverter(allTphsOld, listOfMethodsAndTphs);
+        HashMap<String, List<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?
@@ -203,4 +225,4 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
 
     }
 
-}
+}*/

src/test/java/insertGenerics/MethodsTest.java

@@ -1,30 +0,0 @@
-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

@@ -0,0 +1,102 @@
+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

@@ -20,13 +20,13 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class TryTest {
+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+"TestGGFinder.jav"));
+        execute(new File(rootDirectory+"TestClassField.jav"));
     }
 
     private static class TestResultSet{
@@ -34,25 +34,9 @@ public class TryTest {
     }
 
     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);
@@ -60,9 +44,7 @@ public class TryTest {
         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<>();
@@ -75,9 +57,7 @@ public class TryTest {
                 }
             }
             for(String s : insertedTypes){
-                System.out.println("---------------------------51");
                 System.out.println(s);
-                System.out.println("---------------------------52");
             }
         }
         return new TestResultSet();

src/test/java/insertGenerics/TestExample42.java

@@ -1,16 +1,11 @@
-/*
 package insertGenerics;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
-import de.dhbwstuttgart.bytecode.insertGenerics.MethodConstraint;
-import de.dhbwstuttgart.bytecode.insertGenerics.PositionFinder;
+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;
@@ -27,30 +22,41 @@ public class TestExample42 {
         return cs;
     }
 
-    public HashMap<String, PositionFinder.Position> fillPosOfTphs() {
-        BufferedReader l;
-        HashMap<String, PositionFinder.Position> posOfTphs = new HashMap<>();
-        posOfTphs.put("K", PositionFinder.Position.FIELD);
-        posOfTphs.put("L", PositionFinder.Position.METHOD);
-        posOfTphs.put("M", PositionFinder.Position.METHOD);
-        posOfTphs.put("N", PositionFinder.Position.METHOD);
-        posOfTphs.put("P", PositionFinder.Position.METHOD);
-        posOfTphs.put("Q", PositionFinder.Position.METHOD);
-        posOfTphs.put("U", PositionFinder.Position.METHOD);
-        posOfTphs.put("V", PositionFinder.Position.METHOD);
-        posOfTphs.put("W", PositionFinder.Position.METHOD);
-        posOfTphs.put("Z", PositionFinder.Position.METHOD);
+    public HashMap<String, PairTphMethod<PositionFinder.Position, String>> fillPosOfTphs() {
+        HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs = new HashMap<>();
+
+        // TPHs "U" und "L" auskommentiert, da nach Vorgaben L zu Z umbenannt und U als void interpretiert wird
+        PairTphMethod<PositionFinder.Position, String> posOfK = new PairTphMethod<>(PositionFinder.Position.FIELD, null);
+//        PairTphMethod<PositionFinder.Position, String> posOfL = new PairTphMethod<>(PositionFinder.Position.METHOD, "id");
+        PairTphMethod<PositionFinder.Position, String> posOfM = new PairTphMethod<>(PositionFinder.Position.METHOD, "id");
+        PairTphMethod<PositionFinder.Position, String> posOfN = new PairTphMethod<>(PositionFinder.Position.METHOD, "id");
+        PairTphMethod<PositionFinder.Position, String> posOfP = new PairTphMethod<>(PositionFinder.Position.METHOD, "setA");
+        PairTphMethod<PositionFinder.Position, String> posOfQ = new PairTphMethod<>(PositionFinder.Position.METHOD, "setA");
+//        PairTphMethod<PositionFinder.Position, String> posOfU = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+        PairTphMethod<PositionFinder.Position, String> posOfV = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+        PairTphMethod<PositionFinder.Position, String> posOfW = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+        PairTphMethod<PositionFinder.Position, String> posOfZ = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+
+        posOfTphs.put("K", posOfK);
+//        posOfTphs.put("L", posOfL);
+        posOfTphs.put("M", posOfM);
+        posOfTphs.put("N", posOfN);
+        posOfTphs.put("P", posOfP);
+        posOfTphs.put("Q", posOfQ);
+//        posOfTphs.put("U", posOfU);
+        posOfTphs.put("V", posOfV);
+        posOfTphs.put("W", posOfW);
+        posOfTphs.put("Z", posOfZ);
         return posOfTphs;
     }
 
     @Test
     public void genericTest() {
-        List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(fillConstraintsList(),fillPosOfTphs());
-        System.out.println("ClassConstraints: " + classConstraints);
-        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),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

@@ -0,0 +1,61 @@
+package insertGenerics;
+
+import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
+import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
+import de.dhbwstuttgart.bytecode.insertGenerics.*;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class TestExample42_allInOneMethod {
+    public List<TPHConstraint> fillConstraintsList() {
+        List<TPHConstraint> cs = new ArrayList<>();
+        cs.add(new TPHConstraint("M", "N", Relation.EXTENDS));
+        cs.add(new TPHConstraint("N", "Z", Relation.EXTENDS));
+        cs.add(new TPHConstraint("Q", "K", Relation.EXTENDS));
+        cs.add(new TPHConstraint("K", "P", Relation.EXTENDS));
+        cs.add(new TPHConstraint("W", "M", Relation.EXTENDS));
+        cs.add(new TPHConstraint("Z", "V", Relation.EXTENDS));
+        return cs;
+    }
+
+    public HashMap<String, PairTphMethod<PositionFinder.Position, String>> fillPosOfTphs() {
+        HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs = new HashMap<>();
+
+        // TPHs "U" und "L" auskommentiert, da nach Vorgaben L zu Z umbenannt und U als void interpretiert wird
+        PairTphMethod<PositionFinder.Position, String> posOfK = new PairTphMethod<>(PositionFinder.Position.FIELD, null);
+//        PairTphMethod<PositionFinder.Position, String> posOfL = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+        PairTphMethod<PositionFinder.Position, String> posOfM = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+        PairTphMethod<PositionFinder.Position, String> posOfN = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+        PairTphMethod<PositionFinder.Position, String> posOfP = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+        PairTphMethod<PositionFinder.Position, String> posOfQ = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+//        PairTphMethod<PositionFinder.Position, String> posOfU = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+        PairTphMethod<PositionFinder.Position, String> posOfV = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+        PairTphMethod<PositionFinder.Position, String> posOfW = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+        PairTphMethod<PositionFinder.Position, String> posOfZ = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
+
+        posOfTphs.put("K", posOfK);
+//        posOfTphs.put("L", posOfL);
+        posOfTphs.put("M", posOfM);
+        posOfTphs.put("N", posOfN);
+        posOfTphs.put("P", posOfP);
+        posOfTphs.put("Q", posOfQ);
+//        posOfTphs.put("U", posOfU);
+        posOfTphs.put("V", posOfV);
+        posOfTphs.put("W", posOfW);
+        posOfTphs.put("Z", posOfZ);
+        return posOfTphs;
+    }
+
+    @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<TPHConstraint> testCons;
+    }
+}

src/test/java/insertGenerics/TestGGFinder.java

@@ -0,0 +1,89 @@
+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

@@ -0,0 +1,90 @@
+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

@@ -0,0 +1,115 @@
+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

@@ -0,0 +1,72 @@
+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/TestSecondLineOfClassConstraints.java

@@ -0,0 +1,72 @@
+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 TestSecondLineOfClassConstraints {
+
+    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"));
+    }
+
+    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

@@ -0,0 +1,119 @@
+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

@@ -0,0 +1,72 @@
+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

@@ -0,0 +1,97 @@
+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

@@ -0,0 +1,95 @@
+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

@@ -0,0 +1,83 @@
+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

@@ -0,0 +1,82 @@
+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

@@ -0,0 +1,72 @@
+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/resources/AllgemeinTest/Cycle.jav

@@ -1,11 +0,0 @@
-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

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

src/test/resources/insertGenericsJav/TestAny.jav

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

src/test/resources/insertGenericsJav/TestClassField.jav

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

src/test/resources/insertGenericsJav/TestGGFinder.jav

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

src/test/resources/insertGenericsJav/TestLocalVarLambda.jav

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

src/test/resources/insertGenericsJav/TestMutualRecursion.jav

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,22 @@
+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

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

src/test/resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav

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

src/test/resources/insertGenericsJav/TestTPHsAndGenerics.jav

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,17 @@
+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

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

src/test/resources/insertGenericsJav/TestVector.jav

@@ -0,0 +1,12 @@
+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

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