Changeset 1287 for trunk

Timestamp:

08/07/13 09:09:03 (11 years ago)

Author:

pharms

Message:

• added counting of task occurrences

Location:

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

Files:

• temporalrelation/SequenceForTaskDetectionRule.java (modified) (1 diff)
• treeifc/ITaskInfo.java (modified) (2 diffs)
• treeimpl/TaskInfo.java (modified) (2 diffs)
• treeimpl/TaskModel.java (modified) (5 diffs)

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

@@ -353 +353 @@
         Console.traceln(Level.INFO, "detected and replaced " + appData.getLastFoundTasks().size() +
                         " tasks occuring " + appData.getLastFoundTasks().getOccurrenceCount() +
-                        "times");
+                        " times");
     }
 

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

@@ -19 +19 @@
 /**
  * <p>
- * yet more or less unused, this class will in the future provided extended information about a
+ * yet more or less unused, this class will in the future provide extended information about a
  * specific task, such as statistics about task occurrences, etc.
  * </p>
@@ -36 +36 @@
     public ITask getTask();
 
+    /**
+     * <p>
+     * returns the number of times a task occurred
+     * </p>
+     * 
+     * @return as described
+     */
+    public int getCount();
+
 }

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

@@ -44 +44 @@
     /**
      * <p>
+     * the number of occurrences of this task
+     * </p>
+     */
+    private int count;
+
+    /**
+     * <p>
      * initialized the task infos with the task to which they belong.
      * </p>
@@ -62 +69 @@
 
     /* (non-Javadoc)
+     * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInfo#getCount()
+     */
+    @Override
+    public int getCount() {
+        return count;
+    }
+
+    /* (non-Javadoc)
      * @see java.lang.Object#toString()
      */
     @Override
     public synchronized String toString() {
-        return "NodeInfo(" + task + ")";
+        return "TaskInfo(" + task + ")";
     }
 
+    /**
+     * <p>
+     * used to increase the counter of occurrences of this task by one
+     * </p>
+     */
+    void increaseCount() {
+        count++;
+    }
 }

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

@@ -21 +21 @@
 import java.util.Map;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.IMarkingTemporalRelationship;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.IStructuringTemporalRelationship;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstanceList;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInfo;
@@ -77 +76 @@
         for (IUserSession session : this.userSessions) {
             for (ITaskInstance taskInstance : session) {
-                addTaskToMap(taskInstance.getTask());
+                addTasksToMap(taskInstance);
             }
         }
     }
 
-
+    
     /* (non-Javadoc)
      * @see de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel#getUserSessions()
@@ -117 +116 @@
     }
 
+
+    /**
+     * <p>
+     * internal convenience method to recursively add the tasks of a task instance and its
+     * children to the task model
+     * </p>
+     *
+     * @param taskInstance the task instance of which the tasks shall be added
+     */
+    private void addTasksToMap(ITaskInstance taskInstance) {
+        addTaskToMap(taskInstance.getTask());
+        
+        if (taskInstance instanceof ITaskInstanceList) {
+            for (ITaskInstance child : (ITaskInstanceList) taskInstance) {
+                addTasksToMap(child);
+            }
+        }
+    }
+
+    
     /**
      * <p>
@@ -130 +149 @@
         }
 
-        if (task instanceof IStructuringTemporalRelationship) {
+        taskInfo.increaseCount();
+
+        /*if (task instanceof IStructuringTemporalRelationship) {
             for (ITask child : ((IStructuringTemporalRelationship) task).getChildren()) {
                 addTaskToMap(child);
@@ -137 +158 @@
         else if (task instanceof IMarkingTemporalRelationship) {
             addTaskToMap(((IMarkingTemporalRelationship) task).getMarkedTask());
-        }
+        }*/
     }