Changeset 1957 for trunk/autoquest-core-tasktrees/src/main

Timestamp:

06/01/15 13:50:28 (10 years ago)

Author:

pharms

Message:

• corrected detection of overlapping iterations to handle only iterations of more than one action

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

@@ -890 +890 @@
     {
         if (instance instanceof IIterationInstance) {
-            if (((IIterationInstance) instance).size() > 1) {
-                // iteration executed multiple times --> store path
+            ITask markedTask = instance.getTask();
+            
+            while (markedTask instanceof IMarkingTemporalRelationship) {
+                markedTask = ((IMarkingTemporalRelationship) markedTask).getMarkedTask();
+            }
+            
+            if ((!(markedTask instanceof IEventTask)) &&
+                ((IIterationInstance) instance).size() > 1)
+            {
+                // iteration repeates multiple event tasks and is executed multiple times -->
+                // store path
                 result.add(currentPath.subPath(0, currentPath.size())); // ensure to create a copy
             }