diff --git a/src/de/dhbwstuttgart/typeinference/UndMenge.java b/src/de/dhbwstuttgart/typeinference/UndMenge.java index 0dd2c06c..6771bf18 100644 --- a/src/de/dhbwstuttgart/typeinference/UndMenge.java +++ b/src/de/dhbwstuttgart/typeinference/UndMenge.java @@ -1,18 +1,19 @@ package de.dhbwstuttgart.typeinference; +import de.dhbwstuttgart.typeinference.unify.Unify; import java.util.Collection; import java.util.Iterator; -import com.rits.cloning.Cloner; +//import com.rits.cloning.Cloner; -public abstract class UndMenge implements KomplexeMenge{ +public abstract class UndMenge implements KomplexeMenge{ public abstract Menge> getSet(); @Override public Menge> cartesianProduct() { Menge> ret = null; - Cloner cloner = new Cloner(); + //Cloner cloner = new Cloner(); for(KomplexeMenge km : this.getSet()){ if(ret == null){ ret = km.cartesianProduct(); @@ -20,7 +21,7 @@ public abstract class UndMenge implements KomplexeMenge{ Menge> cartesianProduct = new Menge<>(); for(Menge r : ret)for(Menge m : km.cartesianProduct()){ //Für jedes Element aus dem Karthesischen Produkt: Menge undElement = new Menge(); - undElement.addAll(cloner.deepClone(r)); + undElement.addAll(Unify.deepClone(r)); undElement.addAll(m); cartesianProduct.add(undElement); } diff --git a/src/de/dhbwstuttgart/typeinference/unify/Unify.java b/src/de/dhbwstuttgart/typeinference/unify/Unify.java index bb561cbf..dbe8d5e1 100755 --- a/src/de/dhbwstuttgart/typeinference/unify/Unify.java +++ b/src/de/dhbwstuttgart/typeinference/unify/Unify.java @@ -3648,7 +3648,7 @@ tempKlasse.get_Superclass_Name() ); System.out.println( "P. S.: return T instanceof FreshWildcardType; } - private static Menge deepClone(Menge m){ + public static Menge deepClone(Menge m){ Menge ret = m.stream().map((Function)(x -> x.deepClone())).>collect(Menge::new, Menge::add, Menge::addAll);