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

Timestamp:

08/14/13 17:04:42 (11 years ago)

Author:

pharms

Message:

• rework of task model to move event instance stuff to task instances
• introduction of sequence, selection, iteration and optional instances

File:

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

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

@@ -27 +27 @@
 
 import de.ugoe.cs.autoquest.eventcore.IEventType;
-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.IEventTaskInstance;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IIterationInstance;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelectionInstance;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequenceInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 import de.ugoe.cs.autoquest.usageprofiles.SymbolMap;
@@ -81 +80 @@
      * </p>
      */
-    private TaskComparator comparator;
+    private TaskInstanceComparator comparator;
 
     /**
@@ -117 +116 @@
      * @throws IllegalArgumentException if the provided comparator is null
      */
-    public TaskSymbolBucketedMap(TaskComparator comparator) {
+    public TaskSymbolBucketedMap(TaskInstanceComparator comparator) {
         if (comparator == null) {
             throw new IllegalArgumentException("comparator must not be null");
@@ -400 +399 @@
         // other = hashCode of name of event type
         
-        ITask task = taskInstance.getTask();
-        
-        if (task instanceof IEventTask) {
+        if (taskInstance instanceof IEventTaskInstance) {
             // 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();
+            IEventType eventType = ((IEventTaskInstance) taskInstance).getEvent().getType();
             return new int[] { eventType.getName().hashCode(), 2, 3, 4, 1 };                       
         }
-        else if (task instanceof ISequence) {
+        else if (taskInstance instanceof ISequenceInstance) {
             return new int[] { 0, 2, 3, 1 };                       
         }
-        else if (task instanceof ISelection) {
+        else if (taskInstance instanceof ISelectionInstance) {
             return new int[] { 1, 4, 2, 3 };                       
         }
-        else if (task instanceof IIteration) {
+        else if (taskInstance instanceof IIterationInstance) {
             return new int[] { 2, 1, 4 };                       
         }