Changeset 1127 for trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java

Timestamp:

03/18/13 11:54:15 (11 years ago)

Author:

pharms

Message:

• complete refactoring of task detection
• many performance improvements in task detection
• improved merging of sequences using Myers diff algorithm

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java (modified) (6 diffs)

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.temporalrelation;
 
+import java.util.List;
+
 import de.ugoe.cs.autoquest.eventcore.gui.ValueSelection;
 import de.ugoe.cs.autoquest.eventcore.guimodel.ITrackBar;
-import de.ugoe.cs.autoquest.tasktrees.nodeequality.NodeEquality;
 import de.ugoe.cs.autoquest.tasktrees.nodeequality.NodeEqualityRuleManager;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
@@ -97 +98 @@
 
         int index = 0;
-        while (index < parent.getChildren().size()) {
-            ITaskTreeNode child = parent.getChildren().get(index);
+        List<ITaskTreeNode> children = parent.getChildren();
+        
+        while (index < children.size()) {
+            ITaskTreeNode child = children.get(index);
 
             if ((child instanceof IEventTask) &&
@@ -128 +131 @@
             if (finalize) {
                 handleValueSelections(parent, currentTrackBar, valueSelectionStartIndex,
-                                      parent.getChildren().size() - 1, result);
+                                      children.size() - 1, result);
             }
             else {
-                result.setRuleApplicationStatus(RuleApplicationStatus.RULE_APPLICATION_FEASIBLE);
+                result.setRuleApplicationStatus(RuleApplicationStatus.FEASIBLE);
             }
         }
@@ -156 +159 @@
         taskTreeBuilder.setChild(iteration, selection);
 
+        List<ITaskTreeNode> children = parent.getChildren();
+        
         for (int i = endIndex - startIndex; i >= 0; i--) {
-            addChildIfNecessary(selection, parent.getChildren().get(startIndex), result);
+            addChildIfNecessary(selection, children.get(startIndex), result);
             taskTreeBuilder.removeChild((ISequence) parent, startIndex);
         }
@@ -163 +168 @@
         taskTreeBuilder.addChild((ISequence) parent, startIndex, iteration);
 
-        result.setRuleApplicationStatus(RuleApplicationStatus.RULE_APPLICATION_FINISHED);
+        result.setRuleApplicationStatus(RuleApplicationStatus.FINISHED);
     }
 
@@ -173 +178 @@
                                      RuleApplicationResult result)
     {
-        for (int i = 0; i < parentSelection.getChildren().size(); i++) {
-            ITaskTreeNode child = parentSelection.getChildren().get(i);
+        List<ITaskTreeNode> children = parentSelection.getChildren();
+        
+        for (int i = 0; i < children.size(); i++) {
+            ITaskTreeNode child = children.get(i);
 
             // check, if the new node is a variant for the current event task
-            NodeEquality nodeEquality = nodeEqualityRuleManager.applyRules(child, node);
-            if (nodeEquality.isAtLeast(NodeEquality.SYNTACTICALLY_EQUAL)) {
+            if (nodeEqualityRuleManager.areSyntacticallyEqual(child, node)) {
                 return;
             }