Changeset 1949 for trunk/autoquest-core-usability

Timestamp:

05/29/15 12:06:09 (9 years ago)

Author:

pharms

Message:

• changed smell detection to focus on sequences only

File:

• trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/RequiredInefficientActionsRule.java (modified) (5 diffs)

trunk/autoquest-core-usability/src/main/java/de/ugoe/cs/autoquest/usability/RequiredInefficientActionsRule.java

@@ -24 +24 @@
 import de.ugoe.cs.autoquest.eventcore.gui.Scroll;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.DefaultTaskInstanceTraversingVisitor;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.IMarkingTemporalRelationship;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
@@ -48 +47 @@
         UsabilityEvaluationResult results = new UsabilityEvaluationResult(taskModel);
 
-        Map<ITask, double[]> smellingTasks = getInefficientActionStatistics(taskModel.getTasks());
+        Map<ISequence, double[]> smellingTasks =
+            getInefficientActionStatistics(taskModel.getTasks());
+        
         analyzeTasksWithInefficientActions(smellingTasks, results, taskModel);
 
@@ -57 +58 @@
      *
      */
-    private void analyzeTasksWithInefficientActions(Map<ITask, double[]>      smellingTasks,
+    private void analyzeTasksWithInefficientActions(Map<ISequence, double[]>  smellingTasks,
                                                     UsabilityEvaluationResult results,
                                                     ITaskModel                taskModel)
     {
 
-        for (Map.Entry<ITask, double[]> entry : smellingTasks.entrySet()) {
+        for (Map.Entry<ISequence, double[]> entry : smellingTasks.entrySet()) {
             DescriptiveStatistics stats = new DescriptiveStatistics(entry.getValue());
             
@@ -84 +85 @@
      * 
      */
-    private Map<ITask, double[]> getInefficientActionStatistics(Collection<ITask> tasks) {
-        Map<ITask, double[]> inefficientActionRatios = new HashMap<ITask, double[]>();
+    private Map<ISequence, double[]> getInefficientActionStatistics(Collection<ITask> tasks) {
+        Map<ISequence, double[]> inefficientActionRatios = new HashMap<ISequence, double[]>();
         
         for (ITask task : tasks) {
-            if (taskMustBeChecked(task))  {
-                double[] ratios = getRatiosOfInefficientActionsInInstances(task);
+            if (task instanceof ISequence)  {
+                double[] ratios = getRatiosOfInefficientActionsInInstances((ISequence) task);
                 
                 for (int i = 0; i < ratios.length; i++) {
                     if (ratios[i] > 0) {
                         // there is at least on inefficient action
-                        inefficientActionRatios.put(task, ratios);
+                        inefficientActionRatios.put((ISequence) task, ratios);
                         break;
                     }
@@ -107 +108 @@
      *
      */
-    private boolean taskMustBeChecked(ITask task) {
-        if ((task instanceof IEventTask) || (task instanceof IMarkingTemporalRelationship)) {
-            // event tasks are not considered
-            // marking temporal relationships have a child, that is more important, but it will
-            // be checked independently as all tasks of a task model are checked separately
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-
-    /**
-     *
-     */
-    private double[] getRatiosOfInefficientActionsInInstances(ITask task) {
-        Collection<ITaskInstance> instances = task.getInstances();
+    private double[] getRatiosOfInefficientActionsInInstances(ISequence sequence) {
+        Collection<ITaskInstance> instances = sequence.getInstances();
         
         double[] ratios = new double[instances.size()];