Changeset 2126

Timestamp:

05/03/16 17:06:33 (9 years ago)

Author:

pharms

Message:

• implemented some performance improvements

Location:

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

Files:

• taskequality/GUIEventTaskComparisonRule.java (modified) (3 diffs)
• temporalrelation/utils/SimilarTasks.java (modified) (1 diff)
• treeimpl/Task.java (modified) (3 diffs)

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

@@ -43 +43 @@
 import de.ugoe.cs.autoquest.eventcore.guimodel.IText;
 import de.ugoe.cs.autoquest.eventcore.guimodel.IToolTip;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
@@ -68 +69 @@
     @Override
     public boolean isApplicable(ITask task1, ITask task2) {
-        for (ITaskInstance instance : task1.getInstances()) {
-            if ((!(instance instanceof IEventTaskInstance)) ||
-                (!(((IEventTaskInstance) instance).getEvent().getType() instanceof IInteraction)))
-            {
-                return false;
-            }
-        }
-        
-        for (ITaskInstance instance : task2.getInstances()) {
-            if ((!(instance instanceof IEventTaskInstance)) ||
-                (!(((IEventTaskInstance) instance).getEvent().getType() instanceof IInteraction)))
-            {
-                return false;
-            }
+        if (!(task1 instanceof IEventTask)) {
+            return false;
+        }
+        
+        if (!(task2 instanceof IEventTask)) {
+            return false;
+        }
+        
+        IEventTaskInstance instance1 = (IEventTaskInstance) task1.getInstances().iterator().next();
+        
+        if (!(instance1.getEvent().getType() instanceof IInteraction)) {
+            return false;
+        }
+        
+        IEventTaskInstance instance2 = (IEventTaskInstance) task2.getInstances().iterator().next();
+        
+        if (!(instance2.getEvent().getType() instanceof IInteraction)) {
+            return false;
         }
         
@@ -178 +183 @@
         Collection<ITaskInstance> taskInstances1 = task1.getInstances();
         Collection<ITaskInstance> taskInstances2 = task2.getInstances();
+        
+        if (taskInstances1.size() > taskInstances2.size()) {
+            // it may be the case, that all instances of first task match already the first instance
+            // of the second task. In this case, the below for loops would iterate of all instances
+            // of the first task but the internal loop would always break. But if the first task
+            // has many more instances than the second task, performing the comparison the other
+            // way around would result in less comparisons. Hence, we switch the task instance lists
+            // to have fewer comparisons.
+            Collection<ITaskInstance> tmp = taskInstances1;
+            taskInstances1 = taskInstances2;
+            taskInstances2 = tmp;
+        }
         
         TaskEquality checkedEquality =

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

@@ -1301 +1301 @@
      */
     private boolean isInefficientAction(ITask task) {
-        ITaskInstance inst = task.getInstances().iterator().next();
-        
-        if ((inst instanceof IEventTaskInstance) &&
-            (((IEventTaskInstance) inst).getEvent().getType() instanceof Scroll))
-        {
-            return true;
+        if (task instanceof IEventTask) {
+            IEventTaskInstance inst = (IEventTaskInstance) task.getInstances().iterator().next();
+            if (inst.getEvent().getType() instanceof Scroll) {
+                return true;
+            }
+            else {
+                return false;
+            }
         }
         else if (task instanceof IMarkingTemporalRelationship) {

trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/Task.java

@@ -81 +81 @@
      * </p>
      */
-    private Collection<ITaskInstance> instances = new HashSet<ITaskInstance>();
+    private final Collection<ITaskInstance> instances = new HashSet<ITaskInstance>();
+    
+    /**
+     * <p>
+     * the unmodifiable view on the instances of this task
+     * </p>
+     */
+    private final Collection<ITaskInstance> unmodifiableInstances;
     
     /**
@@ -107 +114 @@
             throw new IllegalArgumentException("type must not be null");
         }
+        
+        unmodifiableInstances = Collections.unmodifiableCollection(instances);
     }
 
@@ -154 +163 @@
     @Override
     public Collection<ITaskInstance> getInstances() {
-        return Collections.unmodifiableCollection(instances);
+        return unmodifiableInstances;
     }