Changeset 1152 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/NoLetterOrDigitRatioMetric.java

Timestamp:

04/08/13 16:50:21 (11 years ago)

Author:

pharms

Message:

• complete refactoring of task tree model with a separation of task models and task instances

File:

• trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/NoLetterOrDigitRatioMetric.java (modified) (4 diffs)

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

@@ -25 +25 @@
 import com.google.common.collect.Multiset;
 
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
-import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask;
+import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel;
 import de.ugoe.cs.autoquest.usability.EvaluationMethodCaller;
 import de.ugoe.cs.autoquest.usability.result.DefectDescriptionResolver;
@@ -34 +34 @@
 import de.ugoe.cs.autoquest.usability.tasktree.FilterResult;
 import de.ugoe.cs.autoquest.usability.tasktree.IterativeDFSFilterStrategy;
-import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTreeFilter;
+import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskModelFilter;
 
 /**
@@ -52 +52 @@
      * @param taskTree
      */
-    public NoLetterOrDigitRatioMetric(ITaskTree taskTree) {
-        super(taskTree);
+    public NoLetterOrDigitRatioMetric(ITaskModel taskModel) {
+        super(taskModel);
         this.name = "NoLetterOrDigitRatio";
         this.defect = new DefectDescriptionResolver().descriptionFor(this.getClass().getSimpleName());
@@ -64 +64 @@
     public Optional<UsabilityDefect> calculate() {
         FilterResult textInputEvents = extractNodesFromTaskTree();
-        float evaluationMetric = calculateEvaluationMetric(textInputEvents.nodesMatchedFilter());
+        float evaluationMetric = calculateEvaluationMetric(textInputEvents.tasksMatchedFilter());
         return this.defect.isPresent(evaluationMetric);
     }
     
     private FilterResult extractNodesFromTaskTree() {
-        return new TaskTreeFilter(new IterativeDFSFilterStrategy()).filterByEventType(TEXT_INPUT)
-            .from(this.taskTree);
+        return new TaskModelFilter(new IterativeDFSFilterStrategy()).filterByEventType(TEXT_INPUT)
+            .from(this.taskModel);
     }
     
-    private float calculateEvaluationMetric(List<ITaskTreeNode> textInputEvents) {
+    private float calculateEvaluationMetric(List<ITask> textInputEvents) {
         Multiset<String> enteredTextFragments =
             aggregateEnteredTextFromTextInputs(textInputEvents);