diff --git a/resources/bytecode/javFiles/Matrix.jav b/resources/bytecode/javFiles/Matrix.jav index 31868108..bac0b88a 100644 --- a/resources/bytecode/javFiles/Matrix.jav +++ b/resources/bytecode/javFiles/Matrix.jav @@ -1,4 +1,4 @@ -import java.util.AbstractList; +import java.util.List; import java.util.Vector; import java.lang.Integer; //import java.lang.Float; diff --git a/src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java b/src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java index 0ac2a84e..dd5b84da 100644 --- a/src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java +++ b/src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java @@ -44,7 +44,7 @@ public class Constraint extends HashSet { } public Boolean isOverridden() { - return isInherited; + return isOverridden; } public Constraint getExtendConstraint() { diff --git a/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java b/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java index f438c664..c3fc5520 100644 --- a/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java +++ b/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java @@ -71,7 +71,7 @@ public class ConstraintSet { for(Set> oderConstraint : oderConstraints){ newOder.add( - oderConstraint.parallelStream().map((Constraint as) -> { + oderConstraint.stream().map((Constraint as) -> { Constraint newConst = as.stream() .map(o) diff --git a/src/test/java/TestComplete.java b/src/test/java/TestComplete.java index ff42eabc..b121f834 100644 --- a/src/test/java/TestComplete.java +++ b/src/test/java/TestComplete.java @@ -4,6 +4,7 @@ import org.junit.Ignore; import org.junit.Test; import java.lang.reflect.*; +import java.util.AbstractList; import java.util.Arrays; import java.util.List; import java.util.Vector; @@ -263,7 +264,7 @@ public class TestComplete { var instanceOfClass_m2 = matrix.getDeclaredConstructor(Vector.class).newInstance(vv1); - var mul = matrix.getDeclaredMethod("mul", Vector.class); + var mul = matrix.getDeclaredMethod("mul", List.class); var result = mul.invoke(instanceOfClass_m1, instanceOfClass_m2); System.out.println(instanceOfClass_m1.toString() + " * " + instanceOfClass_m2.toString() + " = " + result.toString());