Changeset 1973

Timestamp:

06/22/15 16:28:15 (9 years ago)

Author:

pharms

Message:

• again two smaller bugfixes in task merging

Location:

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

Files:

• CondenseSimilarTasksRule.java (modified) (1 diff)
• utils/SimilarTasks.java (modified) (1 diff)

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

@@ -1292 +1292 @@
                 
                 // perform the actual replacement and throw away the instance
+                taskBuilder.setMarkedTask(optionalInstance.getOptional(), replacement.getTask());
                 taskBuilder.setChild(optionalInstance, replacement);
                 TaskPath path = new TaskPath();

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

@@ -1155 +1155 @@
         for (TaskPath path : paths) {
             for (int i = commonPath.size(); i < path.size(); i++) {
-                if (!(path.getLast() instanceof IEventTask)) {
-                    // check, if the parent task covers things fully inside the delta
-                    int[] indexes = traversal.getIndexesRootedBy(path.subPath(0, i + 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));
-                        break;
-                    }
+                // check, if the parent task covers things fully inside the delta
+                int[] indexes = traversal.getIndexesRootedBy(path.subPath(0, i + 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));
+                    break;
                 }
             }