Changeset 1135 for trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/IterativeDFSFilterStrategy.java

Timestamp:

03/27/13 14:10:02 (11 years ago)

Author:

adeicke

Message:

Restructuring of package structure.

File:

• trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/IterativeDFSFilterStrategy.java (copied) (copied from trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/filter/IterativeDFSFilterStrategy.java) (8 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/tasktree/IterativeDFSFilterStrategy.java

@@ -13 +13 @@
 //   limitations under the License.
 
-package de.ugoe.cs.autoquest.usability.tasktree.filter;
+package de.ugoe.cs.autoquest.usability.tasktree;
 
-import java.util.Stack;
+import java.util.LinkedList;
+import java.util.Queue;
 
 import com.google.common.base.Predicate;
@@ -23 +24 @@
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTree;
 import de.ugoe.cs.autoquest.tasktrees.treeifc.ITaskTreeNode;
+import de.ugoe.cs.autoquest.usability.tasktree.filters.EventTargetFilter;
+import de.ugoe.cs.autoquest.usability.tasktree.filters.EventTypeFilter;
+import de.ugoe.cs.autoquest.usability.tasktree.filters.TaskTreeNodeTypeFilter;
 
 /**
@@ -33 +37 @@
 public class IterativeDFSFilterStrategy implements TaskTreeFilterStrategy {
 
-    private FilterStatistic filterStatistic;
+    private FilterResult filterStatistic;
 
     @SuppressWarnings("unchecked")
     @Override
-    public FilterStatistic filter(ITaskTree taskTree, EventTargetFilter eventTarget) {
+    public FilterResult filter(ITaskTree taskTree, EventTargetFilter eventTarget) {
         Predicate<IEventTarget> filterPredicate = eventTarget.filterPredicate();
-        this.filterStatistic = new FilterStatistic(filterPredicate);
+        this.filterStatistic = new FilterResult(filterPredicate);
         traverse(taskTree);
         return this.filterStatistic;
@@ -46 +50 @@
     @SuppressWarnings("unchecked")
     @Override
-    public FilterStatistic filter(ITaskTree taskTree, EventTypeFilter eventType) {
+    public FilterResult filter(ITaskTree taskTree, EventTypeFilter eventType) {
         Predicate<IEventType> filterPredicate = eventType.filterPredicate();
-        this.filterStatistic = new FilterStatistic(filterPredicate);
+        this.filterStatistic = new FilterResult(filterPredicate);
         traverse(taskTree);
         return this.filterStatistic;
@@ -55 +59 @@
     @SuppressWarnings("unchecked")
     @Override
-    public FilterStatistic filter(ITaskTree taskTree, TaskTreeNodeTypeFilter nodeType) {
+    public FilterResult filter(ITaskTree taskTree, TaskTreeNodeTypeFilter nodeType) {
         Predicate<ITaskTreeNode> filterPredicate = nodeType.filterPredicate();
-        this.filterStatistic = new FilterStatistic(filterPredicate);
+        this.filterStatistic = new FilterResult(filterPredicate);
         traverse(taskTree);
         return this.filterStatistic;
@@ -63 +67 @@
 
     private void traverse(ITaskTree taskTree) {
-        Stack<ITaskTreeNode> unvisitedNodes = new Stack<ITaskTreeNode>();
-        unvisitedNodes.push(taskTree.getRoot());
+        Queue<ITaskTreeNode> unvisitedNodes = new LinkedList<ITaskTreeNode>();
+        unvisitedNodes.add(taskTree.getRoot());
         while (stillUnvisitedNodes(unvisitedNodes)) {
-            ITaskTreeNode node = unvisitedNodes.pop();
+            ITaskTreeNode node = unvisitedNodes.poll();
             processCurrentNode(node);
             processChildrenOfCurrentNode(unvisitedNodes, node);
@@ -72 +76 @@
     }
 
-    private boolean stillUnvisitedNodes(Stack<ITaskTreeNode> unvisitedNodes) {
+    private boolean stillUnvisitedNodes(Queue<ITaskTreeNode> unvisitedNodes) {
         return !unvisitedNodes.isEmpty();
     }
@@ -80 +84 @@
     }
 
-    private void processChildrenOfCurrentNode(Stack<ITaskTreeNode> unvisitedNodes,
+    private void processChildrenOfCurrentNode(Queue<ITaskTreeNode> unvisitedNodes,
                                               ITaskTreeNode node)
     {
         for (ITaskTreeNode child : node.getChildren()) {
-            unvisitedNodes.push(child);
+            unvisitedNodes.add(child);
         }
     }