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

Timestamp:

07/30/13 09:44:39 (11 years ago)

Author:

pharms

Message:

• improved performance of task instance trie generation by using different symbol management strategies while creating the trie. This performance improvement is significant and allows to detect tasks now in a much faster manner.

File:

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

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

@@ -19 +19 @@
 import java.util.HashMap;
 
-import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEqualityRuleManager;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
@@ -39 +34 @@
     
     /** */
-    private static final int MAX_BUFFER_SIZE = 10 * 1024 * 1024;
+    private static final int MAX_BUFFER_SIZE = 2 * 1024 * 1024;
 
     /** */
@@ -79 +74 @@
         
         if (task1 != task2) {
-            if ((task1 instanceof IEventTask) && (task2 instanceof IEventTask)) {
+            //if ((task1 instanceof IEventTask) && (task2 instanceof IEventTask)) {
                 long key = ((long) System.identityHashCode(task1)) << 32;
                 key += System.identityHashCode(task2);
@@ -92 +87 @@
                     }
                 }
-            }
+            /*}
             else {
                 result = false;
-            }
+            }*/
         }
         else {
@@ -118 +113 @@
             if (result == null) {
                 result = lexicalComparer.compare(task1, task2);
-                if (equalityBuffer.size() < 1024 * 1024 * 10) {
+                if (equalityBuffer.size() < MAX_BUFFER_SIZE) {
                     lexicalEqualityBuffer.put(key, result);
                 }
@@ -130 +125 @@
     }
     
-    /* (non-Javadoc)
-     * @see SymbolComparator#getBucketSearchOrder(Object)
-     */
-    @Override
-    public int[] getBucketSearchOrder(ITaskInstance taskInstance) {
-        // 0 = sequence; 1 = selection; 2 = iteration; 3 = optional; 4 = event task in general;
-        // other = hashCode of name of event type
-        
-        ITask task = taskInstance.getTask();
-        
-        if (task instanceof IEventTask) {
-            // event tasks are most likely equal to those of the event type with the same name,
-            // Afterwards, they may be equal to iterations, optionals, other event tasks,
-            // selections, and finally the rest.
-            IEventType eventType = ((IEventTask) task).getEventType();
-            return new int[] { eventType.getName().hashCode(), 2, 3, 4, 1 };                       
-        }
-        else if (task instanceof ISequence) {
-            return new int[] { 0, 2, 3, 1 };                       
-        }
-        else if (task instanceof ISelection) {
-            return new int[] { 1, 4, 2, 3 };                       
-        }
-        else if (task instanceof IIteration) {
-            return new int[] { 2, 1, 4 };                       
-        }
-        
-        return null;
-    }
-
+    /**
+     * <p>
+     * TODO: comment
+     * </p>
+     *
+     */
+    void clearBuffers() {
+        equalityBuffer.clear();
+        init();
+    }
+    
     /**
      * 
@@ -275 +251 @@
         }
     }
+
 }