Changeset 1692 for branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation

Timestamp:

08/23/14 17:19:39 (10 years ago)

Author:

rkrimmel

Message:

HarmonizeIterationinstancemodel? DOES need to be called after iteration detection....

Location:

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

Files:

• RuleUtils.java (modified) (2 diffs)
• SequenceForTaskDetectionRuleAlignment.java (modified) (3 diffs)

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

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.tasktrees.temporalrelation;
 
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IIterationInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IMarkingTemporalRelationship;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
@@ -145 +147 @@
 
                         } else if (tempTask.getType() == "sequence") {
-                                //System.out.println("Adding SequenceInstance " + parent.get(startIndex) + " to " + tempTask.getType());
-                                taskBuilder.addChild(subsequence,parent.get(startIndex));
+                                //ISequenceInstance sequence = taskFactory.createNewTaskInstance((ISequence) tempTask);
+                                //taskBuilder.addChild(sequence, parent.get(i));
+                                //taskBuilder.addChild(subsequence,sequence);
+                                taskBuilder.addChild(subsequence, parent.get(startIndex));
                         } else if (tempTask.getType() == "iteration") {
+                                //IIterationInstance iteration = taskFactory.createNewTaskInstance((IIteration) tempTask);
+                                //taskBuilder.addChild(iteration, parent.get(startIndex));
+                                //taskBuilder.addChild(subsequence, iteration);
                                 taskBuilder.addChild(subsequence, parent.get(startIndex));
                                 //System.out.println("Adding IterationInstance " + parent.get(startIndex) + " to " + tempTask.getType());

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

@@ -38 +38 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelectionInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequenceInstance;
@@ -138 +139 @@
         public RuleApplicationResult apply(List<IUserSession> sessions) {
                 RuleApplicationData appData = new RuleApplicationData(sessions);
+                
                 harmonizeEventTaskInstancesModel(appData);
-                
                 do {
                         iteration++;
+                        
                         appData.detectedAndReplacedTasks = false;
                         appData.getStopWatch().start("whole loop"); 
@@ -364 +366 @@
                         }
                 }
-        }
+                  
+        for (Map.Entry<IIteration, List<IIterationInstance>> entry : iterationInstances.entrySet())
+        {
+            harmonizeIterationInstancesModel(entry.getKey(), entry.getValue());
+        }
+        }
+
+        
+        /**
+     * <p>
+     * TODO clarify why this is done
+     * </p>
+     */
+    private void harmonizeIterationInstancesModel(IIteration               iteration,
+                                                  List<IIterationInstance> iterationInstances)
+    {
+        List<ITask> iteratedTaskVariants = new LinkedList<ITask>();
+        TaskInstanceComparator comparator = preparationTaskHandlingStrategy.getTaskComparator();
+        
+        // merge the lexically different variants of iterated task to a unique list 
+        for (IIterationInstance iterationInstance : iterationInstances) {
+            for (ITaskInstance executionVariant : iterationInstance) {
+                ITask candidate = executionVariant.getTask();
+            
+                boolean found = false;
+                for (ITask taskVariant : iteratedTaskVariants) {
+                    if (comparator.areLexicallyEqual(taskVariant, candidate)) {
+                        taskBuilder.setTask(executionVariant, taskVariant);
+                        found = true;
+                        break;
+                    }
+                }
+                
+                if (!found) {
+                    iteratedTaskVariants.add(candidate);
+                }
+            }
+        }
+        
+        // if there are more than one lexically different variant of iterated tasks, adapt the
+        // iteration model to be a selection of different variants. In this case also adapt
+        // the generated iteration instances to correctly contain selection instances. If there
+        // is only one variant of an iterated task, simply set this as the marked task of the
+        // iteration. In this case, the instances can be preserved as is
+        if (iteratedTaskVariants.size() > 1) {
+            ISelection selection = taskFactory.createNewSelection();
+            
+            for (ITask variant : iteratedTaskVariants) {
+                taskBuilder.addChild(selection, variant);
+            }
+            
+            taskBuilder.setMarkedTask(iteration, selection);
+            
+            for (IIterationInstance instance : iterationInstances) {
+                for (int i = 0; i < instance.size(); i++) {
+                    ISelectionInstance selectionInstance =
+                        taskFactory.createNewTaskInstance(selection);
+                    taskBuilder.setChild(selectionInstance, instance.get(i));
+                    taskBuilder.setTaskInstance(instance, i, selectionInstance);
+                }
+            }
+        }
+        else {
+            taskBuilder.setMarkedTask(iteration, iteratedTaskVariants.get(0));
+        }
+    }
+
 
         ISequence matchAsSequence(RuleApplicationData appData, Match m) {