Changeset 807 for trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/nodeequality/SequenceComparisonRule.java

Timestamp:

09/11/12 16:45:51 (12 years ago)

Author:

pharms

Message:

• improved node equality comparison to match the principle of lexical, syntactical and semantical node equality. As a result, more condensed task trees are created.

File:

• trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/nodeequality/SequenceComparisonRule.java (modified) (3 diffs)

trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/nodeequality/SequenceComparisonRule.java

@@ -44 +44 @@
         }
 
+        if (node1 == node2) {
+            return NodeEquality.IDENTICAL;
+        }
+
         // if both sequences do not have children, they are equal although this doesn't make sense
         if ((node1.getChildren().size() == 0) && (node2.getChildren().size() == 0)) {
@@ -49 +53 @@
         }
 
-        // 
         if (node1.getChildren().size() != node2.getChildren().size()) {
-            return null;
+            return NodeEquality.UNEQUAL;
         }
 
+        NodeEquality resultingEquality = NodeEquality.LEXICALLY_EQUAL;
         for (int i = 0; i < node1.getChildren().size(); i++) {
             ITaskTreeNode child1 = node1.getChildren().get(i);
@@ -60 +64 @@
             NodeEquality nodeEquality = mRuleManager.applyRules(child1, child2);
 
-            if (!nodeEquality.isAtLeast(NodeEquality.LEXICALLY_EQUAL)) {
-                return null;
+            if ((nodeEquality == null) || (nodeEquality == NodeEquality.UNEQUAL)) {
+                return NodeEquality.UNEQUAL;
             }
+            
+            resultingEquality = resultingEquality.getCommonDenominator(nodeEquality);
         }
 
-        return NodeEquality.LEXICALLY_EQUAL;
+        return resultingEquality;
     }