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

Timestamp:

03/05/15 11:43:42 (9 years ago)

Author:

pharms

Message:

• remove support for tasks contexts in value measurements

File:

• trunk/autoquest-core-tasktrees/src/main/java/de/ugoe/cs/autoquest/tasktrees/treeimpl/TaskModel.java (modified) (14 diffs)

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

@@ -146 +146 @@
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return "Task Model (" + userSessions.size() + " sessions, " + index.taskMap.size() +
+            " tasks, hash " + System.identityHashCode(this) + ")";
+    }
+
     /**
      * <p>
@@ -158 +167 @@
             for (IUserSession session : this.userSessions) {
                 for (ITaskInstance taskInstance : session) {
-                    index.handleTaskInstance(taskInstance, null);
+                    index.handleTaskInstance(taskInstance);
                 }
             }
@@ -187 +196 @@
                 
                 eventCoverageRatios[i++] = coverageRatio;
-                info.setCount(TaskMetric.EVENT_COVERAGE_RATIO, null, coverageRatio);
+                info.setCount(TaskMetric.EVENT_COVERAGE_RATIO, coverageRatio);
             }
             
@@ -201 +210 @@
                 quantile = 1000 * quantile / eventCoverageRatios.length;
                 
-                info.setCount(TaskMetric.EVENT_COVERAGE_QUANTILE, null, quantile);
+                info.setCount(TaskMetric.EVENT_COVERAGE_QUANTILE, quantile);
             }
             
@@ -242 +251 @@
          * </p>
          */
-        private int[] handleTaskInstance(ITaskInstance taskInstance, ITask context) {
+        private int[] handleTaskInstance(ITaskInstance taskInstance) {
             int eventTaskInstancesCovered = 0;
             int depth = 0;
@@ -248 +257 @@
             if (taskInstance instanceof ITaskInstanceList) {
                 for (ITaskInstance child : (ITaskInstanceList) taskInstance) {
-                    int[] measures = handleTaskInstance(child, taskInstance.getTask());
+                    int[] measures = handleTaskInstance(child);
                     eventTaskInstancesCovered += measures[0];
                     depth = Math.max(depth, measures[1]);
@@ -257 +266 @@
                 {
                     // ensure also empty task infos for unselected variants
-                    ensureTaskInfo(((IIteration) taskInstance.getTask()).getMarkedTask(), context);
+                    ensureTaskInfo(((IIteration) taskInstance.getTask()).getMarkedTask());
                 }
             }
             else if (taskInstance instanceof ISelectionInstance) {
                 ITaskInstance child = ((ISelectionInstance) taskInstance).getChild();
-                int[] measures = handleTaskInstance(child, taskInstance.getTask());
+                int[] measures = handleTaskInstance(child);
                 eventTaskInstancesCovered += measures[0];
                 depth = Math.max(depth, measures[1]);
@@ -268 +277 @@
                 // ensure also empty task infos for unselected variants
                 for (ITask otherChildTask : ((ISelection) taskInstance.getTask()).getChildren()) {
-                    ensureTaskInfo(otherChildTask, context);
+                    ensureTaskInfo(otherChildTask);
                 }
             }
@@ -274 +283 @@
                 ITaskInstance child = ((IOptionalInstance) taskInstance).getChild();
                 if (child != null) {
-                    int[] measures = handleTaskInstance(child, taskInstance.getTask());
+                    int[] measures = handleTaskInstance(child);
                     eventTaskInstancesCovered += measures[0];
                     depth = Math.max(depth, measures[1]);
@@ -280 +289 @@
                 else {
                     // ensure also empty task infos for unselected variants
-                    ensureTaskInfo(((IOptional) taskInstance.getTask()).getMarkedTask(), context);
+                    ensureTaskInfo(((IOptional) taskInstance.getTask()).getMarkedTask());
                 }
             }
@@ -289 +298 @@
             depth++;
             
-            ensureTaskInfo(taskInstance.getTask(), context, eventTaskInstancesCovered, depth);
+            ensureTaskInfo(taskInstance.getTask(), eventTaskInstancesCovered, depth);
             
             return new int[] { eventTaskInstancesCovered, depth };
@@ -299 +308 @@
          * </p>
          */
-        private void ensureTaskInfo(ITask task, ITask context) {
-            ensureTaskInfo(task, context, 0, 0);
+        private void ensureTaskInfo(ITask task) {
+            ensureTaskInfo(task, 0, 0);
             
             if (task instanceof IStructuringTemporalRelationship) {
                 for (ITask child : ((IStructuringTemporalRelationship) task).getChildren()) {
-                    ensureTaskInfo(child, task);
+                    ensureTaskInfo(child);
                 }
             }
             else if (task instanceof IMarkingTemporalRelationship) {
-                ensureTaskInfo(((IMarkingTemporalRelationship) task).getMarkedTask(), task);
+                ensureTaskInfo(((IMarkingTemporalRelationship) task).getMarkedTask());
             }
         
@@ -322 +331 @@
          */
         private void ensureTaskInfo(ITask task,
-                                    ITask context,
                                     int   eventTaskInstancesCovered,
                                     int   depth)
@@ -335 +343 @@
                 taskMap.put(task, taskInfo);
                 
-                taskInfo.setCount(TaskMetric.DEPTH, null, getDepth(task));
-            }
-
-            taskInfo.increaseCount(TaskMetric.COUNT, context, 1);
-            taskInfo.increaseCount(TaskMetric.EVENT_COVERAGE, context, eventTaskInstancesCovered);
-
-            taskInfo.setCount(TaskMetric.DEPTH, context, depth);
+                taskInfo.setCount(TaskMetric.DEPTH, getDepth(task));
+            }
+
+            taskInfo.increaseCount(TaskMetric.COUNT, 1);
+            taskInfo.increaseCount(TaskMetric.EVENT_COVERAGE, eventTaskInstancesCovered);
+
+            taskInfo.setCount(TaskMetric.DEPTH, depth);
         }