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

Timestamp:

09/07/17 16:15:00 (7 years ago)

Author:

pharms

Message:

• changes for first VR oriented usability evaluation

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

@@ -17 +17 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 
-import de.ugoe.cs.autoquest.eventcore.Event;
-import de.ugoe.cs.autoquest.eventcore.gui.Scroll;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.DefaultTaskInstanceTraversingVisitor;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.DefaultTaskTraversingVisitor;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
@@ -90 +92 @@
         for (ITask task : tasks) {
             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((ISequence) task, ratios);
-                        break;
+                if (countEfficientActions((ISequence) task) > 1) {
+                    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((ISequence) task, ratios);
+                            break;
+                        }
                     }
                 }
@@ -103 +107 @@
         
         return inefficientActionRatios;
+    }
+
+    /**
+     * 
+     */
+    private int countEfficientActions(ISequence task) {
+        final List<IEventTask> efficientActions = new LinkedList<>();
+        
+        task.accept(new DefaultTaskTraversingVisitor() {
+            @Override
+            public void visit(IEventTask eventTask) {
+                if (!ActionClassifier.isInefficient(eventTask)) {
+                    efficientActions.add(eventTask);
+                }
+            }
+        });
+        
+        return efficientActions.size();
     }
 
@@ -131 +153 @@
             @Override
             public void visit(IEventTaskInstance eventTaskInstance) {
-                if (isInefficientAction(eventTaskInstance.getEvent())) {
+                if (ActionClassifier.isInefficient(eventTaskInstance.getEvent())) {
                     count[0]++;
                 }
@@ -143 +165 @@
     }
 
-    /**
-     *
-     */
-    private boolean isInefficientAction(Event event) {
-        return (event.getType() instanceof Scroll);
-    }
-
 }