From 867f3d39e86301eaca23b594aa2e84f75088f1c3 Mon Sep 17 00:00:00 2001 From: "pl@gohorb.ba-horb.de" Date: Mon, 20 Mar 2023 16:05:28 +0100 Subject: [PATCH] modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java modified: src/test/java/targetast/TestComplete.java --- .../de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java | 5 +++-- src/test/java/targetast/TestComplete.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java index bc72ce39d..0d66bfb74 100644 --- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java +++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java @@ -732,6 +732,7 @@ public class TypeUnifyTask extends RecursiveTask>> { variance = optVariance.isPresent() ? optVariance.get() : 2; } /* Varianzbestimmung Ende */ + variance = 2; //writeLog("nextSetasList: " + nextSetasList.toString()); Set nextSetElem = nextSetasList.get(0); @@ -1213,7 +1214,7 @@ public class TypeUnifyTask extends RecursiveTask>> { //Alle Variablen bestimmen die nicht hinzugefügt wurden in a_last //System.out.println(a_last); - + if (a_last != null) { 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 varsLast_a = @@ -1265,7 +1266,7 @@ public class TypeUnifyTask extends RecursiveTask>> { } catch (NullPointerException e) { writeLog("NullPointerException: " + a_last.toString()); - } + }} } else { //alle Fehlerfaelle und alle korrekten Ergebnis jeweils adden diff --git a/src/test/java/targetast/TestComplete.java b/src/test/java/targetast/TestComplete.java index 5333944e0..b1773e150 100644 --- a/src/test/java/targetast/TestComplete.java +++ b/src/test/java/targetast/TestComplete.java @@ -233,7 +233,6 @@ public class TestComplete { } @Test - @Ignore public void matrixTest() throws Exception { var classFiles = generateClassFiles("Matrix.jav", new ByteArrayClassLoader()); var matrix = classFiles.get("Matrix");