From db91e737500bb400ec6d25d02d871a4a31128b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Wed, 6 Feb 2019 18:15:39 +0100
Subject: [PATCH] 	modified:  
 src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java aParDef
 wird auch ausgewertet

	modified:   src/test/resources/bytecode/javFiles/MatrixOP.jav
---
 .../typeinference/unify/TypeUnifyTask.java    | 21 +++++++++++--------
 .../resources/bytecode/javFiles/MatrixOP.jav  |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
index 1e762b8ab..5a3d48627 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
@@ -692,15 +692,14 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 																			  //PL 2017-09-29 dies ersetzt //(!eqPrimePrime.isPresent()) 
 																			  //PL 2018-05-18 beide Bedingungen muessen gelten, da eqPrime Veränderungen in allem ausser subst
 																			  //eqPrimePrime Veraenderungen in subst repraesentieren.
-					try {
+					//try {
 						if (isSolvedForm(eqPrime)) {
-							logFile.write("eqPrime:" + eqPrime.toString()+"\n");
-							logFile.flush();
+							writeLog("eqPrime:" + eqPrime.toString()+"\n");
 						}
-					}
-					catch (IOException e) { 
+					//}
+					//catch (IOException e) { 
 						System.err.println("log-File nicht vorhanden");
-					}
+					//}
 					eqPrimePrimeSet.add(eqPrime);
 					Set<Set<UnifyPair>> eqPrimePrimeSetRet = eqPrimePrimeSet.stream().map(x -> {
 						Optional<Set<UnifyPair>> res = new RuleSet().subst(x.stream().map(y -> { 
@@ -971,7 +970,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					synchronized (this) {
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						writeLog("Join " + new Integer(fork.thNo).toString());
-						//noOfThread--; an das Ende von compute verschoben 
+						//noOfThread--; an das Ende von compute verschoben
+						writeLog("fork_res: " + fork_res.toString());
+						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
 						add_res.add(fork_res);
 						if (!isUndefinedPairSetSet(fork_res)) {
 							aParDef.add(fork.getNextSetElement());
@@ -1026,6 +1027,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 						Set<Set<UnifyPair>> fork_res = fork.join();
 						writeLog("Join " + new Integer(fork.thNo).toString());
 						//noOfThread--; an das Ende von compute verschoben 
+						writeLog("fork_res: " + fork_res.toString());
+						writeLog(new Boolean((isUndefinedPairSetSet(fork_res))).toString());
 						add_res.add(fork_res);
 						if (!isUndefinedPairSetSet(fork_res)) {
 							aParDef.add(fork.getNextSetElement());
@@ -1209,7 +1212,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				
 			/* auskommentiert um alle Max und min Betrachtung auszuschalten ANFANG */
-			if (!result.isEmpty() && !isUndefinedPairSetSet(res)) {
+			if (!result.isEmpty() && (!isUndefinedPairSetSet(res) || !aParDef.isEmpty())) {
 				if (nextSetasList.iterator().hasNext() && nextSetasList.iterator().next().stream().filter(x -> x.getLhsType().getName().equals("B")).findFirst().isPresent() && nextSetasList.size()>1) 
 					System.out.print("");
 				Iterator<Set<UnifyPair>> nextSetasListIt = new ArrayList<Set<UnifyPair>>(nextSetasList).iterator();
@@ -1343,7 +1346,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			}
 			 /* auskommentiert um alle Max und min Betrachtung auszuschalten ENDE */ 
 			
-			if (isUndefinedPairSetSet(res)) {
+			if (isUndefinedPairSetSet(res) && aParDef.isEmpty()) {
 				int nofstred= 0;
 				Set<UnifyPair> abhSubst = res.stream()
 							   .map(b -> 
diff --git a/src/test/resources/bytecode/javFiles/MatrixOP.jav b/src/test/resources/bytecode/javFiles/MatrixOP.jav
index 828a270bd..c78c42c76 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<Vector<Integer>> {