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

Timestamp:

06/18/14 21:24:30 (10 years ago)

Author:

rkrimmel

Message:

Adding FitchMargaliash? Class

File:

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

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

@@ -1 +1 @@
 package de.ugoe.cs.autoquest.tasktrees.alignment.substitution;
 
-import java.util.ArrayList;
-import java.util.Collection;
+
 import java.util.HashMap;
 import java.util.Iterator;
 
-import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel;
+
 import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement;
-
-import java.util.List;
-
-import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.tasktrees.alignment.algorithms.AlignmentHelpers;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.IUserSession;
 import de.ugoe.cs.autoquest.usageprofiles.SymbolMap;
-import de.ugoe.cs.util.console.GlobalDataContainer;
+
 
 public class ObjectDistanceSubstitionMatrix implements SubstitutionMatrix {
@@ -92 +86 @@
                                 }
                                 float distance = -1*AlignmentHelpers.distanceBetween(first, second);
-                                //meandistance += distance;
+                        
                         
                                 if(distance > maxDistance){
@@ -98 +92 @@
                                 }
                                 
-                                distance += 5;
+                                distance += positiveThreshold;
                                 
-                                //if (distance < positiveThreshold) {
-                                //      distance = -1*distance;
-                                //}
+
                                 
                                 matrix.set(tempindex1, tempindex2,distance);