From 74ad081e78efebe81fecc6e60adb478669c8fc81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Tue, 13 Nov 2018 14:28:33 +0100
Subject: [PATCH] 	modified:   JavaTXCompiler.java wieder das aus
 uniy-test hinkopiert

---
 src/de/dhbwstuttgart/core/JavaTXCompiler.java | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/de/dhbwstuttgart/core/JavaTXCompiler.java
index f0dcf69db..5387e2a11 100644
--- a/src/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -176,10 +176,7 @@ public class JavaTXCompiler {
 						}	
 					}
 					return x;//HIER DIE JEWEILS RECHT BZW. LINKE SEITE AUF GLEICHE VARIANZ SETZEN WIE DIE JEWEILS ANDERE SEITE 
-				})
-					/* PL 2018-11-07 wird in varianceInheritance erledigt
-					 .map( y -> { 
-					 
+				}).map( y -> { 
 						if ((y.getLhsType() instanceof PlaceholderType) && (y.getRhsType() instanceof PlaceholderType)) {
 							if (((PlaceholderType)y.getLhsType()).getVariance() != 0  && ((PlaceholderType)y.getRhsType()).getVariance() == 0) { 
 								((PlaceholderType)y.getRhsType()).setVariance(((PlaceholderType)y.getLhsType()).getVariance()); 
@@ -189,20 +186,16 @@ public class JavaTXCompiler {
 							} 
 						}
 					return y; } )
-					*/
 				.collect(Collectors.toCollection(HashSet::new));
-				varianceInheritance(xConsSet);
-					
-				
-
-                Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure, logFile, log);
-                //Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
-                System.out.println("RESULT: " + result);
-                logFile.write("RES: " + result.toString()+"\n");
-                logFile.flush();
-                results.addAll(result);
+					varianceInheritance(xConsSet);
+    				Set<Set<UnifyPair>> result = unify.unifySequential(xConsSet, finiteClosure, logFile, log);
+    				//Set<Set<UnifyPair>> result = unify.unify(xConsSet, finiteClosure);
+    				System.out.println("RESULT: " + result);
+    				logFile.write("RES: " + result.toString()+"\n");
+    				logFile.flush();
+    				results.addAll(result);
             	}
-			
+        	
 			results = results.stream().map(x -> {
 				Optional<Set<UnifyPair>> res = new RuleSet().subst(x.stream().map(y -> { 
 					if (y.getPairOp() == PairOperator.SMALLERDOTWC) y.setPairOp(PairOperator.EQUALSDOT);
@@ -227,7 +220,7 @@ public class JavaTXCompiler {
 	 * wenn a eine Variance !=0 hat auf alle Typvariablen in Theta. 
 	 * @param eq The set of constraints
 	 */
-	private  void varianceInheritance(Set<UnifyPair> eq) {
+	private void varianceInheritance(Set<UnifyPair> eq) {
 		Set<PlaceholderType> usedTPH = new HashSet<>();
 		Set<PlaceholderType> phSet = eq.stream().map(x -> { 
 			Set<PlaceholderType> pair = new HashSet<>();