From fc870fd706da5085be84ee0425e25749e5644b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@macmini_pl.verw.ba-horb.de>
Date: Wed, 18 Apr 2018 19:44:00 +0200
Subject: [PATCH] 	modified:  
 ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java

---
 .../typeinference/unify/TypeUnifyTask.java       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
index d2b9c8f2..626ec74e 100644
--- a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
@@ -428,7 +428,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 			i++;
 			Set<Set<UnifyPair>> elems = new HashSet<Set<UnifyPair>>(fstElems);
 			elems.add(a);
-			if (remainingSets.isEmpty()) {
+			//if (remainingSets.isEmpty()) {//muss immer gegeben sein, weil nur 1 Element der topLevelSets mehr als ein Elemet enthaelt
 				Set<Set<UnifyPair>> res = unify2(elems, eq, fc, parallel);
 				if (!isUndefinedPairSetSet(res) && isUndefinedPairSetSet(result)) {
 					//wenn korrektes Ergebnis gefunden alle Fehlerfaelle loeschen
@@ -449,12 +449,12 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 					//}
 				}
 				
-			}
-			else {//duerfte gar nicht mehr vorkommen PL 2018-04-03
-				result.addAll(computeCartesianRecursive(elems, remainingSets, eq, fc, parallel)); 
-			}
+			//}
+			//else {//duerfte gar nicht mehr vorkommen PL 2018-04-03
+				//result.addAll(computeCartesianRecursive(elems, remainingSets, eq, fc, parallel)); 
+			//}
 			
-			if (!result.isEmpty() && !isUndefinedPairSetSet(result)) {
+			if (!result.isEmpty() && !isUndefinedPairSetSet(res)) {
 				if (nextSetasList.iterator().hasNext() && nextSetasList.iterator().next().stream().filter(x -> x.getLhsType().getName().equals("D")).findFirst().isPresent() && nextSetasList.size()>1) 
 					System.out.print("");
 				Iterator<Set<UnifyPair>> nextSetasListIt = new ArrayList<Set<UnifyPair>>(nextSetasList).iterator(); 
@@ -483,8 +483,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				}
 				}
 			}
-			if (isUndefinedPairSetSet(result)) {
-				Set<UnifyPair> abhSubst = result.stream()
+			if (isUndefinedPairSetSet(res)) {
+				Set<UnifyPair> abhSubst = res.stream()
 							   .map(b -> 
 							    b.stream()
 							   .map(x -> x.getAllSubstitutions())