Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java
===================================================================
--- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java	(revision 1675)
+++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java	(revision 1676)
@@ -21,4 +21,5 @@
 	private SymbolMap<ITaskInstance, ITask> uniqueTasks;
 	private double gapPenalty; 
+	private int index = 0;
 	
 	private double positiveThreshold;
@@ -44,8 +45,5 @@
 
 	public void generate() {
-	
-		int index = 0;
 		
-		float maxDistance =34;
 		for (Iterator<ITaskInstance> it = uniqueTasks.getSymbols().iterator(); it
 				.hasNext();) {
@@ -53,8 +51,10 @@
 			IEventTaskInstance eti1 = null;
 			if (obj1 instanceof IEventTaskInstance) {
+				System.out.println(obj1);
 				eti1 = (IEventTaskInstance) obj1;
 			}
 			else {
 				//System.out.println("Not an EventTaskInstance");
+				//System.out.println(obj1);
 				continue;
 			}
@@ -69,45 +69,35 @@
 				else{
 					//System.out.println("Not an EventtaskInstance");
+					//System.out.println(obj1);
 					continue;
 				}
-				IGUIElement first = (IGUIElement) eti1.getEvent().getTarget();
-				IGUIElement second = (IGUIElement) eti2.getEvent().getTarget();
-				int tempindex1 = -1;
-				int tempindex2 = -1;
-				if(!idmapping.containsKey(eti1.getTask().getId()))
-				{
-					idmapping.put(eti1.getTask().getId(), index);
-					tempindex1 = index;
-					index++;
-				}	
-				else 
-				{
-					tempindex1 = idmapping.get(eti1.getTask().getId());
-				}	
-				if(!idmapping.containsKey(eti2.getTask().getId()))
-				{
-					idmapping.put(eti2.getTask().getId(), index);
-					tempindex2 = index;
-					index++;
-				}	
-				else 
-				{
-					tempindex2 = idmapping.get(eti2.getTask().getId());
-				}
-				float distance = -1*AlignmentHelpers.distanceBetween(first, second);
-			
-			
-				if(distance > maxDistance){
-					maxDistance = distance;
-				}
-				
-				distance += positiveThreshold;
-				
-
-				
-				matrix.set(tempindex1, tempindex2,distance);
+		
+				matrix.set(getIndex(eti1), getIndex(eti2),distanceBetweenInstances(eti1,eti2));
 	
 			}
 		}
+	}
+	
+	private int getIndex(IEventTaskInstance eti) {
+		int tempindex = -1;
+		if(!idmapping.containsKey(eti.getTask().getId()))
+		{
+			idmapping.put(eti.getTask().getId(), index);
+			tempindex = index;
+			index++;
+		}	
+		else 
+		{
+			tempindex = idmapping.get(eti.getTask().getId());
+		}
+		return tempindex;
+	}
+	
+	private float distanceBetweenInstances(IEventTaskInstance eti1, IEventTaskInstance eti2)  {
+		IGUIElement first = (IGUIElement) eti1.getEvent().getTarget();
+		IGUIElement second = (IGUIElement) eti2.getEvent().getTarget();
+		float distance = -1*AlignmentHelpers.distanceBetween(first, second);
+		distance += positiveThreshold;
+		return distance;
 	}