From 72fa0978c2d9444467e973b484ade8fba1b8cabe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@macmini_pl.verw.ba-horb.de>
Date: Wed, 7 Nov 2018 13:46:03 +0100
Subject: [PATCH] 	modified:   JavaTXCompiler.java Kleinigkeit entfernt,
 dass varianceInheritance die gesamte variance-Vererbung macht. ~ ~ ~ ~ ~ ~ ~
 ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~

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

diff --git a/src/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/de/dhbwstuttgart/core/JavaTXCompiler.java
index c09c90b0..83f5aeb6 100644
--- a/src/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -176,7 +176,10 @@ public class JavaTXCompiler {
 						}	
 					}
 					return x;//HIER DIE JEWEILS RECHT BZW. LINKE SEITE AUF GLEICHE VARIANZ SETZEN WIE DIE JEWEILS ANDERE SEITE 
-				}).map( y -> { 
+				})
+					/* PL 2018-11-07 wird in varianceInheritance erledigt
+					 .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()); 
@@ -186,16 +189,20 @@ 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);
@@ -219,7 +226,7 @@ public class JavaTXCompiler {
 	 * Vererbt alle Variancen
 	 * @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<>();