Changeset 1887 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/taskequality/SequenceComparisonRule.java

Timestamp:

03/05/15 11:37:37 (9 years ago)

Author:

pharms

Message:

• extended and corrected task comparison

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/taskequality/SequenceComparisonRule.java (modified) (2 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/taskequality/SequenceComparisonRule.java

@@ -147 +147 @@
         }
 
-        TaskEquality resultingEquality = TaskEquality.LEXICALLY_EQUAL;
+        TaskEquality resultingEquality = requiredEqualityLevel != null ?
+            requiredEqualityLevel : TaskEquality.LEXICALLY_EQUAL;
+        
         for (int i = 0; i < children1.size(); i++) {
             ITask child1 = children1.get(i);
             ITask child2 = children2.get(i);
 
-            TaskEquality taskEquality = callRuleManager(child1, child2, requiredEqualityLevel);
+            // it is sufficient to check for the current at most achievable equality, i.e.,
+            // the so far resulting equality
+            TaskEquality taskEquality = callRuleManager(child1, child2, resultingEquality);
 
             if ((taskEquality == null) || (taskEquality == TaskEquality.UNEQUAL)) {
@@ -224 +228 @@
         }
 
-        TaskEquality resultingEquality = TaskEquality.LEXICALLY_EQUAL;
+        TaskEquality resultingEquality = requiredEqualityLevel != null ?
+            requiredEqualityLevel : TaskEquality.LEXICALLY_EQUAL;
+        
         for (int i = 0; i < sequence1.size(); i++) {
             ITaskInstance child1 = sequence1.get(i);
             ITaskInstance child2 = sequence2.get(i);
 
-            TaskEquality taskEquality = callRuleManager(child1, child2, requiredEqualityLevel);
+            // it is sufficient to check for the current at most achievable equality, i.e.,
+            // the so far resulting equality
+            TaskEquality taskEquality = callRuleManager(child1, child2, resultingEquality);
 
             if ((taskEquality == null) || (taskEquality == TaskEquality.UNEQUAL)) {