Changeset 1887 for trunk

Timestamp:

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

Author:

pharms

Message:

• extended and corrected task comparison

Location:

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

Files:

• GUIEventTaskComparisonRule.java (modified) (6 diffs)
• IterationComparisonRule.java (modified) (1 diff)
• OptionalComparisonRule.java (added)
• SequenceComparisonRule.java (modified) (2 diffs)
• TaskAndOptionalComparisonRule.java (added)
• TaskEquality.java (modified) (1 diff)
• TaskEqualityRuleManager.java (modified) (1 diff)

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

@@ -341 +341 @@
             }
             else {
+                // pressing a key on the same target, e.g. a text field, usually has the same
+                // semantics
                 return TaskEquality.SEMANTICALLY_EQUAL;
             }
@@ -389 +391 @@
         }
         
+        // performing drag and drops on the same target usually have the same semantic meaning,
+        // i.e., the same function is called
         return TaskEquality.SEMANTICALLY_EQUAL;
     }
@@ -459 +463 @@
             }
             else {
+                // in most situations, the coordinates are not of interest. But if they are, then
+                // the event can be at most semantically equal
                 return TaskEquality.SEMANTICALLY_EQUAL;
             }
@@ -468 +474 @@
     /**
      * <p>
-     * compares two mouse button interactions such as clicks, mouse button down, or double clicks.
-     * If both interactions have the same coordinates, they are lexically equal. Otherwise, they
-     * are semantically equal. Mouse clicks for which the coordinates make no lexical difference
-     * (see {@link #clickCoordinatesMakeLexicalDifference(IEventTarget)}) are treated as
-     * lexically equal.
-     * </p>
-     * <p>
-     * The provided equality level can be used to restrict the quality check to the given level.
-     * This is done for optimization purposes. The returned equality level is as concrete as
-     * the provided one. It may be more concrete if there is no difference regarding the
-     * comparison on the levels.
-     * </p>
-     *
-     * @param interaction1  the first mouse button interaction to compare
-     * @param interaction2  the second mouse button interaction to compare
-     * @param eventTarget   the event target on which the interactions happened (used within
-     *                      special comparisons like mouse clicks on buttons, where the coordinates
-     *                      can be ignored)
+     * compares two scrolls and considers them as lexically equal if they have the same coordinates.
+     * Otherwise, they are syntactically equal as the happen on the same target
+     * </p>
+     *
+     * @param interaction1  the first scroll interaction to compare
+     * @param interaction2  the second scroll interaction to compare
      * @param equalityLevel the equality level to be checked for
      * 
@@ -494 +488 @@
                                         TaskEquality equalityLevel)
     {
-        if (equalityLevel.isAtLeast(TaskEquality.SYNTACTICALLY_EQUAL)) {
+        if (equalityLevel.isAtLeast(TaskEquality.LEXICALLY_EQUAL)) {
             int x1 = interaction1.getXPosition();
             int x2 = interaction2.getXPosition();
@@ -505 +499 @@
         }
         
-        return TaskEquality.SEMANTICALLY_EQUAL;
+        return TaskEquality.SYNTACTICALLY_EQUAL;
     }
 

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

@@ -192 +192 @@
         IIterationInstance iteration2 = (IIterationInstance) instance2;
 
-        // if both sequences do not have children, they are equal although this doesn't make sense
+        // if both iterations do not have children, they are equal although this doesn't make sense
         if ((iteration1.size() == 0) && (iteration2.size() == 0)) {
             return true;

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)) {

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

@@ -35 +35 @@
  * <p>
  * Tasks are lexically equal, if they represent the same events on a key stroke level to be
- * carried out to execute the task. Identical tasks are also syntactically equal.
+ * carried out to execute the task. Identical tasks are also lexically equal.
  * </p>
  * <p>
- * Nodes are syntactically equal, if they differ in their events on key stroke level, but the
+ * Tasks are syntactically equal, if they differ in their events on key stroke level, but the
  * syntactical result is the same. For example, entering the text "hello" into a text field can
  * be done by entering the letters in their correct order, but also by copying the text into the

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

@@ -58 +58 @@
         mRuleIndex.add(new EventTaskComparisonRule());
         mRuleIndex.add(new IterationComparisonRule());
+        mRuleIndex.add(new OptionalComparisonRule());
         mRuleIndex.add(new SequenceComparisonRule());
         mRuleIndex.add(new SelectionComparisonRule());
         mRuleIndex.add(new TaskAndIterationComparisonRule());
+        mRuleIndex.add(new TaskAndOptionalComparisonRule());
         mRuleIndex.add(new TaskAndSelectionComparisonRule());
     }