From 78794e377ab6fb25e8f1332b048950a247808003 Mon Sep 17 00:00:00 2001
From: Florian Steurer <florian.steurer95@gmail.com>
Date: Tue, 3 May 2016 20:44:55 +0200
Subject: [PATCH] fixed vector

---
 .../typeinference/unify/TypeUnifyTask.java             | 10 +++++-----
 test/unify/UnifyTest.java                              |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
index 178f7bc1..9cb2df6e 100644
--- a/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
+++ b/src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
@@ -425,9 +425,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 	protected Set<Set<UnifyPair>> unifyCase1(PlaceholderType a, UnifyType thetaPrime, IFiniteClosure fc) {
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
-		boolean allGen = true;
+		boolean allGen = thetaPrime.getTypeParams().size() > 0;
 		for(UnifyType t : thetaPrime.getTypeParams())
-			if(t instanceof PlaceholderType && !((PlaceholderType) t).isGenerated()) {
+			if(!(t instanceof PlaceholderType) || !((PlaceholderType) t).isGenerated()) {
 				allGen = false;
 				break;
 			}
@@ -437,7 +437,7 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 		
 		for(UnifyType c : cs) {
 			Set<UnifyType> thetaQs = fc.getChildren(c).stream().collect(Collectors.toCollection(HashSet::new));
-			thetaQs.add(thetaPrime);
+			//thetaQs.add(thetaPrime);
 			Set<UnifyType> thetaQPrimes = new HashSet<>();
 			TypeParams cParams = c.getTypeParams();
 			if(cParams.size() == 0)
@@ -549,9 +549,9 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
 	protected Set<Set<UnifyPair>> unifyCase5(UnifyType theta, PlaceholderType a, IFiniteClosure fc) {
 		Set<Set<UnifyPair>> result = new HashSet<>();
 		
-		boolean allGen = true;
+		boolean allGen = theta.getTypeParams().size() > 0;
 		for(UnifyType t : theta.getTypeParams())
-			if(t instanceof PlaceholderType && !((PlaceholderType) t).isGenerated()) {
+			if(!(t instanceof PlaceholderType) || !((PlaceholderType) t).isGenerated()) {
 				allGen = false;
 				break;
 			}
diff --git a/test/unify/UnifyTest.java b/test/unify/UnifyTest.java
index 825fd40d..16b3380d 100644
--- a/test/unify/UnifyTest.java
+++ b/test/unify/UnifyTest.java
@@ -862,13 +862,12 @@ public class UnifyTest {
 		UnifyType tphT1 = tf.getPlaceholderType("T1");
 		UnifyType tphT2 = tf.getPlaceholderType("T2");
 
-		UnifyType gtv = tf.getSimpleType("gtv");
-		UnifyType vector = tf.getSimpleType("Vector", gtv);
+		UnifyType vector = tf.getSimpleType("Vector", "T");
 		UnifyType vectorE = tf.getSimpleType("Vector", tphT2);
 		UnifyType string = tf.getSimpleType("String");
 		UnifyType vectorString = tf.getSimpleType("Vector", string);
 		
-		fcb.add(vector, vector);
+		fcb.add(vector, tf.getSimpleType("java.lang.Object"));
 		
 		IFiniteClosure fc = fcb.getFiniteClosure();
 		
@@ -879,7 +878,7 @@ public class UnifyTest {
 		Set<Set<UnifyPair>> actual = new TypeUnify().unifySequential(eq, fc);
 		
 		System.out.println("Test OverloadingVector:");
-		System.out.println(actual);
+		System.out.println(actual + "\n");
 	}
 	
 	@Test