Changeset 1767 for trunk/autoquest-core-tasktrees/src

Timestamp:

09/26/14 10:46:05 (10 years ago)

Author:

pharms

Message:

• first version of merging similar task trees

Location:

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

Files:

• temporalrelation/CondenseSimilarTasksRule.java (added)
• temporalrelation/SequenceForTaskDetectionRule.java (modified) (6 diffs)
• temporalrelation/TaskIdentityComparator.java (modified) (2 diffs)
• temporalrelation/TemporalRelationshipRuleManager.java (modified) (1 diff)
• temporalrelation/utils (added)
• temporalrelation/utils/MostSimilarTaskDeterminer.java (added)
• temporalrelation/utils/SimilarTasks.java (added)
• temporalrelation/utils/TaskTraversal.java (added)
• temporalrelation/utils/TaskTraversalMyersDiff.java (added)
• treeifc/TaskPath.java (added)
• treeifc/TaskTreeUtils.java (added)

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

@@ -27 +27 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIterationInstance;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptionalInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelectionInstance;
@@ -280 +282 @@
     {
         Map<ITask, IIteration> iterations = new HashMap<ITask, IIteration>();
+        Map<IIteration, IOptional> optionals = new HashMap<IIteration, IOptional>();
         Map<IIteration, List<IIterationInstance>> iterationInstances =
                 new HashMap<IIteration, List<IIterationInstance>>();
@@ -286 +289 @@
             IIteration iteration = taskFactory.createNewIteration();
             iterations.put(iteratedTask, iteration);
+            
+            if (iteratedTask instanceof IOptional) {
+                IOptional optional = taskFactory.createNewOptional();
+                taskBuilder.setMarkedTask(optional, iteration);
+                optionals.put(iteration, optional);
+            }
+            
             iterationInstances.put(iteration, new LinkedList<IIterationInstance>());
         }
         
+        IOptionalInstance optionalInstance;
         IIterationInstance iterationInstance;
         
         for (IUserSession session : sessions) {
             int index = 0;
+            optionalInstance = null;
             iterationInstance = null;
+            boolean inReplacement = false;
 
             while (index < session.size()) {
@@ -302 +315 @@
                 IIteration iteration = iterations.get(currentTask);
                 if (iteration != null) {
-                    if ((iterationInstance == null) || (iterationInstance.getTask() != iteration))
-                    {
-                        iterationInstance = taskFactory.createNewTaskInstance(iteration);
-                        iterationInstances.get(iteration).add(iterationInstance);
-                        taskBuilder.addTaskInstance(session, index, iterationInstance);
+                    if (!inReplacement || (iterationInstance.getTask() != iteration)) {
+                        if (currentTask instanceof IOptional) {
+                            IOptional optional = optionals.get(iteration);
+                            optionalInstance = taskFactory.createNewTaskInstance(optional);
+                            taskBuilder.addTaskInstance(session, index, optionalInstance);
+                        }
+                        else {
+                            iterationInstance = taskFactory.createNewTaskInstance(iteration);
+                            iterationInstances.get(iteration).add(iterationInstance);
+                            taskBuilder.addTaskInstance(session, index, iterationInstance);
+                        }
+                        inReplacement = true;
                         index++;
                     }
                     
-                    taskBuilder.addChild(iterationInstance, session.get(index));
+                    if (currentTask instanceof IOptional) {
+                        ITaskInstance child = ((IOptionalInstance) session.get(index)).getChild();
+                        
+                        if (child != null) {
+                            if (iterationInstance == null) {
+                                iterationInstance = taskFactory.createNewTaskInstance(iteration);
+                                iterationInstances.get(iteration).add(iterationInstance);
+                                taskBuilder.setChild(optionalInstance, iterationInstance);
+                            }
+                            taskBuilder.addChild(iterationInstance, child);
+                        }
+                    }
+                    else {
+                        taskBuilder.addChild(iterationInstance, session.get(index));
+                    }
+                    
                     taskBuilder.removeTaskInstance(session, index);
                 }
@@ -316 +351 @@
                     if (iterationInstance != null) {
                         iterationInstance = null;
+                        optionalInstance = null;
+                        inReplacement = false;
                     }
                     index++;
@@ -544 +581 @@
                     replaceTaskOccurrences(task, appData.getSessions(), sequence);
                 
-                harmonizeSequenceInstancesModel(sequence, sequenceInstances,task.size());
+                harmonizeSequenceInstancesModel(sequence, sequenceInstances, task.size());
                 appData.detectedAndReplacedTasks
                     (appData.detectedAndReplacedTasks() || (sequenceInstances.size() > 0));

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

@@ -16 +16 @@
 
 import de.ugoe.cs.autoquest.tasktrees.taskequality.TaskEquality;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 
@@ -43 +44 @@
     @Override
     public boolean equals(ITaskInstance taskInstance1, ITaskInstance taskInstance2) {
-        return taskInstance1.getTask() == taskInstance2.getTask();
+        return equals(taskInstance1.getTask(), taskInstance2.getTask());
+    }
+
+    /* (non-Javadoc)
+     * @see TaskInstanceComparator#equals(ITask, ITask)
+     */
+    @Override
+    public boolean equals(ITask task1, ITask task2) {
+        return task1 == task2;
     }        
 

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

@@ -148 +148 @@
             new SequenceForTaskDetectionRule
                 (TaskEquality.SEMANTICALLY_EQUAL, taskFactory, taskBuilder),
+            new CondenseSimilarTasksRule
+                (TaskEquality.SEMANTICALLY_EQUAL, taskFactory, taskBuilder),
             /*new DefaultTaskSequenceDetectionRule
                 (NodeEquality.SYNTACTICALLY_EQUAL, taskFactory, taskTreeBuilder),