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

Timestamp:

05/29/14 22:43:07 (10 years ago)

Author:

rkrimmel

Message:

new Smith waterman variant

File:

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

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

@@ -30 +30 @@
         
         public ObjectDistanceSubstitionMatrix(
-                        SymbolMap<ITaskInstance, ITask> uniqueTasks) {
+                        SymbolMap<ITaskInstance, ITask> uniqueTasks,float positiveThreshold) {
                 this.uniqueTasks = uniqueTasks;
+                this.positiveThreshold = positiveThreshold;
                 idmapping = new HashMap<Integer, Integer>();
                 matrix = new TriangleMatrix(uniqueTasks.size()+1);
                 gapPenalty = -10;
-                //Todo: Calculate this value (the mean distance between every element) before
-                positiveThreshold =7;
+                
         }
 
@@ -47 +47 @@
         public void generate() {
                 int index = 0;
-                float meandistance = 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
                                 .hasNext();) {
@@ -87 +90 @@
                                         tempindex2 = idmapping.get(eti2.getTask().getId());
                                 }
-                                float distance = AlignmentHelpers.distanceBetween(first, second);
-                                meandistance += distance;
+                                float distance = -1*AlignmentHelpers.distanceBetween(first, second);
+                                //meandistance += distance;
                         
-                                if (distance > positiveThreshold) {
-                                        distance = -1*distance;
+                                if(distance > maxDistance){
+                                        maxDistance = distance;
                                 }
+                                
+                                distance += 5;
+                                
+                                //if (distance < positiveThreshold) {
+                                //      distance = -1*distance;
+                                //}
+                                
                                 matrix.set(tempindex1, tempindex2,distance);
                                 
                         }
                 }
-                System.out.println(meandistance/(uniqueTasks.size()*uniqueTasks.size()));
+                //System.out.println("ObjectDistanceMatrix: MaxDistance: " + maxDistance);
+                //System.out.println(meandistance/(uniqueTasks.size()*uniqueTasks.size()));
                 //System.out.println(idmapping.toString());
                 //System.out.println(matrix.toString());
@@ -104 +115 @@
                 
         }
+        
+        public String toString(){
+                return matrix.toString();
+        }
 
         @Override
         public float 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));
         }