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

modified:   ../../resources/bytecode/javFiles/Faculty.jav
	modified:   ../../resources/bytecode/javFiles/MatrixOP.jav

.gitignore

@@ -23,6 +23,3 @@ bin
 
 #
 manually/
-
-logFiles/**
-!logFiles/.gitkeep

PlugInBau.txt

@@ -1,22 +0,0 @@
-Repositories: Branches: JavaCompilerCore: simplyRes
-                        JavaCompilerPlugin: copy_libs
-JavaCompilerCore > mvn install -Dskip.test=true
-
-[INFO] Installing /Users/pl/workspace_oxygen/JavaCompilerCore/target/JavaTXcompiler-0.2.jar to /Users/pl/.m2/repository/de/dhbwstuttgart/JavaTXcompiler/0.2/JavaTXcompiler-0.2.jar
-[INFO] Installing /Users/pl/workspace_oxygen/JavaCompilerCore/pom.xml to /Users/pl/.m2/repository/de/dhbwstuttgart/JavaTXcompiler/0.2/JavaTXcompiler-0.2.pom
-[INFO] Installing /Users/pl/workspace_oxygen/JavaCompilerCore/target/JavaTXcompiler-0.2-jar-with-dependencies.jar to /Users/pl/.m2/repository/de/dhbwstuttgart/JavaTXcompiler/0.2/JavaTXcompiler-0.2-jar-with-dependencies.jar
-[INFO] ------------------------------------------------------------------------
-[INFO] BUILD SUCCESS
-[INFO] ------------------------------------------------------------------------
-[INFO] Total time:  23.279 s
-[INFO] Finished at: 2019-09-17T09:31:30+02:00
-[INFO] -------------------------------------
-
-JavaCompilerCore > cd target
-
-JavaCompilerCore/target >  cp JavaTXcompiler-0.2.jar ../../Plugin_JCC/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/lib/JavaTXcompiler.jar
-
-Im Eclipse: Plugin_JCC/JavaCompilerPlugin>  mvn install
-
-Plugin_JCC/JavaCompilerPlugin/releng/JavaCompilerPlugin.Update/target >  cp JavaCompilerPlugin.Update-0.1.0-SNAPSHOT.zip ~/webdav/public_html/javatx/javatx_XXXXXX.zip
-

abgabeprotokoll.md

@@ -1,19 +0,0 @@
-# JavaTXCompiler Klasse
-* Konstruktor hat einen weiteren Parameter
-* contextPath
-	* Arrays aus URLs (file-urls)
-* Parameter ist Optional
-* wird er gesetzt, so werden Classfiles aus den übergebenen Pfaden geladen
-	* die übergebenen Pfade müssen dabei die Source-Roots sein
-	* Beispiel:
-	`import de.test.Klasse;`
-	* `Klasse.class` liegt in `output/de/test/Klasse.class`
-	* dann muss contextpath auf `output` gesetzt werden
-* wird der Parameter nicht übergeben, so wird der Sourceroot auf das Verzeichnis gesetzt, in dem der Compiler ausgeführt wird
-* dies ist das Verhalten vom javac Compiler
-
-* generateBytecode - Methode hat neuen Parameter: path
-* wird hier null übergeben, so wird die class-File in den gleichen Ordner wie die übergebene .jav File geschrieben
-* wird hier ein Pfad übergeben, so gilt dieser als output root.
-	* Klassen werden in outputRoot/package/name/KlassenName.class geschrieben
-

doc/Generics/generics.tex

@@ -1,25 +0,0 @@
-\documentclass{article}
-
-\begin{document}
-
-\section{Generics sind notwendig}
-Generics können nicht ignoriert werden.
-Folgender Fall ist Typisierbar:
-
-\begin{program}
-<T> T m1(T x){
-	return m2(x);
-}
-
-m2(x){
-	m1(1);
-	m2("Test");
-	return m1(x);
-}
-\end{program}
-
-Beim weglassen des Generics T wäre es aber nicht mehr möglich.
-Dann erhält jeder Constraint, welcher in Verbindung mit der Methode m1 steht
-den selben TPH.
-
-\end{document}

pom.xml

@@ -14,7 +14,7 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -110,11 +110,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 					</execution>
 				</executions>
 				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
-						</manifest>
-					</archive>
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
@@ -169,7 +164,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<tycho.version>0.23.0</tycho.version>
-		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
 	</properties>
 	<distributionManagement>
 		<repository>

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

@@ -61,7 +61,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		assign.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(assign.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(assign.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -70,9 +70,9 @@ public class ArgumentVisitor implements StatementVisitor {
 		binary.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0)) {
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(binary.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(binary.getType()));
 		} else {
-			bytecodeGenMethod.doBoxing(bytecodeGenMethod.getResolver().getResolvedType(binary.getType()));
+			bytecodeGenMethod.doBoxing(bytecodeGenMethod.getResolvedType(binary.getType()));
 		}
 		argListMethCall.remove(0);
 	}
@@ -88,7 +88,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		castExpr.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(castExpr.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(castExpr.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -103,7 +103,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		fieldVar.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(fieldVar.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(fieldVar.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -124,7 +124,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		instanceOf.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(instanceOf.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(instanceOf.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -133,7 +133,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		localVar.accept(bytecodeGenMethod);
 		if(!bytecodeGenMethod.isBinaryExp) {
 			if(argListMethCall.get(0))
-				bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(localVar.getType()));
+				bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(localVar.getType()));
 		}
 		argListMethCall.remove(0);
 	}
@@ -149,7 +149,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		methodCall.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(methodCall.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(methodCall.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -158,7 +158,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		methodCall.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(methodCall.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(methodCall.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -197,7 +197,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		aThis.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(aThis.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(aThis.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -242,7 +242,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		unaryExpr.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(unaryExpr.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(unaryExpr.getType()));
 		argListMethCall.remove(0);
 	}
 
@@ -251,7 +251,7 @@ public class ArgumentVisitor implements StatementVisitor {
 		literal.accept(bytecodeGenMethod);
 		
 		if(argListMethCall.get(0))
-			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolver().getResolvedType(literal.getType()));
+			bytecodeGenMethod.doUnboxing(bytecodeGenMethod.getResolvedType(literal.getType()));
 		argListMethCall.remove(0);
 	}
 

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

@@ -1,15 +1,16 @@
 package de.dhbwstuttgart.bytecode;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Optional;
 
-import de.dhbwstuttgart.environment.DirectoryClassLoader;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.statement.*;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
@@ -17,64 +18,31 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 import de.dhbwstuttgart.bytecode.Exception.BytecodeGeneratorError;
+import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
+import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
+import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
 import de.dhbwstuttgart.bytecode.signature.Signature;
 import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
 import de.dhbwstuttgart.bytecode.signature.TypeToString;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResultForClass;
-import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
+import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
 import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
-import de.dhbwstuttgart.bytecode.utilities.Resolver;
-import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.bytecode.utilities.Simplify;
+import de.dhbwstuttgart.bytecode.utilities.SimplifyResult;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.Field;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Assign;
-import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
-import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
-import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
-import de.dhbwstuttgart.syntaxtree.statement.ExpressionReceiver;
-import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
-import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
-import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
-import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.statement.NewArray;
-import de.dhbwstuttgart.syntaxtree.statement.NewClass;
-import de.dhbwstuttgart.syntaxtree.statement.Return;
-import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
-import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Super;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
+import de.dhbwstuttgart.typeinference.result.ResolvedType;
+import de.dhbwstuttgart.typeinference.result.ResultPair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 public class BytecodeGen implements ASTVisitor {
@@ -84,13 +52,12 @@ public class BytecodeGen implements ASTVisitor {
 	String type;
 
 	public static RefTypeOrTPHOrWildcardOrGeneric THISTYPE = null;
-	private JavaClassName className;
-	private String pkgName;
+	String className;
 	private boolean isInterface;
-	private Collection<ResultSet> listOfResultSets;
+	private List<ResultSet> listOfResultSets;
 	private ResultSet resultSet;
 	private SourceFile sf;
-	private File path;
+	private String path;
 
 	private Optional<Constructor> fieldInitializations;
 
@@ -98,7 +65,7 @@ public class BytecodeGen implements ASTVisitor {
 
 	private String superClass;
 
-	private List<String> tphsClass;
+	private ArrayList<String> tphsClass;
 
 	// stores parameter, local vars and the next index on the local variable table,
 	// which use for aload_i, astore_i,...
@@ -108,39 +75,45 @@ public class BytecodeGen implements ASTVisitor {
 
 	private int constructorPos = 0;
 
+	private final TPHExtractor tphExtractor = new TPHExtractor();
+	private final ArrayList<GenericInsertPair> commonPairs = new ArrayList<>();
+
 	HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes = new HashMap<>();
 	byte[] bytecode;
-	HashMap<JavaClassName, byte[]> classFiles;
+	HashMap<String, byte[]> classFiles;
 
 	private final ArrayList<String> methodNameAndParamsT = new ArrayList<>();
 	private final ArrayList<String> fieldNameAndParamsT = new ArrayList<>();
 
+	private HashMap<String, SimplifyResult> simplifyResults = new HashMap<>();
+	private List<HashMap<String, SimplifyResult>> simplifyResultsList = new ArrayList<>();
+
 	private final ArrayList<String> fieldNameSignature = new ArrayList<>();
 
-	private List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles;
-	private GenericsGeneratorResultForClass generatedGenerics;
+	public List<HashMap<String, SimplifyResult>> getSimplifyResultsList() {
+		return simplifyResultsList;
+	}
 
-	private Resolver resolver;
-	private final DirectoryClassLoader classLoader;
+	public void setSimplifyResultsList(List<HashMap<String, SimplifyResult>> simplifyResultsList) {
+		this.simplifyResultsList = simplifyResultsList;
+	}
 
-	public BytecodeGen(HashMap<JavaClassName, byte[]> classFiles, Collection<ResultSet> listOfResultSets, List<GenericGenratorResultForSourceFile> simplifyResultsForAllSourceFiles, SourceFile sf,
-					   File path, DirectoryClassLoader classLoader) {
+	public BytecodeGen(HashMap<String, byte[]> classFiles, List<ResultSet> listOfResultSets, SourceFile sf,
+			String path) {
 		this.classFiles = classFiles;
 		this.listOfResultSets = listOfResultSets;
-		this.simplifyResultsForAllSourceFiles = simplifyResultsForAllSourceFiles;
 		this.sf = sf;
 		this.path = path;
-		this.pkgName = sf.getPkgName();
-		this.classLoader = classLoader;
 	}
 
 	@Override
 	public void visit(SourceFile sourceFile) {
 		for (ClassOrInterface cl : sourceFile.getClasses()) {
 			System.out.println("in Class: " + cl.getClassName().toString());
-			BytecodeGen classGen = new BytecodeGen(classFiles, listOfResultSets, simplifyResultsForAllSourceFiles, sf, path, classLoader);
+			BytecodeGen classGen = new BytecodeGen(classFiles, listOfResultSets, sf, path);
 			cl.accept(classGen);
-			classGen.writeClass(cl.getClassName());
+			simplifyResultsList.add(classGen.getSimplifyResults());
+			classGen.writeClass(cl.getClassName().toString());
 		}
 	}
 
@@ -148,24 +121,24 @@ public class BytecodeGen implements ASTVisitor {
 	 * Associates the bytecode of the class that was build with the classWriter
 	 * {@link #cw} with the class name in the map {@link #classFiles}
 	 * 
-	 * @param name name of the class with which the bytecode is to be associated
+	 * @param name name of the class with which the the bytecode is to be associated
 	 */
-	private void writeClass(JavaClassName name) {
+	private void writeClass(String name) {
 		bytecode = cw.toByteArray();
 		classFiles.put(name, bytecode);
 
 	}
 
-	public HashMap<JavaClassName, byte[]> getClassFiles() {
+	public HashMap<String, byte[]> getClassFiles() {
 		return classFiles;
 	}
 
 	@Override
 	public void visit(ClassOrInterface classOrInterface) {
 
-		className = classOrInterface.getClassName();
+		className = classOrInterface.getClassName().toString();
 
-		cw.visitSource(className.getClassName() + ".jav", null);
+		cw.visitSource(className + ".jav", null);
 
 		isInterface = (classOrInterface.getModifiers() & 512) == 512;
 
@@ -175,36 +148,75 @@ public class BytecodeGen implements ASTVisitor {
 		fieldInitializations = classOrInterface.getfieldInitializations();
 
 //		resultSet = listOfResultSets.get(0);
+		boolean isConsWithNoParamsVisited = false;
 		boolean isVisited = false;
-		List<ResultSet> listOfResultSetsList = new ArrayList<>(listOfResultSets);
-		generatedGenerics = simplifyResultsForAllSourceFiles.stream().map(sr->sr.getSimplifyResultsByName(className)).findFirst().get();
-		for (int i = 0; i < listOfResultSetsList.size(); i++) {
-		//for (ResultSet rs : listOfResultSets) {
+		for (ResultSet rs : listOfResultSets) {
 			superClass = classOrInterface.getSuperClass().acceptTV(new TypeToDescriptor());
-			resultSet = listOfResultSetsList.get(i);
-			resolver = new Resolver(resultSet);
-//			tphExtractor.setResultSet(resultSet);
-			
+			resultSet = rs;
+			tphExtractor.setResultSet(resultSet);
 
 			// Nur einmal ausführen!!
 			if (!isVisited) {
+				classOrInterface.accept(tphExtractor);
+
+				getCommonTPHS(tphExtractor);
+
+				tphsClass = new ArrayList<>();
+				for (String t : tphExtractor.allTPHS.keySet()) {
+					if (!tphExtractor.allTPHS.get(t))
+						tphsClass.add(t);
+				}
 
 				String sig = null;
 				/*
 				 * if class has generics then creates signature Signature looks like:
 				 * <E:Ljava/...>Superclass
 				 */
-				if (classOrInterface.getGenerics().iterator().hasNext() || classOrInterface.getSuperClass().acceptTV(new TypeToSignature()).contains("<")
-						|| !generatedGenerics.getClassConstraints().isEmpty()) {
+				if (classOrInterface.getGenerics().iterator().hasNext() || !commonPairs.isEmpty()
+						|| classOrInterface.getSuperClass().acceptTV(new TypeToSignature()).contains("<")
+						|| !tphsClass.isEmpty()) {
+					HashMap<TPHConstraint, HashSet<String>> constraints = Simplify
+							.simplifyConstraintsClass(tphExtractor, tphsClass);
+					ArrayList<TPHConstraint> consClass = new ArrayList<>();
+					for (TPHConstraint cons : constraints.keySet()) {
+						String right = null;
+						boolean isToAdd = false;
+						for (String tph : tphsClass) {
+							if (cons.getLeft().equals(tph)) {
 
-					List<GenericsGeneratorResult> consClass = generatedGenerics.getClassConstraints();
-//					
-					Signature signature = new Signature(classOrInterface, genericsAndBounds, consClass);
-					sig = signature.createSignatureForClassOrInterface();
+								consClass.add(cons);
+								try {
+									right = getTPH(cons.getRight());
+									isToAdd = true;
+								} catch (NoSuchElementException e) {
+									continue;
+								}
+
+							}
+						}
+						if (isToAdd) {
+							tphsClass.add(right);
+							removeFromMethod(right);
+							right = null;
+							isToAdd = false;
+						}
+//						if(right != null) {
+//							tphsClass.add(right);
+//							removeFromMethod(right);
+//							right = null;
+//						}
+					}
+
+					SimplifyResult sRes = new SimplifyResult(consClass, tphsClass, new HashMap<>());
+					simplifyResults.put(className, sRes);
+
+					Signature signature = new Signature(classOrInterface, genericsAndBounds, commonPairs, tphsClass,
+							consClass);
+					sig = signature.toString();
 					System.out.println("Signature: => " + sig);
 				}
 
-				cw.visit(Opcodes.V1_8, acc, classOrInterface.getClassName().toString().replace(".", "/"), sig,
+				cw.visit(Opcodes.V1_8, acc, classOrInterface.getClassName().toString(), sig,
 						classOrInterface.getSuperClass().acceptTV(new TypeToDescriptor()), null);
 
 				isVisited = true;
@@ -215,7 +227,12 @@ public class BytecodeGen implements ASTVisitor {
 			}
 
 			for (Constructor c : classOrInterface.getConstructors()) {
+//				if(!isConsWithNoParamsVisited) {
 				c.accept(this);
+//				}
+
+//				if(!c.getParameterList().iterator().hasNext())
+//					isConsWithNoParamsVisited = true;
 			}
 
 			for (Method m : classOrInterface.getMethods()) {
@@ -226,20 +243,69 @@ public class BytecodeGen implements ASTVisitor {
 
 	}
 
+	private void removeFromMethod(String name) {
+		for (MethodAndTPH m : tphExtractor.ListOfMethodsAndTph) {
+			ArrayList<String> toRemove = new ArrayList<>();
+			for (String tph : m.getTphs()) {
+				if (tph.equals(name)) {
+					toRemove.add(tph);
+				}
+			}
+
+			if (!toRemove.isEmpty()) {
+				m.getTphs().removeAll(toRemove);
+				return;
+			}
+		}
+
+	}
+
+	private String getTPH(String name) {
+		for (String tph : tphExtractor.allTPHS.keySet()) {
+			if (tph.equals(name))
+				return tph;
+		}
+		throw new NoSuchElementException("TPH " + name + " does not exist");
+	}
+
+	private void getCommonTPHS(TPHExtractor tphExtractor) {
+		// Gemeinsame TPHs
+		ArrayList<String> cTPHs = new ArrayList<>();
+		// Alle TPHs der Felder speichern
+		for (String tph : tphExtractor.allTPHS.keySet()) {
+			if (!tphExtractor.allTPHS.get(tph))
+				cTPHs.add(tph);
+		}
+	}
+
 	@Override
 	public void visit(Constructor field) {
+		System.out.println("ResultSet: ");
+		resultSet.results.forEach(a -> {
+			System.out.println(a.getLeft().toString() + " = " + a.getRight().toString());
+		});
+		System.out.println("---------------");
+
 		// stores generics and their bounds of method
 		HashMap<String, String> genericsAndBoundsMethod = new HashMap<>();
 
 		field.getParameterList().accept(this);
 
-		String id = MethodUtility.createID(resolver, field);
+		String methParamTypes = field.name + "%%";
 
-		if (methodNameAndParamsT.contains(id)) {
+		Iterator<FormalParameter> itr = field.getParameterList().iterator();
+		while (itr.hasNext()) {
+			FormalParameter fp = itr.next();
+			methParamTypes += resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()) + ";";
+//			methParamTypes += resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToSignature())+";";
+		}
+
+		if (methodNameAndParamsT.contains(methParamTypes)) {
+			System.out.println("ignore - Method: " + field.name + " , paramsType: " + methParamTypes);
 			return;
 		}
-		methodNameAndParamsT.add(id);
-		System.out.println("Constructor: " + field.name + " , paramsType: " + id);
+		methodNameAndParamsT.add(methParamTypes);
+		System.out.println("Method: " + field.name + " , paramsType: " + methParamTypes);
 
 		String desc = null;
 		boolean hasGen = false;
@@ -254,11 +320,10 @@ public class BytecodeGen implements ASTVisitor {
 		}
 		String sig = null;
 		if (hasGen) {
-			List<GenericsGeneratorResult> constraints = generatedGenerics.getClassConstraints();
-			Signature signature = new Signature(genericsAndBounds,
-					methodParamsAndTypes, resultSet, constraints);
-
-			sig = signature.createSignatureForConstructor(field);
+			HashMap<TPHConstraint, HashSet<String>> constraints = Simplify.simplifyConstraints(field.name, tphExtractor,
+					tphsClass);
+			Signature signature = new Signature(field, genericsAndBounds, methodParamsAndTypes, resultSet, constraints);
+			sig = signature.toString();
 		}
 		if (field.getParameterList().iterator().hasNext())
 			System.out.println(field.getParameterList().iterator().next().getType().acceptTV(new TypeToDescriptor()));
@@ -274,7 +339,7 @@ public class BytecodeGen implements ASTVisitor {
 		constructorPos += 1;
 
 		BytecodeGenMethod gen = new BytecodeGenMethod(className, superClass, resultSet, field, mv, paramsAndLocals, cw,
-				genericsAndBoundsMethod, genericsAndBounds, isInterface, classFiles, sf, path, block, constructorPos, classLoader);
+				genericsAndBoundsMethod, genericsAndBounds, isInterface, classFiles, sf, path, block, constructorPos);
 		if (!field.getParameterList().iterator().hasNext()
 				&& !(field.block.statements.get(field.block.statements.size() - 1) instanceof ReturnVoid)) {
 			mv.visitInsn(Opcodes.RETURN);
@@ -289,19 +354,24 @@ public class BytecodeGen implements ASTVisitor {
 		// stored in pos 0
 		// else it will be stored in pos 1 and this will be stored in pos 0
 		String retType = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
-		
-		String id = MethodUtility.createID(resolver, method);
-
-		if (methodNameAndParamsT.contains(id)) {
-			return;
-		}
-		methodNameAndParamsT.add(id);
-		System.out.println("Method: " + method.name + " , paramsType: " + id);
-		// stores generics and their bounds of method
-		HashMap<String, String> genericsAndBoundsMethod = new HashMap<>();
-		
+//		String retType = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToSignature());
+		String methParamTypes = retType + method.name + "%%";
 		method.getParameterList().accept(this);
 
+		Iterator<FormalParameter> itr = method.getParameterList().iterator();
+		while (itr.hasNext()) {
+			FormalParameter fp = itr.next();
+			methParamTypes += resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()) + ";";
+//			methParamTypes += resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToSignature())+";";
+		}
+
+		if (methodNameAndParamsT.contains(methParamTypes)) {
+			return;
+		}
+		methodNameAndParamsT.add(methParamTypes);
+		System.out.println("Method: " + method.name + " , paramsType: " + methParamTypes);
+		// stores generics and their bounds of method
+		HashMap<String, String> genericsAndBoundsMethod = new HashMap<>();
 		String methDesc = null;
 
 		// Method getModifiers() ?
@@ -340,27 +410,43 @@ public class BytecodeGen implements ASTVisitor {
 		// zwite operand muss weggelassen werden
 		if (hasGen || resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToString())
 				.equals("TPH")) {
+			System.out.println("ALL CONST: " + tphExtractor.allCons.size());
+			tphExtractor.allCons.forEach(c -> System.out.println(c.toString()));
+			System.out.println("----------------");
+			HashMap<TPHConstraint, HashSet<String>> constraints = Simplify.simplifyConstraints(method.name,
+					tphExtractor, tphsClass);
+//			ArrayList<GenericInsertPair> pairs = simplifyPairs(method.name,tphExtractor.allPairs,tphExtractor.allCons);
+			Signature signature = new Signature(method, genericsAndBoundsMethod, genericsAndBounds,
+					methodParamsAndTypes, resultSet, constraints);
+			sig = signature.toString();
+			if (simplifyResults.containsKey(className)) {
+				simplifyResults.get(className).getMethodsConstraints().put(methParamTypes, constraints);
+			} else {
+				SimplifyResult sRes = new SimplifyResult(new ArrayList<>(), new ArrayList<>(), new HashMap<>());
+				sRes.getMethodsConstraints().put(methParamTypes, constraints);
+				simplifyResults.put(className, sRes);
+			}
 
-			List<GenericsGeneratorResult> constraints = generatedGenerics.getMethodConstraintsByID(id);
-			List<GenericsGeneratorResult> classConstraints = generatedGenerics.getClassConstraints();
-			Signature signature = new Signature(genericsAndBoundsMethod, genericsAndBounds,
-					methodParamsAndTypes, resultSet, constraints,classConstraints);
-			sig = signature.createSignatureForMethod(method);
 		}
 		System.out.println(method.getName() + " ==> " + sig);
 		NormalMethod meth = new NormalMethod(method, genericsAndBounds, genericsAndBoundsMethod, hasGen);
 		methDesc = meth.accept(new DescriptorToString(resultSet));
 
+//		System.out.println(methDesc);
 		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC + acc, method.getName(), methDesc, sig, null);
 
 		mv.visitCode();
 		BytecodeGenMethod gen = new BytecodeGenMethod(className, superClass, resultSet, method, mv, paramsAndLocals, cw,
-				genericsAndBoundsMethod, genericsAndBounds, isInterface, classFiles, sf, path, classLoader);
+				genericsAndBoundsMethod, genericsAndBounds, isInterface, classFiles, sf, path);
 
 		mv.visitMaxs(0, 0);
 		mv.visitEnd();
 	}
 
+	public HashMap<String, SimplifyResult> getSimplifyResults() {
+		return simplifyResults;
+	}
+
 	@Override
 	public void visit(ParameterList formalParameters) {
 		paramsAndLocals = new HashMap<>();
@@ -431,7 +517,7 @@ public class BytecodeGen implements ASTVisitor {
 		}
 		des += ";";
 		System.out.println(des);
-		String sig = resultSet.resolveType(field.getType()).resolvedType.acceptTV(new TypeToSignature(generatedGenerics.getClassConstraints()));
+		String sig = resultSet.resolveType(field.getType()).resolvedType.acceptTV(new TypeToSignature());
 		System.out.println(sig);
 		if (sig.charAt(sig.length() - 1) != (";").charAt(0)) {
 			sig += ";";

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

@@ -15,10 +15,7 @@ import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
-import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
-import de.dhbwstuttgart.bytecode.utilities.Resolver;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.Field;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
@@ -41,18 +38,16 @@ import de.dhbwstuttgart.typeinference.result.ResultSet;
 public class TPHExtractor extends AbstractASTWalker {
 	// Alle TPHs der Felder werden iKopf der Klasse definiert
 	// alle TPHs der Klasse: (TPH, is in Method?)
-	public final HashMap<String, Boolean> allTPHS = new HashMap<>();
-	public final List<String> tphsClass = new ArrayList<>();
+	final HashMap<String, Boolean> allTPHS = new HashMap<>();
 	MethodAndTPH methodAndTph;
 
 	Boolean inMethod = false;
-	boolean inLocalOrParamOrReturn = false;
+	boolean inLocalOrParam = false;
 
 	public final ArrayList<MethodAndTPH> ListOfMethodsAndTph = new ArrayList<>();
 	final ArrayList<ResultPair<TypePlaceholder, TypePlaceholder>> allPairs = new ArrayList<>();
 	public final ArrayList<TPHConstraint> allCons = new ArrayList<>();
 	private ResultSet resultSet;
-	private Resolver resolver;
 
 	public TPHExtractor() {
 
@@ -60,30 +55,16 @@ public class TPHExtractor extends AbstractASTWalker {
 
 	public void setResultSet(ResultSet resultSet) {
 		this.resultSet = resultSet;
-		this.resolver = new Resolver(resultSet);
 	}
 
-	public Resolver getResolver() {
-		return resolver;
-	}
-	
-//	@Override
-//	public void visit(ClassOrInterface classOrInterface) {
-//		inMethod = false;
-//		classOrInterface.getfieldInitializations().ifPresent(c->c.block.accept(this));
-//		super.visit(classOrInterface);
-//		inMethod = true;
-//	}
 	@Override
 	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)
+				if (inLocalOrParam)
 					methodAndTph.getLocalTphs().add(resolvedTPH.getName());
-			}else {
-				tphsClass.add(resolvedTPH.getName());
 			}
 
 			allTPHS.put(resolvedTPH.getName(), inMethod);
@@ -117,7 +98,7 @@ public class TPHExtractor extends AbstractASTWalker {
 					if (inMethod)
 						methodAndTph.getPairs().add(ag);
 					allPairs.add(ag);
-					TPHConstraint con = new ExtendsConstraint(ag.getLeft().getName(), ag.getRight().getName());
+					TPHConstraint con = new ExtendsConstraint(ag.getLeft().getName(), ag.getRight().getName(), Relation.EXTENDS);
 					if(!containsConstraint(allCons,con))
 						allCons.add(con);
 //				}
@@ -130,7 +111,7 @@ public class TPHExtractor extends AbstractASTWalker {
 
 	private static boolean containsConstraint(ArrayList<TPHConstraint> allCons, TPHConstraint c) {
 		for(TPHConstraint con:allCons) {
-			if(c.getLeft().equals(con.getLeft()) && c.getRight().equals(con.getRight())) {
+			if(c.getLeft().equals(con.getLeft()) && c.getRight().equals(c.getRight())) {
 				return true;
 			}
 		}
@@ -153,11 +134,9 @@ public class TPHExtractor extends AbstractASTWalker {
 	public void visit(GenericRefType genericRefType) {
 		String name = genericRefType.getParsedName();
 		if (inMethod) {
-			methodAndTph.getTphs().add(name);
-			if (inLocalOrParamOrReturn)
 			methodAndTph.getLocalTphs().add(name);
-		}else {
-			tphsClass.add(name);
+			if (inLocalOrParam)
+				methodAndTph.getLocalTphs().add(name);
 		}
 		allTPHS.put(name, inMethod);
 	}
@@ -174,17 +153,8 @@ public class TPHExtractor extends AbstractASTWalker {
 	@Override
 	public void visit(Method method) {
 		inMethod = true;
-		String id = MethodUtility.createID(resolver,method);
-		methodAndTph = new MethodAndTPH(id);
-
-		inLocalOrParamOrReturn = true;
-		method.getReturnType().accept(this);
-        method.getParameterList().accept(this);
-        inLocalOrParamOrReturn = false;
-        
-        if(method.block != null)
-            method.block.accept(this);
-		
+		methodAndTph = new MethodAndTPH(method.name);
+		super.visit(method);
 		inMethod = false;
 		ListOfMethodsAndTph.add(methodAndTph);
 	}
@@ -192,32 +162,29 @@ public class TPHExtractor extends AbstractASTWalker {
 	@Override
 	public void visit(Constructor cons) {
 		inMethod = false;
-		//super.visit(cons);
-		cons.getParameterList().accept(this);
-		if(cons.block != null)
-			cons.block.accept(this);
+		super.visit(cons);
 		inMethod = true;
 	}
 
 	@Override
 	public void visit(LocalVarDecl localVarDecl) {
-//		inLocalOrParamOrReturn = inMethod;
+		inLocalOrParam = true;
 		super.visit(localVarDecl);
-//		inLocalOrParamOrReturn = false;
+		inLocalOrParam = false;
 	}
 
 	@Override
 	public void visit(LocalVar localVar) {
-//		inLocalOrParamOrReturn = inMethod;
+		inLocalOrParam = true;
 		super.visit(localVar);
-//		inLocalOrParamOrReturn = false;
+		inLocalOrParam = false;
 	}
 
 	@Override
 	public void visit(ParameterList formalParameters) {
-		inLocalOrParamOrReturn = inMethod;
+		inLocalOrParam = true;
 		super.visit(formalParameters);
-		inLocalOrParamOrReturn = false;
+		inLocalOrParam = false;
 	}
 
 }

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

@@ -2,8 +2,8 @@ package de.dhbwstuttgart.bytecode.constraint;
 
 public class EqualConstraint extends TPHConstraint {
 
-	public EqualConstraint(String left, String right) {
-		super(left, right, Relation.EQUAL);
+	public EqualConstraint(String left, String right, Relation rel) {
+		super(left, right, rel);
 	}
 
 }

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

@@ -2,8 +2,8 @@ package de.dhbwstuttgart.bytecode.constraint;
 
 public class ExtendsConstraint extends TPHConstraint {
 
-	public ExtendsConstraint(String left, String right) {
-		super(left, right, Relation.EXTENDS);
+	public ExtendsConstraint(String left, String right, Relation rel) {
+		super(left, right, rel);
 	}
 
 }

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

@@ -44,10 +44,6 @@ public class TPHConstraint {
 		return left.equals(tph)||right.equals(tph);
 	}
 	
-	public boolean equalConstraint(TPHConstraint constraint) {
-		return rel == constraint.getRel() && left.equals(constraint.getLeft()) && right.equals(constraint.getRight());
-	}
-	
 	@Override
 	public String toString() {
 		if(rel == Relation.EXTENDS) {

src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java

@@ -3,27 +3,29 @@ package de.dhbwstuttgart.bytecode.descriptor;
 import java.util.HashMap;
 import java.util.Iterator;
 
-import de.dhbwstuttgart.bytecode.utilities.*;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 import org.objectweb.asm.Type;
 
+import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
+import de.dhbwstuttgart.bytecode.utilities.Lambda;
+import de.dhbwstuttgart.bytecode.utilities.MethodFromMethodCall;
+import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
+import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
+import de.dhbwstuttgart.bytecode.utilities.SamMethod;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
-public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
+public class DescriptorToString implements DescriptorVisitor{
 	ResultSet resultSet;
 	
-	public DescriptorToString() {
-	}
-
 	public DescriptorToString(ResultSet resultSet) {
 		this.resultSet = resultSet;
 	}
 	
 	private String addReturnType(String desc, RefTypeOrTPHOrWildcardOrGeneric returnType, ResultSet resultSet) {
-		if(resultSet.resolveType(returnType).resolvedType.toString().equals(CONSTANTS.VOID)){
+		if(resultSet.resolveType(returnType).resolvedType.toString().equals("void")){
 			desc = desc + ")V";
 		}else {
 			desc = desc + ")" + "L"+resultSet.resolveType(returnType).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
@@ -51,7 +53,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 				}else {
 //					desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
 					String resType = resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-					if(resType.contains(CONSTANTS.TPH)/*resType.subSequence(0, 4).equals("TPH ")*/) {
+					if(resType.contains("TPH ")/*resType.subSequence(0, 4).equals("TPH ")*/) {
 						// Bound ist immer Object
 						desc += "L"+Type.getInternalName(Object.class)+ ";";
 					} else {
@@ -69,15 +71,15 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 				}
 			}
 			//TODO: generate a class java%% ... %%
-			else if(resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()).contains(CONSTANTS.ANGLEBRACKET)){
-				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.toString().replace(".", "$$").replace(CONSTANTS.ANGLEBRACKET, "$$$").replace(">", "$$$")+ ";";
+			else if(resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor()).contains("<")){
+				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.toString().replace(".", "$$").replace("<", "$$$").replace(">", "$$$")+ ";";
 			}
 			else {
 				desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
 			}
 		}
 		
-		if(resultSet.resolveType(method.getReturnType()).resolvedType.toString().equals(CONSTANTS.VOID)) {
+		if(resultSet.resolveType(method.getReturnType()).resolvedType.toString().equals("void")) {
 			desc += ")V";
 		}else {
 			if(method.hasGen()) {
@@ -88,7 +90,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 					desc += ")L"+method.getGenericsAndBounds().get(ret)+ ";";
 				}else {
 					String resType = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
-					if(resType.contains(CONSTANTS.TPH)/*resType.subSequence(0, 4).equals("TPH ")*/) {
+					if(resType.contains("TPH ")/*resType.subSequence(0, 4).equals("TPH ")*/) {
 //						desc += ")" + "L"+method.getGenericsAndBoundsMethod().get(resType.substring(4)+"$")+ ";";
 						desc += ")" + "L"+Type.getInternalName(Object.class)+ ";";
 					} else {
@@ -137,7 +139,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 				}else {
 //					desc += "L"+resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor())+ ";";
 					String resType = resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-					if(resType.subSequence(0, 4).equals(CONSTANTS.TPH)) {
+					if(resType.subSequence(0, 4).equals("TPH ")) {
 						// Bound ist immer Object
 						desc += "L"+Type.getInternalName(Object.class)+ ";";
 					} else {
@@ -160,7 +162,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 		while(itr.hasNext()) {
 			FormalParameter fp = itr.next();
 			String d = resultSet.resolveType(fp.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-			if(d.contains(CONSTANTS.TPH) ||d.contains(CONSTANTS.ANGLEBRACKET)) {
+			if(d.contains("TPH ") ||d.contains("<")) {
 				desc += "L"+Type.getInternalName(Object.class)+ ";";
 			}else {
 				desc = desc + "L"+ d + ";";
@@ -169,7 +171,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 		
 		String retType = resultSet.resolveType(lambdaExpression.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
 		
-		if(retType.contains(CONSTANTS.TPH)|| retType.contains(CONSTANTS.ANGLEBRACKET)){
+		if(retType.contains("TPH ")|| retType.contains("<")){
 			desc += ")L"+Type.getInternalName(Object.class)+ ";";
 		}else {
 			desc = desc + ")"+"L"+retType+";";
@@ -185,7 +187,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 			RefTypeOrTPHOrWildcardOrGeneric rt = itr.next();
 			String d = resultSet.resolveType(rt).resolvedType.acceptTV(new TypeToDescriptor());
 			
-			if(d.contains(CONSTANTS.TPH) ||d.contains(CONSTANTS.ANGLEBRACKET)) {
+			if(d.contains("TPH ") ||d.contains("<")) {
 				desc += "L"+Type.getInternalName(Object.class)+ ";";
 			}else {
 				desc += "L"+ d + ";";
@@ -194,7 +196,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 		}
 		String retType = resultSet.resolveType(samMethod.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
 		
-		if(retType.contains(CONSTANTS.TPH)|| retType.contains(CONSTANTS.ANGLEBRACKET)){
+		if(retType.contains("TPH ")|| retType.contains("<")){
 			desc += ")L"+Type.getInternalName(Object.class)+ ";";
 		}else {
 			desc = desc + ")"+"L"+retType+";";
@@ -208,7 +210,7 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 		for(Expression e : methodFromMethodCall.getArgList().getArguments()) {
 			String d = resultSet.resolveType(e.getType()).resolvedType.acceptTV(new TypeToDescriptor());
 			
-			if(d.contains(CONSTANTS.TPH) ||d.contains(CONSTANTS.ANGLEBRACKET) || methodFromMethodCall.getReceiverName().contains("$$")) {
+			if(d.contains("TPH ") ||d.contains("<") || methodFromMethodCall.getReceiverName().contains("$$")) {
 				desc += "L"+Type.getInternalName(Object.class)+ ";";
 			}else {
 				if(methodFromMethodCall.getGenericsAndBoundsMethod().containsKey(d)) {
@@ -223,9 +225,9 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 		}
 		String retType = resultSet.resolveType(methodFromMethodCall.getReturnType()).resolvedType.acceptTV(new TypeToDescriptor());
 		System.out.println("DescriptorToString retType = " + retType);
-		if(retType.equals(CONSTANTS.VOID)) {
+		if(retType.equals("void")) {
 			desc += ")V";
-		}else if(retType.contains(CONSTANTS.TPH)|| retType.contains(CONSTANTS.ANGLEBRACKET) || methodFromMethodCall.getReceiverName().contains("$$")){
+		}else if(retType.contains("TPH ")|| retType.contains("<") || methodFromMethodCall.getReceiverName().contains("$$")){
 			desc += ")L"+Type.getInternalName(Object.class)+ ";";
 		}else {
 			if(methodFromMethodCall.getGenericsAndBoundsMethod().containsKey(retType)) {
@@ -240,20 +242,4 @@ public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
 		return desc;
 	}
 	
-	@Override
-	public String createDescForFunN(ArgumentList argumentList, String returnType) {
-		Iterator<Expression> itr1 = argumentList.getArguments().iterator();
-		String methDesc = "(";
-		while(itr1.hasNext()) {
-			methDesc += "L" + Type.getInternalName(Object.class) + ";";
-			itr1.next();
-		}
-		if (returnType.equals(CONSTANTS.VOID)){
-			methDesc += ")V";
-		} else {
-			methDesc += ")L" + Type.getInternalName(Object.class) + ";";
-		}
-		return methDesc;
-	}
-
 }

src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java

@@ -5,13 +5,11 @@ import de.dhbwstuttgart.bytecode.utilities.MethodFromMethodCall;
 import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
 import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
 import de.dhbwstuttgart.bytecode.utilities.SamMethod;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
 
 public interface DescriptorVisitor {
-	String visit(NormalMethod method);
-	String visit(NormalConstructor constructor);
-	String visit(Lambda lambdaExpression);
-	String visit(SamMethod samMethod);
-	String visit(MethodFromMethodCall methodFromMethodCall);
-	String createDescForFunN(ArgumentList argumentList, String returnType);
+	public String visit(NormalMethod method);
+	public String visit(NormalConstructor constructor);
+	public String visit(Lambda lambdaExpression);
+	public String visit(SamMethod samMethod);
+	public String visit(MethodFromMethodCall methodFromMethodCall);
 }

src/main/java/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java

@@ -20,8 +20,7 @@ public class TypeToDescriptor implements TypeVisitor<String>{
 	@Override
 	public String visit(SuperWildcardType superWildcardType) {
 		System.out.println("\nWILDCARD ="+superWildcardType.getInnerType().toString().replace(".", "/"));
-		//return superWildcardType.getInnerType().toString().replace(".", "/");
-		return superWildcardType.getInnerType().acceptTV(new TypeToDescriptor());
+		return superWildcardType.getInnerType().toString().replace(".", "/");
 		//throw new NotImplementedException();
 	}
 
@@ -33,8 +32,7 @@ public class TypeToDescriptor implements TypeVisitor<String>{
 	@Override
 	public String visit(ExtendsWildcardType extendsWildcardType) {
 		System.out.println("\nWILDCARD extends ="+extendsWildcardType.getInnerType().toString().replace(".", "/"));
-		//return extendsWildcardType.getInnerType().toString().replace(".", "/");
-		return extendsWildcardType.getInnerType().acceptTV(new TypeToDescriptor());
+		return extendsWildcardType.getInnerType().toString().replace(".", "/");
 		//throw new NotImplementedException();
 	}
 

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

@@ -1,53 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGenerator;
-
-import java.util.List;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.NameReplacementResult;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
-
-/**
- * This class represents the result of the constraints simplifier.
- * 
- * @author fayez
- *
- */
-public class ConstraintsSimplierResult {
-	private List<GenericsGeneratorResult> genericsGenResults;
-	private List<NameReplacementResult> nameReplacementResults;
-	/**
-	 * @param genericsGenResults
-	 */
-	public ConstraintsSimplierResult(List<GenericsGeneratorResult> genericsGenResults, 
-			List<NameReplacementResult> nameReplacementResults) {
-		this.genericsGenResults = genericsGenResults;
-		this.setNameReplacementResults(nameReplacementResults);
-	}
-	/**
-	 * @return the genericsGenResults
-	 */
-	public List<GenericsGeneratorResult> getGenericsGenResults() {
-		return genericsGenResults;
-	}
-	/**
-	 * @param genericsGenResults the genericsGenResults to set
-	 */
-	public void setGenericsGenResults(List<GenericsGeneratorResult> genericsGenResults) {
-		this.genericsGenResults = genericsGenResults;
-	}
-	/**
-	 * @return the nameReplacementResults
-	 */
-	public List<NameReplacementResult> getNameReplacementResults() {
-		return nameReplacementResults;
-	}
-	/**
-	 * @param nameReplacementResults the nameReplacementResults to set
-	 */
-	public void setNameReplacementResults(List<NameReplacementResult> nameReplacementResults) {
-		this.nameReplacementResults = nameReplacementResults;
-	}
-	
-}

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

@@ -1,137 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGenerator;
-
-import java.util.*;
-
-import de.dhbwstuttgart.bytecode.TPHExtractor;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.*;
-
-/**
- * @author fayez
- *
- */
-public class ConstraintsSimplifier {
-	public static ConstraintsSimplierResult simplifyConstraints(final TPHExtractor tphExtractor, final List<GenericsGeneratorResult> genericsGeneratorResults, final List<String> tphsClass) {
-		
-		List<TPHConstraint> allCons = tphExtractor.allCons;
-		List<TPHConstraint> equalCons = new ArrayList<>();
-
-		/* Step 1 */
-		List<ConstraintsWithSameLeftSide> foundCons = GenericsGeneratorUtility.findConstraintsWithLeftSameLeftSide(allCons);
-		if(!foundCons.isEmpty()) {
-			List<TPHConstraint> equalCons2 = new ArrayList<>();
-			GenericsGeneratorUtility.simplifyConstraintsWithSameLeftSide(foundCons,tphExtractor,tphsClass,equalCons2);
-			equalCons.addAll(equalCons2);
-		}
-		
-//		if(!simpleCycles.isEmpty()) {
-//			handleSimpleCycles(allCons, simpleCycles,tphExtractor);
-//			equalCons.addAll(GenericsGeneratorUtility.getEqualConstraints(allCons));
-//		}
-//		
-		List<Cycle> cycles = findCycles(allCons);
-		
-		if(!cycles.isEmpty()) {
-			handleCycle(genericsGeneratorResults, allCons, cycles,tphExtractor);
-		}
-		/* The right hand side of equal constraint is the new name in name replacement result */
-		List<NameReplacementResult> nameReplacementResults = GenericsGeneratorUtility.createNameReplacementResultsFromEqualConstraints(equalCons);
-		getEqualsFromNameReplacementResults(genericsGeneratorResults,nameReplacementResults);
-		ConstraintsSimplierResult result = new ConstraintsSimplierResult(genericsGeneratorResults, nameReplacementResults);
-		return result;
-	}
-
-	private static void getEqualsFromNameReplacementResults(List<GenericsGeneratorResult> genericsGeneratorResults,
-			List<NameReplacementResult> nameReplacementResults) {
-		genericsGeneratorResults.forEach(g->{
-			String tph = g.getConstraint().getLeft();
-			if (!nameReplacementResults.isEmpty()) {
-				collectAllEquals(nameReplacementResults, g, tph);
-			}
-
-			if (!nameReplacementResults.isEmpty()) {
-				collectAllEquals(nameReplacementResults, g);
-			}
-		});
-		
-	}
-
-	private static void collectAllEquals(List<NameReplacementResult> nameReplacementResults, GenericsGeneratorResult g) {
-		Set<String> equalsTPHs = g.getEqualsTPHs();
-		Set<String> tphsToAdd = getAllEqualTphs(equalsTPHs, nameReplacementResults);
-		while (!tphsToAdd.isEmpty()){
-			equalsTPHs.addAll(tphsToAdd);
-			tphsToAdd = getAllEqualTphs(equalsTPHs, nameReplacementResults);
-		}
-	}
-
-	private static Set<String> getAllEqualTphs(Set<String> equalsTPHs, List<NameReplacementResult> nameReplacementResults) {
-		Set<String> tphsToAdd = new HashSet<>();
-		equalsTPHs.forEach(e->{
-			collectAllEquals(nameReplacementResults, tphsToAdd,e);
-		});
-		return tphsToAdd;
-	}
-
-	public static void collectAllEquals(List<NameReplacementResult> nameReplacementResults, Set<String> tphsToAdd,
-										String tph) {
-		List<NameReplacementResult> toRemoveList = new ArrayList<>();
-		Optional<NameReplacementResult> nameReplacementResult = nameReplacementResults.stream().filter(n->n.getName().equals(tph)).findFirst();
-		nameReplacementResult.ifPresent(toRemove->{
-			tphsToAdd.addAll(toRemove.getOldNames());
-			toRemoveList.add(toRemove);
-		});
-		if(!toRemoveList.isEmpty()){
-			nameReplacementResults.remove(toRemoveList.get(0));
-			toRemoveList.clear();
-		}
-	}
-
-	/**
-	 * @param nameReplacementResults
-	 * @param g
-	 * @param tph
-	 */
-	public static void collectAllEquals(List<NameReplacementResult> nameReplacementResults, GenericsGeneratorResult g,
-			String tph) {
-		List<NameReplacementResult> toRemoveList = new ArrayList<>();
-		Optional<NameReplacementResult> nameReplacementResult = nameReplacementResults.stream().filter(n->n.getName().equals(tph)).findFirst();
-		nameReplacementResult.ifPresent(toRemove->{
-			g.getEqualsTPHs().addAll(toRemove.getOldNames());
-			toRemoveList.add(toRemove);
-		});
-		if(!toRemoveList.isEmpty()){
-			nameReplacementResults.remove(toRemoveList.get(0));
-			toRemoveList.clear();
-		}
-	}
-
-	/**
-	 * @param genericsGeneratorResults
-	 * @param allCons
-	 * @param cycles
-	 * @param tphExtractor 
-	 */
-	public static void handleCycle(List<GenericsGeneratorResult> genericsGeneratorResults,
-								   List<TPHConstraint> allCons, List<Cycle> cycles, TPHExtractor tphExtractor) {
-		GenericsGeneratorUtility.modifyRelationForConstraintsInCycle(cycles);
-		List<NameReplacementResult> nameReplacementResults = GenericsGeneratorUtility.substituteTPHSFormCycle(allCons, cycles,tphExtractor);
-		GenericsGeneratorUtility.createResults(genericsGeneratorResults,nameReplacementResults);
-		GenericsGeneratorUtility.removeEqualConstraints(allCons);
-	}
-
-	/**
-	 * @param allCons
-	 * @return
-	 */
-	public static List<Cycle> findCycles(List<TPHConstraint> allCons) {
-		/* find all cycles */
-		CyclesFinder cyclesFinder = new CyclesFinder(allCons);
-		List<Cycle> cycles = cyclesFinder.findCycles();
-		return cycles;
-	}
-
-}

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

@@ -1,106 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGenerator;
-
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.Cycle;
-
-/**
- * @author fayez
- *
- */
-public class CyclesFinder {
-	private final List<TPHConstraint> allCons;
-
-	public CyclesFinder(List<TPHConstraint> allCons) {
-		this.allCons = allCons;
-	}
-
-	public List<Cycle> findCycles() {
-		List<TPHConstraint> vistedConstraints = new ArrayList<>(allCons.size());
-		List<Cycle> cycles = new ArrayList<>();
-		for (TPHConstraint constraint : allCons) {
-			if(constraint.getRel()==Relation.EQUAL)
-				continue;
-			if (!vistedConstraints.contains(constraint)) {
-				vistedConstraints.add(constraint);
-				checkConstraint(constraint, vistedConstraints, cycles);
-			}
-		}
-		return cycles;
-	}
-
-	private void checkConstraint(TPHConstraint constraint, List<TPHConstraint> vistedConstraints,
-			List<Cycle> cycles) {
-		List<String> tphsInRelation = new LinkedList<>();
-		List<TPHConstraint> maybeCycle = new ArrayList<>();
-		maybeCycle.add(constraint);
-		tphsInRelation.add(constraint.getLeft());
-		tphsInRelation.add(constraint.getRight());
-		Optional<TPHConstraint> nextConstraint = getConstraintInRelation(tphsInRelation, maybeCycle);
-		while (nextConstraint.isPresent()) {
-			if(containsInLongCycle(nextConstraint.get(), cycles)) {
-				break;
-			}
-			if (isCycle(tphsInRelation)) {
-				addAllToVisitedConstraints(vistedConstraints, maybeCycle);
-				Cycle cycle = new Cycle(maybeCycle);
-				cycles.add(cycle);
-				return;
-			}
-			nextConstraint = getConstraintInRelation(tphsInRelation, maybeCycle);
-		}
-
-//		addAllToVisitedConstraints(vistedConstraints, maybeCycle);
-	}
-
-	private boolean containsInLongCycle(TPHConstraint c, List<Cycle> cycles) {
-		for(Cycle cycle : cycles) {
-			if(cycle.containConstraint(c))
-				return true;
-		}
-		return false;
-	}
-
-	private void addAllToVisitedConstraints(List<TPHConstraint> vistedConstraints, List<TPHConstraint> maybeCycle) {
-		for (TPHConstraint con : maybeCycle) {
-			if (!vistedConstraints.contains(con))
-				vistedConstraints.add(con);
-		}
-	}
-
-	private Optional<TPHConstraint> getConstraintInRelation(List<String> tphsInRelation,
-			List<TPHConstraint> maybeCycle) {
-		TPHConstraint constraint = getConstraintByLeftSide(tphsInRelation.get(tphsInRelation.size()-1),maybeCycle);
-		Optional<TPHConstraint> nextConstraint = Optional.ofNullable(constraint);
-		if(nextConstraint.isPresent()) {
-			maybeCycle.add(constraint);
-			tphsInRelation.add(constraint.getRight());
-		}
-		return nextConstraint;
-	}
-
-	private TPHConstraint getConstraintByLeftSide(String left, List<TPHConstraint> maybeCycle) {
-		for(TPHConstraint constraint : allCons) {
-			if(constraint.getRel()==Relation.EQUAL)
-				continue;
-			if(maybeCycle.contains(constraint))
-				continue;
-			if(constraint.getLeft().equals(left))
-				return constraint;
-		}
-		return null;
-	}
-
-	private boolean isCycle(List<String> tphsInRelation) {
-		return tphsInRelation.get(0).equals(tphsInRelation.get(tphsInRelation.size() - 1));
-	}
-
-}

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

@@ -1,675 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGenerator;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-import de.dhbwstuttgart.bytecode.TPHExtractor;
-import de.dhbwstuttgart.bytecode.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;
-import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.Field;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Assign;
-import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
-import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
-import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
-import de.dhbwstuttgart.syntaxtree.statement.ExpressionReceiver;
-import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
-import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
-import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
-import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.statement.NewArray;
-import de.dhbwstuttgart.syntaxtree.statement.NewClass;
-import de.dhbwstuttgart.syntaxtree.statement.Return;
-import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
-import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Super;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-
-/**
- * @author fayez
- *
- */
-public class GeneratedGenericsFinder implements ASTVisitor {
-	private final TPHExtractor tphExtractor = new TPHExtractor();
-	private Collection<ResultSet> listOfResultSets;
-	private SourceFile sf;
-	private List<String> tphsClass;
-	private GenericGenratorResultForSourceFile generatedGenericsForSF;
-	private ResultSet resultSet;
-	private final List<String> methodNameAndParamsT = new ArrayList<>();
-	
-	private String pkgName;
-	private JavaClassName className;
-	private Resolver resolver;
-
-	/**
-	 * @param sf
-	 * @param listOfResultSets
-	 */
-	public GeneratedGenericsFinder(SourceFile sf, Collection<ResultSet> listOfResultSets) {
-		this.sf = sf;
-		this.listOfResultSets = listOfResultSets;
-	}
-
-	public GenericGenratorResultForSourceFile findGeneratedGenerics() {
-		sf.accept(this);
-		return generatedGenericsForSF;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * SourceFile)
-	 */
-	@Override
-	public void visit(SourceFile sourceFile) {
-		pkgName = sf.getPkgName();
-		generatedGenericsForSF = new GenericGenratorResultForSourceFile(pkgName);
-		for (ClassOrInterface cl : sourceFile.getClasses()) {
-			cl.accept(this);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * ClassOrInterface)
-	 */
-	@Override
-	public void visit(ClassOrInterface classOrInterface) {
-		className = classOrInterface.getClassName();
-		List<ResultSet> listOfResultSetsList = new ArrayList<>(listOfResultSets);
-		
-		boolean isVisited = false;
-		
-		ConstraintsSimplierResult simplifiedConstraints = null;
-		GenericsGeneratorResultForClass ggResult = null;
-		
-		for (int i = 0; i < listOfResultSetsList.size(); i++) {
-			resultSet = listOfResultSetsList.get(i);
-			tphExtractor.setResultSet(resultSet);
-			resolver = new Resolver(resultSet);
-			classOrInterface.accept(tphExtractor);
-			tphsClass = tphExtractor.tphsClass;
-			simplifiedConstraints = GenericsGenerator.simplifyConstraints(tphExtractor, tphsClass);
-			if(!isVisited) {
-				ggResult = GenericsGenerator.generateConstraints(className, tphExtractor, tphsClass,simplifiedConstraints);
-				isVisited = true;
-			}
-
-			for(Method m : classOrInterface.getMethods()) {
-				addMethodConstraints(simplifiedConstraints, ggResult, m);
-				
-			}
-			
-			if(ggResult != null)
-				generatedGenericsForSF.addGenericGeneratorResultClass(ggResult);
-			
-			
-		}
-
-	}
-
-	/**
-	 * @param simplifiedConstraints
-	 * @param ggResult
-	 * @param m
-	 */
-	public void addMethodConstraints(ConstraintsSimplierResult simplifiedConstraints,
-			GenericsGeneratorResultForClass ggResult, Method m) {
-		String id = MethodUtility.createID(resolver, m);
-		boolean isInGGResult = (ggResult != null) && ggResult.contains(id);
-		if(methodNameAndParamsT.contains(id) || isInGGResult)
-			return;
-		methodNameAndParamsT.add(id);
-		Optional<MethodAndTPH> methodAndTPH = GenericsGeneratorUtility.getMethodAndTphs(tphExtractor.ListOfMethodsAndTph,id);
-		methodAndTPH.ifPresent(mt->{
-			MethodAndConstraints methodConstraints = GenericsGenerator.generateConstraintsForMethod(tphExtractor.allCons, mt , simplifiedConstraints, tphsClass);
-			ggResult.getMethodsAndTheirConstraints().getMethodsAndConstraints().add(methodConstraints);
-		});
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * Method)
-	 */
-	@Override
-	public void visit(Method method) {
-		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * ParameterList)
-	 */
-	@Override
-	public void visit(ParameterList formalParameters) {
-		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * Constructor)
-	 */
-	@Override
-	public void visit(Constructor field) {
-		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.ArgumentList)
-	 */
-	@Override
-	public void visit(ArgumentList argumentList) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.LambdaExpression)
-	 */
-	@Override
-	public void visit(LambdaExpression lambdaExpression) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.Assign)
-	 */
-	@Override
-	public void visit(Assign assign) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.BinaryExpr)
-	 */
-	@Override
-	public void visit(BinaryExpr binary) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.Block)
-	 */
-	@Override
-	public void visit(Block block) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.CastExpr)
-	 */
-	@Override
-	public void visit(CastExpr castExpr) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.EmptyStmt)
-	 */
-	@Override
-	public void visit(EmptyStmt emptyStmt) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.FieldVar)
-	 */
-	@Override
-	public void visit(FieldVar fieldVar) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.ForStmt)
-	 */
-	@Override
-	public void visit(ForStmt forStmt) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.IfStmt)
-	 */
-	@Override
-	public void visit(IfStmt ifStmt) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.InstanceOf)
-	 */
-	@Override
-	public void visit(InstanceOf instanceOf) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.LocalVar)
-	 */
-	@Override
-	public void visit(LocalVar localVar) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.LocalVarDecl)
-	 */
-	@Override
-	public void visit(LocalVarDecl localVarDecl) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.MethodCall)
-	 */
-	@Override
-	public void visit(MethodCall methodCall) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.NewClass)
-	 */
-	@Override
-	public void visit(NewClass methodCall) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.NewArray)
-	 */
-	@Override
-	public void visit(NewArray newArray) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.Return)
-	 */
-	@Override
-	public void visit(Return aReturn) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.ReturnVoid)
-	 */
-	@Override
-	public void visit(ReturnVoid aReturn) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.StaticClassName)
-	 */
-	@Override
-	public void visit(StaticClassName staticClassName) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.Super)
-	 */
-	@Override
-	public void visit(Super aSuper) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.This)
-	 */
-	@Override
-	public void visit(This aThis) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.WhileStmt)
-	 */
-	@Override
-	public void visit(WhileStmt whileStmt) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.DoStmt)
-	 */
-	@Override
-	public void visit(DoStmt whileStmt) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.AssignToField)
-	 */
-	@Override
-	public void visit(AssignToField assignLeftSide) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.parser.
-	 * SyntaxTreeGenerator.AssignToLocal)
-	 */
-	@Override
-	public void visit(AssignToLocal assignLeftSide) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.SuperCall)
-	 */
-	@Override
-	public void visit(SuperCall superCall) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.ExpressionReceiver)
-	 */
-	@Override
-	public void visit(ExpressionReceiver expressionReceiver) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.UnaryExpr)
-	 */
-	@Override
-	public void visit(UnaryExpr unaryExpr) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see de.dhbwstuttgart.syntaxtree.StatementVisitor#visit(de.dhbwstuttgart.
-	 * syntaxtree.statement.Literal)
-	 */
-	@Override
-	public void visit(Literal literal) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * GenericTypeVar)
-	 */
-	@Override
-	public void visit(GenericTypeVar genericTypeVar) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * FormalParameter)
-	 */
-	@Override
-	public void visit(FormalParameter formalParameter) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * GenericDeclarationList)
-	 */
-	@Override
-	public void visit(GenericDeclarationList genericTypeVars) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.
-	 * Field)
-	 */
-	@Override
-	public void visit(Field field) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.type
-	 * .RefType)
-	 */
-	@Override
-	public void visit(RefType refType) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.type
-	 * .SuperWildcardType)
-	 */
-	@Override
-	public void visit(SuperWildcardType superWildcardType) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.type
-	 * .TypePlaceholder)
-	 */
-	@Override
-	public void visit(TypePlaceholder typePlaceholder) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.type
-	 * .ExtendsWildcardType)
-	 */
-	@Override
-	public void visit(ExtendsWildcardType extendsWildcardType) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * de.dhbwstuttgart.syntaxtree.ASTVisitor#visit(de.dhbwstuttgart.syntaxtree.type
-	 * .GenericRefType)
-	 */
-	@Override
-	public void visit(GenericRefType genericRefType) {
-		// TODO Auto-generated method stub
-
-	}
-
-}

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

@@ -1,256 +0,0 @@
-/**
- *
- */
-package de.dhbwstuttgart.bytecode.genericsGenerator;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.*;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import org.objectweb.asm.Type;
-
-import de.dhbwstuttgart.bytecode.TPHExtractor;
-import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
-
-/**
- * @author fayez
- *
- */
-public class GenericsGenerator {
-    /*TODO: When generating generics for a class if we have the following:
-       tphClass < tphMeth1 < tphMeth2
-       then we have to convert tphMeth1, tphMeth2  to tph class and generate the following
-       class constraints: tphClass < tphMeth1, tphMeth1 < tphMeth2, tphMeth2 < Object
-     */
-
-    public static GenericsGeneratorResultForClass generateConstraints(final JavaClassName className, final TPHExtractor tphExtractor,
-                                                                      final List<String> tphsClass, final ConstraintsSimplierResult simplifiedConstraints) {
-
-        List<GenericsGeneratorResult> classConstraints = generateConstraintsForClass(tphExtractor,
-                simplifiedConstraints, tphsClass);
-//		GenericGeneratorResultsForAllMethods methodsAndConstraints = generateConstraintsForAllMethods(tphExtractor,
-//				simplifiedConstraints, tphsClass);
-        GenericGeneratorResultsForAllMethods methodsAndConstraints = new GenericGeneratorResultsForAllMethods(new ArrayList<>());
-
-        return new GenericsGeneratorResultForClass(className, classConstraints, methodsAndConstraints);
-    }
-
-
-    /**
-     * @param tphExtractor
-     * @param tphsClass
-     * @return
-     */
-    public static ConstraintsSimplierResult simplifyConstraints(final TPHExtractor tphExtractor,
-                                                                final List<String> tphsClass) {
-        final List<GenericsGeneratorResult> genericsGeneratorResults = new ArrayList<>();
-
-        ConstraintsSimplierResult simplifiedConstraints = ConstraintsSimplifier.simplifyConstraints(tphExtractor,
-                genericsGeneratorResults, tphsClass);
-        return simplifiedConstraints;
-    }
-
-
-    private static List<GenericsGeneratorResult> generateConstraintsForClass(final TPHExtractor tphExtractor,
-                                                                             final ConstraintsSimplierResult simplifiedConstraints, final List<String> tphsClass) {
-        final List<GenericsGeneratorResult> constraints = new ArrayList<>();
-
-        if (tphsClass.isEmpty())
-            return constraints;
-
-        final List<TPHConstraint> allCons = tphExtractor.allCons;
-
-        final Set<String> visitedTPHs = new HashSet<>();
-
-        final List<String> methodTPHs = tphExtractor.ListOfMethodsAndTph.stream().map(m -> m.getLocalTphs())
-                .flatMap(l -> l.stream()).collect(Collectors.toList());
-
-        createConstraintsForClassTphs(simplifiedConstraints, tphsClass, constraints, allCons, visitedTPHs, methodTPHs);
-
-        GenericsGeneratorUtility.addTPHsToClassTPHs(constraints, tphsClass);
-        GenericsGeneratorUtility.removeClassTPHsFromMethodTPHs(tphsClass, tphExtractor);
-
-        generateGGConstraintsForTPH(tphsClass, constraints, simplifiedConstraints);
-
-        return constraints;
-    }
-
-    private static void createConstraintsForClassTphs(ConstraintsSimplierResult simplifiedConstraints, List<String> tphsClass, List<GenericsGeneratorResult> constraints, List<TPHConstraint> allCons, Set<String> visitedTPHs, List<String> methodTPHs) {
-        List<String> classAndMethodTphs = new ArrayList<>(tphsClass);
-        classAndMethodTphs.addAll(methodTPHs);
-
-        for (String tph : tphsClass) {
-
-            if (visitedTPHs.contains(tph))
-                continue;
-
-            final LinkedList<String> tphsInRel = GenericsGeneratorUtility
-                    .createLinkedListForTPHsInRelationClass(allCons, tphsClass, methodTPHs, visitedTPHs, tph);
-
-            generateConstraintsForClassFromList(tphsInRel,simplifiedConstraints,classAndMethodTphs,constraints);
-        }
-    }
-
-    private static void generateConstraintsForClassFromList(LinkedList<String> tphsInRel, ConstraintsSimplierResult simplifiedConstraints, List<String> classAndMethodTphs, List<GenericsGeneratorResult> constraints) {
-
-        if(tphsInRel.isEmpty())
-            return;
-
-        List<GenericsGeneratorResult> resultConstraints = new ArrayList<>();
-        String subType = tphsInRel.getFirst();
-        String superType = GenericsGeneratorUtility.getNextClassTph(classAndMethodTphs, tphsInRel);
-
-        int idxOfSuper = tphsInRel.indexOf(superType);
-        int size = tphsInRel.size();
-        while (size > 2 && idxOfSuper < size-1){
-            GenericsGeneratorResult genericsGeneratorResult = getGenericsGeneratorResultForClass(simplifiedConstraints, subType, superType);
-            constraints.add(genericsGeneratorResult);
-
-            tphsInRel = new LinkedList<>(tphsInRel.subList(idxOfSuper, size));
-            subType = tphsInRel.getFirst();
-            superType = GenericsGeneratorUtility.getNextClassTph(classAndMethodTphs, tphsInRel);
-
-            idxOfSuper = tphsInRel.indexOf(superType);
-            size = tphsInRel.size();
-        }
-        GenericsGeneratorResult genericsGeneratorResult = getGenericsGeneratorResultForClass(simplifiedConstraints, subType, superType);
-        constraints.add(genericsGeneratorResult);
-    }
-
-    private static GenericsGeneratorResult getGenericsGeneratorResultForClass(ConstraintsSimplierResult simplifiedConstraints, String subType, String superType) {
-        TPHConstraint constraint = new ExtendsConstraint(subType, superType);
-
-        Set<String> equalSet = GenericsGeneratorUtility
-                .createEqualSet(simplifiedConstraints.getNameReplacementResults(), subType);
-
-        return new GenericsGeneratorResult(constraint, equalSet);
-    }
-    /* TODO Remove this methoda*/
-    private static GenericsGeneratorResult generateGGResultForClass(LinkedList<String> tphsInRel,
-                                                                    ConstraintsSimplierResult simplifiedConstraints, List<String> tphsClass) {
-        String subType = tphsInRel.getFirst();
-
-        String superType = GenericsGeneratorUtility.getNextClassTph(tphsClass, tphsInRel);
-
-        TPHConstraint constraint = new ExtendsConstraint(subType, superType);
-
-        Set<String> equalSet = GenericsGeneratorUtility
-                .createEqualSet(simplifiedConstraints.getNameReplacementResults(), subType);
-
-        return new GenericsGeneratorResult(constraint, equalSet);
-    }
-
-    private static GenericGeneratorResultsForAllMethods generateConstraintsForAllMethods(
-            final TPHExtractor tphExtractor, ConstraintsSimplierResult simplifiedConstraints, List<String> tphsClass) {
-
-        final List<MethodAndConstraints> methodsAndConstraints = new ArrayList<>();
-        final GenericGeneratorResultsForAllMethods results = new GenericGeneratorResultsForAllMethods(
-                methodsAndConstraints);
-        tphExtractor.ListOfMethodsAndTph.forEach(m -> {
-            MethodAndConstraints methAndCons = generateConstraintsForMethod(tphExtractor.allCons, m,
-                    simplifiedConstraints, tphsClass);
-            methodsAndConstraints.add(methAndCons);
-        });
-
-        return results;
-    }
-
-    public static MethodAndConstraints generateConstraintsForMethod(final List<TPHConstraint> allCons,
-                                                                    final MethodAndTPH m, final ConstraintsSimplierResult simplifiedConstraints, List<String> tphsClass) {
-        final List<String> localTphs = m.getLocalTphs();
-
-        List<GenericsGeneratorResult> constraints = new ArrayList<>();
-        MethodAndConstraints result = new MethodAndConstraints(m.getId(), constraints);
-
-        if (localTphs.isEmpty())
-            return result;
-
-        if (localTphs.size() == 1 && tphsClass.isEmpty()) {
-            generateGGConstraintsForTPH(localTphs, constraints, simplifiedConstraints);
-            return result;
-        }
-
-        final Set<String> visitedTPHs = new HashSet<>();
-
-        for (String tph : localTphs) {
-
-            if (visitedTPHs.contains(tph))
-                continue;
-
-            final LinkedList<String> tphsInRel = GenericsGeneratorUtility.createLinkedListForTPHsInRelation(allCons,
-                    localTphs, tphsClass, visitedTPHs, tph);
-            if (!tphsInRel.isEmpty()) {
-                GenericsGeneratorUtility.removeNotLocalTphs(tphsInRel, localTphs, tphsClass);
-                if (!GenericsGeneratorUtility.isInResult(tphsInRel.getFirst(), constraints)) {
-                    GenericsGeneratorResult constraint = generateGGResult(tphsInRel, simplifiedConstraints);
-                    constraints.add(constraint);
-                }
-            }
-        }
-
-        generateGGConstraintsForTPH(localTphs, constraints, simplifiedConstraints);
-        return result;
-    }
-
-    private static void generateGGConstraintsForTPH(List<String> localTphs,
-                                                    final List<GenericsGeneratorResult> constraints, final ConstraintsSimplierResult simplifiedConstraints) {
-
-        localTphs.forEach(tph -> {
-            boolean isInSimplifiedConstraints = GenericsGeneratorUtility.isTPHInGenericGeneratorResult(simplifiedConstraints.getGenericsGenResults(), tph);
-            if (isInSimplifiedConstraints) {
-                GenericsGeneratorResult ggResult = GenericsGeneratorUtility.getGenericGeneratorResult(simplifiedConstraints.getGenericsGenResults(), tph).get();
-//				GenericsGeneratorUtility.removeGenericGeneratorResult(simplifiedConstraints.getGenericsGenResults(),ggResult);
-                constraints.add(ggResult);
-            } else {
-                boolean isInConstraints = GenericsGeneratorUtility.isTPHInGenericGeneratorResult(constraints, tph);
-
-                if (!isInConstraints) {
-                    GenericsGeneratorResult ggResult = generateGGResult(tph, simplifiedConstraints.getNameReplacementResults());
-                    constraints.add(ggResult);
-                }
-            }
-        });
-
-    }
-
-    private static GenericsGeneratorResult generateGGResult(String tph,
-                                                            List<NameReplacementResult> nameReplacementResults) {
-        String superType = Type.getInternalName(Object.class);
-        TPHConstraint constraint = new ExtendsConstraint(tph, superType);
-        Set<String> equalSet = GenericsGeneratorUtility.createEqualSet(nameReplacementResults, tph);
-
-        return new GenericsGeneratorResult(constraint, equalSet);
-    }
-
-    private static GenericsGeneratorResult generateGGResult(final LinkedList<String> tphsInRel,
-                                                            final ConstraintsSimplierResult simplifiedConstraints) {
-
-        String subType = tphsInRel.getFirst();
-
-        if (tphsInRel.size() == 1) {
-            Optional<GenericsGeneratorResult> constraintFromSimplifiedCon = simplifiedConstraints
-                    .getGenericsGenResults().stream().filter(g -> g.getConstraint().getLeft().equals(subType))
-                    .findFirst();
-            if (constraintFromSimplifiedCon.isPresent())
-                return constraintFromSimplifiedCon.get();
-        }
-
-        String superType = tphsInRel.size() > 1 ? tphsInRel.getLast() : Type.getInternalName(Object.class);
-
-        TPHConstraint constraint = new ExtendsConstraint(subType, superType);
-
-        Set<String> equalSet = GenericsGeneratorUtility
-                .createEqualSet(simplifiedConstraints.getNameReplacementResults(), subType);
-
-        return new GenericsGeneratorResult(constraint, equalSet);
-    }
-
-}

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

@@ -1,571 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGenerator;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.*;
-import org.objectweb.asm.Type;
-
-import de.dhbwstuttgart.bytecode.TPHExtractor;
-import de.dhbwstuttgart.bytecode.constraint.EqualConstraint;
-import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.utilities.ConstraintsFinder;
-import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
-import de.dhbwstuttgart.bytecode.utilities.NameReplacer;
-
-/**
- * @author fayez
- *
- */
-public class GenericsGeneratorUtility {
-	/**
-	 * Returns a list of type placeholders names of a specified method
-	 * 
-	 * @param methodID The id of the method ReturnTypeMethodName(ParameterTypes)
-	 * @param listOfMethodsAndTph List of all methods 
-	 * @return a list of type placehoders names
-	 */
-	public static List<String> getMethodTPHS(String methodID, ArrayList<MethodAndTPH> listOfMethodsAndTph) {
-		return listOfMethodsAndTph.stream().filter(mt->mt.getId().equals(methodID)).findAny().get().getTphs();
-	}
-	
-	/**
-	 * Returns a reverse constraint of a specified constraint which is given by its left and right 
-	 * side
-	 * 
-	 * @param allCons List of all constraints
-	 * @param left The left side of the given constraint
-	 * @param right The right side of the given constraint
-	 * @return An Optional object which contains the reverse constraint if it is exist
-	 */
-	public static Optional<TPHConstraint> getReverseConstraint(List<TPHConstraint> allCons, String left, String right) {
-		return allCons.stream().filter(c->{
-			return c.getRight().equals(left) && c.getLeft().equals(right);
-		}).findAny();
-	}
-	
-	/**
-	 * Substitutes the old name by the new name in all constraints
-	 *  
-	 * @param allCons List of all constraints
-	 * @param oldName The name to be replaced
-	 * @param newName The new name
-	 */
-	public static void substituteTPH(List<TPHConstraint> allCons, String oldName, String newName) {
-		allCons.stream()
-		.filter(c->c.getRel()==Relation.EXTENDS)
-		.forEach(c->{
-			if(c.getLeft().equals(oldName))
-				c.setLeft(newName);
-			if(c.getRight().equals(oldName))
-				c.setRight(newName);
-		});
-		
-	}
-
-	public static List<ConstraintsWithSameLeftSide> findConstraintsWithLeftSameLeftSide(List<TPHConstraint> allCons) {
-		// finder looks for constraints that have the same left hand side
-		// and put them in a list
-		ConstraintsFinder finder = new ConstraintsFinder(allCons);
-		List<ConstraintsWithSameLeftSide> foundCons = finder.findConstraints();
-		return foundCons;
-	}
-
-	public static void simplifyConstraintsWithSameLeftSide(List<ConstraintsWithSameLeftSide> consWithSameLeftSide,
-			List<TPHConstraint> allCons, List<String> methodTPHS) {
-		List<TPHConstraint> eqCons = new ArrayList<>();
-
-		for (ConstraintsWithSameLeftSide list : consWithSameLeftSide) {
-			NameReplacementResult replRes = modifyNames(allCons, methodTPHS, list);
-			createEqualConstraintsForNames(replRes.getName(), replRes.getOldNames(),eqCons);
-			
-			for (TPHConstraint c : allCons) {
-				if (c.getRel() == Relation.EQUAL && replRes.getName().equals(c.getRight())) {
-					eqCons.add(c);
-				}
-			}
-			updateEqualCons(replRes, eqCons);
-
-			TPHConstraint c = list.getConstraints().get(0);
-			allCons.removeAll(list.getConstraints());
-			allCons.add(c);
-		}
-		
-	}
-	
-	public static void simplifyConstraintsWithSameLeftSide(List<ConstraintsWithSameLeftSide> consWithSameLeftSide,
-																		  TPHExtractor tphExtractor, List<String> tphsClass, List<TPHConstraint> equalCons) {
-		List<TPHConstraint> allCons = tphExtractor.allCons;
-		
-		for (ConstraintsWithSameLeftSide list : consWithSameLeftSide) {
-			if(!stillWithSameLeftSide(list))
-				continue;
-			NameReplacementResult replRes = modifyNames(allCons, list, tphExtractor.ListOfMethodsAndTph,tphsClass);
-			createEqualConstraintsForNames(replRes.getName(), replRes.getOldNames(),equalCons);
-			
-			for (TPHConstraint c : allCons) {
-				if (c.getRel() == Relation.EQUAL && replRes.getName().equals(c.getRight())) {
-					equalCons.add(c);
-				}
-			}
-			updateEqualCons(replRes, equalCons);
-
-			TPHConstraint c = list.getConstraints().get(0);
-			allCons.removeAll(list.getConstraints());
-			removeConstraintsWithSameLeftAndRightSide(allCons);
-			allCons.add(c);
-			removeDuplicate(allCons);
-		}
-		consWithSameLeftSide.clear();
-		consWithSameLeftSide = findConstraintsWithLeftSameLeftSide(allCons);
-		if(!consWithSameLeftSide.isEmpty())
-			simplifyConstraintsWithSameLeftSide(consWithSameLeftSide,tphExtractor,tphsClass,equalCons);
-		
-	}
-
-	private static void removeDuplicate(List<TPHConstraint> allCons) {
-		List<TPHConstraint> visited = new ArrayList<>();
-		List<Integer> toRemove = new ArrayList<>();
-		checkForDuplicate(allCons, visited, toRemove);
-		removeConstraintsByIndex(allCons, toRemove);
-	}
-
-	private static void removeConstraintsByIndex(List<TPHConstraint> allCons, List<Integer> toRemove) {
-		for(int index : toRemove)
-			allCons.remove(index);
-	}
-
-	private static void checkForDuplicate(List<TPHConstraint> allCons, List<TPHConstraint> visited, List<Integer> toRemove) {
-		for(int i = 0;i<allCons.size();++i){
-			markConstraintIfDuplicate(allCons, visited, toRemove, i);
-		}
-	}
-
-	private static void markConstraintIfDuplicate(List<TPHConstraint> allCons, List<TPHConstraint> visited, List<Integer> toRemove, int i) {
-		TPHConstraint constraint = allCons.get(i);
-		if(containsInList(visited,constraint.getLeft(),constraint.getRight())){
-			toRemove.add(i);
-		} else {
-			visited.add(constraint);
-		}
-	}
-
-	private static boolean containsInList(List<TPHConstraint> allConstraints, String left, String right) {
-		for(TPHConstraint constraint : allConstraints)
-			if(constraint.getLeft().equals(left) && constraint.getRight().equals(right))
-				return true;
-		return false;
-	}
-
-	private static void addNewConstraintsWithSameLeftSide(ConstraintsWithSameLeftSide constraintsWithSameLeftSide, List<TPHConstraint> allCons) {
-		allCons.forEach(c->{
-			if (constraintsWithSameLeftSide.getConstraints().get(0).getLeft().equals(c.getLeft())){
-				if(!constraintsWithSameLeftSide.getConstraints().contains(c))
-					constraintsWithSameLeftSide.getConstraints().add(c);
-			}
-		});
-	}
-
-	private static void checkForNewConstraintsWithSameLeftSide(List<ConstraintsWithSameLeftSide> consWithSameLeftSide, List<TPHConstraint> allCons) {
-		allCons.forEach(c->{
-			Optional<ConstraintsWithSameLeftSide> constraintsWithSameLeftSide = getConstraintsWithSameLeftSide(consWithSameLeftSide, c.getLeft());
-			constraintsWithSameLeftSide.ifPresent(cls->{
-				if(!cls.getConstraints().contains(c))
-					cls.getConstraints().add(c);
-			});
-		});
-	}
-
-	private static Optional<ConstraintsWithSameLeftSide> getConstraintsWithSameLeftSide(List<ConstraintsWithSameLeftSide> consWithSameLeftSide, String left) {
-		return consWithSameLeftSide.stream().filter(csl->isContainedInConsWithLeftSide(csl,left)).findAny();
-	}
-
-	private static boolean isContainedInConsWithLeftSide(ConstraintsWithSameLeftSide csl, String left) {
-		return csl.getConstraints().get(0).getLeft().equals(left);
-	}
-
-	private static boolean stillWithSameLeftSide(ConstraintsWithSameLeftSide constraints) {
-		removeUnvalidConstraints(constraints);
-		return constraints.getConstraints().size()>1;
-	}
-
-	private static void removeUnvalidConstraints(ConstraintsWithSameLeftSide constraints) {
-		List<TPHConstraint> toRemove = new ArrayList<>();
-		constraints.getConstraints().forEach(c->{
-			if(c.getLeft().equals(c.getRight()))
-				toRemove.add(c);
-		});
-		if(!toRemove.isEmpty())
-			constraints.getConstraints().removeAll(toRemove);
-	}
-
-	private static void removeConstraintsWithSameLeftAndRightSide(List<TPHConstraint> allCons) {
-		List<TPHConstraint> toRemove = new ArrayList<>();
-		allCons.forEach(c->{
-			if(c.getLeft().equals(c.getRight()))
-				toRemove.add(c);
-		});
-		allCons.removeAll(toRemove);
-	}
-
-	private static void createEqualConstraintsForNames(String name, List<String> equalNames, List<TPHConstraint> eqCons) {
-		// create an equal constraint for each value in repres
-		for (String eName : equalNames) {
-			EqualConstraint ec = new EqualConstraint(eName, name);
-			eqCons.add(ec);
-		}
-	}
-
-	/**
-	 * @param allCons
-	 * @param methodTPHS
-	 * @param list
-	 * @return
-	 */
-	public static NameReplacementResult modifyNames(List<TPHConstraint> allCons, List<String> methodTPHS,
-			ConstraintsWithSameLeftSide list) {
-		// generate a new name and replace the right hand side for each constraint
-		// in list with the new name
-		NameReplacer replacer = new NameReplacer(list.getConstraints(), allCons, methodTPHS);
-		// new name -> [all old names]
-		NameReplacementResult replRes = replacer.replaceNames();
-		return replRes;
-	}
-	
-	public static NameReplacementResult modifyNames(List<TPHConstraint> allCons, ConstraintsWithSameLeftSide list, List<MethodAndTPH> methodAndTPHs, List<String> tphsClass) {
-		// generate a new name and replace the right hand side for each constraint
-		// in list with the new name
-		NameReplacer replacer = new NameReplacer(list.getConstraints(), allCons, methodAndTPHs, tphsClass);
-		// new name -> [all old names]
-		NameReplacementResult replRes = replacer.replaceNames();
-		return replRes;
-	}
-	
-	public static void updateEqualCons(NameReplacementResult nameReplacementResult, List<TPHConstraint> eqCons) {
-		List<String> oldNames = nameReplacementResult.getOldNames();
-		String newName = nameReplacementResult.getName();
-		for (TPHConstraint c : eqCons) {
-//			if(oldNames.contains(c.getLeft()))
-//				c.setLeft(newName);
-			if (oldNames.contains(c.getRight()))
-				c.setRight(newName);
-		}
-
-	}
-
-	public static void modifyRelationForConstraintsInCycle(List<Cycle> cycles) {
-		cycles.stream().map(lc->lc.getConstraints()).flatMap(e->e.stream()).forEach(c->c.setRel(Relation.EQUAL));
-	}
-
-	public static List<NameReplacementResult> substituteTPHSFormCycle(List<TPHConstraint> allCons, List<Cycle> cycles, TPHExtractor tphExtractor) {
-		List<NameReplacementResult> results = new ArrayList<>();
-		cycles.forEach(lc->{
-			Set<String> names = getNamesFromCycle(lc);
-			String newName = names.stream().findFirst().get();
-			
-			List<String> equalNames = new ArrayList<>(names);
-			
-			Stream<ArrayList<String>> tphsOfMethods = tphExtractor.ListOfMethodsAndTph.stream().map(m->m.getTphs());
-			Stream<ArrayList<String>> localTphsOfMethods = tphExtractor.ListOfMethodsAndTph.stream().map(m->m.getLocalTphs());
-			
-			replaceOldNames(newName, equalNames, tphsOfMethods);
-			replaceOldNames(newName, equalNames, localTphsOfMethods);
-			
-			NameReplacementResult res = new NameReplacementResult(newName, equalNames);
-			results.add(res);
-			substituteAll(allCons,names,newName);
-		});
-		return results;
-	}
-	
-	/**
-	 * @param newName
-	 * @param names
-	 * @param tphsOfMethods
-	 */
-	public static void replaceOldNames(final String newName, final List<String> names, Stream<ArrayList<String>> tphsOfMethods) {
-		tphsOfMethods.forEach(tphsMethod->{
-			if(tphsMethod.removeAll(names))
-				tphsMethod.add(newName);
-		});
-	}
-	
-	public static void substituteAll(List<TPHConstraint> allCons, Set<String> names, String newName) {
-		allCons.stream()
-		.filter(c-> c.getRel()==Relation.EXTENDS)
-		.forEach(c->{
-			if(names.contains(c.getLeft())) {
-				c.setLeft(newName);
-			} else if(names.contains(c.getRight())) {
-				c.setRight(newName);
-			}
-		});
-	}
-
-	public static Set<String> getNamesFromCycle(Cycle lc) {
-		Set<String> names = new HashSet<>();
-		lc.getConstraints().forEach(c->names.add(c.getLeft()));
-		return names;
-	}
-
-	public static void createResults(List<GenericsGeneratorResult> genericsGeneratorResults,
-			List<NameReplacementResult> nameReplacementResults) {
-		nameReplacementResults.forEach(n->{
-			Set<String> equals = new HashSet<>(n.getOldNames());
-			TPHConstraint cons = new ExtendsConstraint(n.getName(), Type.getInternalName(Object.class));
-			GenericsGeneratorResult ggRes = new GenericsGeneratorResult(cons, equals);
-			genericsGeneratorResults.add(ggRes);
-		});
-	}
-
-	public static void removeEqualConstraints(List<TPHConstraint> allCons) {
-		List<TPHConstraint> equalConstraints = getEqualConstraints(allCons);
-		allCons.removeAll(equalConstraints);
-	}
-
-	public static List<TPHConstraint> getEqualConstraints(List<TPHConstraint> allCons) {
-		return allCons.stream().filter(c->c.getRel()==Relation.EQUAL).collect(Collectors.toList());
-	}
-
-	public static List<NameReplacementResult> createNameReplacementResultsFromEqualConstraints(
-			List<TPHConstraint> equalCons) {
-		List<NameReplacementResult> nameReplacementResults = new ArrayList<>();
-		equalCons.forEach(c->{
-			if(isInNameReplacementResults(nameReplacementResults,c.getRight())) {
-				getNameReplacementByName(nameReplacementResults,c.getRight()).getOldNames().add(c.getLeft());
-			} else {
-				List<String> oldNames = new ArrayList<>();
-				oldNames.add(c.getLeft());
-				NameReplacementResult nrRes = new NameReplacementResult(c.getRight(), oldNames);
-				nameReplacementResults.add(nrRes);
-			}
-		});
-		return nameReplacementResults;
-	}
-	
-	private static NameReplacementResult getNameReplacementByName(List<NameReplacementResult> nameReplacementResults,
-			String name) {
-		return nameReplacementResults.stream().filter(n->n.getName().equals(name)).findFirst().get();
-	}
-
-	public static boolean isInNameReplacementResults(List<NameReplacementResult> nameReplacementResults,String name){
-		if(nameReplacementResults.isEmpty())
-			return false;
-		return nameReplacementResults.stream().map(r->r.getName()).filter(n->name.equals(n)).findFirst().isPresent();
-	}
-
-	public static Optional<TPHConstraint> getConstraintByLeftSide(List<TPHConstraint> allCons, String tph) {
-		return allCons.stream().filter(c->c.getLeft().equals(tph)).findFirst();
-	}
-
-	public static Optional<TPHConstraint> getConstraintByRightSide(List<TPHConstraint> allCons, String tph) {
-		return allCons.stream().filter(c->c.getRight().equals(tph)).findFirst();
-	}
-
-	public static boolean isTPHInGenericGeneratorResult(final List<GenericsGeneratorResult> constraints, final String tph) {
-		return constraints.stream().filter(g->g.getConstraint().getLeft().equals(tph)).findFirst().isPresent();
-	}
-
-	/**
-	 * @param allCons
-	 * @param tphsMethod
-	 * @param tphsClass 
-	 * @param visitedTPHs
-	 * @param tph
-	 * @return
-	 */
-	public static LinkedList<String> createLinkedListForTPHsInRelation(final List<TPHConstraint> allCons,
-			List<String> tphsMethod, List<String> tphsClass, final Set<String> visitedTPHs, String tph) {
-		
-		final LinkedList<String> tphsInRel = new LinkedList<>();
-		List<String> tphsList = new ArrayList<>(tphsMethod);
-		tphsList.addAll(tphsClass);
-		
-		boolean isNextSuperTypeFound = findNextSuperTyp(allCons,tphsList ,visitedTPHs, tph, tphsInRel);
-		if(!isNextSuperTypeFound)
-			findNextSubType(allCons, tphsList,visitedTPHs, tph, tphsInRel);
-		return tphsInRel;
-	}
-
-	public static boolean findNextSubType(List<TPHConstraint> allCons, List<String> tphsList, Set<String> visitedTPHs, String tph,
-			LinkedList<String> tphsInRel) {
-		Optional<TPHConstraint> con = getConstraintByRightSide(allCons, tph);
-		while (con.isPresent()) {
-			String left = con.get().getLeft();
-			String right = con.get().getRight();
-			
-			addTPHsToListFromLeft(tphsInRel, left, right);
-			markAsVisited(visitedTPHs, left);
-			
-			if(tphsList.contains(left))
-				return true;
-	
-			con = getConstraintByRightSide(allCons, left);
-		}
-		return false;
-	}
-
-	public static void addTPHsToListFromLeft(LinkedList<String> tphsInRel, String left, String right) {
-		if (tphsInRel.isEmpty())
-			tphsInRel.add(right);
-	
-		tphsInRel.addFirst(left);
-	}
-
-	/**
-	 * @param allCons
-	 * @param tphsList 
-	 * @param visitedTPHs
-	 * @param tph
-	 * @param tphsInRel
-	 * @return
-	 */
-	public static boolean findNextSuperTyp(final List<TPHConstraint> allCons, List<String> tphsList, final Set<String> visitedTPHs, String tph,
-			final LinkedList<String> tphsInRel) {
-		Optional<TPHConstraint> con = getConstraintByLeftSide(allCons, tph);
-		
-		markAsVisited(visitedTPHs, tph);
-		
-		while (con.isPresent()) {
-			String left = con.get().getLeft();
-			String right = con.get().getRight();
-			addTPHsToList(tphsInRel, left, right);
-	
-			if(tphsList.contains(right))
-				return true;
-			
-			markAsVisited(visitedTPHs, right);
-	
-			con = getConstraintByLeftSide(allCons, right);
-		}
-		return false;
-	}
-
-	public static void markAsVisited(Set<String> visitedTPHs, String left) {
-		visitedTPHs.add(left);
-	}
-
-	/**
-	 * @param visitedTPHs
-	 * @param right
-	 * @param left
-	 */
-	public static void markAsVisited(final Set<String> visitedTPHs, String left, String right) {
-		visitedTPHs.add(left);
-		visitedTPHs.add(right);
-	}
-
-	/**
-	 * @param tphsInRel
-	 * @param right
-	 * @param left
-	 */
-	public static void addTPHsToList(final LinkedList<String> tphsInRel, String left, String right) {
-		if (tphsInRel.isEmpty())
-			tphsInRel.add(left);
-		tphsInRel.add(right);
-	}
-
-	public static void removeNotLocalTphs(final LinkedList<String> tphsInRel, final List<String> localTphs,
-			List<String> tphsClass) {
-	
-		while (!localTphs.contains(tphsInRel.peek())) {
-			tphsInRel.removeFirst();
-		}
-	
-		String last = tphsInRel.peekLast();
-		while (!localTphs.contains(last) && !tphsClass.contains(last)) {
-			tphsInRel.removeLast();
-			last = tphsInRel.peekLast();
-		}
-	}
-
-	/**
-	 * @param nameReplacementResults
-	 * @param subType
-	 * @return
-	 */
-	public static Set<String> createEqualSet(final List<NameReplacementResult> nameReplacementResults, String subType) {
-		Optional<NameReplacementResult> equals = nameReplacementResults.stream()
-				.filter(n -> n.getName().equals(subType)).findFirst();
-	
-		Set<String> equalSet = equals.isPresent() ? new HashSet<>(equals.get().getOldNames()) : new HashSet<>();
-		return equalSet;
-	}
-
-	public static String getNextClassTph(List<String> tphsClass, LinkedList<String> tphsInRel) {
-		
-		for(int i = 1;i<tphsInRel.size();++i) {
-			String next = tphsInRel.get(i);
-			if(tphsClass.contains(next))
-				return next;
-		}
-		
-		return tphsInRel.getLast();
-	}
-
-	public static void addTPHsToClassTPHs(final List<GenericsGeneratorResult> constraints, final List<String> tphsClass) {
-		
-		List<String> lefts = constraints.stream().map(r->r.getConstraint()).map(c->c.getLeft()).collect(Collectors.toList());
-		List<String> rights = constraints.stream().map(r->r.getConstraint()).map(c->c.getRight()).collect(Collectors.toList());
-		List<String> leftsAndRights = new ArrayList<>(lefts);
-		leftsAndRights.addAll(rights);
-		List<String> shouldBeClassTphs = leftsAndRights.stream().distinct().collect(Collectors.toList());
-		
-		for(String tph : shouldBeClassTphs) {
-			if(!tphsClass.contains(tph))
-				tphsClass.add(tph);
-		}
-	}
-
-	public static void removeClassTPHsFromMethodTPHs(List<String> tphsClass, TPHExtractor tphExtractor) {
-		
-		tphExtractor.ListOfMethodsAndTph.stream().map(m->m.getTphs()).forEach(tphs->{
-			tphs.removeAll(tphsClass);
-		});
-	
-		tphExtractor.ListOfMethodsAndTph.stream().map(m->m.getLocalTphs()).forEach(tphs->{
-			tphs.removeAll(tphsClass);
-		});
-		
-	}
-
-	public static LinkedList<String> createLinkedListForTPHsInRelationClass(List<TPHConstraint> allCons,
-			List<String> tphsClass, List<String> methodTPHs, Set<String> visitedTPHs, String tph) {
-		final LinkedList<String> tphsInRel = new LinkedList<>();
-
-		boolean isNextSuperTypeFound = findNextSuperTyp(allCons,tphsClass ,visitedTPHs, tph, tphsInRel);
-		if(!tphsInRel.isEmpty() && !isNextSuperTypeFound && !methodTPHs.contains(tphsInRel.getLast()))
-			findNextSubType(allCons, tphsClass,visitedTPHs, tph, tphsInRel);
-		return tphsInRel;
-	}
-
-	public static boolean isInResult(String first, List<GenericsGeneratorResult> constraints) {
-		return constraints.stream().map(r->r.getConstraint()).filter(c->c.getLeft().equals(first)).findFirst().isPresent();
-	}
-
-	public static Optional<GenericsGeneratorResult> getGenericGeneratorResult(List<GenericsGeneratorResult> list,
-			String tph) {
-		return list.stream().filter(g->g.getConstraint().getLeft().equals(tph)).findFirst();
-	}
-
-	public static void removeGenericGeneratorResult(List<GenericsGeneratorResult> genericsGenResults,
-			GenericsGeneratorResult ggResult) {
-		genericsGenResults.remove(ggResult);
-	}
-
-	public static Optional<MethodAndTPH> getMethodAndTphs(ArrayList<MethodAndTPH> listOfMethodsAndTph, String id) {
-		return listOfMethodsAndTph.stream().filter(m->m.getId().equals(id)).findFirst();
-	}
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/ConstraintsWithSameLeftSide.java

@@ -1,35 +0,0 @@
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import java.util.List;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-
-public class ConstraintsWithSameLeftSide {
-	private List<TPHConstraint> constraints;
-
-	/**
-	 * @param constraints
-	 */
-	public ConstraintsWithSameLeftSide(List<TPHConstraint> constraints) {
-		this.constraints = constraints;
-	}
-
-	/**
-	 * @return the constraints
-	 */
-	public List<TPHConstraint> getConstraints() {
-		return constraints;
-	}
-
-	/**
-	 * @param constraints the constraints to set
-	 */
-	public void setConstraints(List<TPHConstraint> constraints) {
-		this.constraints = constraints;
-	}
-
-	@Override
-	public String toString() {
-		return "[" + constraints.toString() + "]";
-	}
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/Cycle.java

@@ -1,46 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import java.util.List;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-
-/**
- * @author fayez
- *
- */
-public class Cycle {
-	private final List<TPHConstraint> constraints;
-
-	/**
-	 * @param constraints
-	 */
-	public Cycle(List<TPHConstraint> constraints) {
-		this.constraints = constraints;
-	}
-
-	/**
-	 * @return the constraints
-	 */
-	public List<TPHConstraint> getConstraints() {
-		return constraints;
-	}
-
-	public boolean containConstraint(TPHConstraint constraint) {
-		for(TPHConstraint c : constraints) {
-			if(c.equalConstraint(constraint))
-				return true;
-		}
-		return false;
-	}
-	
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		constraints.forEach(c->sb.append(c.getLeft()+" -> "));
-		sb.append(constraints.get(constraints.size()-1).getRight());
-		return sb.toString();
-	}
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/GenericGeneratorResultsForAllMethods.java

@@ -1,33 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author fayez
- *
- */
-public class GenericGeneratorResultsForAllMethods {
-	private final List<MethodAndConstraints> methodsAndConstraints;
-	
-	public GenericGeneratorResultsForAllMethods() {
-		this(Collections.emptyList());
-	}
-	/**
-	 * @param methodsAndConstraints
-	 */
-	public GenericGeneratorResultsForAllMethods(List<MethodAndConstraints> methodsAndConstraints) {
-		this.methodsAndConstraints = methodsAndConstraints;
-	}
-	
-	/**
-	 * @return the methodsAndConstraints
-	 */
-	public List<MethodAndConstraints> getMethodsAndConstraints() {
-		return methodsAndConstraints;
-	}
-
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/GenericGenratorResultForSourceFile.java

@@ -1,53 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-/**
- * The simplify results of a source file (package)
- * 
- * @author fayez
- *
- */
-public class GenericGenratorResultForSourceFile {
-	private String pkgName;
-	private final List<GenericsGeneratorResultForClass> genericGeneratorResultForAllClasses = new ArrayList<>();
-
-	/**
-	 * @param pkgName
-	 */
-	public GenericGenratorResultForSourceFile(String pkgName) {
-		this.pkgName = pkgName;
-	}
-
-	public List<GenericsGeneratorResultForClass> getGenericGeneratorResultForAllClasses() {
-		return genericGeneratorResultForAllClasses;
-	}
-
-	/**
-	 * Appends the simplify results of a class to simplifyResForSF
-	 * 
-	 * @param sResClass simplify results of a class to added
-	 */
-	public void addGenericGeneratorResultClass(GenericsGeneratorResultForClass sResClass) {
-		genericGeneratorResultForAllClasses.add(sResClass);
-	}
-
-	public GenericsGeneratorResultForClass getSimplifyResultsByName(JavaClassName name) {
-
-		if (this.pkgName.equals(name.getPackageName())) {
-			return genericGeneratorResultForAllClasses.stream()
-					.filter(sr -> sr.getClassName().equals(name))
-					.findAny()
-					.orElseThrow(() -> new NoSuchElementException(
-							"Simplify results for the class " + pkgName + "." + name + " are not found"));
-		}
-		throw new NoSuchElementException("Simplify results for the class " + pkgName + "." + name + " are not found");
-	}
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/GenericsGeneratorResult.java

@@ -1,55 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import java.util.Set;
-
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-
-/**
- * @author fayez
- *
- */
-public class GenericsGeneratorResult {
-	private TPHConstraint constraint;
-	/** 
-	 * contains the names of all type placeholders which are equals to the left side of
-	 * the constraint {@link #constraint}.
-	 */
-	private Set<String> equalsTPHs;
-	/**
-	 * @param constraint
-	 * @param equalsTPHs
-	 */
-	public GenericsGeneratorResult(TPHConstraint constraint, Set<String> equalsTPHs) {
-		this.constraint = constraint;
-		this.equalsTPHs = equalsTPHs;
-	}
-	
-	/**
-	 * @return the constraint
-	 */
-	public TPHConstraint getConstraint() {
-		return constraint;
-	}
-	/**
-	 * @param constraint the constraint to set
-	 */
-	public void setConstraint(TPHConstraint constraint) {
-		this.constraint = constraint;
-	}
-	/**
-	 * @return the equalsTPHs
-	 */
-	public Set<String> getEqualsTPHs() {
-		return equalsTPHs;
-	}
-	/**
-	 * @param equalsTPHs the equalsTPHs to set
-	 */
-	public void setEqualsTPHs(Set<String> equalsTPHs) {
-		this.equalsTPHs = equalsTPHs;
-	}
-	
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/GenericsGeneratorResultForClass.java

@@ -1,69 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author fayez
- *
- */
-public class GenericsGeneratorResultForClass {
-	private final JavaClassName className;
-	private final List<GenericsGeneratorResult> classConstraints;
-	private final GenericGeneratorResultsForAllMethods methodsAndTheirConstraints;
-
-	public GenericsGeneratorResultForClass(JavaClassName className) {
-		this(className, Collections.emptyList(), new GenericGeneratorResultsForAllMethods());
-	}
-	/**
-	 * @param className
-	 * @param classConstraints
-	 * @param methodsAndTheirConstraints
-	 */
-	public GenericsGeneratorResultForClass(JavaClassName className, List<GenericsGeneratorResult> classConstraints,
-										   GenericGeneratorResultsForAllMethods methodsAndTheirConstraints) {
-		this.className = className;
-		this.classConstraints = classConstraints;
-		this.methodsAndTheirConstraints = methodsAndTheirConstraints;
-	}
-
-	/**
-	 * @return the className
-	 */
-	public JavaClassName getClassName() {
-		return className;
-	}
-
-	/**
-	 * @return the classConstraints
-	 */
-	public List<GenericsGeneratorResult> getClassConstraints() {
-		return classConstraints;
-	}
-
-	/**
-	 * @return the methodsAndTheirConstraints
-	 */
-	public GenericGeneratorResultsForAllMethods getMethodsAndTheirConstraints() {
-		return methodsAndTheirConstraints;
-	}
-
-	public boolean contains(String id) {
-		return methodsAndTheirConstraints.getMethodsAndConstraints().stream().map(mc -> mc.getMethodID())
-				.anyMatch(i -> i.equals(id));
-	}
-
-	
-	
-	
-	public List<GenericsGeneratorResult> getMethodConstraintsByID(String id) {
-		return methodsAndTheirConstraints.getMethodsAndConstraints().stream().filter(mc -> mc.getMethodID().equals(id))
-				.findFirst().get().getConstraints();
-	}
-
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/MethodAndConstraints.java

@@ -1,36 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import java.util.List;
-
-/**
- * @author fayez
- *
- */
-public class MethodAndConstraints {
-	private final String methodID;
-	private final List<GenericsGeneratorResult> constraints;
-	/**
-	 * @param methodID
-	 * @param constraints
-	 */
-	public MethodAndConstraints(String methodID, List<GenericsGeneratorResult> constraints) {
-		this.methodID = methodID;
-		this.constraints = constraints;
-	}
-	/**
-	 * @return the methodID
-	 */
-	public String getMethodID() {
-		return methodID;
-	}
-	/**
-	 * @return the constraints
-	 */
-	public List<GenericsGeneratorResult> getConstraints() {
-		return constraints;
-	}
-	
-}

src/main/java/de/dhbwstuttgart/bytecode/genericsGeneratorTypes/NameReplacementResult.java

@@ -1,49 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.genericsGeneratorTypes;
-
-import java.util.List;
-
-/**
- * @author fayez
- *
- */
-public class NameReplacementResult {
-	private String name;
-	private List<String> oldNames;
-	/**
-	 * @param name
-	 * @param oldNames
-	 */
-	public NameReplacementResult(String name, List<String> oldNames) {
-		this.name = name;
-		this.oldNames = oldNames;
-	}
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	/**
-	 * @return the oldNames
-	 */
-	public List<String> getOldNames() {
-		return oldNames;
-	}
-	/**
-	 * @param oldNames the oldNames to set
-	 */
-	public void setOldNames(List<String> oldNames) {
-		this.oldNames = oldNames;
-	};
-	
-	
-}

src/main/java/de/dhbwstuttgart/bytecode/signature/Signature.java

@@ -1,166 +1,93 @@
 package de.dhbwstuttgart.bytecode.signature;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
 
 import org.objectweb.asm.Type;
 import org.objectweb.asm.signature.SignatureVisitor;
 import org.objectweb.asm.signature.SignatureWriter;
 
+import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
+import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
+import de.dhbwstuttgart.bytecode.utilities.Simplify;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.Constructor;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.type.WildcardType;
+import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
+import de.dhbwstuttgart.typeinference.result.ResolvedType;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 public class Signature {
-	private static final char SUPER_CHAR = '-';
-	private static final char EXTENDS_CHAR = '+';
-	private static final String SPECIAL_CHAR_FOR_FUN = "$$";
-	private static final String SPECIAL_CHAR = "$";
 	private ClassOrInterface classOrInterface;
 	private HashMap<String, String> genericsAndBounds;
 	private HashMap<String, String> genericsAndBoundsMethod;
-	private final SignatureWriter sw = new SignatureWriter();;
+	private SignatureWriter sw;
 	private Constructor constructor;
 	private Method method;
 	private HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes;
 	private ResultSet resultSet;
-	private Map<TPHConstraint, Set<String>> methodConstraints;
-	private List<GenericsGeneratorResult> consClass;
-	private List<GenericsGeneratorResult> constraints;
+	private ArrayList<GenericInsertPair> commonPairs;
+	private HashMap<TPHConstraint,HashSet<String>> methodConstraints;
+	private ArrayList<String> tphsClass;
+	private ArrayList<TPHConstraint> consClass;
 	
-//	public Signature(ClassOrInterface classOrInterface, HashMap<String, String> genericsAndBounds,
-//			List<TPHConstraint> consClass) {
-//		this.classOrInterface = classOrInterface;
-//		this.genericsAndBounds = genericsAndBounds;
-//		this.consClass = consClass;
-//		sw = new SignatureWriter();
-//		createSignatureForClassOrInterface();
-//	}
+	public Signature(ClassOrInterface classOrInterface, HashMap<String, String> genericsAndBounds,
+			ArrayList<GenericInsertPair> commonPairs, ArrayList<String> tphsClass, ArrayList<TPHConstraint> consClass) {
+		this.classOrInterface = classOrInterface;
+		this.genericsAndBounds = genericsAndBounds;
+		this.commonPairs = commonPairs;
+		this.tphsClass = tphsClass;
+		this.consClass = consClass;
+		sw = new SignatureWriter();
+		createSignatureForClassOrInterface();
+	}
 
-	public Signature(HashMap<String, String> genericsAndBounds,
+	public Signature(Constructor constructor, HashMap<String, String> genericsAndBounds, 
 			HashMap<String,RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes,ResultSet resultSet,
-					 List<GenericsGeneratorResult> constraints) {
-		//this.constructor = constructor;
+			HashMap<TPHConstraint,HashSet<String>> methodConstraints) {
+		this.constructor = constructor;
 		this.genericsAndBounds = genericsAndBounds;
 		this.methodParamsAndTypes = methodParamsAndTypes;
 		this.resultSet = resultSet;
-		this.constraints = constraints;
+		this.methodConstraints = methodConstraints;
+		sw = new SignatureWriter();
+		createSignatureForConsOrMethod(this.constructor,true);
 	}
 
-	public Signature(int numberOfParams) {
-		createSignatureForFunN(numberOfParams);
-	}
-
-	public Signature(int numberOfParams, String to, String[] paramTypes) {
-		createSignatureForFunN(numberOfParams, to, paramTypes);
-	}
-
-	public Signature(ClassOrInterface classOrInterface, HashMap<String, String> genericsAndBounds,
-			List<GenericsGeneratorResult> consClass) {
-		this.classOrInterface = classOrInterface;
-		this.genericsAndBounds = genericsAndBounds;
-		this.consClass = consClass;
-	}
-
-	public Signature(HashMap<String, String> genericsAndBoundsMethod,
-			HashMap<String, String> genericsAndBounds,
+	public Signature(Method method, HashMap<String, String> genericsAndBoundsMethod,HashMap<String, String> genericsAndBounds,
 			HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> methodParamsAndTypes, ResultSet resultSet, 
-			List<GenericsGeneratorResult> constraints,List<GenericsGeneratorResult> consClass) {
+			HashMap<TPHConstraint,HashSet<String>> methodConstraints) {
+		this.method = method;
 		this.genericsAndBoundsMethod = genericsAndBoundsMethod;
 		this.genericsAndBounds = genericsAndBounds;
 		this.methodParamsAndTypes = methodParamsAndTypes;
 		this.resultSet = resultSet;
-		this.constraints = constraints;
-		this.consClass = consClass;
+		this.methodConstraints = methodConstraints;
+		sw = new SignatureWriter();
+		createSignatureForConsOrMethod(this.method,false);
 	}
 	
-	public String createSignatureForConstructor(Constructor constructor) {
-		visitParams();
-		sw.visitReturnType().visitBaseType('V');
-		return sw.toString();
-	}
-
-	public String createSignatureForMethod(Method method) {
-		defineGenerics(method);
-
-		String ret = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToSignature());
-
-		visitParams();
-		visitReturnType(method, ret);
-		return sw.toString();
-	}
-
-	/**
-	 * @param method
-	 * @param ret
-	 */
-	private void visitReturnType(Method method, String ret) {
-		if (ret.equals("V")) {
-			sw.visitReturnType().visitBaseType('V');
-		} else {
-			RefTypeOrTPHOrWildcardOrGeneric returnType = method.getReturnType();
-			SignatureVisitor sv = sw.visitReturnType();
-			doVisitParamsOrReturn(returnType, sv);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	private void visitParams() {
-		for (String paramName : methodParamsAndTypes.keySet()) {
-			RefTypeOrTPHOrWildcardOrGeneric t = methodParamsAndTypes.get(paramName);
-			SignatureVisitor sv = sw.visitParameterType();
-			doVisitParamsOrReturn(t, sv);
-		}
-	}
-
-	/**
-	 *
-	 * @param method
-	 */
-	private void defineGenerics(Method method) {
-		method.getGenerics().forEach(g -> {
-			visitTypeVarsAndTheirBounds(g, genericsAndBoundsMethod);
-		});
-		defineGenericsFromConstraints(constraints,genericsAndBoundsMethod);
-	}
-
-	private void createSignatureForFunN(int numberOfParams, String to, String[] paramTypes) {
-		defineTypeVariablesForParametersOfFunN(numberOfParams);
-
-		sw.visitFormalTypeParameter("R");
-		visitClassBound(to);
-		// TODO: prüfe ob Return-Type = void,
-		sw.visitSuperclass().visitClassType(Type.getInternalName(Object.class));
-		sw.visitEnd();
-
+	public Signature(int numberOfParams) {
+		sw = new SignatureWriter();
+		createSignatureForFunN(numberOfParams);
 	}
 
 	private void createSignatureForFunN(int numberOfParams) {
 		
-		defineTypeVariablesForParametersOfFunN(numberOfParams);
-
-		sw.visitFormalTypeParameter("R");
-		// getBounds vom Return-Type
-		sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
-		sw.visitClassBound().visitEnd();
-		// TODO: prüfe ob Return-Type = void,
-		sw.visitSuperclass().visitClassType(Type.getInternalName(Object.class));
-		sw.visitEnd();
-	}
-
-	private void defineTypeVariablesForParametersOfFunN(int numberOfParams) {
+//		sw.visitClassBound().visitEnd();
 		for(int i = 0;i<numberOfParams;i++) {
 			int j = i+1;
 			sw.visitFormalTypeParameter("T"+ j);
@@ -168,42 +95,221 @@ public class Signature {
 			sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
 			sw.visitClassBound().visitEnd();
 		}
+
+		sw.visitFormalTypeParameter("R");
+		// getBounds vom Return-Type
+		sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+		sw.visitClassBound().visitEnd();
+		// TODO: prüfe ob Return-Type = void,
+		sw.visitSuperclass().visitClassType(Type.getInternalName(Object.class));;
+		sw.visitEnd();
+	}
+
+	/**
+	 * Creates signature for a method or constructor with @see {@link SignatureWriter}
+	 * Signature looks like: 
+	 * <typevaliables (K:Ljava/lang/Object "Bounds")>(params L.. OR T.. Or basistape)ReturnType
+	 * 
+	 * @param method method or constructor
+	 * @param isConstructor true if constructor
+	 */
+	private void createSignatureForConsOrMethod(Method method, boolean isConstructor) {
+		Iterator<? extends GenericTypeVar> itr = method.getGenerics().iterator();
+		// visits all formal type parameter and visits their bounds <T:...;B:...;...>
+		while(itr.hasNext()) {
+			System.out.println("HAS GENERICS!!");
+			GenericTypeVar g = itr.next();
+			getBoundsOfTypeVar(g,genericsAndBoundsMethod);
+		}
+		
+		// Wenn die RückgabeType eine TPH ist, wird als generic behandelt
+		// z.B: Type = TPH K => wird eine Formal Type Parameter K$ erzeugt und Bound = Object
+		if(!isConstructor) {
+			String ret = resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToSignature());
+			ArrayList<TPHConstraint> allConsBeforeSimplify = new ArrayList<>();
+			
+			HashMap<TPHConstraint,HashSet<String>> allConstraints = new HashMap<>();
+			
+			if(ret.contains("<")) {
+				allConsBeforeSimplify = getAllConstraints((RefType) resultSet.resolveType(method.getReturnType()).resolvedType);
+			}
+			 
+			for(String paramName : methodParamsAndTypes.keySet()) {
+				RefTypeOrTPHOrWildcardOrGeneric t = methodParamsAndTypes.get(paramName);
+				String pT = t.acceptTV(new TypeToSignature()); 
+				
+				if(pT.contains("<"))
+					allConsBeforeSimplify = getAllConstraints((RefType) t);
+			}
+			boolean doSimplify = false;
+			if(!allConsBeforeSimplify.isEmpty()) {
+				addConstraintsToMap(allConstraints,allConsBeforeSimplify);
+				doSimplify = true;
+			}
+			createTypeVars(allConstraints, doSimplify);
+			
+			if(!ret.equals("V")) {
+				if(ret.contains("$") && !ret.contains("$$") && !ret.contains("<")) {
+					if(genericsAndBounds.containsKey(ret)) {
+						genericsAndBoundsMethod.put(ret.substring(1), genericsAndBounds.get(ret.substring(1)));
+					}
+				}
+				
+			}
+		}
+		
+		// visit each method-parameter to create the signature 
+		for(String paramName : methodParamsAndTypes.keySet()) {
+			RefTypeOrTPHOrWildcardOrGeneric t = methodParamsAndTypes.get(paramName);
+			// parameter type deswegen ist true
+			doVisitParamsOrReturn(t,true);
+		}
+		if(isConstructor || 
+				resultSet.resolveType(method.getReturnType()).resolvedType.acceptTV(new TypeToSignature()).equals("V")) {
+			sw.visitReturnType().visitBaseType('V');
+		}else {
+			RefTypeOrTPHOrWildcardOrGeneric returnType = method.getReturnType();
+			// return type deswegen ist false
+			doVisitParamsOrReturn(returnType, false);
+		}
+//		sw.visitEnd();
+	}
+	
+	private void addConstraintsToMap(HashMap<TPHConstraint, HashSet<String>> allConstraints,
+			ArrayList<TPHConstraint> allConsBeforeSimplify) {
+		for(TPHConstraint tphCons : allConsBeforeSimplify) {
+			allConstraints.put(tphCons, null);
+		}
+	}
+
+	private String getEqualTPH(HashMap<TPHConstraint, HashSet<String>> methodConstraints, String tph) {
+		for(TPHConstraint cons : methodConstraints.keySet()) {
+			if(methodConstraints.get(cons) != null) {
+				if(methodConstraints.get(cons).contains(tph)) {
+					return cons.getLeft();
+				}
+			}
+		}
+		return tph;
+	}
+
+	private void createTypeVars(HashMap<TPHConstraint, HashSet<String>> allConstraints, boolean doSimplify) {
+		allConstraints.putAll(methodConstraints);
+		
+		HashMap<TPHConstraint, HashSet<String>> simplifiedConstraints;
+		if(doSimplify) {
+			simplifiedConstraints = Simplify.simplifyContraints(allConstraints);
+		}else {
+			simplifiedConstraints = allConstraints;
+		}
+		
+		for(TPHConstraint cons : simplifiedConstraints.keySet()) {
+			// need subst.
+			String sub = cons.getLeft()+"$";
+			if(!genericsAndBoundsMethod.containsKey(sub) && !genericsAndBounds.containsKey(sub)) {
+				sw.visitFormalTypeParameter(sub);
+				String bound = cons.getRight();
+				if(bound.equals(Type.getInternalName(Object.class))) {
+					sw.visitClassBound().visitClassType(Type.getInternalName(Object.class));
+					sw.visitClassBound().visitEnd();
+					genericsAndBoundsMethod.put(sub, bound);
+				} else {
+					String boundName = bound+"$";
+					sw.visitClassBound().visitTypeVariable(boundName);
+					genericsAndBoundsMethod.put(sub, boundName);
+				}
+			}
+			
+		}
+	}
+	
+	private ArrayList<TPHConstraint> getAllConstraints(RefType ref) {
+		final ArrayList<TPHConstraint> res = new ArrayList<>();
+		for(RefTypeOrTPHOrWildcardOrGeneric p : ref.getParaList()) {
+			ResolvedType resType;
+			if(p instanceof WildcardType) {
+				resType = resultSet.resolveType(((WildcardType) p).getInnerType());
+			}else {
+				resType = resultSet.resolveType(p);
+			}
+			
+			RefTypeOrTPHOrWildcardOrGeneric resolved = resType.resolvedType;
+			if(resolved instanceof TypePlaceholder) {
+				//resType.getAdditionalGenerics().forEach(ag ->{
+				resultSet.genIns.forEach(ag ->{
+					TPHConstraint constr = new ExtendsConstraint(ag.getLeft().getName(), ag.getRight().getName(), Relation.EXTENDS);
+					if(!contains(res,constr)) {
+						res.add(constr);
+					}
+				});
+			}
+			if(resolved instanceof WildcardType) {
+				WildcardType resWC = (WildcardType) resolved;
+				ResolvedType resType2 = resultSet.resolveType(resWC.getInnerType());
+				if(resType2.resolvedType instanceof TypePlaceholder) {
+					//resType2.getAdditionalGenerics().forEach(ag ->{
+					resultSet.genIns.forEach(ag ->{
+						TPHConstraint constr = new ExtendsConstraint(ag.getLeft().getName(), ag.getRight().getName(), Relation.EXTENDS);
+						if(!contains(res,constr)) {
+							res.add(constr);
+						}
+				});
+				}
+			}
+				
+		}
+		System.out.println("RES GIP === " + res.size());
+		return res;
+	}
+	private boolean contains(ArrayList<TPHConstraint> constraints, TPHConstraint constr) {
+		for(int i=0; i<constraints.size();++i) {
+			TPHConstraint p = constraints.get(i);
+			if(constr.getLeft().equals(p.getLeft()) && constr.getRight().equals(p.getRight()))
+				return true;
+		}
+		return false;
 	}
 
 	/**
 	 * Visits parameter type or return type with {@link SignatureVisitor} to create
 	 * the method signature
-	 * 
 	 * @param t type of parameter or return type
-	 * @param sv true if t is type of parameter
+	 * @param isParameterType true if t is type of parameter
 	 */
-	private void doVisitParamsOrReturn(RefTypeOrTPHOrWildcardOrGeneric t, SignatureVisitor sv) {
+	private void doVisitParamsOrReturn(RefTypeOrTPHOrWildcardOrGeneric t, boolean isParameterType) {
 		String type = t.acceptTV(new TypeToString());
-
+		SignatureVisitor sv;
+		if(isParameterType) {
+			 sv = sw.visitParameterType();
+		}
+		else {
+			sv = sw.visitReturnType();
+		}
 		switch (type) {
 		case "RT":
-			String sig = t.acceptTV(new TypeToSignature(constraints));
+			String sig = t.acceptTV(new TypeToSignature());
 			sv.visitClassType(sig.substring(1, sig.length()));
 			break;
 		case "GRT":
 			GenericRefType g = (GenericRefType) t;
-			sv.visitTypeVariable(g.acceptTV(new TypeToSignature(constraints)));
+//			sv.visitTypeVariable(g.acceptTV(new TypeToSignature()).substring(1));
+			sv.visitTypeVariable(g.acceptTV(new TypeToSignature()));
 			break;
 		case "TPH":
 			RefTypeOrTPHOrWildcardOrGeneric r = resultSet.resolveType(t).resolvedType;
-			// der Fall wenn der Typ eine Interface ist, muss betrachtet werden
+			// der Fall wenn die Type eine Interface ist, muss betrachtet werden
 			// Deswegen muss in ResutSet noch enthalten werden, ob die Type eine
 			// Interface oder eine Klasse ist.
 			
-			// das braucht man nicht es reicht: sv.visitTypeVariable(r.acceptTV(new
-			// TypeToSignature())
+			// das braucht man nicht es reicht: sv.visitTypeVariable(r.acceptTV(new TypeToSignature())
 			// 
-			String sig2 = r.acceptTV(new TypeToSignature(constraints));
+			String sig2 = r.acceptTV(new TypeToSignature());
 			if(r instanceof GenericRefType) {
 				sv.visitTypeVariable(sig2);
 			}else if(!(r instanceof TypePlaceholder)) {
-				if (sig2.contains(SPECIAL_CHAR_FOR_FUN)) {
-					sv.visitInterface().visitClassType(sig2.substring(1));
+				if(sig2.contains("$$")) {
+					System.out.println(" Signature FUN$$: "+r);
+					sv.visitInterface().visitClassType(sig2.substring(1, sig2.length()));
 				} else {
 					// Kann zwischen GenericRefType und RefType nicht unterscheiden
 					// Deswegen wird immer geprüft, ob der Name in Generic Maps liegt
@@ -218,162 +324,165 @@ public class Signature {
 				}
 				
 			} else {
-				String realName = sig2.substring(1, sig2.length() - 1);
-				String toVisit = realName+SPECIAL_CHAR;
-				if(!genericsAndBounds.containsKey(toVisit)) {
-					Optional<GenericsGeneratorResult> equalTPH = getEqualTPHFromClassConstraints(consClass, realName);
-					if(equalTPH.isPresent()){
-						toVisit = equalTPH.get().getConstraint().getLeft() + SPECIAL_CHAR;
-					} else {
-						toVisit = getEqualTPH(constraints, realName) + SPECIAL_CHAR;
-					}
-				}
-				sv.visitTypeVariable(toVisit);
+				String eqTPH = getEqualTPH(methodConstraints, sig2.substring(1, sig2.length()-1))+"$";
+				System.out.println(r.getClass()+" Signature TPH: "+r.acceptTV(new TypeToSignature()));
+				sv.visitTypeVariable(eqTPH);
 			}
 			
 			break;
 			
 		case "SWC":
+			System.out.println("SWC---Signature");
 			SuperWildcardType swc = (SuperWildcardType) t;
-			String sigInner = swc.getInnerType().acceptTV(new TypeToSignature(constraints));
-			int length = sigInner.length();
-			visitWildCard(sv, sigInner, length, swc.getInnerType(), SUPER_CHAR);
+			String sigInner = swc.getInnerType().acceptTV(new TypeToSignature());
+			if(swc.getInnerType() instanceof TypePlaceholder) {
+				sv.visitTypeArgument('-').visitTypeVariable(sigInner.substring(1, sigInner.length()));
+			} else if(swc.getInnerType() instanceof RefType) {
+				if(sigInner.contains("$$")) {
+					sv.visitTypeArgument('-').visitInterface().visitClassType(sigInner.substring(1,sigInner.length()));
+				}else {
+					sv.visitTypeArgument('-').visitClassType(sigInner.substring(1,sigInner.length()));
+				}
+			}else {
+				sv.visitTypeArgument('-').visitTypeVariable(sigInner.substring(1));
+			}
 			
 			break;
 			
 		case "EWC":
+			System.out.println("EWC---Signature");
 			ExtendsWildcardType ewc = (ExtendsWildcardType) t;
-			String esigInner = ewc.getInnerType().acceptTV(new TypeToSignature(constraints));
-			int lengthEWCSig = esigInner.length();
-			visitWildCard(sv, esigInner, lengthEWCSig, ewc.getInnerType(), EXTENDS_CHAR);
+			String esigInner = ewc.getInnerType().acceptTV(new TypeToSignature());
+			System.out.println(esigInner);
+			if(ewc.getInnerType() instanceof TypePlaceholder) {
+				sv.visitTypeArgument('+').visitTypeVariable(esigInner.substring(1, esigInner.length()));
+			} else if(ewc.getInnerType() instanceof RefType) {
+				if(esigInner.contains("$$")) {
+					sv.visitTypeArgument('+').visitInterface().visitClassType(esigInner.substring(1,esigInner.length()));
+				}else {
+//					sv.visitClassType(esigInner.substring(1,esigInner.length()));
+					sv.visitTypeArgument('+').visitClassType(esigInner.substring(1,esigInner.length()));
+				}
+			}else {
+				sv.visitTypeArgument('+').visitTypeVariable(esigInner.substring(1));
+			}
 			
 			break;
 		default:
-//			if (!sv)
-//				sv.visitBaseType('V');
+			if(!isParameterType)
+				sv.visitBaseType('V');
 			break;
 		}
 	}
-
-	private void visitWildCard(SignatureVisitor sv, String sigInner, int length, RefTypeOrTPHOrWildcardOrGeneric innerType, char superOrExtendsChar) {
-		if (innerType instanceof TypePlaceholder) {
-			sv.visitTypeArgument(superOrExtendsChar).visitTypeVariable(sigInner.substring(1, length));
-		} else if (innerType instanceof RefType) {
-			checkInnerSignatureOfWildCard(sv, sigInner, length, superOrExtendsChar);
-		} else {
-			sv.visitTypeArgument(superOrExtendsChar).visitTypeVariable(sigInner.substring(1));
-		}
-	}
-
-	private void checkInnerSignatureOfWildCard(SignatureVisitor sv, String sigInner, int length, char superOrExtendsChar) {
-		if (sigInner.contains(SPECIAL_CHAR_FOR_FUN)) {
-			sv.visitTypeArgument(superOrExtendsChar).visitInterface().visitClassType(sigInner.substring(1, length));
-		} else {
-			sv.visitTypeArgument(superOrExtendsChar).visitClassType(sigInner.substring(1, length));
-		}
-	}
-
-	private Optional<GenericsGeneratorResult> getEqualTPHFromClassConstraints(List<GenericsGeneratorResult> consClass, String tph) {
-		return consClass.stream()
-				.filter(c -> c.getConstraint().getLeft().equals(tph) || c.getEqualsTPHs().contains(tph))
-				.findFirst();
-	}
-
-	private String getEqualTPH(List<GenericsGeneratorResult> constraints2, String tph) {
-		return constraints2.stream()
-				.filter(c -> c.getConstraint().getLeft().equals(tph) || c.getEqualsTPHs().contains(tph))
-				.findFirst().get().getConstraint().getLeft();
-	}
-
 	/**
 	 * Creates signature for class or interface with {@link SignatureWriter}
-	 * Signature looks like: <typevaliables (K:Ljava/lang/Object
-	 * "Bounds")>superclass
+	 * Signature looks like: 
+	 * <typevaliables (K:Ljava/lang/Object "Bounds")>superclass
 	 */
-	public String createSignatureForClassOrInterface() {
-		defineTypeVariablesForClassOrInterface();
-
-		defineGenericsFromConstraints(consClass,genericsAndBounds);
-
-		String sClass = classOrInterface.getSuperClass().acceptTV(new TypeToSignature());
-		sw.visitSuperclass().visitClassType(sClass.substring(1, sClass.length() - 1));
-		sw.visitEnd();
-		return sw.toString();
-	}
-
-	private void defineTypeVariablesForClassOrInterface() {
+	private void createSignatureForClassOrInterface() {
 		Iterator<GenericTypeVar> itr = classOrInterface.getGenerics().iterator();
 
 		while(itr.hasNext()) {
 			GenericTypeVar g = itr.next();
-			visitTypeVarsAndTheirBounds(g, genericsAndBounds);
-		}
+			getBoundsOfTypeVar(g,genericsAndBounds);
 		}
 		
-	/**
-	 * @param genericsAndBounds2 
-	 * 
-	 */
-	private void defineGenericsFromConstraints(List<GenericsGeneratorResult> constraints, HashMap<String,String> genericsAndBounds2) {
-		constraints.forEach(c -> {
-			String typeVariable = c.getConstraint().getLeft() + SPECIAL_CHAR;
-			sw.visitFormalTypeParameter(typeVariable);
+		if(!consClass.isEmpty()) {
+			ArrayList<String> types = new ArrayList<>();
+			ArrayList<String> superTypes = new ArrayList<>();
 			
-			String bound = c.getConstraint().getRight();
-			bound = checkBound(bound);
-			genericsAndBounds2.put(typeVariable, bound);
-		});
+			for(TPHConstraint cons : consClass) {
+				types.add(cons.getLeft());
+				superTypes.add(cons.getRight());
 			}
 			
-	/**
-	 * @param bound
-	 * @return
-	 */
-	private String checkBound(String bound) {
-		if (bound.equals(Type.getInternalName(Object.class))) {
-			visitClassBound(bound);
-		} else {
-			bound += SPECIAL_CHAR;
+			for(TPHConstraint cons : consClass) {
+				String t = cons.getLeft()+"$";
+				String bound = cons.getRight()+"$";
+				sw.visitFormalTypeParameter(t);
 				sw.visitClassBound().visitTypeVariable(bound);
-		}
-		return bound;
+				genericsAndBounds.put(t, bound);
 			}
 			
-	/**
-	 * @param bound
-	 */
-	private void visitClassBound(String bound) {
+			for(TPHConstraint cons : consClass) {
+				if(!types.contains(cons.getRight()) && !genericsAndBounds.keySet().contains(cons.getRight()+"$")) {
+					String t = cons.getRight()+"$";
+					String bound = Type.getInternalName(Object.class);
+					sw.visitFormalTypeParameter(t);
 					sw.visitClassBound().visitClassType(bound);
+					genericsAndBounds.put(t, bound);
 					sw.visitClassBound().visitEnd();
 				}
+			}
 			
+		}
+		/*if(!commonPairs.isEmpty()) {
+			ArrayList<TypePlaceholder> types = new ArrayList<>();
+			ArrayList<TypePlaceholder> superTypes = new ArrayList<>();
+			
+			for(GenericInsertPair p : commonPairs) {
+				types.add(p.TA1);
+				superTypes.add(p.TA2);
+			}
+			
+			for(GenericInsertPair p : commonPairs) {
+				String t = p.TA1.getName()+"$";
+				String bound = p.TA2.getName()+"$";
+				sw.visitFormalTypeParameter(t);
+				sw.visitClassBound().visitTypeVariable(bound);
+				genericsAndBounds.put(t, bound);
+			}
+			
+			for(GenericInsertPair p : commonPairs) {
+				if(!types.contains(p.TA2)) {
+					String t = p.TA2.getName()+"$";
+					String bound = Type.getInternalName(Object.class);
+					sw.visitFormalTypeParameter(t);
+					sw.visitClassBound().visitClassType(bound);
+					genericsAndBounds.put(t, bound);
+					sw.visitClassBound().visitEnd();
+				}
+			}
+		}
+		for(TypePlaceholder t : tphsClass) {
+			String n = t.getName()+"$";
+			String bound = Type.getInternalName(Object.class);
+			sw.visitFormalTypeParameter(n);
+			sw.visitClassBound().visitClassType(bound);
+			genericsAndBounds.put(n, bound);
+			sw.visitClassBound().visitEnd();
+		}*/
+		String sClass = classOrInterface.getSuperClass().acceptTV(new TypeToSignature());
+		sw.visitSuperclass().visitClassType(sClass.substring(1, sClass.length()-1));
+		sw.visitEnd();
+	}
 	/**
 	 * Get bounds of type variable
-	 * 
 	 * @param g type variable
 	 * @param genAndBounds 
 	 */
-	private void visitTypeVarsAndTheirBounds(GenericTypeVar g, HashMap<String, String> genAndBounds) {
+	private void getBoundsOfTypeVar(GenericTypeVar g, HashMap<String, String> genAndBounds) {
 		sw.visitFormalTypeParameter(g.getName());
 		
 		Iterator<? extends RefTypeOrTPHOrWildcardOrGeneric> bItr = g.getBounds().iterator(); 
 		while(bItr.hasNext()) {
 			RefTypeOrTPHOrWildcardOrGeneric b =bItr.next();
 			String boundDesc = b.acceptTV(new TypeToDescriptor());
+//			System.out.println("GetBounds: " + boundDesc);
 			// Ensure that <...> extends java.lang.Object OR ...
 			if(b instanceof GenericRefType) {
 				sw.visitClassBound().visitTypeVariable(boundDesc);
 			} else {
-				visitClassBound(boundDesc);
+				sw.visitClassBound().visitClassType(boundDesc);
+				sw.visitClassBound().visitEnd();
 			}
 			genAndBounds.put(g.getName(), boundDesc);
 		}
+//		sw.visitClassBound().visitEnd();
 	}
 	
-	@Override
 	public String toString() {
-		if(sw == null)
-			return super.toString();
 		return sw.toString();
 	}
+	
 }

src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java

@@ -1,11 +1,8 @@
 package de.dhbwstuttgart.bytecode.signature;
 
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
 
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
+import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
 import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
@@ -15,15 +12,6 @@ import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
 
 public class TypeToSignature implements TypeVisitor<String> {
-	private List<GenericsGeneratorResult> constraints;
-
-	public TypeToSignature() {
-		this.constraints = new ArrayList<>();
-	}
-
-	public TypeToSignature(List<GenericsGeneratorResult> constraints) {
-		this.constraints = constraints;
-	}
 
 	@Override
 	public String visit(RefType refType) {
@@ -45,7 +33,7 @@ public class TypeToSignature implements TypeVisitor<String> {
 //                } else {
 //                		params += "L"+param.toString().replace(".", "/");
 //                }
-                params += param.acceptTV(new TypeToSignature(constraints));
+                params += param.acceptTV(new TypeToSignature());
 
                 if(param instanceof TypePlaceholder)
                 	params += ";";
@@ -60,7 +48,7 @@ public class TypeToSignature implements TypeVisitor<String> {
 	@Override
 	public String visit(SuperWildcardType superWildcardType) {
 //		throw new NotImplementedException();
-		String sig = "-" + superWildcardType.getInnerType().acceptTV(new TypeToSignature(constraints));
+		String sig = "-" + superWildcardType.getInnerType().acceptTV(new TypeToSignature());
 		if(superWildcardType.getInnerType() instanceof TypePlaceholder)
 			sig += ";";
 		return sig;
@@ -69,21 +57,13 @@ public class TypeToSignature implements TypeVisitor<String> {
 	@Override
 	public String visit(TypePlaceholder typePlaceholder) {
 //		return typePlaceholder.toString().replace(".", "/");
-		String name = typePlaceholder.getName();
-
-		if(!constraints.isEmpty()){
-			Optional<GenericsGeneratorResult> equalName = getEqualTPHFromClassConstraints(constraints, name);
-			if(equalName.isPresent())
-				name = equalName.get().getConstraint().getLeft();
-		}
-
-		return "T" + name + "$";
+		return "T" + typePlaceholder.getName() + "$";
 	}
 
 	@Override
 	public String visit(ExtendsWildcardType extendsWildcardType) {
 //		throw new NotImplementedException();
-		String sig = "+" + extendsWildcardType.getInnerType().acceptTV(new TypeToSignature(constraints));
+		String sig = "+" + extendsWildcardType.getInnerType().acceptTV(new TypeToSignature());
 		if(extendsWildcardType.getInnerType() instanceof TypePlaceholder)
 			sig += ";";
 		return sig;
@@ -94,9 +74,4 @@ public class TypeToSignature implements TypeVisitor<String> {
 		return genericRefType.getParsedName().replace(".", "/");
 	}
 	
-	private Optional<GenericsGeneratorResult> getEqualTPHFromClassConstraints(List<GenericsGeneratorResult> listOfConstraints, String tph) {
-		return listOfConstraints.stream()
-				.filter(c -> c.getConstraint().getLeft().equals(tph) || c.getEqualsTPHs().contains(tph))
-				.findFirst();
-	}
 }

src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericGenratorResultForSourceFile.java

@@ -1,50 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.simplifyRes;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-/**
- * The simplify results of a source file (package)
- * 
- * @author fayez
- *
- */
-public class GenericGenratorResultForSourceFile {
-	private String pkgName;
-	private final List<GenericsGeneratorResultForClass> genericGeneratorResultForAllClasses = new ArrayList<>();
-
-	/**
-	 * @param pkgName
-	 */
-	public GenericGenratorResultForSourceFile(String pkgName) {
-		this.pkgName = pkgName;
-	}
-
-	public List<GenericsGeneratorResultForClass> getGenericGeneratorResultForAllClasses() {
-		return genericGeneratorResultForAllClasses;
-	}
-
-	/**
-	 * Appends the simplify results of a class to simplifyResForSF
-	 * 
-	 * @param sResClass simplify results of a class to added
-	 */
-	public void addGenericGeneratorResultClass(GenericsGeneratorResultForClass sResClass) {
-		genericGeneratorResultForAllClasses.add(sResClass);
-	}
-
-	public GenericsGeneratorResultForClass getSimplifyResultsByName(String pkgName, String name) {
-		for (int i = 0; i < genericGeneratorResultForAllClasses.size(); i++) {
-			GenericsGeneratorResultForClass genericsGeneratorResult = genericGeneratorResultForAllClasses.get(i);
-			if (genericsGeneratorResult.getClassName().equals(name)) {
-				return genericsGeneratorResult;
-			}
-		}
-		
-		return new GenericsGeneratorResultForClass(name);
-	}
-}

src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericsGeneratorResultForClass.java

@@ -1,75 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.simplifyRes;
-
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.base.Optional;
-
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGeneratorResultsForAllMethods;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.MethodAndConstraints;
-
-/**
- * @author fayez
- *
- */
-public class GenericsGeneratorResultForClass {
-	private final String className;
-	private final List<GenericsGeneratorResult> classConstraints;
-	private final GenericGeneratorResultsForAllMethods methodsAndTheirConstraints;
-
-	public GenericsGeneratorResultForClass(String className) {
-		this(className, Collections.emptyList(), new GenericGeneratorResultsForAllMethods());
-	}
-	/**
-	 * @param className
-	 * @param classConstraints
-	 * @param methodsAndTheirConstraints
-	 */
-	public GenericsGeneratorResultForClass(String className, List<GenericsGeneratorResult> classConstraints,
-			GenericGeneratorResultsForAllMethods methodsAndTheirConstraints) {
-		this.className = className;
-		this.classConstraints = classConstraints;
-		this.methodsAndTheirConstraints = methodsAndTheirConstraints;
-	}
-
-	/**
-	 * @return the className
-	 */
-	public String getClassName() {
-		return className;
-	}
-
-	/**
-	 * @return the classConstraints
-	 */
-	public List<GenericsGeneratorResult> getClassConstraints() {
-		return classConstraints;
-	}
-
-	/**
-	 * @return the methodsAndTheirConstraints
-	 */
-	public GenericGeneratorResultsForAllMethods getMethodsAndTheirConstraints() {
-		return methodsAndTheirConstraints;
-	}
-
-	public boolean contains(String id) {
-		return methodsAndTheirConstraints.getMethodsAndConstraints().stream().map(mc -> mc.getMethodID())
-				.anyMatch(i -> i.equals(id));
-	}
-
-	
-	
-	
-	public List<GenericsGeneratorResult> getMethodConstraintsByID(String id) {
-		java.util.Optional<MethodAndConstraints> methodAndConstraints = methodsAndTheirConstraints.getMethodsAndConstraints().stream().filter(mc -> mc.getMethodID().equals(id))
-				.findFirst();
-		
-		return methodAndConstraints.isPresent() ? methodAndConstraints.get().getConstraints() : Collections.emptyList();
-	}
-
-}

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

@@ -1,94 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-import de.dhbwstuttgart.bytecode.signature.Signature;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.signature.SignatureVisitor;
-import org.objectweb.asm.signature.SignatureWriter;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Iterator;
-
-public class ByteCodeForFunNGenerator {
-
-    public static void generateBCForFunN(LambdaExpression lambdaExpression, String methDesc, File path) {
-        ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-
-        SignatureWriter methSig = new SignatureWriter();
-
-        int numberOfParams = 0;
-        SignatureVisitor paramVisitor = methSig.visitParameterType();
-        Iterator<FormalParameter> itr = lambdaExpression.params.iterator();
-        while (itr.hasNext()) {
-            numberOfParams++;
-            // getBounds
-            paramVisitor.visitTypeVariable(CONSTANTS.T + numberOfParams);
-            itr.next();
-        }
-        methSig.visitReturnType().visitTypeVariable(CONSTANTS.R);
-        // ")"+lam.getReturn.getBounds
-        Signature sig = new Signature(numberOfParams);
-        String name = CONSTANTS.FUN + numberOfParams + CONSTANTS.$$;
-        classWriter.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC+Opcodes.ACC_INTERFACE + Opcodes.ACC_ABSTRACT, name, sig.toString(),
-                Type.getInternalName(Object.class), null);
-        MethodVisitor mvApply = classWriter.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT, "apply", methDesc,
-                methSig.toString(), null);
-        mvApply.visitEnd();
-        writeClassFile(classWriter.toByteArray(), name, path);
-    }
-
-    public static void generateBCForFunN(ArgumentList argumentList, String methDesc, File path) {
-        ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
-
-        SignatureWriter methSig = new SignatureWriter();
-
-        int numberOfParams = 0;
-        SignatureVisitor paramVisitor = methSig.visitParameterType();
-        Iterator<Expression> itr1 = argumentList.getArguments().iterator();
-
-        while(itr1.hasNext()) {
-            numberOfParams++;
-            // getBounds
-            paramVisitor.visitTypeVariable(CONSTANTS.T + numberOfParams);
-            itr1.next();
-        }
-
-        methSig.visitReturnType().visitTypeVariable(CONSTANTS.R);
-        // ")"+lam.getReturn.getBounds
-        Signature sig = new Signature(numberOfParams);
-        String name = CONSTANTS.FUN + numberOfParams + CONSTANTS.$$;
-        classWriter.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC+Opcodes.ACC_INTERFACE + Opcodes.ACC_ABSTRACT, name, sig.toString(),
-                Type.getInternalName(Object.class), null);
-        MethodVisitor mvApply = classWriter.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT, "apply", methDesc,
-                methSig.toString(), null);
-        mvApply.visitEnd();
-        writeClassFile(classWriter.toByteArray(), name, path);
-    }
-
-
-    public static void writeClassFile(byte[] bytecode, String name, File path) {
-        FileOutputStream output;
-        try {
-            System.out.println("generating " + name + ".class file...");
-            output = new FileOutputStream(
-                    new File(path , name + CONSTANTS.EXTENSIONCLASS));
-            output.write(bytecode);
-            output.close();
-            System.out.println(name + ".class file generated");
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-    }
-}

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

@@ -1,22 +0,0 @@
-package de.dhbwstuttgart.bytecode.utilities;
-
-public interface CONSTANTS {
-
-    String VOID = "void";
-    String TPH = "TPH ";
-    String ANGLEBRACKET = "<";
-    String FUN = "Fun";
-    String EXTENSIONCLASS = ".class";
-    String $$ = "$$";
-    String T = "T";
-    String R = "R";
-    String DESUGAREDMETHODNAME = "lambda$new$";
-    String REFTYPE_BYTE = "java/lang/Byte";
-    String REFTYPE_SHORT = "java/lang/Short";
-    String REFTYPE_INTEGER = "java/lang/Integer";
-    String REFTYPE_LONG = "java/lang/Long";
-    String REFTYPE_DOUBLE = "java/lang/Double";
-    String REFTYPE_FLOAT = "java/lang/Float";
-    String REFTYPE_STRING = "java/lang/String";
-    String TO_STRING = "toString";
-}

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

@@ -5,27 +5,25 @@ import java.util.List;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.ConstraintsWithSameLeftSide;
 
 public class ConstraintsFinder {
 	private List<TPHConstraint> allConstaints;
 
 	public ConstraintsFinder(List<TPHConstraint> allConstaints) {
+		super();
 		this.allConstaints = allConstaints;
 	}
 
-	public List<ConstraintsWithSameLeftSide> findConstraints() {
-		List<ConstraintsWithSameLeftSide> result = new ArrayList<>();
+	public List<List<TPHConstraint>> findConstraints() {
+		List<List<TPHConstraint>> result = new ArrayList<>();
 		
 		List<TPHConstraint> visitedCons = new ArrayList<>();
 		for(TPHConstraint c : allConstaints) {
 			if(c.getRel() == Relation.EXTENDS) {
 				// get constraints with the same left side
 				List<TPHConstraint> cons = getConstraints(c,visitedCons);
-				if(cons.size()>1) {
-					ConstraintsWithSameLeftSide consWithSameLeftSide = new ConstraintsWithSameLeftSide(cons);
-					result.add(consWithSameLeftSide);
-				}
+				if(cons.size()>1)
+					result.add(cons);
 			}
 		}
 		

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

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.bytecode.utilities;
 
+import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.statement.*;
 
 import java.util.ArrayList;
@@ -18,8 +19,7 @@ public class KindOfLambda implements StatementVisitor{
 	private boolean isInstanceCapturingLambda = false;
 	private List<RefTypeOrTPHOrWildcardOrGeneric> argumentList = new ArrayList<>();
 	private ArrayList<String> usedVars = new ArrayList<>();
-	private ArrayList<String> varsFromInnerLambdas = new ArrayList<>();
-	private boolean thisUsed = false;
+	private boolean hasThis = false;
 	private ArrayList<String> definedLocals = new ArrayList<>();
 	
 	public KindOfLambda(LambdaExpression lambdaExpression) {
@@ -40,20 +40,19 @@ public class KindOfLambda implements StatementVisitor{
 		return argumentList;
 	}
 	
-	public boolean isThisUsed() {
-		return thisUsed;
+	public boolean isHasThis() {
+		return hasThis;
 	}
 	
 	@Override
 	public void visit(ArgumentList argumentList) {
-		argumentList.getArguments().forEach(a->a.accept(this));
+		// TODO Auto-generated method stub
 		
 	}
 
 	@Override
 	public void visit(LambdaExpression lambdaExpression) {
-		lambdaExpression.params.getFormalparalist().forEach(p->varsFromInnerLambdas.add(p.getName()));
-		lambdaExpression.methodBody.accept(this);
+		
 	}
 
 	@Override
@@ -112,11 +111,9 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(LocalVar localVar) {
-		boolean addVar = !contain(params, localVar.name) && !definedLocals.contains(localVar.name) &&
-				!varsFromInnerLambdas.contains(localVar.name) && !usedVars.contains(localVar.name);
-		if(addVar) {
+		if(!contain(params, localVar.name) && !definedLocals.contains(localVar.name)) {
 			argumentList.add(localVar.getType());
-			if(thisUsed) {
+			if(hasThis) {
 				usedVars.add(1, localVar.name);
 			} else {
 				usedVars.add(0, localVar.name);
@@ -144,13 +141,12 @@ public class KindOfLambda implements StatementVisitor{
 	@Override
 	public void visit(MethodCall methodCall) {
 		methodCall.receiver.accept(this);
-		methodCall.arglist.accept(this);
 	}
 
 	@Override
 	public void visit(NewClass methodCall) {
-		methodCall.receiver.accept(this);
-		methodCall.arglist.accept(this);
+		// TODO Auto-generated method stub
+		
 	}
 
 	@Override
@@ -194,8 +190,8 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(This aThis) {
-		if(!thisUsed) {
-			thisUsed = true;
+		if(!hasThis) {
+			hasThis = true;
 			this.argumentList.add(0,aThis.getType());
 		}
 		if(!isInstanceCapturingLambda) {

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

@@ -9,7 +9,7 @@ import de.dhbwstuttgart.typeinference.result.ResultPair;
 
 public class MethodAndTPH {
 	
-	private String id;
+	private String name;
 	private final ArrayList<String> tphs = new ArrayList<>();
 	//private final ArrayList<GenericInsertPair> pairs = new ArrayList<>();
 	private final ArrayList<ResultPair<TypePlaceholder, TypePlaceholder>> pairs = new ArrayList<>();
@@ -17,7 +17,7 @@ public class MethodAndTPH {
 	private final ArrayList<String> localTphs = new ArrayList<>();
 
 	public MethodAndTPH(String name) {
-		this.id = name;
+		this.name = name;
 	}
 
 	public ArrayList<String> getTphs() {
@@ -31,8 +31,8 @@ public class MethodAndTPH {
 		return pairs;
 	}
 	
-	public String getId() {
-		return id;
+	public String getName() {
+		return name;
 	}
 
 	public ArrayList<String> getLocalTphs() {

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

@@ -3,21 +3,44 @@
  */
 package de.dhbwstuttgart.bytecode.utilities;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.signature.SignatureVisitor;
+import org.objectweb.asm.signature.SignatureWriter;
+
 import de.dhbwstuttgart.bytecode.Exception.NotInCurrentPackageException;
 import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
+import de.dhbwstuttgart.bytecode.signature.Signature;
 import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
-import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.FormalParameter;
+import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.Method;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
 import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
+import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
 import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import javassist.NotFoundException;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-
-import java.io.File;
-import java.util.*;
 
 /**
  * @author fayez
@@ -27,7 +50,7 @@ public class MethodCallHelper {
 	private MethodCall methCall;
 	private SourceFile sourceFile;
 	private ResultSet resultSet;
-	private File path;
+	private String path;
 
 	/**
 	 * @param methCall
@@ -35,7 +58,7 @@ public class MethodCallHelper {
 	 * @param resultSet
 	 * @param path TODO
 	 */
-	public MethodCallHelper(MethodCall methCall, SourceFile sourceFile, ResultSet resultSet, File path) {
+	public MethodCallHelper(MethodCall methCall, SourceFile sourceFile, ResultSet resultSet, String path) {
 		this.methCall = methCall;
 		this.sourceFile = sourceFile;
 		this.resultSet = resultSet;
@@ -75,15 +98,11 @@ public class MethodCallHelper {
 	public String getDesc(String className) throws NotInCurrentPackageException, NotFoundException {
 		String name = methCall.name;
 		ClassOrInterface clazz = getClassFromCurrPkg(className);
-		String retType = getResolvedType(methCall.getType());
-		ArrayList<String> params = getTypes(methCall.arglist.getArguments());
 
 		Map<String, String> genAndBoundsClass = getGenericsAndBounds(clazz.getGenerics());
 		modifyGenAndBounds(genAndBoundsClass);
 		for (Method m : clazz.getMethods()) {
-			if (name.equals(m.getName()) && retType.equals(getResolvedType(m.getReturnType()))) {
-				ArrayList<String> paramsOfM = getTypes(m.getParameterList());
-				if(areEquals(params,paramsOfM)) {
+			if (name.equals(m.getName())) {
 				Map<String, String> genAndBoundsMethod = getGenericsAndBoundsMethod(m.getGenerics());
 				modifyGenAndBounds(genAndBoundsMethod);
 				boolean hasGen = hasGen(m, genAndBoundsClass);
@@ -92,45 +111,10 @@ public class MethodCallHelper {
 				return nm.accept(new DescriptorToString(resultSet));
 			}
 		}
-		}
 
 		throw new NotFoundException("Method " + name + " is not found");
 	}
 
-	private boolean areEquals(ArrayList<String> params, ArrayList<String> paramsOfM) {
-		if(params.size() != paramsOfM.size())
-			return false;
-		
-		for(String t : params) {
-			for(String t2 : paramsOfM) {
-				if(!t.equals(t2))
-					return false;
-			}
-		}
-		return true;
-	}
-
-	private ArrayList<String> getTypes(ParameterList parameterList) {
-		Iterator<FormalParameter> itr = parameterList.iterator();
-		ArrayList<String> typeList = new ArrayList<>();
-		while (itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			String t = getResolvedType(fp.getType());
-			typeList.add(t);
-		}
-		
-		return typeList;
-	}
-
-	private ArrayList<String> getTypes(List<Expression> arguments) {
-		ArrayList<String> types = new ArrayList<>();
-		for(int i = 0; i<arguments.size(); ++i) {
-			String t = getResolvedType(arguments.get(i).getType());
-			types.add(t);
-		}
-		return types;
-	}
-
 	private boolean hasGen(Method m, Map<String, String> genericsAndBounds) {
 		String retType = resultSet.resolveType(m.getReturnType()).resolvedType.acceptTV(new TypeToSignature());
 		/*Prüfe, ob die Rückgabe-Type der Methode eine Type-Variable ist*/
@@ -220,25 +204,52 @@ public class MethodCallHelper {
 		}
 	}
 
-	public void generateBCForFunN(String methodDescriptor) {
-		ByteCodeForFunNGenerator.generateBCForFunN(methCall.arglist,methodDescriptor,path);
+	public String generateBCForFunN() {
+		ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+
+		SignatureWriter methSig = new SignatureWriter();
+
+		int numberOfParams = 0;
+		SignatureVisitor paramVisitor = methSig.visitParameterType();
+		Iterator<Expression> itr1 = methCall.arglist.getArguments().iterator();
+		String methDesc = "(";
+		while(itr1.hasNext()) {
+			numberOfParams++;
+			// getBounds
+			paramVisitor.visitTypeVariable("T" + numberOfParams);
+			methDesc += "L" + Type.getInternalName(Object.class) + ";";
+			itr1.next();
+		}
+		methDesc += ")L" + Type.getInternalName(Object.class) + ";";
+		
+		methSig.visitReturnType().visitTypeVariable("R");
+		// ")"+lam.getReturn.getBounds
+		Signature sig = new Signature(numberOfParams);
+		String name = "Fun" + numberOfParams + "$$";
+		classWriter.visit(Opcodes.V1_8, Opcodes.ACC_PUBLIC+Opcodes.ACC_INTERFACE + Opcodes.ACC_ABSTRACT, name, sig.toString(),
+				Type.getInternalName(Object.class), null);
+		MethodVisitor mvApply = classWriter.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT, "apply", methDesc,
+				methSig.toString(), null);
+		mvApply.visitEnd();
+		writeClassFile(classWriter.toByteArray(), name);
+		return methDesc;
+	}
+
+	private void writeClassFile(byte[] bytecode, String name) {
+		FileOutputStream output;
+		try {
+			System.out.println("generating " + name + ".class file...");
+			output = new FileOutputStream(
+					new File(path + name + ".class"));
+			output.write(bytecode);
+			output.close();
+			System.out.println(name + ".class file generated");
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
 
-	public String getDescriptorOfApplyMethod(String methodCallType) {
-		return new DescriptorToString().createDescForFunN(methCall.arglist, methodCallType);
-	}
-	
-	/**
-	 * @param methodCall
-	 */
-	public void createCheckCast(MethodCall methodCall, MethodVisitor mv) {
-		String checkCast = getResolvedType(methodCall.getType());
-		if(!checkCast.contains("TPH ")) {
-			int pos = checkCast.length();
-			if(checkCast.contains("<"))
-				pos = checkCast.indexOf("<");
-			mv.visitTypeInsn(Opcodes.CHECKCAST,checkCast.substring(0,pos));
-		}
 	}
 
 }

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

@@ -1,34 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.utilities;
-
-import java.util.Iterator;
-
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.Method;
-
-/**
- * @author fayez
- *
- */
-public class MethodUtility {
-	/**
-	 * Creates an ID for a method
-	 * 
-	 * @param resolver type Resolver
-	 * @param method   for which the ID will be generated
-	 * @return ID for the given method. 
-	 * 	ID = ReturntypeMethodname(Parametertypes)
-	 */
-	public static String createID(Resolver resolver, Method method) {
-		String id = resolver.getResolvedType(method.getReturnType()) + method.name + "(";
-		Iterator<FormalParameter> itr = method.getParameterList().iterator();
-		while (itr.hasNext()) {
-			FormalParameter fp = itr.next();
-			id += resolver.getResolvedType(fp.getType());
-		}
-		id += ")";
-		return id;
-	}
-}

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

@@ -4,18 +4,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.NameReplacementResult;
 import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
 
 public class NameReplacer {
-	//TODO rename
 	private List<TPHConstraint> constraints;
 	private List<TPHConstraint> allConstraints;
-	private List<MethodAndTPH> methodAndTPHs;
-	// TODO rename into tphClass
 	private List<String> tphs;
 	private List<String> localTphs;
 	
@@ -27,98 +22,7 @@ public class NameReplacer {
 		this.localTphs = localTphs;
 	}
 	
-	public NameReplacer(List<TPHConstraint> constraints, List<TPHConstraint> allConstraints,List<String> tphs) {
-		super();
-		this.constraints = constraints;
-		this.allConstraints = allConstraints;
-		this.tphs = tphs;
-	}
-	
-	public NameReplacer(List<TPHConstraint> constraints, List<TPHConstraint> allConstraints) {
-		this.constraints = constraints;
-		this.allConstraints = allConstraints;
-	}
-
-	public NameReplacer(List<TPHConstraint> constraints, List<TPHConstraint> allConstraints, List<MethodAndTPH> methodAndTPHs,
-			List<String> tphsClass) {
-		this.constraints = constraints;
-		this.allConstraints = allConstraints;
-		this.methodAndTPHs = methodAndTPHs;
-		this.tphs = tphsClass;
-	}
-
-	public NameReplacementResult replaceNames() {
-		String newName = NameGenerator.makeNewName();
-		List<String> names = new ArrayList<>();
-		substituteRightSidesWithNewName(newName, names);
-		
-		substituteNamesInAllConstraints(newName, names);
-		Stream<ArrayList<String>> tphsOfMethods = methodAndTPHs.stream().map(m->m.getTphs());
-		Stream<ArrayList<String>> localTphsOfMethods = methodAndTPHs.stream().map(m->m.getLocalTphs());
-		
-		replaceOldNames(newName, names, tphsOfMethods);
-		replaceOldNames(newName, names, localTphsOfMethods);
-		
-		if(tphs.removeAll(names))
-			tphs.add(newName);
-		
-		NameReplacementResult res = new NameReplacementResult(newName, names);
-		
-		return res;
-	}
-
-	/**
-	 * @param newName
-	 * @param names
-	 * @param tphsOfMethods
-	 */
-	public void replaceOldNames(final String newName, final List<String> names, Stream<ArrayList<String>> tphsOfMethods) {
-		tphsOfMethods.forEach(tphsMethod->{
-			if(tphsMethod.removeAll(names))
-				tphsMethod.add(newName);
-		});
-	}
-	
-	public NameReplacementResult replaceNamesLocal() {
-		String newName = NameGenerator.makeNewName();
-		List<String> names = new ArrayList<>();
-		substituteRightSidesWithNewName(newName, names);
-		
-		substituteNamesInAllConstraints(newName, names);
-		
-		tphs.removeAll(names);
-		tphs.add(newName);
-		
-		NameReplacementResult res = new NameReplacementResult(newName, names);
-		
-		return res;
-	}
-
-	/**
-	 * @param newName
-	 * @param names
-	 */
-	public void substituteNamesInAllConstraints(String newName, List<String> names) {
-		for(TPHConstraint cons : allConstraints) {
-			if(names.contains(cons.getLeft()))
-				cons.setLeft(newName);
-			if(names.contains(cons.getRight()))
-				cons.setRight(newName);
-		}
-	}
-
-	/**
-	 * @param newName
-	 * @param names
-	 */
-	public void substituteRightSidesWithNewName(String newName, List<String> names) {
-		for(TPHConstraint cons : constraints) {
-			names.add(cons.getRight());
-			cons.setRight(newName);
-		}
-	}
-	
-	public Map<String, List<String>> replaceNamesWithLocals() {
+	public Map<String, List<String>> replaceNames() {
 		String newName = NameGenerator.makeNewName();
 		ArrayList<String> names = new ArrayList<>();
 		for(TPHConstraint cons : constraints) {

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

@@ -1,28 +0,0 @@
-/**
- * 
- */
-package de.dhbwstuttgart.bytecode.utilities;
-
-import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.result.ResultSet;
-
-/**
- * @author fayez
- *
- */
-public class Resolver {
-	
-	private ResultSet resultSet;
-
-	/**
-	 * @param resultSet
-	 */
-	public Resolver(ResultSet resultSet) {
-		this.resultSet = resultSet;
-	}
-	
-	public String getResolvedType(RefTypeOrTPHOrWildcardOrGeneric type) {
-		return resultSet.resolveType(type).resolvedType.acceptTV(new TypeToDescriptor());
-	}
-}

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

@@ -0,0 +1,42 @@
+/**
+ * 
+ */
+package de.dhbwstuttgart.bytecode.utilities;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+
+import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+
+/**
+ * @author fayez
+ *
+ */
+public class SimplifyResult {
+	private final ArrayList<TPHConstraint> classConstraints;
+	private final ArrayList<String> tphsClass;
+	private final HashMap<String, HashMap<TPHConstraint, HashSet<String>>> methodsConstraints;
+	
+	public SimplifyResult(ArrayList<TPHConstraint> classConstraints, ArrayList<String> tphsClass,
+			HashMap<String, HashMap<TPHConstraint, HashSet<String>>> methodsConstraints) {
+		super();
+		this.classConstraints = classConstraints;
+		this.tphsClass = tphsClass;
+		this.methodsConstraints = methodsConstraints;
+	}
+
+	public ArrayList<TPHConstraint> getClassConstraints() {
+		return classConstraints;
+	}
+
+	public HashMap<String, HashMap<TPHConstraint, HashSet<String>>> getMethodsConstraints() {
+		return methodsConstraints;
+	}
+
+	public ArrayList<String> getTphsClass() {
+		return tphsClass;
+	}
+	
+}

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

@@ -2,7 +2,6 @@ package de.dhbwstuttgart.core;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URL;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -10,29 +9,8 @@ public class ConsoleInterface {
 	private static final String directory = System.getProperty("user.dir");
 
 	public static void main(String[] args) throws IOException, ClassNotFoundException {
-		List<File> input = new ArrayList<>();
-		List<File> classpath = new ArrayList<>();
-        String outputPath = null;
-		Iterator<String> it = Arrays.asList(args).iterator();
-		while(it.hasNext()){
-            String arg = it.next();
-            if(arg.equals("-d")){
-                outputPath = it.next();
-            }else if(arg.startsWith("-d")) {
-                outputPath = arg.substring(2);
-            }else if(arg.equals("-cp") || arg.equals("-classpath")){
-                String[] cps = it.next().split(":");
-                for(String cp : cps){
-                    classpath.add(new File(cp));
-                }
-            }else{
-                input.add(new File(arg));
-            }
-        }
-		JavaTXCompiler compiler = new JavaTXCompiler(input, classpath);
+		List<File> input = Arrays.asList(args).stream().map((s -> new File(s))).collect(Collectors.toList());
+		JavaTXCompiler compiler = new JavaTXCompiler(input);
 		compiler.typeInference();
-		compiler.generateBytecode(outputPath);
 	}
-
-
 }

src/main/java/de/dhbwstuttgart/environment/CompilationEnvironment.java

@@ -4,12 +4,18 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.*;
 
-import com.google.common.collect.Lists;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import org.antlr.v4.runtime.tree.TerminalNode;
+import org.reflections.Reflections;
+import org.reflections.scanners.ResourcesScanner;
+import org.reflections.scanners.SubTypesScanner;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
+import org.reflections.util.FilterBuilder;
 
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.JavaTXParser;
@@ -43,7 +49,8 @@ public class CompilationEnvironment {
 		 *
 		 */
 		//String bootClassPath = System.getProperty("sun.boot.class.path");
-		//		DirectoryClassLoader cl = DirectoryClassLoader.getPlatformClassLoader();
+		//		ClassLoader cl = ClassLoader.getPlatformClassLoader();
+				ClassLoader cl = ClassLoader.getSystemClassLoader();
 				String bootClassPath = System.getProperty("java.class.path");
 		librarys = new ArrayList<>();
 		for(String path : bootClassPath.split(File.pathSeparator)) {
@@ -60,44 +67,13 @@ public class CompilationEnvironment {
         this.packageCrawler = new PackageCrawler(librarys);
 	}
 
-	public JavaClassRegistry getRegistry(File forSourceFile, DirectoryClassLoader classLoader) throws ClassNotFoundException, IOException {
+	public JavaClassRegistry getRegistry(File forSourceFile) throws ClassNotFoundException, IOException {
 		Map<String, Integer> allNames;
 		CompilationUnitContext tree = JavaTXParser.parse(forSourceFile);
-		allNames = GatherNames.getNames(tree, packageCrawler, classLoader);
-		for(Class c : loadDefaultPackageClasses(forSourceFile, classLoader)){
-			allNames.put(c.getName(), c.getTypeParameters().length);
-		}
+		allNames = GatherNames.getNames(tree, packageCrawler);
 		return new JavaClassRegistry(allNames);
 	}
 
-	public static List<Class> loadDefaultPackageClasses(File forSourceFile, DirectoryClassLoader classLoader) throws IOException, ClassNotFoundException {
-		List<Class> ret = new ArrayList<>();
-		String packageName = getPackageName(JavaTXParser.parse(forSourceFile));
-		//Set classLoader to include default package for this specific source file
-		File dir = new File(forSourceFile.getAbsoluteFile().getParent());
-		String dirPath = dir.toString() + "/";
-		if(packageName.length()>0)dirPath = dirPath.substring(0,dirPath.length() - packageName.length());
-		String path = dirPath;
-		ArrayList<File> defaultPath = Lists.newArrayList(new File(path));
-		classLoader = new DirectoryClassLoader(defaultPath, classLoader);
-		//Gather all names in the default package for this source file (classes that are imported by default)
-		File [] files = dir.listFiles((dir1, name) -> name.endsWith(".class"));
-		if(files != null)for (File classFile : files) {
-			String className = classFile.getName().substring(0,classFile.getName().length()-6);
-			ret.add(classLoader.loadClass(packageName + className));
-        }
-		return ret;
-	}
-
-	private static String getPackageName(CompilationUnitContext forTree){
-		String packageName = "";
-		if(forTree.packageDeclaration() != null && forTree.packageDeclaration().Identifier() != null)
-		    for(TerminalNode subPackage : forTree.packageDeclaration().Identifier()){
-			    packageName += subPackage.toString() + ".";
-		}
-		return packageName;
-	}
-
 	public List<ClassOrInterface> getAllAvailableClasses() {
 		List<ClassOrInterface> ret = new ArrayList<>();
 		for(Class c : new PackageCrawler(librarys).getAllAvailableClasses()){

src/main/java/de/dhbwstuttgart/environment/DirectoryClassLoader.java

@@ -1,45 +0,0 @@
-package de.dhbwstuttgart.environment;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class DirectoryClassLoader {
-    private final URLClassLoader classLoader;
-
-    public DirectoryClassLoader(File directory, java.lang.ClassLoader parent) {
-        classLoader = new URLClassLoader(generateURLArray(dirToURL(directory)), parent);
-    }
-
-    public DirectoryClassLoader(List<File> directory, java.lang.ClassLoader parent) {
-        classLoader = new URLClassLoader(directory.stream().map(DirectoryClassLoader::dirToURL).collect(Collectors.toList()).toArray(new URL[0]), parent);
-    }
-
-    public DirectoryClassLoader(File directory, DirectoryClassLoader parent) {
-        classLoader = new URLClassLoader(generateURLArray(dirToURL(directory)), parent.classLoader);
-    }
-
-    public DirectoryClassLoader(List<File> directory, DirectoryClassLoader parent) {
-        classLoader = new URLClassLoader(directory.stream().map(DirectoryClassLoader::dirToURL).collect(Collectors.toList()).toArray(new URL[0]), parent.classLoader);
-    }
-
-    private static URL[] generateURLArray(URL url) {
-        return new URL[]{url};
-    }
-
-    private static URL dirToURL(File url){
-        if(!url.isDirectory())throw new RuntimeException(url.toString() + " is not a directory");
-        try {
-            return url.toURI().toURL();
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public Class loadClass(String className) throws ClassNotFoundException {
-        return classLoader.loadClass(className);
-    }
-}

src/main/java/de/dhbwstuttgart/environment/PackageCrawler.java

@@ -26,11 +26,11 @@ public class PackageCrawler {
 	
     public Set<Class<?>> getClassesInPackage(String packageName){
     	/*
-        List<DirectoryClassLoader> classLoadersList = new LinkedList<DirectoryClassLoader>();
+        List<ClassLoader> classLoadersList = new LinkedList<ClassLoader>();
         classLoadersList.add(Thread.currentThread().getContextClassLoader());
         classLoadersList.add(ClasspathHelper.staticClassLoader());
         classLoadersList.add(Thread.currentThread().getContextClassLoader().getParent());
-        classLoadersList.add(DirectoryClassLoader.getSystemClassLoader());
+        classLoadersList.add(ClassLoader.getSystemClassLoader());
         String bootClassPath = System.getProperty("sun.boot.class.path");
         ArrayList<URL> urlList = new ArrayList<>();
         for(String path : bootClassPath.split(";")) {
@@ -41,7 +41,7 @@ public class PackageCrawler {
 			}
         }
         URL[] urls = urlList.toArray(new URL[0]);
-        classLoadersList.add(new URLClassLoader(urls, DirectoryClassLoader.getSystemClassLoader()));
+        classLoadersList.add(new URLClassLoader(urls, ClassLoader.getSystemClassLoader()));
         */
         Reflections reflections = new Reflections(new ConfigurationBuilder()
                 .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
@@ -23,16 +22,16 @@ public class FCGenerator {
      *
      * @param availableClasses - Alle geparsten Klassen
      */
-    public static Set<UnifyPair> toUnifyFC(Collection<ClassOrInterface> availableClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException {
-        return toFC(availableClasses, classLoader).stream().map(t -> UnifyTypeFactory.convert(t)).collect(Collectors.toSet());
+    public static Set<UnifyPair> toUnifyFC(Collection<ClassOrInterface> availableClasses) throws ClassNotFoundException {
+        return toFC(availableClasses).stream().map(t -> UnifyTypeFactory.convert(t)).collect(Collectors.toSet());
     }
 
-    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException {
+    public static Set<Pair> toFC(Collection<ClassOrInterface> availableClasses) throws ClassNotFoundException {
         HashSet<Pair> pairs = new HashSet<>();
         //PL 2018-09-18: gtvs vor die for-Schleife gezogen, damit immer die gleichen Typeplaceholder eingesetzt werden.
         HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs = new HashMap<>();
         for(ClassOrInterface cly : availableClasses){
-            pairs.addAll(getSuperTypes(cly, availableClasses, gtvs, classLoader));
+            pairs.addAll(getSuperTypes(cly, availableClasses, gtvs));
         }
         return pairs;
     }
@@ -49,8 +48,8 @@ public class FCGenerator {
      * @param forType
      * @return
      */
-    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException {
-        return getSuperTypes(forType, availableClasses, new HashMap<>(), classLoader);
+    private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses) throws ClassNotFoundException {
+        return getSuperTypes(forType, availableClasses, new HashMap<>());
     }
 
     /**
@@ -62,7 +61,7 @@ public class FCGenerator {
      * @throws ClassNotFoundException
      */
     private static List<Pair> getSuperTypes(ClassOrInterface forType, Collection<ClassOrInterface> availableClasses,
-                                            HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs, DirectoryClassLoader classLoader) throws ClassNotFoundException {
+                                            HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs) throws ClassNotFoundException {
         List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
         //Die GTVs, die in forType hinzukommen:
         HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> newGTVs = new HashMap<>();
@@ -87,7 +86,7 @@ public class FCGenerator {
             ClassOrInterface superClass;
             if(!hasSuperclass.isPresent()) //Wenn es die Klasse in den available Klasses nicht gibt wird sie im Classpath gesucht. Ansonsten Exception
             {
-                superClass = ASTFactory.createClass(classLoader.loadClass(superType.getName().toString()));
+                superClass = ASTFactory.createClass(ClassLoader.getSystemClassLoader().loadClass(superType.getName().toString()));
             }else{
                 superClass = hasSuperclass.get();
             }
@@ -121,7 +120,7 @@ public class FCGenerator {
             if(superClass.getClassName().equals(ASTFactory.createObjectClass().getClassName())){
                 superTypes = Arrays.asList(new Pair(ASTFactory.createObjectType(), ASTFactory.createObjectType(), PairOperator.SMALLER));
             }else{
-                superTypes = getSuperTypes(superClass, availableClasses, newGTVs, classLoader);
+                superTypes = getSuperTypes(superClass, availableClasses, newGTVs);
             }
 
             retList.add(ret);

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java

@@ -17,7 +17,6 @@ import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class StatementGenerator {
 
@@ -210,12 +209,7 @@ public class StatementGenerator {
         }else throw new NotImplementedException();
 
         ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = argumentList.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(methodInvocationContext.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), 
-        		getReceiver(receiver), name, argumentList, TypePlaceholder.fresh(methodInvocationContext.getStart()), 
-        		argTypes, methodInvocationContext.getStart());
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), getReceiver(receiver), name, argumentList, methodInvocationContext.getStart());
         return ret;
     }
 
@@ -285,24 +279,9 @@ public class StatementGenerator {
     }
 
 
-    private Statement convert(Java8Parser.ClassInstanceCreationExpressionContext newExpression) {
-        Java8Parser.TypeArgumentsContext genericArgs = null;
-        if(newExpression.expressionName()!= null)throw new NotImplementedException();
-        if(newExpression.typeArgumentsOrDiamond()!= null){
-            if(newExpression.typeArgumentsOrDiamond().typeArguments()!=null){
-                genericArgs = newExpression.typeArgumentsOrDiamond().typeArguments();
-            }
-        }
-        if(newExpression.typeArguments()!= null)throw new NotImplementedException();
-
-        TerminalNode identifier = newExpression.Identifier(0);
-        RefType newClass = (RefType) TypeGenerator.convertTypeName(identifier.getText(),genericArgs,identifier.getSymbol(),reg,generics);
-
-        ArgumentList args = convert(newExpression.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = args.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(newExpression.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        return new NewClass(newClass, args, null, argTypes, newExpression.getStart());
+    private Statement convert(Java8Parser.ClassInstanceCreationExpressionContext stmt) {
+        //TODO
+        throw new NotImplementedException();
     }
 
     private Statement convert(Java8Parser.PreIncrementExpressionContext stmt) {
@@ -788,11 +767,7 @@ public class StatementGenerator {
         }else {
             Java8Parser.MethodInvocation_lf_primaryContext ctxt = e.methodInvocation_lf_primary();
             String methodName = ctxt.Identifier().toString();
-            ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = ctxt.argumentList().expression().stream()
-            		.map(x -> TypePlaceholder.fresh(e.getStart()))
-            		.collect(Collectors.toCollection(ArrayList::new));
-            return new MethodCall(TypePlaceholder.fresh(e.getStart()), getReceiver(expr), methodName, 
-            		convert(ctxt.argumentList()), TypePlaceholder.fresh(e.getStart()), argTypes, e.getStart());
+            return new MethodCall(TypePlaceholder.fresh(e.getStart()), getReceiver(expr), methodName, convert(ctxt.argumentList()), e.getStart());
         }
     }
 
@@ -846,10 +821,7 @@ public class StatementGenerator {
         RefType newClass = (RefType) TypeGenerator.convertTypeName(identifier.getText(),genericArgs,identifier.getSymbol(),reg,generics);
 
         ArgumentList args = convert(newExpression.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = args.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(newExpression.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        return new NewClass(newClass, args, null, argTypes, newExpression.getStart());
+        return new NewClass(newClass, args, newExpression.getStart());
     }
 
     private Expression convert(Java8Parser.LiteralContext literal) {
@@ -907,12 +879,7 @@ public class StatementGenerator {
         }
 
         ArgumentList argumentList = convert(methodInvocationContext.argumentList());
-        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes = argumentList.getArguments().stream()
-        		.map(x -> TypePlaceholder.fresh(methodInvocationContext.getStart()))
-        		.collect(Collectors.toCollection(ArrayList::new));
-        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), 
-        		getReceiver(receiver), name, argumentList, TypePlaceholder.fresh(methodInvocationContext.getStart()),
-        		argTypes, methodInvocationContext.getStart());
+        MethodCall ret = new MethodCall(TypePlaceholder.fresh(methodInvocationContext.getStart()), getReceiver(receiver), name, argumentList, methodInvocationContext.getStart());
         return ret;
     }
 

src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.environment.PackageCrawler;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import java.lang.ClassNotFoundException;
@@ -20,7 +19,6 @@ import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 
 import java.lang.reflect.Modifier;
-import java.net.URL;
 import java.sql.Ref;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -37,7 +35,7 @@ public class SyntaxTreeGenerator{
   Set<JavaClassName> imports = new HashSet();
   private Map<String, RefTypeOrTPHOrWildcardOrGeneric> fields = new HashMap<>(); //PL 2018-11-01 fields eingefuegt, damit die fields immer die gleiche TPH bekommen
 
-  List<Statement> fieldInitializations = new ArrayList<>(); //PL 2019-10-23: Muss für jede Klasse neu initilisiert werden
+  List<Statement> fieldInitializations = new ArrayList<>();
 
   public SyntaxTreeGenerator(JavaClassRegistry reg, GenericsRegistry globalGenerics){
     //Die Generics müssen während des Bauens des AST erstellt werden,
@@ -76,10 +74,10 @@ public class SyntaxTreeGenerator{
     return ret;
   }
   
-  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, PackageCrawler packageCrawler, DirectoryClassLoader classLoader) throws ClassNotFoundException{
+  public SourceFile convert(Java8Parser.CompilationUnitContext ctx, PackageCrawler packageCrawler) throws ClassNotFoundException{
     if(ctx.packageDeclaration()!=null)this.pkgName = convert(ctx.packageDeclaration());
     List<ClassOrInterface> classes = new ArrayList<>();
-    Map<String, Integer> imports = GatherNames.getImports(ctx, packageCrawler, classLoader);
+    Map<String, Integer> imports = GatherNames.getImports(ctx, packageCrawler);
     this.imports = imports.keySet().stream().map(name -> reg.getName(name)).collect(Collectors.toSet());
     for(Java8Parser.TypeDeclarationContext typeDecl : ctx.typeDeclaration()){
       ClassOrInterface newClass;
@@ -161,7 +159,6 @@ public class SyntaxTreeGenerator{
 
   private ClassOrInterface convertClass(Java8Parser.ClassDeclarationContext ctx)  {
     ClassOrInterface newClass;
-    fieldInitializations = new ArrayList<>(); //PL 2019-10-22: muss für jede Klasse neu initilisiert werden
     if(ctx.normalClassDeclaration() != null){
       newClass = convertNormal(ctx.normalClassDeclaration());
     }

src/main/java/de/dhbwstuttgart/parser/scope/GatherNames.java

@@ -1,14 +1,13 @@
 package de.dhbwstuttgart.parser.scope;
 
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.parser.antlr.Java8BaseListener;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
-import org.antlr.v4.runtime.tree.ParseTreeWalker;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 import de.dhbwstuttgart.environment.PackageCrawler;
@@ -16,7 +15,7 @@ import de.dhbwstuttgart.parser.antlr.Java8Parser;
 
 public class GatherNames {
 
-	  public static Map<String, Integer> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, DirectoryClassLoader classLoader) throws ClassNotFoundException{
+	  public static Map<String, Integer> getNames(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException{
 		  Map<String, Integer> ret = new HashMap<>();
 	    String pkgName = getPackageName(ctx);
 	    String nameString = "";
@@ -65,12 +64,14 @@ public class GatherNames {
 	        }
 	      }
 	    }
-		  ret.putAll(getImports(ctx, packages, classLoader));
+	    ret.putAll(getImports(ctx, packages));
 	    return ret;
 	  }
 	  
-	public static Map<String, Integer> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages, DirectoryClassLoader classLoader) throws ClassNotFoundException {
+
+	  public static Map<String, Integer> getImports(Java8Parser.CompilationUnitContext ctx, PackageCrawler packages) throws ClassNotFoundException {
 		  Map<String, Integer> ret = new HashMap<>();
+	    ClassLoader classLoader = ClassLoader.getSystemClassLoader();
 		  //ret.putAll(packages.getClassNames("java.lang"));
 		  for(Java8Parser.ImportDeclarationContext importDeclCtx : ctx.importDeclaration()){
 	      if(importDeclCtx.singleTypeImportDeclaration() != null){

src/main/java/de/dhbwstuttgart/parser/scope/JavaClassName.java

@@ -84,15 +84,7 @@ public class JavaClassName {
 
 	@Override
 	public String toString() {
-		return (packageName!=null ? packageName.toString() + "." : "") + name;
-	}
-
-	public String getPackageName() {
-		return (packageName!=null ? packageName.toString() : "");
-	}
-
-	public String getClassName(){
-		return name;
+		return (packageName!=null ? packageName.toString() : "") + name;
 	}
 }
 
@@ -138,9 +130,6 @@ class PackageName{
 		String ret = "";
 		if(names == null)return "";
 		for(String n : names)ret+=n+".";
-		if (ret != null && ret.length() > 0 && ret.charAt(ret.length() - 1) == '.') {
-			ret = ret.substring(0, ret.length() - 1);
-		}
 		return ret;
 	}
 }

src/main/java/de/dhbwstuttgart/sat/asp/writer/ASPFactory.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.sat.asp.writer;
 
-import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.FCGenerator;
 import de.dhbwstuttgart.sat.asp.ASPStringConverter;
@@ -17,9 +16,9 @@ import java.util.*;
 
 public class ASPFactory implements TypeVisitor<String>{
 
-    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException{
+    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses) throws ClassNotFoundException{
         ASPFactory factory = new ASPFactory();
-        factory.convertFC(fcClasses, classLoader);
+        factory.convertFC(fcClasses);
         List<Constraint<Pair>> constraints1 = constraints.cartesianProduct().iterator().next();
         for(Constraint<Pair> constraint : constraints1){
             for(Pair p : constraint){
@@ -33,8 +32,8 @@ public class ASPFactory implements TypeVisitor<String>{
     ASPWriter writer = new ASPWriter();
     boolean isFCType = false;
 
-    private void convertFC(Collection<ClassOrInterface> classes, DirectoryClassLoader classLoader) throws ClassNotFoundException {
-        Set<Pair> fc = FCGenerator.toFC(classes, classLoader);
+    private void convertFC(Collection<ClassOrInterface> classes) throws ClassNotFoundException {
+        Set<Pair> fc = FCGenerator.toFC(classes);
         isFCType = true;
         for(Pair fcp : fc){
             convertPair(fcp);

src/main/java/de/dhbwstuttgart/sat/asp/writer/ASPGencayFactory.java

@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.sat.asp.writer;
 
-import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.FCGenerator;
 import de.dhbwstuttgart.sat.asp.ASPStringConverter;
@@ -56,9 +55,9 @@ public class ASPGencayFactory implements TypeVisitor<String> {
         return ret;
     }
 
-    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses, DirectoryClassLoader classLoader) throws ClassNotFoundException{
+    public static String generateASP(ConstraintSet<Pair> constraints, Collection<ClassOrInterface> fcClasses) throws ClassNotFoundException{
         ASPGencayFactory factory = new ASPGencayFactory();
-        factory.convertFC(fcClasses, classLoader);
+        factory.convertFC(fcClasses);
         List<Constraint<Pair>> constraints1 = constraints.cartesianProduct().iterator().next();
         for(Constraint<Pair> constraint : constraints1){
             for(Pair p : constraint){
@@ -70,8 +69,8 @@ public class ASPGencayFactory implements TypeVisitor<String> {
         return factory.writer.getASPFile();
     }
 
-    private void convertFC(Collection<ClassOrInterface> classes, DirectoryClassLoader classLoader) throws ClassNotFoundException {
-        Set<Pair> fc = FCGenerator.toFC(classes, classLoader);
+    private void convertFC(Collection<ClassOrInterface> classes) throws ClassNotFoundException {
+        Set<Pair> fc = FCGenerator.toFC(classes);
         isFCType = true;
         for(Pair fcp : fc){
             generateTheta((RefType) fcp.TA1);

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

@@ -34,7 +34,6 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
   private List<RefType> implementedInterfaces;
   private List<Constructor> constructors;
 
-  
   public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, Optional<Constructor> fieldInitializations, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters,
                           RefType superClass, Boolean isInterface, List<RefType> implementedInterfaces, Token offset){
     super(offset);
@@ -51,23 +50,6 @@ public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
     this.constructors = constructors;
   }
   
-  /* erzeugt fuer Fields, Konstruktoren und Methoden neue ArrayList-Objekte 
-   * alle anderen Datenobjekte werden nur kopiert.
-   */
-  public ClassOrInterface(ClassOrInterface cl){
-	  super(cl.getOffset());
-	  this.modifiers = cl.modifiers;
-	  this.name = cl.name;
-	  this.fields = new ArrayList<>(cl.fields);
-	  this.fieldInitializations= cl.fieldInitializations;
-	  this.genericClassParameters = cl.genericClassParameters;
-	  this.superClass = cl.superClass;
-	  this.isInterface = cl.isInterface;
-	  this.implementedInterfaces = cl.implementedInterfaces;
-	  this.methods = new ArrayList<>(cl.methods);
-	  this.constructors = new ArrayList<>(cl.constructors);
-  }
-  
   // Gets class name
   public JavaClassName getClassName(){
     return this.name;

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

@@ -27,7 +27,7 @@ public class Constructor extends Method {
 	 */
 	protected static Block prepareBlock(Block constructorBlock /*, List<Statement> fieldInitializations new ArrayList<>() geloescht PL 2018-11-24 */){
 		List<Statement> statements = constructorBlock.getStatements();
-		statements.add(0, new SuperCall(null, null, constructorBlock.getOffset()));
+		statements.add(0, new SuperCall(constructorBlock.getOffset()));
 		/* statements.addAll(fieldInitializations); geloescht PL 2018-11-24 */
 		return new Block(statements, constructorBlock.getOffset());
 	}

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

@@ -2,10 +2,6 @@ package de.dhbwstuttgart.syntaxtree;
 
 import org.antlr.v4.runtime.Token;
 
-import com.google.common.collect.Lists;
-
-import de.dhbwstuttgart.parser.NullToken;
-
 import java.util.*;
 
 
@@ -20,20 +16,10 @@ public class GenericDeclarationList extends SyntaxTreeNode implements Iterable<G
 	private Token offsetOfLastElement;
 	private List<GenericTypeVar> gtvs = new ArrayList<>();
 	
-	@SuppressWarnings("unchecked")
-	public GenericDeclarationList(Iterable<? extends GenericTypeVar> values, Token endOffset) {
-		super(endOffset);
-		gtvs = isListOfGenericTypeVar(values) ? (List<GenericTypeVar>)values : Lists.newArrayList(values);
-		this.offsetOfLastElement = endOffset;
-	}
-
-	public GenericDeclarationList(ArrayList<GenericTypeVar> values, Token endOffset) {
+	public GenericDeclarationList(List<GenericTypeVar> values, Token endOffset) {
 		super(endOffset);
 		gtvs = values;
-		this.offsetOfLastElement = endOffset;	}
-
-	private boolean isListOfGenericTypeVar(Iterable<? extends GenericTypeVar> values) {
-		return values instanceof List && ((List<?>)values).size() > 0 && ((List<?>)values).get(0) instanceof GenericTypeVar;
+		this.offsetOfLastElement = endOffset;
 	}
 
 	@Override

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

@@ -26,13 +26,6 @@ public class SourceFile extends SyntaxTreeNode{
     this.imports = imports;
   }
   
-  public SourceFile(SourceFile sf) {
-	  super(new NullToken());
-	  this.KlassenVektor = new ArrayList<>(sf.KlassenVektor);
-	  this.imports = new HashSet<>(sf.imports);
-  }
-  
-  
   public String getPkgName(){
     return this.pkgName;
   }

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

@@ -70,7 +70,7 @@ public class ASTFactory {
 	}
 
 	private static Field createField(java.lang.reflect.Field field, JavaClassName jreClass) {
-		return new Field(field.getName(), createType(field.getGenericType()), field.getModifiers(), new NullToken());
+		return new Field(field.getName(), createType(field.getType()), field.getModifiers(), new NullToken());
 	}
 
 	//private static RefType createType(Class classType) {
@@ -189,11 +189,11 @@ public class ASTFactory {
 
 	public static de.dhbwstuttgart.syntaxtree.GenericTypeVar createGeneric(TypeVariable jreTypeVar, String jreTVName, Class context, String parentMethod){
 		JavaClassName parentClass = new JavaClassName(context.getName());
-		List<RefTypeOrTPHOrWildcardOrGeneric> genericBounds = new ArrayList<>();
+		List<RefType> genericBounds = new ArrayList<>();
 		java.lang.reflect.Type[] bounds = jreTypeVar.getBounds();
 		if(bounds.length > 0){
 			for(java.lang.reflect.Type bound : bounds){
-				genericBounds.add(createType(bound));
+				genericBounds.add((RefType) createType(bound));
 			}
 		}
 		return new de.dhbwstuttgart.syntaxtree.GenericTypeVar(jreTVName, genericBounds, new NullToken(), new NullToken());

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

@@ -7,7 +7,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
@@ -32,7 +31,7 @@ public class UnifyTypeFactory {
 	
 	private static ArrayList<PlaceholderType> PLACEHOLDERS = new ArrayList<>(); 
 
-    public static FiniteClosure generateFC(List<ClassOrInterface> fromClasses, Writer logFile, DirectoryClassLoader classLoader) throws ClassNotFoundException {
+    public static FiniteClosure generateFC(List<ClassOrInterface> fromClasses, Writer logFile) throws ClassNotFoundException {
         /*
         Die transitive Hülle muss funktionieren.
         Man darf schreiben List<A> extends AL<A>
@@ -43,7 +42,7 @@ public class UnifyTypeFactory {
         Generell dürfen sie immer die gleichen Namen haben.
         TODO: die transitive Hülle bilden
          */
-        return new FiniteClosure(FCGenerator.toUnifyFC(fromClasses, classLoader), logFile);
+        return new FiniteClosure(FCGenerator.toUnifyFC(fromClasses), logFile);
     }
 
     public static UnifyPair generateSmallerPair(UnifyType tl, UnifyType tr){
@@ -123,7 +122,6 @@ public class UnifyTypeFactory {
     		System.out.println("XXX"+innerType);
     	}
     	PlaceholderType ntph = new PlaceholderType(tph.getName());
-    	ntph.setVariance(tph.getVariance());
     	int in = PLACEHOLDERS.indexOf(ntph);
 		if (in == -1) {
 			PLACEHOLDERS.add(ntph);

src/main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java

@@ -21,24 +21,13 @@ public class MethodCall extends Statement
 {
     public final String name;
     public final Receiver receiver;
-    
     public final ArgumentList arglist;
 
-    /*
-     * noetig fuer Bytecodegenerierung
-     */
-    public RefTypeOrTPHOrWildcardOrGeneric receiverType;
-    public final ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes;
-    
-
-    public MethodCall(RefTypeOrTPHOrWildcardOrGeneric retType, Receiver receiver, String methodName, ArgumentList argumentList, 
-    		          RefTypeOrTPHOrWildcardOrGeneric receiverType, ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset){
+    public MethodCall(RefTypeOrTPHOrWildcardOrGeneric retType, Receiver receiver, String methodName, ArgumentList argumentList, Token offset){
 		super(retType,offset);
 		this.arglist = argumentList;
         this.name = methodName;
         this.receiver = receiver;
-        this.receiverType = receiverType;
-        this.argTypes = argTypes;
 	}
 
     @Override

src/main/java/de/dhbwstuttgart/syntaxtree/statement/NewClass.java

@@ -29,10 +29,8 @@ public class NewClass extends MethodCall
      * @param args Argumente mit denen der New-Call aufgerufen wurde
      * @param start
      */
-    public NewClass(RefType newClass, ArgumentList args, RefTypeOrTPHOrWildcardOrGeneric receiverType, 
-    		ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token start) {
-        super(newClass, new ExpressionReceiver(new EmptyStmt(start)), newClass.getName().toString(), 
-        		args, receiverType, argTypes, start);
+    public NewClass(RefType newClass, ArgumentList args, Token start) {
+        super(newClass, new ExpressionReceiver(new EmptyStmt(start)), newClass.getName().toString(), args, start);
     }
 
     @Override

src/main/java/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java

@@ -2,7 +2,6 @@ package de.dhbwstuttgart.syntaxtree.statement;
 
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
 import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.syntaxtree.type.Void;
 import org.antlr.v4.runtime.Token;
 
@@ -13,14 +12,12 @@ import java.util.ArrayList;
 
 public class SuperCall extends MethodCall
 {
-    public SuperCall(RefTypeOrTPHOrWildcardOrGeneric receiverType, 
-    		ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset){
-        this(new ArgumentList(new ArrayList<Expression>(), offset), receiverType, argTypes, offset);
+    public SuperCall(Token offset){
+        this(new ArgumentList(new ArrayList<Expression>(), offset),offset);
     }
 
-    public SuperCall(ArgumentList argumentList, RefTypeOrTPHOrWildcardOrGeneric receiverType, 
-    		ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset){
-        super(new Void(offset), new ExpressionReceiver(new This(offset)), "<init>", argumentList, receiverType, argTypes, offset);
+    public SuperCall(ArgumentList argumentList, Token offset){
+        super(new Void(offset), new ExpressionReceiver(new This(offset)), "<init>", argumentList, offset);
     }
 
 

src/main/java/de/dhbwstuttgart/syntaxtree/statement/This.java

@@ -19,8 +19,4 @@ public class This extends Expression
     public void accept(StatementVisitor visitor) {
         visitor.visit(this);
     }
-    
-    public String toString() {
-    	return "this: "+ this.getType();
-    }
 }

src/main/java/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java

@@ -8,7 +8,7 @@ public class ThisCall extends MethodCall
 {
     public ThisCall(Receiver receiver, ArgumentList arglist, int offset)
     {
-		super(null, null, null, null, null, null, null);
+		super(null, null, null, null, null);
 
 	}
     

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

@@ -19,11 +19,6 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
 {
 	private final String name;
 
-	/**
-	 * wird bisher nicht genutzt
-	 * setVariance muss ggf. auskommentiert werden.
-	 */
-	int variance = 0;
 
 
     /**
@@ -74,16 +69,6 @@ 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;
-    }
-    
     @Override
     public void accept(ASTVisitor visitor) {
         visitor.visit(this);

src/main/java/de/dhbwstuttgart/typedeployment/TypeInsert.java

@@ -4,21 +4,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.typeinference.result.ResultPair;
-
 public class TypeInsert {
     /**
      * point wird hauptsächlich zur Anzeige einer Annotation im Eclipse-plugin benutzt.
      */
     public final TypeInsertPoint point;
     Set<TypeInsertPoint> inserts;
-    ResultPair<?, ?> resultPair;
 
-    public TypeInsert(TypeInsertPoint point, Set<TypeInsertPoint> additionalPoints, ResultPair<?, ?> resultPair){
+    public TypeInsert(TypeInsertPoint point, Set<TypeInsertPoint> additionalPoints){
         this.point = point;
         inserts = additionalPoints;
-        this.resultPair = resultPair;
     }
 
     public String insert(String intoSource){
@@ -36,10 +31,6 @@ public class TypeInsert {
         return point.getInsertString();
     }
     
-    public ResultPair<?, ?> getResultPair() {
-    	return this.resultPair;
-    }
-    
     /* PL 2018-06-18
      * Zwei TypeInsert's sind gleich, wenn ihre point's und ihre inserts' gleich sind 
      * eingefuegt damit man TypeReplaceMarker vergleichen kann
@@ -54,11 +45,6 @@ public class TypeInsert {
     				
     	}			
     }
-    
-    public Set<TypeInsertPoint> getAdditionalPoints() {
-    	return this.inserts;
-    }
-    
     public String toString() {
     	return point.toString();
     }

src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java

@@ -1,18 +1,9 @@
 package de.dhbwstuttgart.typedeployment;
 
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResultForClass;
-import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
-import de.dhbwstuttgart.bytecode.utilities.Resolver;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.typeinference.result.*;
-
 import org.antlr.v4.runtime.Token;
-import org.objectweb.asm.Type;
 
 import java.util.*;
 
@@ -31,98 +22,68 @@ import java.util.*;
  */
 public class TypeInsertFactory {
 
-	private static List<ResultSet> newResults;
 
-    public static Set<TypeInsert> createTypeInsertPoints(SourceFile forSourcefile, ResultSet withResults, List<ResultSet> newResults){
-    	TypeInsertFactory.newResults = newResults;
+    public static Set<TypeInsert> createTypeInsertPoints(SourceFile forSourcefile, ResultSet withResults){
         return new TypeInsertPlacer().getTypeInserts(forSourcefile, withResults);
     }
 
     public static TypeInsert createInsertPoints(RefTypeOrTPHOrWildcardOrGeneric type, Token offset, ClassOrInterface cl, Method m,
                                                 ResultSet resultSet) {
-        
-		try {
         ResolvedType resolvedType = resultSet.resolveType(type);
         TypeInsertPoint insertPoint = new TypeInsertPoint(offset,
                     new TypeToInsertString(resolvedType.resolvedType).insert);
-			List<GenericGenratorResultForSourceFile> simplifyResults = JavaTXCompiler.INSTANCE.getGeneratedGenericResultsForAllSourceFiles(newResults);
-			for (GenericGenratorResultForSourceFile simplifyResultsEntries : simplifyResults) {
-				GenericsGeneratorResultForClass genericResultsForClass = simplifyResultsEntries.getSimplifyResultsByName(cl.getClassName());
-				return new TypeInsert(insertPoint, createGenericInsert(genericResultsForClass, cl, m, resultSet, offset), resolvedType.getResultPair());
+        return new TypeInsert(insertPoint, new HashSet<>());
     }
 
-			return new TypeInsert(insertPoint, new HashSet<>(), resolvedType.getResultPair());
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-		    return null;
-		}
-    }
-
-    private static synchronized Set<TypeInsertPoint> createGenericInsert(GenericsGeneratorResultForClass genericResult, ClassOrInterface cl, Method m, ResultSet resultSet, Token mOffset){
-        Set<TypeInsertPoint> result = createGenericClassInserts(genericResult, cl);
-        
-        for (Method method : cl.getMethods()) {        	
-        	Resolver resolver = new Resolver(resultSet);
-        	List<GenericsGeneratorResult> methodConstraints = genericResult.getMethodConstraintsByID(MethodUtility.createID(resolver, method));
-        	result.addAll(createMethodConstraints(method, methodConstraints, mOffset));
-        }
-        
-        return result;
-    }
-    
-    private static Set<TypeInsertPoint> createMethodConstraints(Method method, List<GenericsGeneratorResult> constraints, Token mOffset) {
-    	Set<TypeInsertPoint> result = new HashSet<>();
-    	Token offset = mOffset;
-
-		if (constraints.size() == 0) {
-			result.add(new TypeInsertPoint(offset, ""));
-			return result;
-		} 
-		
-		String insert = " <";
-
-        for (GenericsGeneratorResult genericInsertConstraint : constraints) {
-        	if (genericInsertConstraint.getConstraint().getRight().equals(Type.getInternalName(Object.class))) {
-        		insert += genericInsertConstraint.getConstraint().getLeft();
+    private static TypeInsertPoint createGenericInsert(Set<GenericInsertPair> toInsert, ClassOrInterface cl, Method m){
+        //Momentan wird Methode ignoriert. Parameter werden immer als Klassenparameter angefügt:
+        //Offset zum Einstzen bestimmen:
+        Token offset;
+        String insert = "";
+        String end;
+        if(cl.getGenerics().iterator().hasNext()){
+            //offset = cl.getGenerics().iterator().next().getOffset();
+            offset = cl.getGenerics().getOffset();
+            end=",";
         }else{
-        		insert += genericInsertConstraint.getConstraint().getLeft() + " extends " + genericInsertConstraint.getConstraint().getRight() + ", ";
+            offset = cl.getGenerics().getOffset();
+            insert += "<";
+            end = ">";
+        }
+
+        //Alle einzusetzenden Generics und deren Bounds bestimmen:
+        HashMap<TypePlaceholder, HashSet<TypePlaceholder>> genericsAndBounds = new HashMap<>();
+        for(GenericInsertPair p : toInsert){
+            if(!genericsAndBounds.containsKey(p.TA1)){
+                genericsAndBounds.put((TypePlaceholder) p.TA1, new HashSet<>());
+            }
+            if(p.TA2 != null){
+                genericsAndBounds.get(p.TA1).add((TypePlaceholder) p.TA2);
+                if(!genericsAndBounds.containsKey(p.TA2)){
+                    genericsAndBounds.put((TypePlaceholder) p.TA2, new HashSet<>());
+                }
             }
         }
 
-        insert = insert.substring(0, insert.length() -2);
-        insert += ">";
-
-        result.add(new TypeInsertPoint(offset, insert));
-    	return result;
-    }
-
-	private static Set<TypeInsertPoint> createGenericClassInserts(GenericsGeneratorResultForClass genericResult, ClassOrInterface cl) {
-		Set<TypeInsertPoint> result = new HashSet<>();
-		Token offset = cl.getGenerics().getOffset();
-    	
-        List<GenericsGeneratorResult> classConstraints = genericResult.getClassConstraints();
-        
-		if (classConstraints.size() == 0) {
-			result.add(new TypeInsertPoint(offset, ""));
-			return result;
-		} 
-		
-		String insert = " <";
-
-        for (GenericsGeneratorResult genericInsertConstraint : classConstraints) {
-        	if (genericInsertConstraint.getConstraint().getRight().equals(Type.getInternalName(Object.class))) {
-        		insert += genericInsertConstraint.getConstraint().getLeft();
-        	} else {        		
-        		insert += genericInsertConstraint.getConstraint().getLeft() + " extends " + genericInsertConstraint.getConstraint().getRight() + ", ";
+        //String zum Einsetzen (Generics mit bounds) generieren:
+        Iterator<TypePlaceholder> it = genericsAndBounds.keySet().iterator();
+        if(! it.hasNext())return new TypeInsertPoint(offset, "");
+        while(it.hasNext()){
+            TypePlaceholder tph = it.next();
+            insert += tph.getName();
+            Set<TypePlaceholder> bounds = genericsAndBounds.get(tph);
+            if(bounds.size() > 0){
+                insert += " extends ";
+                Iterator<TypePlaceholder> boundIt = bounds.iterator();
+                while(boundIt.hasNext()){
+                    TypePlaceholder bound = boundIt.next();
+                    insert += bound.getName();
+                    if(boundIt.hasNext())insert += " & ";
                 }
             }
-
-        insert = insert.substring(0, insert.length() -2);
-        insert += ">";
-
-        result.add(new TypeInsertPoint(offset, insert));
-        
-        return result;
+            if(it.hasNext())insert+=",";
+        }
+        return new TypeInsertPoint(offset, insert + end);
     }
 }
 

src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java

@@ -1,12 +1,13 @@
 package de.dhbwstuttgart.typedeployment;
 
+import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.statement.JavaInternalExpression;
 import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
 import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class TypeInsertPlacer extends AbstractASTWalker{

src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPoint.java

@@ -4,15 +4,12 @@ import org.antlr.v4.runtime.Token;
 
 import de.dhbwstuttgart.typeinference.unify.model.ReferenceType;
 
-import java.time.OffsetDateTime;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class TypeInsertPoint {
     public Token point;
     private String insertString;
-    private int extraOffset = 0;
 
     public TypeInsertPoint(Token point, String toInsert){
         this.point = point;
@@ -24,19 +21,19 @@ public class TypeInsertPoint {
                 //token.point.getLine() != point.getLine() && token.point.getCharPositionInLine() <= point.getCharPositionInLine()))
                 token.point.getStartIndex() <= point.getStartIndex()))
                 .mapToInt((typeInsertPoint -> typeInsertPoint.insertString.length())).sum();
-        return new StringBuilder(intoSource).insert(point.getStartIndex()+offset+extraOffset, insertString).toString();
+        return new StringBuilder(intoSource).insert(point.getStartIndex()+offset, insertString).toString();
     }
 
     public String getInsertString() {
         return insertString;
     }
     
-    public void addExtraOffset(int toAdd) {
-    	this.extraOffset += toAdd;
+    public Token getToken() {
+    	return this.point;
     }
     
-    public int getPositionInCode() {
-    	return point.getStartIndex() + extraOffset; 
+    public void setToken(Token point) {
+    	this.point = point;
     }
     
     /* PL 2018-06-19
@@ -54,10 +51,6 @@ public class TypeInsertPoint {
     	}			
     }
     
-    public Set<TypeInsertPoint> getAdditionalPoints() {
-    	return this.getAdditionalPoints();
-    }
-    
     public String toString() {
     	return point.toString() + " " + insertString.toString();
     }

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

@@ -6,7 +6,6 @@ import de.dhbwstuttgart.typeinference.unify.GuavaSetOperations;
 import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 import java.util.*;
-import java.util.function.BinaryOperator;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -30,10 +29,7 @@ public class ConstraintSet<A> {
 
     @Override
     public String toString(){
-    	BinaryOperator<String> b = (x,y) -> x+y;
-        return "\nUND:" + this.undConstraints.toString() + "\n" + 
-    		   "ODER:" + this.oderConstraints.stream().reduce("", (x,y) -> x.toString()+ "\n"  +y, b);
-        		//cartesianProduct().toString();
+        return cartesianProduct().toString();
     }
 
     public Set<List<Constraint<A>>> cartesianProduct(){

src/main/java/de/dhbwstuttgart/typeinference/result/ResolvedType.java

@@ -7,8 +7,6 @@ import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import java.util.Set;
 
 public class ResolvedType{
-	private ResultPair<?, ?> resultPair; 
-	
     public final RefTypeOrTPHOrWildcardOrGeneric resolvedType;
     //public final Set<GenericInsertPair> additionalGenerics;
 
@@ -16,12 +14,4 @@ public class ResolvedType{
         this.resolvedType = resolvedType;
         //this.additionalGenerics = additionalGenerics;
     }
-
-	public void setResultPair(ResultPair<?, ?> resultPair) {
-		this.resultPair = resultPair;
-	}
-	
-	public ResultPair<?, ?> getResultPair() {
-		return resultPair;
-	}
 }

src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java

@@ -27,36 +27,4 @@ public abstract class ResultPair<A extends RefTypeOrTPHOrWildcardOrGeneric,B ext
     public String toString() {
     	return "(" + left.toString() + ", " + right.toString() + ")";
     }
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((left == null) ? 0 : left.getOffset().hashCode());
-		result = prime * result + ((right == null) ? 0 : right.getOffset().hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ResultPair<?,?> other = (ResultPair<?,?>) obj;
-		if (left == null) {
-			if (other.left != null)
-				return false;
-		} else if (!left.getOffset().equals(other.left.getOffset()))
-			return false;
-		if (right == null) {
-			if (other.right != null)
-				return false;
-		} else if (!right.getOffset().equals(other.right.getOffset()))
-			return false;
-		return true;
-	}
-   
 }

src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java

@@ -1,34 +1,21 @@
 package de.dhbwstuttgart.typeinference.result;
 
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.type.*;
+
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-
-@SuppressWarnings("rawtypes")
 public class ResultSet {
-
     public final Set<ResultPair> results;
     public Set<ResultPair<TypePlaceholder, TypePlaceholder>> genIns;
-
-    public ResultSet(Set<ResultPair> set){
-        this.results = set;
-        this.genIns = new HashSet<>();
-        results.forEach(x -> { if (x instanceof PairTPHsmallerTPH) { this.genIns.add(x);}} );
-    }
-    
-    public boolean contains(ResultPair toCheck) {
-    	return this.results.contains(toCheck);
-    }
-    
-    public void remove(ResultPair toCheck) {
-    	results.remove(toCheck);
+    public ResultSet(Set<ResultPair> results){
+        this.results = results;
+        this.genIns =  results.stream().filter(a -> a instanceof PairTPHsmallerTPH)
+				              //.map(b -> new GenericInsertPair( (TypePlaceholder)(b.getLeft()), (TypePlaceholder)(b.getRight())))
+				              .collect(Collectors.toCollection(HashSet::new));
     }
 
     public ResolvedType resolveType(RefTypeOrTPHOrWildcardOrGeneric type) {
@@ -45,24 +32,12 @@ public class ResultSet {
         }
     }
 
+    //TODO Beim Einsetzen eines Generics, müssen die new und Methodenaufrufe verändert werden
+    
     public String toString() {
     	return results.toString();
     }
 
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof ResultSet) {
-			ResultSet other = (ResultSet)o;
-			return this.results.equals(other.results);
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		return results.hashCode();
-	}
 }
 
 class Resolver implements ResultSetVisitor {
@@ -70,7 +45,6 @@ class Resolver implements ResultSetVisitor {
     private TypePlaceholder toResolve;
     private RefTypeOrTPHOrWildcardOrGeneric resolved;
     private final Set<GenericInsertPair> additionalTPHs = new HashSet<>();
-    private ResultPair<?,?> currentPair;
 
     public Resolver(ResultSet resultPairs){
         this.result = resultPairs;
@@ -80,28 +54,23 @@ class Resolver implements ResultSetVisitor {
         toResolve = tph;
         resolved = null;
         System.out.println(tph.toString());
-        for(ResultPair<?,?> resultPair : result.results) {
+        for(ResultPair resultPair : result.results){
             if(resultPair instanceof PairTPHEqualTPH && ((PairTPHEqualTPH) resultPair).getLeft().equals(toResolve)){
-            	currentPair = resultPair;
                 return resolve(((PairTPHEqualTPH) resultPair).getRight());
             }
         }
-        for(ResultPair<?,?> resultPair : result.results){
-        	currentPair = resultPair;
+        for(ResultPair resultPair : result.results){
             resultPair.accept(this);
         }
         if(resolved==null){//TPH kommt nicht im Result vor:
             resolved = tph;
         }
 
-        ResolvedType result = new ResolvedType(resolved, additionalTPHs);//resolved;
-        result.setResultPair(currentPair);
-        return result;
+        return new ResolvedType(resolved, additionalTPHs);//resolved;
     }
 
     @Override
     public void visit(PairTPHsmallerTPH p) {
-    	currentPair = p;
         if(p.left.equals(toResolve)){
             additionalTPHs.add(new GenericInsertPair(p.left, p.right));
             additionalTPHs.addAll(new RelatedTypeWalker(p.right, result).relatedTPHs);
@@ -112,7 +81,6 @@ class Resolver implements ResultSetVisitor {
 
     @Override
     public void visit(PairTPHequalRefTypeOrWildcardType p) {
-    	currentPair = p;
         if(p.left.equals(toResolve)){
             resolved = p.right;
             RelatedTypeWalker related = new RelatedTypeWalker(null, result);
@@ -158,7 +126,6 @@ class Resolver implements ResultSetVisitor {
 /**
  * Sucht aus dem Result Set den Sub/supertyp für einen TPH
  */
-@SuppressWarnings("rawtypes")
 class TPHResolver implements ResultSetVisitor {
 
     private final TypePlaceholder tph;
@@ -227,7 +194,6 @@ class TPHResolver implements ResultSetVisitor {
     }
 }
 
-@SuppressWarnings("rawtypes")
 class RelatedTypeWalker implements ResultSetVisitor {
 
     final Set<GenericInsertPair> relatedTPHs = new HashSet<>();

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

@@ -46,7 +46,7 @@ public class TYPE {
     /*
     TODO: Hier eine Information erstellen nur mit den importierte Klassen einer einzigen SourceFile
         private TypeInferenceInformation getTypeInferenceInformation(sourceFile) {
-            DirectoryClassLoader classLoader = DirectoryClassLoader.getSystemClassLoader();
+            ClassLoader classLoader = ClassLoader.getSystemClassLoader();
             Set<ClassOrInterface> classes = new HashSet<>();
 
             for(SourceFile sourceFile : sfs){

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

@@ -17,7 +17,6 @@ import de.dhbwstuttgart.typeinference.assumptions.MethodAssumption;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.*;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -160,12 +159,10 @@ public class TYPEStmt implements StatementVisitor{
     }
 
     @Override
-    //Es wird in OderConstraints davon ausgegangen dass die Bedingungen für die Typen der Argumente links stehen
-  	//und die Typen der Rückgabewerte immer rechts stehen (vgl. JavaTXCompiler)
     public void visit(MethodCall methodCall) {
         methodCall.receiver.accept(this);
         //Overloading:
-        Set<Constraint<Pair>> methodConstraints = new HashSet<>();
+        Set<Constraint> methodConstraints = new HashSet<>();
         for(MethodAssumption m : this.getMethods(methodCall.name, methodCall.arglist, info)){
             GenericsResolver resolver = getResolverInstance();
             methodConstraints.add(generateConstraint(methodCall, m, info, resolver));
@@ -225,8 +222,6 @@ public class TYPEStmt implements StatementVisitor{
     }
 
     @Override
-    //Es wird in OderConstraints davon ausgegangen dass die Bedingungen für die Typen der Argumente links stehen
-	//und die Typen der Rückgabewerte immer rechts stehen (vgl. JavaTXCompiler)
     public void visit(BinaryExpr binary) {
     		binary.lexpr.accept(this);
     		binary.rexpr.accept(this);
@@ -253,7 +248,7 @@ public class TYPEStmt implements StatementVisitor{
             	numeric = new Constraint<>();
             	numeric.add(new Pair(binary.lexpr.getType(), bytee, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.rexpr.getType(), bytee, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.getType(), integer, PairOperator.EQUALSDOT));
+            	numeric.add(new Pair(binary.getType(), integer, PairOperator.SMALLERDOT));
                 numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
@@ -261,7 +256,7 @@ public class TYPEStmt implements StatementVisitor{
             	numeric = new Constraint<>();
             	numeric.add(new Pair(binary.lexpr.getType(), shortt, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.rexpr.getType(), shortt, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.getType(), integer, PairOperator.EQUALSDOT));
+            	numeric.add(new Pair(binary.getType(), integer, PairOperator.SMALLERDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
@@ -269,7 +264,7 @@ public class TYPEStmt implements StatementVisitor{
             	numeric = new Constraint<>();
             	numeric.add(new Pair(binary.lexpr.getType(), integer, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.rexpr.getType(), integer, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(integer, binary.getType(), PairOperator.EQUALSDOT));
+            	numeric.add(new Pair(integer, binary.getType(), PairOperator.SMALLERDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
@@ -277,7 +272,7 @@ public class TYPEStmt implements StatementVisitor{
             	numeric = new Constraint<>();
             	numeric.add(new Pair(binary.lexpr.getType(), longg, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.rexpr.getType(), longg, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(longg, binary.getType(), PairOperator.EQUALSDOT));
+            	numeric.add(new Pair(longg, binary.getType(), PairOperator.SMALLERDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
@@ -285,7 +280,7 @@ public class TYPEStmt implements StatementVisitor{
             	numeric = new Constraint<>();
             	numeric.add(new Pair(binary.lexpr.getType(), floatt, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.rexpr.getType(), floatt, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(floatt, binary.getType(), PairOperator.EQUALSDOT));
+            	numeric.add(new Pair(floatt, binary.getType(), PairOperator.SMALLERDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
@@ -293,7 +288,7 @@ public class TYPEStmt implements StatementVisitor{
             	numeric = new Constraint<>();
             	numeric.add(new Pair(binary.lexpr.getType(), doublee, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.rexpr.getType(), doublee, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(doublee, binary.getType(), PairOperator.EQUALSDOT));
+            	numeric.add(new Pair(doublee, binary.getType(), PairOperator.SMALLERDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             /* PL auskommentiert Anfang 2018-07-17
@@ -317,9 +312,6 @@ public class TYPEStmt implements StatementVisitor{
             		numericAdditionOrStringConcatenation.add(stringConcat);
             	}
             }
-            if(numericAdditionOrStringConcatenation.size()<1){
-                throw new TypeinferenceException("Kein Typ für " + binary.operation.toString() + "  vorhanden", binary.getOffset());
-            }
             constraintsSet.addOderConstraint(numericAdditionOrStringConcatenation);
         }else if(binary.operation.equals(BinaryExpr.Operator.LESSEQUAL) ||
                 binary.operation.equals(BinaryExpr.Operator.BIGGEREQUAL) ||
@@ -363,11 +355,10 @@ public class TYPEStmt implements StatementVisitor{
             //***ACHTUNG: Moeglicherweise oder und und-Contraint falsch
     */
             //Testeise eingefuegt PL 2018-05-24
-        	//Hier sollte evtl. noch importe angefragt werden PL 2019-05-07
             constraintsSet.addUndConstraint(new Pair(binary.lexpr.getType(), number, PairOperator.SMALLERNEQDOT));
             constraintsSet.addUndConstraint(new Pair(binary.rexpr.getType(), number, PairOperator.SMALLERNEQDOT));
             //Rückgabetyp ist Boolean
-            constraintsSet.addUndConstraint(new Pair(bool, binary.getType(), PairOperator.EQUALSDOT));
+            constraintsSet.addUndConstraint(new Pair(bool, binary.getType(), PairOperator.SMALLERDOT));
 
             //auskommentiert PL 2018-05-24
             //constraintsSet.addUndConstraint(new Pair(binary.lexpr.getType(), number, PairOperator.SMALLERDOT));
@@ -379,7 +370,7 @@ public class TYPEStmt implements StatementVisitor{
             The equality operators may be used to compare two operands that are convertible (§5.1.8) to numeric type, or two operands of type boolean or Boolean, or two operands that are each of either reference type or the null type. All other cases result in a compile-time error.
              */
             //Der Equals Operator geht mit fast allen Typen, daher werden hier keine Constraints gesetzt
-            constraintsSet.addUndConstraint(new Pair(bool, binary.getType(), PairOperator.EQUALSDOT));
+            constraintsSet.addUndConstraint(new Pair(bool, binary.getType(), PairOperator.SMALLERDOT));
         }else{
                 throw new NotImplementedException();
         }
@@ -560,7 +551,7 @@ public class TYPEStmt implements StatementVisitor{
 
     protected Constraint<Pair> generateConstraint(MethodCall forMethod, MethodAssumption assumption,
                                                   TypeInferenceBlockInformation info, GenericsResolver resolver){
-        Constraint<Pair> methodConstraint = new Constraint<>();
+        Constraint methodConstraint = new Constraint();
         ClassOrInterface receiverCl = assumption.getReceiver();
         /*
         List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
@@ -574,13 +565,7 @@ public class TYPEStmt implements StatementVisitor{
         
         RefTypeOrTPHOrWildcardOrGeneric retType = assumption.getReceiverType(resolver);
         methodConstraint.add(new Pair(forMethod.receiver.getType(), retType,
-                    PairOperator.EQUALSDOT));//PL 2020-03-17 SMALLERDOT in EQUALSDOT umgewandelt, weil alle geerbten Methoden in den jeweilen Klassen enthalten sind. 
-        
-        //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ANFANG
-        //methodConstraint.add(new Pair(forMethod.receiverType, retType,
-        //        PairOperator.EQUALSDOT));
-        //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ENDE
-        
+                    PairOperator.SMALLERDOT));
         methodConstraint.add(new Pair(assumption.getReturnType(resolver), forMethod.getType(),
                 PairOperator.EQUALSDOT));
         methodConstraint.addAll(generateParameterConstraints(forMethod, assumption, info, resolver));
@@ -595,10 +580,6 @@ public class TYPEStmt implements StatementVisitor{
             RefTypeOrTPHOrWildcardOrGeneric argType = foMethod.arglist.getArguments().get(i).getType();
             RefTypeOrTPHOrWildcardOrGeneric assType = assumption.getArgTypes(resolver).get(i);
             ret.add(new Pair(argType, assType, PairOperator.SMALLERDOT));
-            
-          //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ANFANG
-          //  ret.add(new Pair(foMethod.argTypes.get(i), assType, PairOperator.EQUALSDOT));
-          //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ENDE
         }
         return ret;
     }
@@ -681,11 +662,8 @@ public class TYPEStmt implements StatementVisitor{
     protected Constraint<Pair> generateConstructorConstraint(NewClass forConstructor, MethodAssumption assumption,
                                                              TypeInferenceBlockInformation info, GenericsResolver resolver){
         Constraint methodConstraint = new Constraint();
-        //WELCHEN SINN MACHT DIESER CONSTRAINT???
-        //Ist er nicht immer classname <. classname und damit redundant?
         methodConstraint.add(new Pair(assumption.getReturnType(resolver), forConstructor.getType(),
                 PairOperator.SMALLERDOT));
-        //WELCHEN SINN MACHT DIESER CONSTRAINT??? 
         methodConstraint.addAll(generateParameterConstraints(forConstructor, assumption, info, resolver));
         return methodConstraint;
     }

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

@@ -22,7 +22,6 @@ import de.dhbwstuttgart.typeinference.unify.model.UnifyType;
 public class Match implements IMatch {
 
 	@Override
-	//vorne muss das Pattern stehen
 	//A<X> =. A<Integer> ==> True
 	//A<Integer> =. A<X> ==> False
 	public Optional<Unifier> match(ArrayList<UnifyPair> termsList) {

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

@@ -3,12 +3,10 @@ package de.dhbwstuttgart.typeinference.unify;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 
-import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
@@ -28,8 +26,8 @@ public class TypeUnify {
 	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Set<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);
+	public Set<Set<UnifyPair>> unify(Set<UnifyPair> undConstrains, List<Set<Set<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
 		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
@@ -54,8 +52,8 @@ public class TypeUnify {
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Set<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);
+	public UnifyResultModel unifyAsync(Set<UnifyPair> undConstrains, List<Set<Set<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
 		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		return ret;
@@ -72,8 +70,8 @@ public class TypeUnify {
 	 * @param ret
 	 * @return
 	 */
-	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Set<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);
+	public UnifyResultModel unifyParallel(Set<UnifyPair> undConstrains, List<Set<Set<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, true, logFile, log, 0, ret);
 		ForkJoinPool pool = new ForkJoinPool();
 		pool.invoke(unifyTask);
 		Set<Set<UnifyPair>> res =  unifyTask.join();
@@ -105,8 +103,8 @@ public class TypeUnify {
 	 * @param cons
 	 * @return
 	 */
-	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Set<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);
+	public Set<Set<UnifyPair>> unifyOderConstraints(Set<UnifyPair> undConstrains, List<Set<Set<UnifyPair>>> oderConstraints, IFiniteClosure fc, Writer logFile, Boolean log, UnifyResultModel ret) {
+		TypeUnifyTask unifyTask = new TypeUnifyTask(undConstrains, oderConstraints, fc, false, logFile, log, 0, ret);
 		Set<Set<UnifyPair>> res = unifyTask.compute();
 		try {
 			logFile.write("\nnoShortendElements: " + unifyTask.noShortendElements +"\n");

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

@@ -3,7 +3,6 @@ package de.dhbwstuttgart.typeinference.unify;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -18,8 +17,8 @@ public class TypeUnify2Task extends TypeUnifyTask {
        
        Set<Set<UnifyPair>> setToFlatten;
 
-       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Set<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);
+       public TypeUnify2Task(Set<Set<UnifyPair>> setToFlatten, Set<UnifyPair> eq, List<Set<Set<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;
        }
@@ -39,17 +38,9 @@ public class TypeUnify2Task extends TypeUnifyTask {
                        return new HashSet<>(); }
                else
                */ 
-               //writeLog("xxx");
-               //noOfThread--;
-               synchronized (usedTasks) {
-            	   if (this.myIsCancelled()) {
-   						return new HashSet<>();
-   					}
-   					else {
+               noOfThread--;
                return res;
        }
-   				}
-       	}
        
        public void closeLogFile() {
 

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

@@ -28,7 +28,6 @@ import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IFiniteClosure;
-import de.dhbwstuttgart.typeinference.unify.interfaces.IMatch;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IRuleSet;
 import de.dhbwstuttgart.typeinference.unify.interfaces.ISetOperations;
 import de.dhbwstuttgart.typeinference.unify.interfaces.IUnify;
@@ -123,10 +122,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	static Integer  noShortendElements = 0;
 	
-	Boolean myIsCanceled = false;
-	
-	volatile UnifyTaskModel usedTasks;
-	
 	public TypeUnifyTask() { 
 		rules = new RuleSet();
 	}
@@ -146,7 +141,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	*/
 	
 
-	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Set<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm, UnifyTaskModel usedTasks) {
+	public TypeUnifyTask(Set<UnifyPair> eq, List<Set<Set<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, Writer logFile, Boolean log, int rekTiefe, UnifyResultModel urm) {
 		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));
@@ -174,26 +169,15 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			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("");
+				new FileWriter(new File(System.getProperty("user.dir")+"/src/test/java/logFiles/"+"Thread_"+thNo));
+				//logFile.write("");
 			}
 			catch (IOException e) { 
 				System.err.println("log-File nicht vorhanden");
 			}
-			/*Abbruchtest
-			if (thNo > 10) {
-				System.out.println("cancel");
-				usedTasks.cancel();
-				writeLog(nOfUnify.toString() + "cancel");
-				System.out.println("cancel");
-			}
-			*/
 			rules = new RuleSet(logFile);
 			this.rekTiefeField = rekTiefe;
 			this.urm = urm;
-			this.usedTasks = usedTasks;
-			this.usedTasks.add(this);
 		}
 	}
 	
@@ -229,13 +213,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		}		
 }
 */
-	void myCancel(Boolean b) {
-		myIsCanceled = true;
-	}
-	
-	public boolean myIsCancelled() {
-		return myIsCanceled;
-	}
 	
 	protected Set<Set<UnifyPair>> compute() {
 		if (one) {
@@ -261,16 +238,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		if (isUndefinedPairSetSet(res)) { 
 				throw new TypeinferenceException("Unresolved constraints: " + res.toString(), new NullToken()); //return new HashSet<>(); 
 			}
-		else {
-			synchronized (usedTasks) {
-				if (this.myIsCancelled()) {
-					return new HashSet<>();
-				}
-				else {
-					return res;
-				}
-			}
-		}
+		else return res;
 	}
 /*	
 	@Override
@@ -304,11 +272,11 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		/*
 		 * Step 1: Repeated application of reduce, adapt, erase, swap 
 		 */
-		
 		rekTiefe++;
 		nOfUnify++;
         writeLog(nOfUnify.toString() + " Unifikation: " + eq.toString());
         writeLog(nOfUnify.toString() + " Oderconstraints: " + oderConstraints.toString());
+		//eq = eq.stream().map(x -> {x.setVariance((byte)-1); return x;}).collect(Collectors.toCollection(HashSet::new));
 		
 		/*
 		 * Variancen auf alle Gleichungen vererben
@@ -463,8 +431,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		//		.collect(Collectors.toCollection(HashSet::new));
 		//Muss auskommentiert werden, wenn computeCartesianRecursive ENDE
 
-
-		
 		Set<Set<UnifyPair>> eqPrimePrimeSet = new HashSet<>();
 		
 		Set<TypeUnifyTask> forks = new HashSet<>();
@@ -574,7 +540,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	
 	Set<Set<UnifyPair>> computeCartesianRecursive(Set<Set<UnifyPair>> fstElems, ArrayList<Set<Set<UnifyPair>>> topLevelSets, Set<UnifyPair> eq, List<Set<Set<UnifyPair>>> oderConstraints, IFiniteClosure fc, boolean parallel, int rekTiefe, Boolean finalresult) {
 		//ArrayList<Set<Set<UnifyPair>>> remainingSets = new ArrayList<>(topLevelSets);
-		
 		fstElems.addAll(topLevelSets.stream()
 				                    .filter(x -> x.size()==1)
 				                    .map(y -> y.stream().findFirst().get())
@@ -587,7 +552,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			return result;
 		}
 		Set<Set<UnifyPair>> nextSet = remainingSets.remove(0);
-		writeLog("nextSet: " + nextSet.toString());
+		if (finalresult) writeLog("nextSet: " + nextSet.toString());
 		List<Set<UnifyPair>> nextSetasList =new ArrayList<>(nextSet);
 		try {
 		//List<Set<UnifyPair>> 
@@ -607,8 +572,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			for (UnifyPair ele : nextSetasList.get(0)) {//check ob a <. ty base oder ob Ueberladung
 				sameBase = sameBase && ele.getBasePair() != null && ele.getBasePair().equals(fstBasePair);
 			}
-			if (sameBase) {                                                                                                                 //angefuegt PL 2020-02-30
-				Optional<Integer> xi = nextSetasList.stream().map(x -> x.stream().filter(y -> (y.getLhsType() instanceof PlaceholderType && !(y.getRhsType() instanceof PlaceholderType)))
+			if (sameBase) {
+				Optional<Integer> xi = nextSetasList.stream().map(x -> x.stream().filter(y -> y.getLhsType() instanceof PlaceholderType)
 						.filter(z -> ((PlaceholderType)z.getLhsType()).getVariance() != 0)
 						.map(c -> ((PlaceholderType)c.getLhsType()).getVariance())
 						.reduce((a,b)-> {if (a==b) return a; else return 0; })) //2 kommt insbesondere bei Oder-Constraints vor
@@ -656,9 +621,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			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());
+		if (finalresult) writeLog("nextSetasList: " + nextSetasList.toString());
 		Set<UnifyPair> nextSetElem =  nextSetasList.get(0);
-		writeLog("BasePair1: " + nextSetElem + " " + nextSetElem.iterator().next().getBasePair());
+		if (finalresult) 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 fstElems */
 		Set<UnifyPair> sameEqSet = new HashSet<>();
@@ -731,7 +696,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			}
 			else if (variance == -1) {
 				a = oup.min(nextSetasList.iterator());
-				writeLog("Min: a in " + variance + " "+ a);
 				nextSetasList.remove(a);
 				nextSetasListRest = new ArrayList<>(nextSetasList);
 				Iterator<Set<UnifyPair>> nextSetasListItRest = new ArrayList<Set<UnifyPair>>(nextSetasListRest).iterator();
@@ -793,7 +757,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		//for(Set<UnifyPair> a : newSet) {
 			i++;
 			Set<Set<UnifyPair>> elems = new HashSet<Set<UnifyPair>>(fstElems);
-			writeLog("a1: " + rekTiefe + "  "+ "variance:  "+ variance + " " + a.toString()+ "\n");
+			if (finalresult) 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
@@ -840,14 +804,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				newElemsOrig.add(a);
 				
 				/* FORK ANFANG */
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm);
 				//forks.add(forkOrig);
-				synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
 				forkOrig.fork();
-				}
 				/* FORK ENDE */
 				
 				synchronized (this) {
@@ -892,23 +851,17 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 					List<Set<Set<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm);
 					forks.add(fork);
-					synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
 					fork.fork();
 				}
-				}
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
 				/* FORK ANFANG */
 				synchronized (this) {
-					writeLog("wait "+ forkOrig.thNo);
 					noOfThread--;
+					writeLog("wait "+ forkOrig.thNo);
 					res = forkOrig.join();
-					//noOfThread++;
 					forkOrig.writeLog("final Orig 1");
 					forkOrig.closeLogFile();
 					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
@@ -921,9 +874,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
-						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
-						//noOfThread++;
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben
 						writeLog("fork_res: " + fork_res.toString());
@@ -936,7 +887,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						fork.closeLogFile();
 					};
 				}
-				//noOfThread++;
+				noOfThread++;
 			} else {
 			if(parallel && (variance == -1) && noOfThread <= MaxNoOfThreads) {
 				Set<TypeUnify2Task> forks = new HashSet<>();
@@ -946,14 +897,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				newElemsOrig.add(a);
 				
 				/* FORK ANFANG */
-				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+				TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm);
 				//forks.add(forkOrig);
-				synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
 				forkOrig.fork();
-				}
 				/* FORK ENDE */
 				
 				synchronized (this) {
@@ -998,23 +944,17 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 					List<Set<Set<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 					newElems.add(nSaL);
-					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+					TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm);
 					forks.add(fork);
-					synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
 					fork.fork();
 				}
-				}
 				//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 				
 				/* FORK ANFANG */
 				synchronized (this) {
-					writeLog("wait "+ forkOrig.thNo);
 					noOfThread--;
+					writeLog("wait "+ forkOrig.thNo);
 					res = forkOrig.join();
-					//noOfThread++;
 					forkOrig.writeLog("final Orig -1");
 					forkOrig.closeLogFile();
 					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
@@ -1027,9 +967,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				forks.forEach(x -> writeLog("wait: " + x.thNo));
 				for(TypeUnify2Task fork : forks) {
 					synchronized (this) {
-						noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
-						//noOfThread++;
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben 
 						writeLog("fork_res: " + fork_res.toString());
@@ -1042,7 +980,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						fork.closeLogFile();
 					};
 				}
-				//noOfThread++;
+				noOfThread++;
 		    } else {
 		    if(parallel && (variance == 2) && noOfThread <= MaxNoOfThreads) {
 		    	writeLog("var2einstieg");
@@ -1053,14 +991,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	newElemsOrig.add(a);
 				
 				/* FORK ANFANG */
-		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+		    	TypeUnify2Task forkOrig = new TypeUnify2Task(newElemsOrig, newEqOrig, newOderConstraintsOrig, a, fc, parallel, logFile, log, rekTiefe, urm);
 		    	//forks.add(forkOrig);
-		    	synchronized(usedTasks) {
-					if (this.myIsCancelled()) {
-						return new HashSet<>();
-					}
 		    	forkOrig.fork();
-		    	}
 		    	/* FORK ENDE */
 		    	
 		    	synchronized (this) {
@@ -1069,28 +1002,22 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 		    	while (!nextSetasListRest.isEmpty()) {
 		    		Set<UnifyPair> nSaL = nextSetasListRest.remove(0);
-		    		nextSetasList.remove(nSaL); //PL einkommentiert 20-02-03
+		    		//nextSetasList.remove(nSaL);
 		    		Set<UnifyPair> newEq = new HashSet<>(eq);
 		    		Set<Set<UnifyPair>> newElems = new HashSet<>(elems);
 		    		List<Set<Set<UnifyPair>>> newOderConstraints = new ArrayList<>(oderConstraints);
 		    		newElems.add(nSaL);
-		    		TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, usedTasks);
+		    		TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm);
 		    		forks.add(fork);
-		    		synchronized(usedTasks) {
-						if (this.myIsCancelled()) {
-							return new HashSet<>();
-						}
 		    		fork.fork();
 		    	}
-		    	}
 		    	//res = unify2(newElemsOrig, newEqOrig, newOderConstraintsOrig, fc, parallel, rekTiefe);
 		    	
 		    	/* FORK ANFANG */
 		    	synchronized (this) {
-		    		writeLog("wait "+ forkOrig.thNo);
 		    		noOfThread--;
+		    		writeLog("wait "+ forkOrig.thNo);
 					res = forkOrig.join();
-					//noOfThread++;
 					forkOrig.writeLog("final Orig 2");
 					forkOrig.closeLogFile();
 					//Set<Set<UnifyPair>> fork_res = forkOrig.join();
@@ -1102,9 +1029,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		    	forks.forEach(x -> writeLog("wait: " + x.thNo));
 		    	for(TypeUnify2Task fork : forks) {
 		    		synchronized (this) {
-		    			noOfThread--;
 						Set<Set<UnifyPair>> fork_res = fork.join();
-						//noOfThread++;
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben 
 						add_res.add(fork_res);
@@ -1112,7 +1037,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						fork.closeLogFile();
 					};
 				} 
-		    	//noOfThread++;	
+		    	noOfThread++;	
 		    } else {
 		    	//parallel = false; //Wenn MaxNoOfThreads erreicht ist, sequentiell weiterarbeiten
 				elems.add(a); //PL 2019-01-16 muss das wirklich hin steht schon in Zeile 859 ja braucht man siehe Zeile 859
@@ -1121,6 +1046,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				if (!isUndefinedPairSetSet(res) && isUndefinedPairSetSet(result)) {
 					//wenn korrektes Ergebnis gefunden alle Fehlerfaelle loeschen
 					result = res;
+					if (res.iterator().next() instanceof WildcardType) {
+						System.out.println("");
+					}
 				}
 				else { 
 					if ((isUndefinedPairSetSet(res) && isUndefinedPairSetSet(result))
@@ -1148,9 +1076,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						
 							//Alle Variablen bestimmen die nicht hinzugefügt wurden in a_last
 							//System.out.println(a_last);
-							
+							a_last.forEach(x -> {writeLog("a_last_elem:" + x + " basepair: " + x.getBasePair());});
 							try {//PL eingefuegt 2019-03-06 da bei map mmer wieder Nullpointer kamen
-							a_last.forEach(x -> {writeLog("a_last_elem:" + x + " basepair: " + x.getBasePair());});//PL 2019-05-13 ins try hinzugefuegt Nullpointer-Exception ist in der Zeile aufgetaucht.
 							List<PlaceholderType> varsLast_a = 
 									a_last.stream().filter(x -> ((x.getLhsType().getName().equals(x.getBasePair().getLhsType().getName())
 																 && (x.getLhsType() instanceof PlaceholderType) && (x.getBasePair().getLhsType() instanceof PlaceholderType))
@@ -1424,7 +1351,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				//			.collect(Collectors.toCollection(ArrayList::new));
 				writeLog("res (undef): " + res.toString());
 				writeLog("abhSubst: " + abhSubst.toString());
-				writeLog("a2: " + rekTiefe + " " + a.toString());
+				if (finalresult) writeLog("a2: " + rekTiefe + " " + a.toString());
 				writeLog("Durchschnitt: " + durchschnitt.toString());
 				writeLog("nextSet: " + nextSet.toString());
 				writeLog("nextSetasList: " + nextSetasList.toString());
@@ -1446,7 +1373,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			//else result.stream().filter(y -> !isUndefinedPairSet(y));
 			writeLog("res: " + res.toString());
 		}
-		//2020-02-02: if (variance ==2) Hier Aufruf von filterOverriding einfuegen
+		
 		writeLog("Return computeCR: " + result.toString());
 		return result;
 	}
@@ -1765,7 +1692,6 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	 * (as in case 1 where sigma is added to the innermost set).
 	 */
 	protected Set<Set<Set<Set<UnifyPair>>>> calculatePairSets(Set<UnifyPair> eq2s, List<Set<Set<UnifyPair>>> oderConstraintsInput, IFiniteClosure fc, Set<UnifyPair> undefined, List<Set<Set<UnifyPair>>> oderConstraintsOutput) {
-		writeLog("eq2s: " + eq2s.toString());
 		oderConstraintsOutput.addAll(oderConstraintsInput);
 		List<Set<Set<Set<UnifyPair>>>> result = new ArrayList<>(9);
 
@@ -1775,30 +1701,17 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		
 		ArrayList<UnifyPair> eq2sprime = new ArrayList<>(eq2s);
 		Iterator<UnifyPair> eq2sprimeit = eq2sprime.iterator();
-		ArrayList<UnifyPair> eq2sAsListFst = new ArrayList<>();
-		ArrayList<UnifyPair> eq2sAsListSnd = new ArrayList<>();
-		ArrayList<UnifyPair> eq2sAsListBack = new ArrayList<>();
 		ArrayList<UnifyPair> eq2sAsList = new ArrayList<>();
 		Boolean first = true;
 		while(eq2sprimeit.hasNext()) {// alle mit Variance != 0 nach vorne schieben
 			UnifyPair up = eq2sprimeit.next();
-			if ((up.getLhsType() instanceof PlaceholderType && ((PlaceholderType)up.getLhsType()).getVariance() != 0 && !((PlaceholderType)up.getLhsType()).isInnerType())
-					|| (up.getRhsType() instanceof PlaceholderType && ((PlaceholderType)up.getRhsType()).getVariance() != 0) && !((PlaceholderType)up.getRhsType()).isInnerType()) {
-				eq2sAsListFst.add(up);
-				eq2s.remove(up);
-			}
-			else if ((up.getLhsType() instanceof PlaceholderType && ((PlaceholderType)up.getLhsType()).getVariance() != 0 && ((PlaceholderType)up.getLhsType()).isInnerType())
-					|| (up.getRhsType() instanceof PlaceholderType && ((PlaceholderType)up.getRhsType()).getVariance() != 0) && ((PlaceholderType)up.getRhsType()).isInnerType()) {
-				eq2sAsListSnd.add(up);
-				eq2s.remove(up);
-			}
-			else if ((up.getLhsType() instanceof PlaceholderType && ((PlaceholderType)up.getLhsType()).isInnerType())
-					|| (up.getRhsType() instanceof PlaceholderType && ((PlaceholderType)up.getRhsType()).isInnerType())) {
-				eq2sAsListBack.add(up);
+			if ((up.getLhsType() instanceof PlaceholderType && ((PlaceholderType)up.getLhsType()).getVariance() != 0)
+					|| (up.getRhsType() instanceof PlaceholderType && ((PlaceholderType)up.getRhsType()).getVariance() != 0)) {
+				eq2sAsList.add(up);
 				eq2s.remove(up);
 			}
 		}
-		if (eq2sAsListFst.isEmpty()) {
+		if (eq2sAsList.isEmpty()) {
 			List<Set<Set<UnifyPair>>> oderConstraintsVariance = oderConstraintsOutput.stream() //Alle Elemente rauswerfen, die Variance 0 haben oder keine TPH in LHS oder RHS sind
 			.filter(x -> x.stream()
 					.filter(y -> 
@@ -1813,24 +1726,13 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				oderConstraintsOutput.remove(ret);
 				//Set<UnifyPair> retFlat = new HashSet<>(); 
 			    //ret.stream().forEach(x -> retFlat.addAll(x)); 
-				ret.stream().forEach(x -> x.stream().forEach(y -> { Set<UnifyPair> x_new = new HashSet<>(x); //PL 2020-03-18: y selbst darf nicht in die Substitutionen
-																	x_new.remove(y);
-																	y.addSubstitutions(x_new);
-																  })); 
+				ret.stream().forEach(x -> x.stream().forEach(y -> y.addSubstitutions(x))); 
 				result.get(8).add(ret);
 				first = false;
 			}
 		}
 		
-		writeLog("eq2s: " + eq2s.toString());
-		writeLog("eq2sAsListFst: " + eq2sAsListFst.toString());
-		writeLog("eq2sAsListSnd: " + eq2sAsListSnd.toString());
-		writeLog("eq2sAsListBack: " + eq2sAsListBack.toString());
-		
-		eq2sAsList.addAll(eq2sAsListFst);
-		eq2sAsList.addAll(eq2sAsListSnd);
 		eq2sAsList.addAll(eq2s);
-		eq2sAsList.addAll(eq2sAsListBack);
 		
 		if (eq2sAsList.isEmpty() && first) {//Alle eq2s sind empty und alle oderConstraints mit Variance != 0 sind bearbeitet 
 			if (!oderConstraintsOutput.isEmpty()) {
@@ -1839,10 +1741,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				//	System.out.println("M");
 				//Set<UnifyPair> retFlat = new HashSet<>(); 
 			    //ret.stream().forEach(x -> retFlat.addAll(x)); 
-				ret.stream().forEach(x -> x.stream().forEach(y -> { Set<UnifyPair> x_new = new HashSet<>(x); //PL 2020-03-18: y selbst darf nicht in die Substitutionen
-																	x_new.remove(y);
-																	y.addSubstitutions(x_new);
-															      })); 				
+				ret.stream().forEach(x -> x.stream().forEach(y -> y.addSubstitutions(x))); 				
 				result.get(8).add(ret);
 				first = false;
 			}
@@ -2062,14 +1961,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	protected Set<Set<UnifyPair>> unifyCase1(UnifyPair pair, IFiniteClosure fc) {
 		PlaceholderType a = (PlaceholderType)pair.getLhsType(); 
 		UnifyType thetaPrime = pair.getRhsType(); 
-		
-		if (thetaPrime instanceof ExtendsType) {
-			thetaPrime = ((ExtendsType)thetaPrime).getExtendedType();
-		}
-		
-		if (thetaPrime instanceof SuperType) {
-			//HIER MUSS NOCH WAS UEBERLEGT WERDEN
-		}
+		byte variance = pair.getVariance();
 		
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
@@ -2088,7 +1980,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		//}
 		Set<UnifyType> cs = fc.getAllTypesByName(thetaPrime.getName());//cs= [java.util.Vector<NP>, java.util.Vector<java.util.Vector<java.lang.Integer>>, ????java.util.Vector<gen_hv>???]
 		
-		writeLog("cs: " + cs.toString());
+		
 		//PL 18-02-06 entfernt, kommt durch unify wieder rein
 		//cs.add(thetaPrime);
 		//PL 18-02-06 entfernt
@@ -2102,19 +1994,13 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			return x.accept(new freshPlaceholder(), hm);
 		}).collect(Collectors.toCollection(HashSet::new));
 				
-		IMatch match = new Match();		
+				
 		for(UnifyType c : csPHRenamed) {
 			//PL 18-02-05 getChildren durch smaller ersetzt in getChildren werden die Varianlen nicht ersetzt.
 			Set<UnifyType> thetaQs = new HashSet<>();
 			//TODO smaller wieder reinnehmen? 
 			//thetaQs.add(c);//
 			thetaQs = fc.smaller(c, new HashSet<>()).stream().collect(Collectors.toCollection(HashSet::new));
-			ArrayList<UnifyPair> ml = new ArrayList<>();
-			ml.add(new UnifyPair(c, thetaPrime, PairOperator.EQUALSDOT));
-			if (!(match.match(ml)).isPresent()) {
-				thetaQs.remove(c);
-			}
-			writeLog("thetaQs von " + c + ": " + thetaQs.toString());
 			//Set<UnifyType> thetaQs = fc.getChildren(c).stream().collect(Collectors.toCollection(HashSet::new));
 		    //thetaQs.add(thetaPrime); //PL 18-02-05 wieder geloescht
 			                           //PL 2017-10-03: War auskommentiert habe ich wieder einkommentiert, 
@@ -2122,7 +2008,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			
 			//PL 18-02-06: eingefuegt, thetaQs der Form V<V<...>> <. V'<V<...>> werden entfernt
 			//TODO PL 19-01-14 wieder reinnehmen kurzfristig auskommentiert 
-			//thetaQs = thetaQs.stream().filter(ut -> ut.getTypeParams().arePlaceholders()).collect(Collectors.toCollection(HashSet::new));
+			thetaQs = thetaQs.stream().filter(ut -> ut.getTypeParams().arePlaceholders()).collect(Collectors.toCollection(HashSet::new));
 			//PL 18-02-06: eingefuegt
 			
 			Set<UnifyType> thetaQPrimes = new HashSet<>();
@@ -2138,8 +2024,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				for(TypeParams tp : permuteParams(candidateParams))
 					thetaQPrimes.add(c.setTypeParams(tp));
 			}
-			writeLog("thetaQPrimes von " + c + ": " + thetaQPrimes.toString());
-			for(UnifyType tqp : thetaQPrimes) {//PL 2020-03-08 umbauen in der Schleife wird nur unifizierbarer Typ gesucht break am Ende
+			
+			for(UnifyType tqp : thetaQPrimes) {
 				Collection<PlaceholderType> tphs = tqp.getInvolvedPlaceholderTypes();
 				Optional<Unifier> opt = stdUnify.unify(tqp, thetaPrime);
 				if (!opt.isPresent()) {                     
@@ -2158,10 +2044,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				//List<UnifyType> freshTphs = new ArrayList<>(); PL 18-02-06 in die For-Schleife verschoben
 				for (UnifyType tq : thetaQs) {
-					//geaendert PL 20-03-07 
-					Set<UnifyType> smaller = new HashSet<>();
-					smaller.add(unifier.apply(tq));
-					//Set<UnifyType> smaller = fc.smaller(unifier.apply(tq), new HashSet<>()); 
+					Set<UnifyType> smaller = fc.smaller(unifier.apply(tq), new HashSet<>()); 
 					//eingefuegt PL 2018-03-29 Anfang ? ext. theta hinzufuegen
 					if (a.isWildcardable()) {
 						Set<UnifyType> smaller_ext = smaller.stream().filter(x -> !(x instanceof ExtendsType) && !(x instanceof SuperType)) 
@@ -2203,14 +2086,16 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						}
 						resultPrime.addAll(substitutionSet);
 						//writeLog("Substitution: " + substitutionSet.toString());
+						resultPrime = resultPrime.stream().map(x -> { x.setVariance(variance); return x;}).collect(Collectors.toCollection(HashSet::new));
 						result.add(resultPrime);
 						//writeLog("Result: " + resultPrime.toString());
 						//writeLog("MAX: " + oup.max(resultPrime.iterator()).toString());
 					}
 				}
+
 			}
 		}
-		writeLog("result von " + pair + ": " + result.toString());
+		
 		return result;
 	}
 	
@@ -2220,6 +2105,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	private Set<Set<UnifyPair>> unifyCase2(UnifyPair pair, IFiniteClosure fc) {
 		PlaceholderType a = (PlaceholderType) pair.getLhsType();
 		ExtendsType extThetaPrime = (ExtendsType) pair.getRhsType();
+		byte variance = pair.getVariance();
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
 		UnifyType aPrime = PlaceholderType.freshPlaceholder();
@@ -2234,6 +2120,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		resultPrime = new HashSet<>();
 		resultPrime.add(new UnifyPair(a, extAPrime, PairOperator.EQUALSDOT, pair.getSubstitution(), pair));
 		resultPrime.add(new UnifyPair(aPrime, thetaPrime, PairOperator.SMALLERDOT, pair.getSubstitution(), pair));
+		resultPrime = resultPrime.stream().map(x -> { x.setVariance(variance); return x;}).collect(Collectors.toCollection(HashSet::new));
 		result.add(resultPrime);
 		//writeLog("Result: " + resultPrime.toString());
 		return result;
@@ -2246,6 +2133,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		PlaceholderType a = (PlaceholderType) pair.getLhsType();
 		a.reversVariance();
 		SuperType subThetaPrime = (SuperType) pair.getRhsType();
+		byte variance = pair.getVariance();
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
 		UnifyType aPrime = PlaceholderType.freshPlaceholder();
@@ -2261,6 +2149,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		resultPrime = new HashSet<>();
 		resultPrime.add(new UnifyPair(a, supAPrime, PairOperator.EQUALSDOT, pair.getSubstitution(), pair));
 		resultPrime.add(new UnifyPair(thetaPrime, aPrime, PairOperator.SMALLERDOT, pair.getSubstitution(), pair));
+		resultPrime = resultPrime.stream().map(x -> { x.setVariance(variance); return x;}).collect(Collectors.toCollection(HashSet::new));
 		result.add(resultPrime);
 		//writeLog(resultPrime.toString());
 		
@@ -2273,6 +2162,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	private Set<Set<UnifyPair>> unifyCase5(UnifyPair pair, IFiniteClosure fc) {
 		UnifyType theta = pair.getLhsType();
 		PlaceholderType a = (PlaceholderType) pair.getRhsType();
+		byte variance = pair.getVariance();
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
 		boolean allGen = theta.getTypeParams().size() > 0;
@@ -2336,6 +2226,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				resultPrime.add(new UnifyPair(a, thetaS, PairOperator.EQUALSDOT, pair.getSubstitution(), pair));
 			else
 				resultPrime.add(new UnifyPair(a, thetaS.setTypeParams(new TypeParams(freshTphs)), PairOperator.EQUALSDOT, pair.getSubstitution(), pair));
+			resultPrime = resultPrime.stream().map(x -> { x.setVariance(variance); return x;}).collect(Collectors.toCollection(HashSet::new));
 			result.add(resultPrime);
 			//writeLog("FBOUNDED2: " + pair.getfBounded());
 			//writeLog("resultPrime Theta < a: " + greater + pair + "THETA: " + theta + "FBOUNDED: " + pair.getfBounded() + " " + resultPrime.toString());
@@ -2350,6 +2241,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 	private Set<Set<UnifyPair>> unifyCase8(UnifyPair pair, IFiniteClosure fc) {
 		UnifyType theta = pair.getLhsType();
 	    PlaceholderType a = (PlaceholderType) pair.getRhsType();
+	    byte variance = pair.getVariance();
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		//for(UnifyType thetaS : fc.grArg(theta)) {
 		Set<UnifyPair> resultPrime = new HashSet<>();
@@ -2370,6 +2262,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		resultPrime = new HashSet<>();
 		resultPrime.add(new UnifyPair(a, new SuperType(freshTph), PairOperator.EQUALSDOT, pair.getSubstitution(), pair));
 		resultPrime.add(new UnifyPair(freshTph, theta, PairOperator.SMALLERDOT, pair.getSubstitution(), pair));
+		resultPrime = resultPrime.stream().map(x -> { x.setVariance(variance); return x;}).collect(Collectors.toCollection(HashSet::new));
 		result.add(resultPrime);
 		//writeLog(resultPrime.toString());
 		//}

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

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

@@ -711,15 +711,13 @@ implements IFiniteClosure  {
 		HashSet<UnifyPair> hs = new HashSet<>();
 		hs.add(up);
 		Set<UnifyPair> smallerRes = unifyTask.applyTypeUnificationRules(hs, this);
-		/*
-		//if (left.getName().equals("Matrix") || right.getName().equals("Matrix")) 
+		if (left.getName().equals("Matrix") || right.getName().equals("Matrix")) 
 		{try { 
 			logFile.write("\nsmallerRes: " + smallerRes);//"smallerHash: " + greaterHash.toString());
 			logFile.flush();
 		}
 		catch (IOException e) {
 			System.err.println("no LogFile");}}
-		*/
 		//Gleichungen der Form a <./=. Theta oder Theta <./=. a oder a <./=. b sind ok.
 		Predicate<UnifyPair> delFun = x -> !((x.getLhsType() instanceof PlaceholderType || 
 											 x.getRhsType() instanceof PlaceholderType)
@@ -734,15 +732,13 @@ implements IFiniteClosure  {
 			hs = new HashSet<>();
 			hs.add(up);
 			Set<UnifyPair> greaterRes = unifyTask.applyTypeUnificationRules(hs, this);
-			/*
-			//if (left.getName().equals("Matrix") || right.getName().equals("Matrix")) 
+			if (left.getName().equals("Matrix") || right.getName().equals("Matrix")) 
 			{try { 
 				logFile.write("\ngreaterRes: " + greaterRes);//"smallerHash: " + greaterHash.toString());
 				logFile.flush();
 			}
 			catch (IOException e) {
 				System.err.println("no LogFile");}}
-			*/
 			//Gleichungen der Form a <./=. Theta oder Theta <./=. a oder a <./=. b sind ok. 
 			long greaterLen = greaterRes.stream().filter(delFun).count();
 			if (greaterLen == 0) return 1;

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

@@ -293,25 +293,24 @@ public class OrderingUnifyPair extends Ordering<Set<UnifyPair>> {
 			} else {
 				if (leftlewc.size() > 0) {
 					Set<UnifyPair> subst;
-					subst = leftlewc.stream().map(x -> { 
-						if (x.getLhsType() instanceof PlaceholderType) {
-							return new UnifyPair(x.getLhsType(), x.getRhsType(), PairOperator.EQUALSDOT);
+					if (leftlewc.iterator().next().getLhsType() instanceof PlaceholderType) {
+						subst = leftlewc.stream().map(x -> new UnifyPair(x.getLhsType(), x.getRhsType(), PairOperator.EQUALSDOT)).collect(Collectors.toCollection(HashSet::new));
 					}
 					else {
-							return new UnifyPair(x.getRhsType(), x.getLhsType(), PairOperator.EQUALSDOT);
-						}}).collect(Collectors.toCollection(HashSet::new));
+						subst = leftlewc.stream().map(x -> new UnifyPair(x.getRhsType(), x.getLhsType(), PairOperator.EQUALSDOT)).collect(Collectors.toCollection(HashSet::new));
+					}
 					Unifier uni = new Unifier();
+					subst.stream().forEach(x -> uni.add((PlaceholderType) x.getLhsType(), x.getRhsType()));
 					lseq = uni.apply(lseq);
 				}
 				else {
 					Set<UnifyPair> subst;
-					subst = rightlewc.stream().map(x -> { 
-						if (x.getLhsType() instanceof PlaceholderType) {
-							return new UnifyPair(x.getLhsType(), x.getRhsType(), PairOperator.EQUALSDOT);
+					if (rightlewc.iterator().next().getLhsType() instanceof PlaceholderType) {
+						subst = rightlewc.stream().map(x -> new UnifyPair(x.getLhsType(), x.getRhsType(), PairOperator.EQUALSDOT)).collect(Collectors.toCollection(HashSet::new));
 					}
 					else {
-							return new UnifyPair(x.getRhsType(), x.getLhsType(), PairOperator.EQUALSDOT);
-						}}).collect(Collectors.toCollection(HashSet::new));
+						subst = rightlewc.stream().map(x -> new UnifyPair(x.getRhsType(), x.getLhsType(), PairOperator.EQUALSDOT)).collect(Collectors.toCollection(HashSet::new));
+					}
 					Unifier uni = new Unifier();
 					subst.stream().forEach(x -> uni.add((PlaceholderType) x.getLhsType(), x.getRhsType()));
 					rseq = uni.apply(rseq);

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

@@ -29,6 +29,15 @@ public class UnifyPair {
 	 */
 	private PairOperator pairOp;
 	
+	/** wieder loesecn wird nicht mehr benoetigt PL 2018-03-31
+     * variance shows the variance of the pair
+     * -1: contravariant
+     * 1 covariant
+     * 0 invariant
+     * PL 2018-03-21
+     */
+    private byte variance = 0;
+    
     private boolean undefinedPair = false;
     
     /**
@@ -74,6 +83,7 @@ public class UnifyPair {
 		pairOp = op;
 		substitution = uni;
 		basePair = base;
+		this.variance = variance;
 		
 		
 		// Caching hashcode
@@ -115,11 +125,19 @@ public class UnifyPair {
 		substitution.addAll(sup);
 	}
 	
+	public byte getVariance() {
+		return variance;
+	}
+	
+	public void setVariance(byte v) {
+		variance = v;
+	}
+	
 	public void setUndefinedPair() {
 		undefinedPair = true;
 	}
 	public Set<UnifyPair> getSubstitution() {
-		return new HashSet<>(substitution);
+		return substitution;
 	}
 	
 	public UnifyPair getBasePair() {
@@ -131,9 +149,9 @@ public class UnifyPair {
 	
 	public Set<UnifyPair> getAllSubstitutions () {
 		Set<UnifyPair> ret = new HashSet<>();
-		ret.addAll(new ArrayList<>(getSubstitution()));
+		ret.addAll(getSubstitution());
 		if (basePair != null) {
-			ret.addAll(new ArrayList<>(basePair.getAllSubstitutions()));
+			ret.addAll(basePair.getAllSubstitutions());
 		}
 		return ret;
 	}
@@ -195,14 +213,12 @@ public class UnifyPair {
 			if (other.getBasePair() != basePair || (other.getBasePair() == null && basePair == null)) { 
 				return false;
 			}
-			
 			if (!other.getBasePair().equals(basePair) ||
 				!other.getAllSubstitutions().equals(getAllSubstitutions())) {
 				return false;
 			}
 		}
 		
-		
 		return other.getPairOp() == pairOp 
 				&& other.getLhsType().equals(lhs) 
 				&& other.getRhsType().equals(rhs);

src/test/java/asp/ClingoTest.java

@@ -0,0 +1,52 @@
+package asp;
+
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.sat.asp.parser.ASPParser;
+import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
+import de.dhbwstuttgart.sat.asp.Clingo;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
+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.ResultSet;
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import org.junit.Test;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import java.io.*;
+import java.util.*;
+
+public class ClingoTest {
+    public static final String tempDirectory = "/tmp/";
+    private final TypePlaceholder testType = TypePlaceholder.fresh(new NullToken());
+    @Test
+    public void test() throws IOException, InterruptedException, ClassNotFoundException {
+        String content = "";
+        content = ASPFactory.generateASP(this.getPairs(), this.getFC());
+        
+        PrintWriter writer = new PrintWriter(tempDirectory + "test.lp", "UTF-8");
+        writer.println(content);
+        writer.close();
+
+        Clingo clingo = new Clingo(Arrays.asList(new File(tempDirectory + "test.lp")));
+        String result = clingo.runClingo();
+        System.out.println(result);
+        ResultSet resultSet = ASPParser.parse(result, Arrays.asList(testType));
+        RefTypeOrTPHOrWildcardOrGeneric resolvedType = resultSet.resolveType(testType).resolvedType;
+        assert resolvedType.toString().equals(ASTFactory.createObjectType().toString());
+    }
+
+    public Collection<ClassOrInterface> getFC() {
+        Set<ClassOrInterface> ret = new HashSet<>();
+        return ret;
+    }
+
+    public ConstraintSet<Pair> getPairs() {
+        ConstraintSet<Pair> ret = new ConstraintSet<>();
+        ret.addUndConstraint(new Pair(testType, ASTFactory.createObjectType(), PairOperator.EQUALSDOT));
+        return ret;
+    }
+}

src/test/java/asp/UnifyWithoutWildcards.java

@@ -0,0 +1,103 @@
+package asp;
+
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.sat.asp.Clingo;
+import de.dhbwstuttgart.sat.asp.parser.ASPParser;
+import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
+import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.visual.ResultSetPrinter;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Ref;
+import java.util.*;
+
+public class UnifyWithoutWildcards {
+
+    public static final String tempDirectory = "/tmp/";
+
+    @Test
+    public void adapt() throws InterruptedException, IOException, ClassNotFoundException {
+        ConstraintSet<Pair> testSet = new ConstraintSet<>();
+        List<RefTypeOrTPHOrWildcardOrGeneric> list1 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
+        List<RefTypeOrTPHOrWildcardOrGeneric> list2 = Arrays.asList(TypePlaceholder.fresh(new NullToken()),TypePlaceholder.fresh(new NullToken()));
+        RefType t1 = new RefType(new JavaClassName("asp.UnifyWithoutWildcards$Matrix"), list1, new NullToken());
+        RefType t2 = new RefType(new JavaClassName("java.util.HashMap"), list2, new NullToken());
+        testSet.addUndConstraint(new Pair(t1, t2, PairOperator.SMALLERDOT));
+        ResultSet resultSet = run(testSet);
+        System.out.println(ResultSetPrinter.print(resultSet));
+        assert resultSet.results.size() > 0;
+    }
+
+    public ResultSet run(ConstraintSet<Pair> toTest) throws IOException, InterruptedException, ClassNotFoundException {
+        String content = "";
+        content = ASPFactory.generateASP(toTest, this.getFC());
+
+        PrintWriter writer = new PrintWriter(tempDirectory + "test.lp", "UTF-8");
+        writer.println(content);
+        writer.close();
+        Clingo clingo = new Clingo(Arrays.asList(new File(tempDirectory + "test.lp")));
+        String result = clingo.runClingo();
+        ResultSet resultSet = ASPParser.parse(result, getInvolvedTPHS(toTest));
+        return resultSet;
+    }
+
+    private static class TPHExtractor implements TypeVisitor<List<TypePlaceholder>>{
+        @Override
+        public List<TypePlaceholder> visit(RefType refType) {
+            ArrayList<TypePlaceholder> ret = new ArrayList<>();
+            for(RefTypeOrTPHOrWildcardOrGeneric param : refType.getParaList()){
+                ret.addAll(param.acceptTV(this));
+            }
+            return ret;
+        }
+
+        @Override
+        public List<TypePlaceholder> visit(SuperWildcardType superWildcardType) {
+            return superWildcardType.getInnerType().acceptTV(this);
+        }
+
+        @Override
+        public List<TypePlaceholder> visit(TypePlaceholder typePlaceholder) {
+            return Arrays.asList(typePlaceholder);
+        }
+
+        @Override
+        public List<TypePlaceholder> visit(ExtendsWildcardType extendsWildcardType) {
+            return extendsWildcardType.getInnerType().acceptTV(this);
+        }
+
+        @Override
+        public List<TypePlaceholder> visit(GenericRefType genericRefType) {
+            return new ArrayList<>();
+        }
+    }
+
+    protected Collection<TypePlaceholder> getInvolvedTPHS(ConstraintSet<Pair> toTest) {
+        List<TypePlaceholder> ret = new ArrayList<>();
+        toTest.map((Pair p)-> {
+            ret.addAll(p.TA1.acceptTV(new TPHExtractor()));
+            ret.addAll(p.TA2.acceptTV(new TPHExtractor()));
+            return p;
+        });
+        return ret;
+    }
+
+    private Collection<ClassOrInterface> getFC() {
+        Set<ClassOrInterface> ret = new HashSet<>();
+        ret.add(ASTFactory.createClass(Matrix.class));
+        //ret.add(ASTFactory.createObjectClass());
+        //ret.add(ASTFactory.createClass(java.util.List.class));
+        return ret;
+    }
+    private class Matrix<A> extends HashMap<A,Map<Integer, A>>{}
+}

src/test/java/asp/gencay/GeneratorTest.java

@@ -0,0 +1,63 @@
+package asp.gencay;
+
+import asp.UnifyWithoutWildcards;
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.sat.asp.Clingo;
+import de.dhbwstuttgart.sat.asp.parser.ASPParser;
+import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
+import de.dhbwstuttgart.sat.asp.writer.ASPGencayFactory;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
+import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.visual.ResultSetPrinter;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
+import de.dhbwstuttgart.typeinference.result.ResultSet;
+import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+
+public class GeneratorTest extends UnifyWithoutWildcards{
+    @Test
+    public void simple() throws ClassNotFoundException {
+        ConstraintSet<Pair> testSet = new ConstraintSet<>();
+        List<RefTypeOrTPHOrWildcardOrGeneric> list1 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
+        List<RefTypeOrTPHOrWildcardOrGeneric> list2 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
+        RefType t1 = new RefType(new JavaClassName("java.util.List"), list1, new NullToken());
+        RefType t2 = new RefType(new JavaClassName("java.util.List"), list2, new NullToken());
+        testSet.addUndConstraint(new Pair(t1, t2, PairOperator.SMALLERDOT));
+        String resultSet = ASPGencayFactory.generateASP(testSet,
+                new HashSet<>(Arrays.asList(ASTFactory.createClass(List.class))));
+        System.out.println(resultSet);
+    }
+
+    @Test
+    public void matrix() throws ClassNotFoundException {
+        ConstraintSet<Pair> testSet = new ConstraintSet<>();
+        List<RefTypeOrTPHOrWildcardOrGeneric> list1 = Arrays.asList(TypePlaceholder.fresh(new NullToken()));
+        List<RefTypeOrTPHOrWildcardOrGeneric> list2 = Arrays.asList(TypePlaceholder.fresh(new NullToken()),TypePlaceholder.fresh(new NullToken()));
+        RefType t1 = new RefType(new JavaClassName("asp.UnifyWithoutWildcards$Matrix"), list1, new NullToken());
+        RefType t2 = new RefType(new JavaClassName("java.util.HashMap"), list2, new NullToken());
+        testSet.addUndConstraint(new Pair(t1, t2, PairOperator.SMALLERDOT));
+        String resultSet = ASPGencayFactory.generateASP(testSet, this.getFC());
+        System.out.println(resultSet);
+    }
+
+    private Collection<ClassOrInterface> getFC() {
+        Set<ClassOrInterface> ret = new HashSet<>();
+        ret.add(ASTFactory.createClass(Matrix.class));
+        //ret.add(ASTFactory.createObjectClass());
+        //ret.add(ASTFactory.createClass(java.util.List.class));
+        return ret;
+    }
+}
+
+class Matrix extends Vector<Vector<Integer>> {}

src/test/java/asp/typeinference/ASPTest.java

@@ -0,0 +1,70 @@
+package asp.typeinference;
+
+import de.dhbwstuttgart.core.JavaTXCompiler;
+import de.dhbwstuttgart.sat.asp.writer.ASPFactory;
+import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
+import de.dhbwstuttgart.syntaxtree.SourceFile;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import de.dhbwstuttgart.typeinference.constraints.Pair;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ASPTest {
+
+    public static final String rootDirectory = System.getProperty("user.dir")+"/src/test/resources/javFiles/";
+    private static final List<File> filesToTest = new ArrayList<>();
+    protected File fileToTest = null;
+
+    public ASPTest(){
+    }
+
+
+    @Test
+    public void test() throws IOException, ClassNotFoundException {
+        if(fileToTest != null)filesToTest.add(fileToTest);
+        else return;
+        //filesToTest.add(new File(rootDirectory+"Faculty.jav"));
+        //filesToTest.add(new File(rootDirectory+"mathStruc.jav"));
+        //filesToTest.add(new File(rootDirectory+"test.jav"));
+        filesToTest.add(new File(rootDirectory+"EmptyMethod.jav"));
+        //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"));
+        JavaTXCompiler compiler = new JavaTXCompiler(fileToTest);
+        Set<ClassOrInterface> allClasses = new HashSet<>();
+        for(SourceFile sf : compiler.sourceFiles.values()) {
+            allClasses.addAll(compiler.getAvailableClasses(sf));
+        }
+        for(SourceFile sf : compiler.sourceFiles.values()) {
+            allClasses.addAll(sf.getClasses());
+        }
+
+        final ConstraintSet<Pair> cons = compiler.getConstraints();
+        String asp = ASPFactory.generateASP(cons, allClasses);
+        System.out.println(asp);
+    }
+
+    static String readFile(String path, Charset encoding)
+            throws IOException
+    {
+        byte[] encoded = Files.readAllBytes(Paths.get(path));
+        return new String(encoded, encoding);
+    }
+
+}
+

src/test/java/asp/typeinference/GenericsTest.java

@@ -0,0 +1,9 @@
+package asp.typeinference;
+
+import java.io.File;
+
+public class GenericsTest extends ASPTest {
+    public GenericsTest() {
+        this.fileToTest = new File(rootDirectory+"Generics.jav");
+    }
+}

src/test/java/asp/typeinference/VectorTest.java

@@ -0,0 +1,9 @@
+package asp.typeinference;
+
+import java.io.File;
+
+public class VectorTest extends ASPTest {
+    public VectorTest() {
+        this.fileToTest = new File(rootDirectory+"Vector.jav");
+    }
+}

src/test/java/asp/unifywithoutwildcards/ASPTests.java

@@ -0,0 +1,10 @@
+package asp.unifywithoutwildcards;
+
+import org.junit.Test;
+
+public class ASPTests {
+    @Test
+    public void test(){
+
+    }
+}

src/test/java/bytecode/BinaryTest.java

@@ -37,14 +37,14 @@ public class BinaryTest {
 	public void test() throws Exception {
 		Method m2 = classToTest.getDeclaredMethod("m2", Integer.class,Integer.class);
 		Integer res = (Integer) m2.invoke(instanceOfClass, 2,3);
-		assertEquals(new Integer(6), res);
+		assertEquals(6, res);
 	}
 	
 	@Test
 	public void testM3() throws Exception {
 		Method m3 = classToTest.getDeclaredMethod("m3", Integer.class);
 		Integer res = (Integer) m3.invoke(instanceOfClass, 2);
-		assertEquals(new Integer(4), res);
+		assertEquals(4, res);
 	}
 
 }

src/test/java/bytecode/FacTest.java

@@ -38,7 +38,7 @@ public class FacTest {
 	public void testInteger() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
 		Method getFac = classToTest.getDeclaredMethod("getFac", Integer.class);
 		Integer result = (Integer) getFac.invoke(instanceOfClass,3);
-		assertEquals(result, new Integer(6));
+		assertEquals(result, 6);
 	}
 
 }

src/test/java/bytecode/FacultyTest.java

@@ -51,7 +51,7 @@ public class FacultyTest {
 //		Integer result = (Integer) apply.invoke(lambda,i);
 		Integer result = (Integer) getFact.invoke(instanceOfClass,i);
 
-		assertEquals(new Integer(6), result);
+		assertEquals(6, result);
 	}
 
 

src/test/java/bytecode/FieldTphConsMethTest.java

@@ -40,7 +40,7 @@ public class FieldTphConsMethTest {
 		Field a = classToTest.getDeclaredField("a");
 		a.setAccessible(true);
 		
-		Method m = classToTest.getDeclaredMethod("id", Object.class);
+		Method m = classToTest.getDeclaredMethod("m", Object.class);
 		Object result = m.invoke(instanceOfClass, 42);
 		
 		assertEquals(42,result);

src/test/java/bytecode/FunOLTest.java

@@ -12,7 +12,7 @@ import org.junit.Test;
 
 import de.dhbwstuttgart.core.JavaTXCompiler;
 
-public class OLFunTest {
+public class FunOLTest {
 	private static String path;
 	private static File fileToTest;
 	private static JavaTXCompiler compiler;
@@ -23,13 +23,13 @@ public class OLFunTest {
 	
 	@Test
 	public void generateBC() throws Exception {
-		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/OLFun.jav";
+		path = System.getProperty("user.dir")+"/src/test/resources/bytecode/javFiles/FunOL.jav";
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		compiler.generateBytecode(System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/");
 		pathToClassFile = System.getProperty("user.dir")+"/src/test/resources/testBytecode/generatedBC/";
 		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-		classToTest = loader.loadClass("OLFun");
+		classToTest = loader.loadClass("FunOL");
 		/*
 		instanceOfClass = classToTest.getDeclaredConstructor().newInstance();
 

src/test/java/bytecode/IdTest.java

@@ -8,10 +8,9 @@ import java.net.URL;
 import java.net.URLClassLoader;
 
 import org.junit.BeforeClass;
-
+import org.junit.Test;
 
 import de.dhbwstuttgart.core.JavaTXCompiler;
-import org.junit.Test;
 
 public class IdTest {