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

modified:   src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
	modified:   src/test/java/insertGenerics/TestExample42.java
	modified:   src/test/java/insertGenerics/TestExample42_allInOneMethod.java

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

@@ -1,5 +1,6 @@
 package de.dhbwstuttgart.bytecode.insertGenerics;
 
+import com.ibm.icu.text.CurrencyMetaInfo;
 import de.dhbwstuttgart.bytecode.TPHExtractor;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
@@ -47,22 +48,33 @@ public class FamilyOfGeneratedGenerics {
         return cs_cl;
     }
 
-    public static List<MethodConstraint> getMethodConstraints(List<TPHConstraint> cs, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
+    public static List<MethodConstraint> getMethodConstraints(List<TPHConstraint> cs, List<ClassConstraint> cs_cl, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
         //TODO: Regeln
         List<MethodConstraint> cs_m = new ArrayList<>();
-        List<MethodConstraint> methodConstraints1 = typeOfTheMethodInClSigma(cs, cs_m, posOfTphs);
+        List<MethodConstraint> methodConstraints1 = typeOfTheMethodInClSigma(cs, posOfTphs);
         for (MethodConstraint cons: methodConstraints1) {
             if (!checkForDuplicates(cons, cs_m)) {
                 cs_m.add(cons);
             }
         }
-        List<MethodConstraint> methodConstraints2 = firstTransitiveSubtypeForMethodTypes(cs, cs_m, posOfTphs);
+        List<MethodConstraint> methodConstraints2 = firstTransitiveSubtypeForMethodTypes(cs, cs_m);
         for (MethodConstraint cons: methodConstraints2) {
             if (!checkForDuplicates(cons, cs_m)) {
                 cs_m.add(cons);
             }
         }
-        System.out.println("sdfsdf" + methodConstraints2);
+        List<MethodConstraint> methodConstraints3 = secondTransitiveSubtypeForMethodTypes(cs, cs_cl, cs_m);
+        for (MethodConstraint cons: methodConstraints3) {
+            if (!checkForDuplicates(cons, cs_m)) {
+                cs_m.add(cons);
+            }
+        }
+        List<MethodConstraint> methodConstraints4 = hasNoSupertypeForMethodTypes(cs, posOfTphs);
+        for (MethodConstraint cons: methodConstraints4) {
+            if (!checkForDuplicates(cons, cs_m)) {
+                cs_m.add(cons);
+            }
+        }
         return cs_m;
     }
 
@@ -137,21 +149,11 @@ public class FamilyOfGeneratedGenerics {
         return tempCC;
     }
 
-    public static boolean checkUpperBound(List<TPHConstraint> cs, String tph) {
+    /**
-        for(int i=0; i<cs.size(); i++) {
-            if(cs.get(i).getLeft() == tph) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-/**
      * Def. FGG: erste Zeile von cs_m
      * {T < .T' | T is a type variable in a type of the method/constructor m in cl_\sigma, (T <. T') \in cs}
      */
-
+    public static List<MethodConstraint> typeOfTheMethodInClSigma(List<TPHConstraint> allConstraints, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { // cl_\sigma??
-    public static List<MethodConstraint> typeOfTheMethodInClSigma(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { // cl_\sigma??
         //TODO:
         List<MethodConstraint> tempCC= new ArrayList<>();
         for(TPHConstraint allCons: allConstraints){
@@ -170,12 +172,11 @@ public class FamilyOfGeneratedGenerics {
     }
 
 
-/**
+    /**
      * Def. FGG: zweite Zeile von cs_m
      * {R' <. S | (R <. R'), (S <. S') \in cs_m and (R',S) is in the transitive closure of cs}
      */
-
+    public static List<MethodConstraint> firstTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m) { //transitive closure of cs
-    public static List<MethodConstraint> firstTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) { //transitive closure of cs
         //TODO:
         List<MethodConstraint> tempCC= new ArrayList<>();
         List<TPHConstraint> tcOfCs =  buildTransitiveClosure(allConstraints);
@@ -188,7 +189,6 @@ public class FamilyOfGeneratedGenerics {
                         MethodConstraint consToAdd = new MethodConstraint(lSide, rSide, tphC.getRel()); //create (R'<.S)
                         if (!checkForDuplicates(consToAdd, tempCC)) {
                             tempCC.add(consToAdd);
-                            System.out.println(consToAdd);
                         }
                     }
                 }
@@ -197,12 +197,11 @@ public class FamilyOfGeneratedGenerics {
         return tempCC;
     }
 
-/**
+    /**
      * Def. FGG: dritte Zeile von cs_m
      * {R' <. S | (R <. R') \in cs_m, (S <. S') \in cs_cl and (R',S) is in the transitive closure of cs}
      */
-
+    public static List<MethodConstraint> secondTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m) {
-    public static List<MethodConstraint> secondTransitiveSubtypeForMethodTypes(List<TPHConstraint> allConstraints, List<ClassConstraint> cs_cl, List<MethodConstraint> cs_m, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
         //TODO:
         List<MethodConstraint> tempCC= new ArrayList<>();
         List<TPHConstraint> tcOfCs =  buildTransitiveClosure(allConstraints);
@@ -212,7 +211,11 @@ public class FamilyOfGeneratedGenerics {
                 String leftSide = cC.getLeft();
                 for(TPHConstraint tphC : tcOfCs) {
                     if(tphC.getLeft().equals(leftSide)&&tphC.getRight().equals(rightSide)) {
-                        tempCC.add((MethodConstraint) tphC);
+                        if (!checkForDuplicates(tphC, tempCC)) {
+                            tempCC.add((MethodConstraint) tphC);
+                            System.out.println(tphC);
+                        }
+
                     }
                 }
             }
@@ -225,10 +228,21 @@ public class FamilyOfGeneratedGenerics {
      * {T <. Object | (T is a type variable in a type of a node of the method/constructor m in cl_\sigma),
      *                  (\existsnot T': T <. T') \in cs)}
      */
-
+    public static List<MethodConstraint> hasNoSupertypeForMethodTypes(List<TPHConstraint> allConstraints, HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs) {
-    public static List<MethodConstraint> hasNoSupertypeForMethodTypes() {
         //TODO:
-        return null;
+        List<MethodConstraint> tempCC= new ArrayList<>();
+        for(TPHConstraint allCons: allConstraints) {
+            for(TPHConstraint allCons2: allConstraints) {
+                if(posOfTphs.containsKey(allCons.getRight()) && (posOfTphs.get(allCons.getRight()).fst.equals(PositionFinder.Position.METHOD) ||posOfTphs.get(allCons.getRight()).fst.equals(PositionFinder.Position.CONSTRUCTOR)) && allCons.getRight()!=allCons2.getLeft()) {
+                    MethodConstraint consToAdd = new MethodConstraint(allCons.getRight(), "Object", Relation.EXTENDS);
+                    if (!checkForDuplicates(consToAdd, tempCC)) {
+                        tempCC.add(consToAdd);
+                        System.out.println(consToAdd);
+                    }
+                }
+            }
+        }
+        return tempCC;
     }
 
 /**
@@ -274,6 +288,15 @@ public class FamilyOfGeneratedGenerics {
         return tcList;
     }
 
+    public static boolean checkUpperBound(List<TPHConstraint> cs, String tph) {
+        for(int i=0; i<cs.size(); i++) {
+            if(cs.get(i).getLeft() == tph) {
+                return false;
+            }
+        }
+        return true;
+    }
+
 
     public static HashMap<String, PairTphMethod<PositionFinder.Position, String>> positionConverter(HashMap<String, Boolean> allTphs, List<MethodAndTPH> listOfMethodsAndTphs) {
         HashMap<String, PairTphMethod<PositionFinder.Position, String>> convertedPositions = new HashMap<>();

src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java

@@ -32,7 +32,7 @@ public class FamilyOfGeneratedGenericsTest extends TestCase {
         /*
         MethodConstraints should be the same as the input constraint
          */
-        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, tphPositions);
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(inputConstraints, new ArrayList<ClassConstraint>(), tphPositions);
         assertTrue(methodConstraints.size() == 1);
         assertTrue(methodConstraints.get(0).getLeft().equals("B"));
         assertTrue(methodConstraints.get(0).getRight().equals("A"));

src/test/java/insertGenerics/TestExample42.java

@@ -53,7 +53,7 @@ public class TestExample42 {
     public void genericTest() {
         List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(fillConstraintsList(),fillPosOfTphs());
         System.out.println("ClassConstraints: " + classConstraints);
-        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),fillPosOfTphs());
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),classConstraints,fillPosOfTphs());
         System.out.println("MethodConstraints: " + methodConstraints);
 
         List<TPHConstraint> testCons;

src/test/java/insertGenerics/TestExample42_allInOneMethod.java

@@ -25,15 +25,15 @@ public class TestExample42_allInOneMethod {
         HashMap<String, PairTphMethod<PositionFinder.Position, String>> posOfTphs = new HashMap<>();
 
         PairTphMethod<PositionFinder.Position, String> posOfK = new PairTphMethod<>(PositionFinder.Position.FIELD, null);
-        PairTphMethod<PositionFinder.Position, String> posOfL = new PairTphMethod<>(PositionFinder.Position.METHOD, "id");
+        PairTphMethod<PositionFinder.Position, String> posOfL = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfM = new PairTphMethod<>(PositionFinder.Position.METHOD, "id");
+        PairTphMethod<PositionFinder.Position, String> posOfM = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfN = new PairTphMethod<>(PositionFinder.Position.METHOD, "id");
+        PairTphMethod<PositionFinder.Position, String> posOfN = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfP = new PairTphMethod<>(PositionFinder.Position.METHOD, "setA");
+        PairTphMethod<PositionFinder.Position, String> posOfP = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfQ = new PairTphMethod<>(PositionFinder.Position.METHOD, "setA");
+        PairTphMethod<PositionFinder.Position, String> posOfQ = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfU = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+        PairTphMethod<PositionFinder.Position, String> posOfU = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfV = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+        PairTphMethod<PositionFinder.Position, String> posOfV = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfW = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+        PairTphMethod<PositionFinder.Position, String> posOfW = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
-        PairTphMethod<PositionFinder.Position, String> posOfZ = new PairTphMethod<>(PositionFinder.Position.METHOD, "m");
+        PairTphMethod<PositionFinder.Position, String> posOfZ = new PairTphMethod<>(PositionFinder.Position.METHOD, "sameMethod");
 
         posOfTphs.put("K", posOfK);
         posOfTphs.put("L", posOfL);
@@ -52,7 +52,7 @@ public class TestExample42_allInOneMethod {
     public void genericTest() {
         List<ClassConstraint> classConstraints = FamilyOfGeneratedGenerics.getClassConstraints(fillConstraintsList(),fillPosOfTphs());
         System.out.println("ClassConstraints: " + classConstraints);
-        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),fillPosOfTphs());
+        List<MethodConstraint> methodConstraints = FamilyOfGeneratedGenerics.getMethodConstraints(fillConstraintsList(),classConstraints,fillPosOfTphs());
         System.out.println("MethodConstraints: " + methodConstraints);
 
         List<TPHConstraint> testCons;