From 07c679a598d248d1e430c5728cbade0913681a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Pl=C3=BCmicke?= <pl@dhbw.de>
Date: Tue, 13 Nov 2018 16:08:07 +0100
Subject: [PATCH] 	modified:  
 ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java Variance =2
 eingefuehrt, wenn Variancen einer Menge unterschiedlich sind
 (Oer-Constraints) 	modified:   ../bytecode/MatrixOpTest.java wieder zum
 Ausfuehren eingeschaltet

---
 src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java | 4 ++--
 test/bytecode/MatrixOpTest.java                             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
index fa84a8d9e..fbf354d0e 100644
--- a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
@@ -711,7 +711,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 		Optional<Integer> xi = nextSetasList.stream().map(x -> x.stream().filter(y -> y.getLhsType() instanceof PlaceholderType)
 				                                  .filter(z -> ((PlaceholderType)z.getLhsType()).getVariance() != 0)
 				                                  .map(c -> ((PlaceholderType)c.getLhsType()).getVariance())
-				                                  .reduce((a,b)-> {if (a==b) return a; else return 0; }))
+				                                  .reduce((a,b)-> {if (a==b) return a; else return 2; })) //2 kommt insbesondere bei Oder-Constraints vor
 												  .filter(d -> d.isPresent())
 												  .map(e -> e.get())
 												  .findAny();
@@ -758,7 +758,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>>  {
 				a = oup.min(nextSetasList.iterator());
 				nextSetasList.remove(a);
 			}
-			else if (variance == 0) {
+			else if (variance == 0 || variance == 2) {
 				a = nextSetasList.remove(0);
 			}
 			//writeLog("nextSet: " + nextSetasList.toString()+ "\n");
diff --git a/test/bytecode/MatrixOpTest.java b/test/bytecode/MatrixOpTest.java
index 8fe538aaf..178aa43e5 100644
--- a/test/bytecode/MatrixOpTest.java
+++ b/test/bytecode/MatrixOpTest.java
@@ -32,9 +32,9 @@ public class MatrixOpTest {
 		fileToTest = new File(path);
 		compiler = new JavaTXCompiler(fileToTest);
 		pathToClassFile = System.getProperty("user.dir")+"/testBytecode/generatedBC/";
-//		compiler.generateBytecode(pathToClassFile);
-//		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
-//		classToTest = loader.loadClass("MatrixOP"); 
+		compiler.generateBytecode(pathToClassFile);
+		loader = new URLClassLoader(new URL[] {new URL("file://"+pathToClassFile)});
+		classToTest = loader.loadClass("MatrixOP"); 
 /*		
 		Vector<Vector<Integer>> vv = new Vector<Vector<Integer>>();
 		 Vector<Integer> v1 = new Vector<Integer> ();