Changeset 1974 for trunk/autoquest-core-tasktrees/src

Timestamp:

06/24/15 11:27:39 (10 years ago)

Author:

pharms

Message:

• corrected determination of parent tasks fully inside a delta

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/utils/SimilarTasks.java (modified) (1 diff)

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

@@ -1151 +1151 @@
         List<TaskPath> paths = (List<TaskPath>) chunk.getLines();
         
-        TaskPath commonPath = getCommonPath(paths);
-
         for (TaskPath path : paths) {
-            for (int i = commonPath.size(); i < path.size(); i++) {
+            for (int i = path.size() - 1; i >= 0; i--) {
                 // check, if the parent task covers things fully inside the delta
-                int[] indexes = traversal.getIndexesRootedBy(path.subPath(0, i + 1));
+                TaskPath parentPath = path.subPath(0, i);
+                
+                //System.out.println("checking parent path " + parentPath);
+                int[] indexes = traversal.getIndexesRootedBy(parentPath);
+                //System.out.println("indexes are " + indexes[0] + "  " + indexes[1]);
                 
                 if ((chunk.getPosition() <= indexes[0]) && // starts in the delta
                     (indexes[1] < (chunk.getPosition() + chunk.size()))) // ends in the delta
                 {
-                    // System.out.println("found path to parent task lieing completely in the " +
-                    //                    "delta: " + path.subPath(0, i + 1));
-                    result.add(path.subPath(0, i + 1));
+                    //System.out.println("found path to parent task lying completely in the " +
+                    //                   "delta: " + parentPath);
+                    result.add(parentPath);
+                }
+                else {
+                    // further parents can not be inside the delta
                     break;
                 }