Changeset 1889 for trunk

Timestamp:

03/05/15 11:40:19 (9 years ago)

Author:

pharms

Message:

• added support for separating task tree generation and merging

Location:

trunk

Files:

• autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/manager/TaskTreeManager.java (modified) (1 diff)
• autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/TemporalRelationshipRuleManager.java (modified) (1 diff)
• autoquest-ui-core/src/main/java/de/ugoe/cs/autoquest/commands/usability/CMDmergeSimilarTasks.java (added)
• autoquest-ui-core/src/main/resources/manuals/mergeSimilarTasks (added)

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

@@ -154 +154 @@
         finishSession();
         
-        Console.traceln(Level.INFO, "applying temporal relationship generation rules");
+        Console.traceln
+            (Level.INFO, "applying temporal relationship generation rules for detecting tasks");
         
-        ComponentManager.getTemporalRelationshipRuleManager().applyRules(sessions);
+        ComponentManager.getTemporalRelationshipRuleManager().applyTaskDetectionRule(sessions);
+
+        return taskFactory.createTaskModel(sessions);
+    }
+
+    /**
+     * <p>
+     * merges similar tasks in the given task model and returns a condensed task model
+     * </p>
+     * 
+     * @param inputModel the model with the tasks to be merged
+     * 
+     * @return as described
+     */
+    public synchronized ITaskModel mergeSimilarTasks(ITaskModel inputModel) {
+        Console.traceln
+            (Level.INFO, "applying temporal relationship generation rules for merging tasks");
+        
+        sessions = inputModel.getUserSessions();
+        
+        ComponentManager.getTemporalRelationshipRuleManager().applyTaskMergingRule(sessions);
 
         return taskFactory.createTaskModel(sessions);

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

@@ -183 +183 @@
      * </p>
      * 
-     * @param taskFactory  the task factory to be used for instantiating new tasks.
+     * @param sessions  the sessions to be processed
      */
     public void applyRules(List<IUserSession> sessions) {
         applyRules(sessionScopeRules, sessions, "");
+    }
+
+    /**
+     * <p>
+     * applies only the known rules for task detection, i.e., currently only the sequence for task
+     * detection rule
+     * </p>
+     * 
+     * @param sessions  the sessions to be processed
+     */
+    public void applyTaskDetectionRule(List<IUserSession> sessions) {
+        ISessionScopeRule[] rules = new ISessionScopeRule[] {
+            new SequenceForTaskDetectionRule
+                (TaskEquality.SEMANTICALLY_EQUAL, taskFactory, taskBuilder)
+        };
+        
+        applyRules(rules, sessions, "");
+    }
+
+    /**
+     * <p>
+     * applies only the known rules for task merging, i.e., currently only the condense similar task
+     * rule
+     * </p>
+     * 
+     * @param sessions  the sessions to be processed
+     */
+    public void applyTaskMergingRule(List<IUserSession> sessions) {
+        ISessionScopeRule[] rules = new ISessionScopeRule[] {
+            new CondenseSimilarTasksRule
+                (TaskEquality.SEMANTICALLY_EQUAL, taskFactory, taskBuilder)
+        };
+        
+        applyRules(rules, sessions, "");
     }