Changeset 1292 for trunk


Ignore:
Timestamp:
08/10/13 10:26:17 (11 years ago)
Author:
adeicke
Message:

Refactored filter mechanism.

Location:
trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules
Files:
4 edited

Legend:

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

    r1217 r1292  
    2828import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    2929import de.ugoe.cs.autoquest.usability.EvaluationMethodCaller; 
     30import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3031import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescriptionResolver; 
    31 import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3232import de.ugoe.cs.autoquest.usability.rules.UsabilityMetric; 
    3333import de.ugoe.cs.autoquest.usability.rules.UsabilityRule; 
    3434import de.ugoe.cs.autoquest.usability.taskmodel.filter.FilterResult; 
    35 import de.ugoe.cs.autoquest.usability.taskmodel.filter.IterativeDFSFilterStrategy; 
    36 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskModelFilter; 
     35import de.ugoe.cs.autoquest.usability.taskmodel.filter.TaskModelFilter; 
    3736 
    3837/** 
     
    8281     */ 
    8382    private FilterResult extractNodesFromTaskTree() { 
    84         return new TaskModelFilter(new IterativeDFSFilterStrategy()).filterByEventType(TEXT_INPUT) 
    85             .from(this.taskModel); 
     83        return new TaskModelFilter().filter(taskModel, TEXT_INPUT); 
    8684    } 
    8785 
  • trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputEntryRepetitionsMetric.java

    r1217 r1292  
    2828import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    2929import de.ugoe.cs.autoquest.usability.EvaluationMethodCaller; 
     30import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3031import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescriptionResolver; 
    31 import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3232import de.ugoe.cs.autoquest.usability.rules.UsabilityMetric; 
    3333import de.ugoe.cs.autoquest.usability.rules.UsabilityRule; 
    3434import de.ugoe.cs.autoquest.usability.taskmodel.filter.FilterResult; 
    35 import de.ugoe.cs.autoquest.usability.taskmodel.filter.IterativeDFSFilterStrategy; 
    36 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskModelFilter; 
     35import de.ugoe.cs.autoquest.usability.taskmodel.filter.TaskModelFilter; 
    3736 
    3837/** 
     
    8281     */ 
    8382    private FilterResult extractNodesFromTaskTree() { 
    84         return new TaskModelFilter(new IterativeDFSFilterStrategy()).filterByEventType(TEXT_INPUT) 
    85             .from(this.taskModel); 
     83        return new TaskModelFilter().filter(taskModel, TEXT_INPUT); 
    8684    } 
    8785 
  • trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/metrics/TextInputRatioMetric.java

    r1217 r1292  
    2727import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    2828import de.ugoe.cs.autoquest.usability.EvaluationMethodCaller; 
     29import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    2930import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescriptionResolver; 
    30 import de.ugoe.cs.autoquest.usability.result.UsabilityProblemDescription; 
    3131import de.ugoe.cs.autoquest.usability.rules.UsabilityMetric; 
    3232import de.ugoe.cs.autoquest.usability.rules.UsabilityRule; 
    3333import de.ugoe.cs.autoquest.usability.taskmodel.filter.FilterResult; 
    34 import de.ugoe.cs.autoquest.usability.taskmodel.filter.IterativeDFSFilterStrategy; 
    35 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskModelFilter; 
     34import de.ugoe.cs.autoquest.usability.taskmodel.filter.TaskModelFilter; 
    3635 
    3736/** 
     
    8281     */ 
    8382    private FilterResult extractNodesFromTaskTree() { 
    84         return new TaskModelFilter(new IterativeDFSFilterStrategy()).filterByEventType(TEXT_INPUT) 
    85             .from(this.taskModel); 
     83        return new TaskModelFilter().filter(taskModel, TEXT_INPUT); 
    8684    } 
    8785 
  • trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/rules/patterns/InteractionPattern.java

    r1217 r1292  
    2121import com.google.common.collect.Iterables; 
    2222 
     23import de.ugoe.cs.autoquest.tasktrees.treeifc.ISelection; 
    2324import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; 
    2425import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskModel; 
    25 import de.ugoe.cs.autoquest.usability.taskmodel.filter.IterativeDFSFilterStrategy; 
    26 import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskModelFilter; 
     26import de.ugoe.cs.autoquest.usability.taskmodel.filter.ITaskModelFilter; 
     27import de.ugoe.cs.autoquest.usability.taskmodel.filter.TaskModelFilter; 
    2728import de.ugoe.cs.autoquest.usability.taskmodel.filter.types.TaskTypeFilter; 
    2829 
     
    3839    /** 
    3940     * <p> 
    40      * {@link TaskModelFilter}, which is used to filter a task model after different {@link ITask}s 
    41      * </p> 
    42      */ 
    43     private TaskModelFilter taskTreeFilter = new TaskModelFilter(new IterativeDFSFilterStrategy()); 
     41     * {@link TaskModelFilterAccessor}, which is used to filter a task model after different {@link ITask}s 
     42     * </p> 
     43     */ 
     44    private ITaskModelFilter taskTreeFilter = new TaskModelFilter(); 
    4445 
    4546    /** 
     
    188189     */ 
    189190    private List<ITask> filterAllConcernedTasksFrom(ITaskModel taskModel) { 
    190         return this.taskTreeFilter.filterByNodeType(this.rootTask).from(taskModel) 
    191             .tasksMatchedFilter(); 
     191        return this.taskTreeFilter.filter(taskModel, this.rootTask).tasksMatchedFilter(); 
    192192    } 
    193193 
Note: See TracChangeset for help on using the changeset viewer.