Changeset 1699

Timestamp:

08/27/14 21:23:17 (10 years ago)

Author:

rkrimmel

Message:

Fixed updating Eventtaskinstances with visitor pattern

Location:

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees

Files:

• alignment/matrix/ObjectDistanceSubstitionMatrix.java (modified) (4 diffs)
• temporalrelation/RuleUtils.java (modified) (1 diff)

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java

@@ -48 +48 @@
         }
 
+        //TODO: Merge this with updateEventTaskInstances
         private void searchEventTaskInstances() {
-                int count = 0;
                 for (Iterator<ITask> it = uniqueTasks.iterator(); it.hasNext();) {
-                        count++;
-                        
                         ITask task = it.next();
                         if (!(task instanceof IEventTask)) {
@@ -62 +60 @@
                         }
                 }
-
+        }
+        
+        public void updateEventTaskInstances(LinkedList<ITask> newTasks){
+                for (Iterator<ITask> it = newTasks.iterator();it.hasNext();) {
+                        ITask task = it.next();
+                        if (!(task instanceof IEventTask)) {
+                                EventTaskInstancesListGenerator etlg = new EventTaskInstancesListGenerator();
+                                task.accept(etlg);
+                                LinkedList<IEventTaskInstance> eventTaskInstances = etlg
+                                                .getEventlist();
+                                etisOfTasks.put(task.getId(), eventTaskInstances);
+                        }
+                }
         }
         
@@ -70 +80 @@
                 if (this.calculateNonTaskInstances) {
                         Console.traceln(Level.INFO, "searching EventTasks in Tasks");
-                        searchEventTaskInstances();
+                        this.updateEventTaskInstances(newTasks);
                 }
                 
@@ -200 +210 @@
                 if (this.calculateNonTaskInstances) {
                         float tmpDistance = 0;
+                        //System.out.println(etisOfTasks);
                         LinkedList<IEventTaskInstance> eventTaskInstances = etisOfTasks
                                         .get(task1.getId());

branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java

@@ -120 +120 @@
                         }
                         ITask tempTask = model.getChildren().get(modelindex);
-                        //System.out.println("Trying to add " + parent.get(startIndex)
-                        //      + " to the model instance " + tempTask.getType());
+                        System.out.println("Trying to add " + parent.get(startIndex)
+                                + " to the model instance " + tempTask);
                         if (tempTask.getType() == "optionality") {