Changeset 1905 for trunk

Timestamp:

03/10/15 15:06:08 (10 years ago)

Author:

pharms

Message:

• corrected comparison of sequences

File:

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

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

@@ -147 +147 @@
         }
 
-        TaskEquality resultingEquality = requiredEqualityLevel != null ?
-            requiredEqualityLevel : TaskEquality.LEXICALLY_EQUAL;
+        TaskEquality resultingEquality = null;
         
         for (int i = 0; i < children1.size(); i++) {
@@ -158 +157 @@
             TaskEquality taskEquality = callRuleManager(child1, child2, resultingEquality);
 
-            if ((taskEquality == null) || (taskEquality == TaskEquality.UNEQUAL)) {
+            if ((taskEquality == null) || (taskEquality == TaskEquality.UNEQUAL) ||
+                ((requiredEqualityLevel != null) &&
+                 (!taskEquality.isAtLeast(requiredEqualityLevel))))
+            {
                 return TaskEquality.UNEQUAL;
             }
             
-            resultingEquality = resultingEquality.getCommonDenominator(taskEquality);
+            if (resultingEquality == null) {
+                // non identical sequences can be at most lexically equal
+                resultingEquality = TaskEquality.LEXICALLY_EQUAL.getCommonDenominator(taskEquality);
+            }
+            else {
+                resultingEquality = resultingEquality.getCommonDenominator(taskEquality);
+            }
         }
 
@@ -228 +236 @@
         }
 
-        TaskEquality resultingEquality = requiredEqualityLevel != null ?
-            requiredEqualityLevel : TaskEquality.LEXICALLY_EQUAL;
+        TaskEquality resultingEquality = TaskEquality.LEXICALLY_EQUAL;
         
         for (int i = 0; i < sequence1.size(); i++) {
@@ -239 +246 @@
             TaskEquality taskEquality = callRuleManager(child1, child2, resultingEquality);
 
-            if ((taskEquality == null) || (taskEquality == TaskEquality.UNEQUAL)) {
+            if ((taskEquality == null) || (taskEquality == TaskEquality.UNEQUAL) ||
+                ((requiredEqualityLevel != null) &&
+                 (!taskEquality.isAtLeast(requiredEqualityLevel))))
+            {
                 return TaskEquality.UNEQUAL;
             }
             
-            resultingEquality = resultingEquality.getCommonDenominator(taskEquality);
+            if (resultingEquality == null) {
+                // non identical sequences can be at most lexically equal
+                resultingEquality = TaskEquality.LEXICALLY_EQUAL.getCommonDenominator(taskEquality);
+            }
+            else {
+                resultingEquality = resultingEquality.getCommonDenominator(taskEquality);
+            }
         }