Changeset 1890 for trunk/autoquest-core-tasktrees/src/main/java/de

Timestamp:

03/05/15 11:42:26 (10 years ago)

Author:

pharms

Message:

• extended task similarity check to handle identical tasks also correctly

Location:

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/utils

Files:

• MostSimilarTaskDeterminer.java (modified) (4 diffs)
• SimilarTasks.java (modified) (3 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/utils/MostSimilarTaskDeterminer.java

@@ -118 +118 @@
 
     /**
-     * filters the given list of similar tasks for those having the smalled diff level, which is
+     * filters the given list of similar tasks for those having the smallest diff level, which is
      * in turn the highest similarity
      */
@@ -140 +140 @@
                 }
             }
+            
+            Console.println("smallest diff level is " + smallestDiffLevel);
         }
         else {
@@ -197 +199 @@
                                                  ITaskModel               taskModel)
     {
+        for (SimilarTasks similarTasks : mostSimilarTasksList) {
+            System.out.println(similarTasks.getLeftHandSide() + "  " + similarTasks.getRightHandSide());
+        }
+        
         // check, if several remaining similar tasks refer to the same task
         Map<ITask, LinkedList<SimilarTasks>> referredTasks =
@@ -597 +603 @@
                                 getSimilarTasksToPrefer(similarTasks1, similarTasks2);
 
-                            if (similarTasks.isInBetweenDifference()) {
+                            if (similarTasks.isInBetweenDifference() ||
+                                (similarTasks.getPatch().getDeltas().size() == 0))
+                            {
                                 if (similarTasks.getDiffLevel() < mostSimilarDiffLevel) {
                                     mostSimilarTasks = similarTasks;

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/utils/SimilarTasks.java

@@ -1095 +1095 @@
             if (isInefficientAction(path.getLast())) {
                 diffCount++;
+                allCount++;
             }
             else {
@@ -1104 +1105 @@
             if (isInefficientAction(path.getLast())) {
                 diffCount++;
+                allCount++;
             }
             else {
@@ -1110 +1112 @@
         }
         
-        return (100 * diffCount) / allCount;
+        if (allCount == 0) {
+            // this happens, if all actions are inefficient. Return the highest diff level
+            return 100;
+        }
+        else {
+            return (100 * diffCount) / allCount;
+        }
     }