Changeset 1319 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules

Timestamp:

11/08/13 22:34:21 (11 years ago)

Author:

khartmann

Message:

• Reworked Filters to use the first instance of a task to provide type and target
• Added a function to extract all tasks matching a given filter
• Added simple console feedback for matched usability problems

Location:

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules

Files:

• UsabilityMetricsRuleset.java (modified) (1 diff)
• patterns/InteractionPattern.java (modified) (9 diffs)
• patterns/InteractionPatternVisitor.java (modified) (3 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/UsabilityMetricsRuleset.java

@@ -42 +42 @@
      * 
      */
-    private UsabilityMetricsRuleset(ITaskModel taskModel) {
+    public UsabilityMetricsRuleset(ITaskModel taskModel) {
         this.metrics = Lists.newArrayList();
         metrics.add(new NoLetterOrDigitRatioMetric(taskModel));

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPattern.java

@@ -15 +15 @@
 package de.ugoe.cs.autoquest.usability.rules.patterns;
 
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 
@@ -107 +109 @@
      * 
      * <p>
+     * Returns all tasks of the given task model matching the provided interaction pattern.
+     * </p>
+     * 
+     * @param taskModel
+     *            {@link ITaskModel}, which might contain the interaction pattern
+     * @return all tasks matched
+     */
+    public Collection<ITask> matchingTasks(ITaskModel taskModel) {
+        List<ITask> allConcernedTasks = filterAllConcernedTasksFrom(taskModel);
+        for (Iterator<ITask> iterator = allConcernedTasks.iterator(); iterator.hasNext();) {
+            ITask concernedTask = iterator.next();
+            checkTask(concernedTask);
+            if (this.present)
+                this.present = false;
+            else
+                iterator.remove();
+        }
+        return allConcernedTasks;
+    }
+
+    /**
+     * 
+     * <p>
      * Checks a single {@link ITask} for the interaction pattern.
      * </p>
@@ -114 +139 @@
      */
     private void checkTask(ITask task) {
+        System.out.println("+++++++++++++++");
+        System.out.println(task);
+        System.out.println(this);
+        System.out.println(this.patternVisitors);
         applyAllVisitors(task);
+        System.out.println("------------");
         if (allVisitorsArePresent()) {
             this.present = true;
@@ -121 +151 @@
             resetAllVisitors();
         }
+        System.out.println("^^^^^^^^^^^^");
     }
 
@@ -134 +165 @@
      */
     public boolean containedIn(ITask task) {
+        System.out.println('>');
         checkTask(task);
+        System.out.println("< "+this.present);
         return this.present;
     }
@@ -151 +184 @@
         Optional<InteractionPatternVisitor> previousVisitor = Optional.absent();
         for (InteractionPatternVisitor visitor : patternVisitors) {
+            System.out.print(visitor+" ");
             if (appliedOnSelectionNode(previousVisitor)) {
+                System.out.println("Selection");
                 for (ITask selection : previousVisitor.get().getRetainedSelectionNodes()) {
                     selection.accept(visitor);
@@ -157 +192 @@
             }
             else {
+                System.out.println("Normal");
                 previousVisitor = Optional.of(visitor);
                 task.accept(visitor);
             }
+            System.out.println(visitor.isPresent() ? '1' : '0');
         }
     }
@@ -208 +245 @@
 
             });
-        return Iterables.size(allPresent) == this.patternVisitors.size();
+        int cnt = Iterables.size(allPresent);
+        System.out.printf("%d/%d\n", cnt, this.patternVisitors.size());
+        return cnt == this.patternVisitors.size();
     }
 
@@ -218 +257 @@
      */
     private void resetAllVisitors() {
+        System.out.println("+RESET+");
         for (InteractionPatternVisitor visitor : this.patternVisitors) {
             visitor.reset();

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPatternVisitor.java

@@ -20 +20 @@
 
 import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
+import de.ugoe.cs.autoquest.eventcore.Event;
 import de.ugoe.cs.autoquest.eventcore.IEventTarget;
 import de.ugoe.cs.autoquest.eventcore.IEventType;
 import de.ugoe.cs.autoquest.eventcore.StringEventType;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IIteration;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.IOptional;
@@ -31 +34 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ISequence;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskInstance;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskVisitor;
 import de.ugoe.cs.autoquest.test.DummyGUIElement;
@@ -67 +71 @@
     public void visit(IEventTask event) {
         if (!this.present && isEventVisitor()) {
-                boolean matchesEventType = matchesEventType(event.getEventType());
-                boolean matchesEventTarget = matchesEventTarget(event.getEventTarget());
+                Event eventRepresentative = ((IEventTaskInstance) event.getInstances().iterator().next()).getEvent();
+                boolean matchesEventType = matchesEventType(eventRepresentative.getType());
+                boolean matchesEventTarget = matchesEventTarget(eventRepresentative.getTarget());
                 this.present = eventTarget != null ? matchesEventType && matchesEventTarget : matchesEventType;
         }
+        System.out.printf("%s [%s, %s, %s]: %s\n", event, this.eventType, this.eventTarget, this.taskType, this.present);
+        System.out.println(this.getClass().getSimpleName() + " "+ this.hashCode());
     }