diff --git a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java index 351bb0bf..f0f3b591 100644 --- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java +++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java @@ -935,9 +935,9 @@ public class TypeUnifyTask extends RecursiveTask>> { Set forks = new HashSet<>(); Set newEqOrig = new HashSet<>(eq); Set> newElemsOrig = new HashSet<>(elems); - //List,OrderingUnifyPair>> newOderConstraintsOrig = new ArrayList<>(oderConstraints); - List,OrderingUnifyPair>> newOderConstraintsOrig = - oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); + List,OrderingUnifyPair>> newOderConstraintsOrig = new ArrayList<>(oderConstraints); + //List,OrderingUnifyPair>> newOderConstraintsOrig = + // oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); newElemsOrig.add(a); /* FORK ANFANG */ @@ -957,9 +957,9 @@ public class TypeUnifyTask extends RecursiveTask>> { } Set newEq = new HashSet<>(eq); Set> newElems = new HashSet<>(elems); - //List,OrderingUnifyPair>> newOderConstraints = new ArrayList<>(oderConstraints); - List,OrderingUnifyPair>> newOderConstraints = - oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); + List,OrderingUnifyPair>> newOderConstraints = new ArrayList<>(oderConstraints); + //List,OrderingUnifyPair>> newOderConstraints = + // oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); newElems.add(nSaL); TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, cons); forks.add(fork); @@ -995,9 +995,9 @@ public class TypeUnifyTask extends RecursiveTask>> { Set forks = new HashSet<>(); Set newEqOrig = new HashSet<>(eq); Set> newElemsOrig = new HashSet<>(elems); - //List,OrderingUnifyPair>> newOderConstraintsOrig = new ArrayList<>(oderConstraints); - List,OrderingUnifyPair>> newOderConstraintsOrig = - oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); + List,OrderingUnifyPair>> newOderConstraintsOrig = new ArrayList<>(oderConstraints); + //List,OrderingUnifyPair>> newOderConstraintsOrig = + // oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); newElemsOrig.add(a); /* FORK ANFANG */ @@ -1017,9 +1017,9 @@ public class TypeUnifyTask extends RecursiveTask>> { } Set newEq = new HashSet<>(eq); Set> newElems = new HashSet<>(elems); - //List,OrderingUnifyPair>> newOderConstraints = new ArrayList<>(oderConstraints); - List,OrderingUnifyPair>> newOderConstraints = - oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); + List,OrderingUnifyPair>> newOderConstraints = new ArrayList<>(oderConstraints); + //List,OrderingUnifyPair>> newOderConstraints = + // oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); newElems.add(nSaL); TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, cons); forks.add(fork); @@ -1056,9 +1056,9 @@ public class TypeUnifyTask extends RecursiveTask>> { Set forks = new HashSet<>(); Set newEqOrig = new HashSet<>(eq); Set> newElemsOrig = new HashSet<>(elems); - //List,OrderingUnifyPair>> newOderConstraintsOrig = new ArrayList<>(oderConstraints); - List,OrderingUnifyPair>> newOderConstraintsOrig = - oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); + List,OrderingUnifyPair>> newOderConstraintsOrig = new ArrayList<>(oderConstraints); + //List,OrderingUnifyPair>> newOderConstraintsOrig = + // oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); newElemsOrig.add(a); /* FORK ANFANG */ @@ -1076,9 +1076,9 @@ public class TypeUnifyTask extends RecursiveTask>> { //nextSetasList.remove(nSaL); Set newEq = new HashSet<>(eq); Set> newElems = new HashSet<>(elems); - //List,OrderingUnifyPair>> newOderConstraints = new ArrayList<>(oderConstraints); - List,OrderingUnifyPair>> newOderConstraints = - oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); + List,OrderingUnifyPair>> newOderConstraints = new ArrayList<>(oderConstraints); + //List,OrderingUnifyPair>> newOderConstraints = + // oderConstraints.stream().map(x -> new PartialOrderSet,OrderingUnifyPair>(x)).collect(Collectors.toList()); newElems.add(nSaL); TypeUnify2Task fork = new TypeUnify2Task(newElems, newEq, newOderConstraints, nSaL, fc, parallel, logFile, log, rekTiefe, urm, cons); forks.add(fork); diff --git a/src/test/resources/bytecode/javFiles/MatrixOP.jav b/src/test/resources/bytecode/javFiles/MatrixOP.jav index c78c42c7..828a270b 100644 --- a/src/test/resources/bytecode/javFiles/MatrixOP.jav +++ b/src/test/resources/bytecode/javFiles/MatrixOP.jav @@ -1,6 +1,6 @@ import java.util.Vector; import java.lang.Integer; -import java.lang.Byte; +//import java.lang.Byte; import java.lang.Boolean; public class MatrixOP extends Vector> {