Changeset 1578 for branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java

Timestamp:

06/25/14 19:21:42 (10 years ago)

Author:

rkrimmel

Message:

Added Constants for the gap and unmatched symbol

File:

• branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java (modified) (5 diffs)

branches/ralph/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java

@@ -5 +5 @@
 import java.util.Iterator;
 
-
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
 import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.AlignmentHelpers;
+import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.Constants;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
@@ -40 +40 @@
         @Override
         public void generate() {
+        
                 int index = 0;
-                //TODO We need to determine this parameter before generating the matrix..
-                //float meandistance = 18;
-                //TODO We need to determine this parameter before generating the matrix..
+                
                 float maxDistance =34;
                 for (Iterator<ITaskInstance> it = uniqueTasks.getSymbols().iterator(); it
@@ -52 +51 @@
                                 eti1 = (IEventTaskInstance) obj1;
                         }
-                        //System.out.println(eti1.getTask().toString());
                 
                         for (Iterator<ITaskInstance> jt = uniqueTasks.getSymbols()
@@ -97 +95 @@
                                 
                                 matrix.set(tempindex1, tempindex2,distance);
-                                
+        
                         }
                 }
-                //System.out.println("ObjectDistanceMatrix: MaxDistance: " + maxDistance);
+                
                 //System.out.println(meandistance/(uniqueTasks.size()*uniqueTasks.size()));
                 //System.out.println(idmapping.toString());
                 //System.out.println(matrix.toString());
+                //System.out.println("ObjectDistanceMatrix: MaxDistance: " + maxDistance);
                 //System.out.println(idmapping.keySet().toString());
                 //System.out.println(idmapping.values().toString());
@@ -113 +112 @@
         }
 
-        @Override
-        public double getDistance(int taskId1, int taskId2) {
-                //System.out.println("Taskid1: " + taskId1 + " Taskid2: " + taskId2 + " Idmapping1: " + idmapping.get(taskId1) + " Idmapping2: " + idmapping.get(taskId2));
-                return matrix.get(idmapping.get(taskId1),idmapping.get(taskId2));
+        public double getScore(int taskId1, int taskId2) {
+                if(taskId1 == Constants.GAP_SYMBOL || taskId1 == Constants.UNMATCHED_SYMBOL || taskId2 == Constants.GAP_SYMBOL || taskId2 == Constants.UNMATCHED_SYMBOL ) {
+                        return 0.0; 
+                } 
+                else {
+                        return matrix.get(idmapping.get(taskId1),idmapping.get(taskId2));       
+                }
+                
         }