diff --git a/app/src/main/java/ch/nuth/zhaw/exbox/TreeTraversal.java b/app/src/main/java/ch/nuth/zhaw/exbox/TreeTraversal.java index cf9990f..1b45e0b 100644 --- a/app/src/main/java/ch/nuth/zhaw/exbox/TreeTraversal.java +++ b/app/src/main/java/ch/nuth/zhaw/exbox/TreeTraversal.java @@ -52,7 +52,7 @@ public class TreeTraversal> implements Traversal { queue.add(root); while (!queue.isEmpty()) { - TreeNode node = queue.poll(); + TreeNode node = queue.pop(); if (node.left != null) { queue.add(node.left); @@ -67,8 +67,27 @@ public class TreeTraversal> implements Traversal { } @Override - public void interval(T min, T max, Visitor vistor) { - // TODO Auto-generated method stub - + public void interval(T min, T max, Visitor visitor) { + Deque> queue = new LinkedList<>(); + queue.add(root); + + while (!queue.isEmpty()) { + TreeNode node = queue.pop(); + + if (node != null) { + T value = node.getValue(); + + if (value.compareTo(min) >= 0 && value.compareTo(max) <= 0) { + visitor.visit(value); + queue.add(node.left); + queue.add(node.right); + } else if (value.compareTo(max) > 0) { + queue.add(node.left); + } + else if (value.compareTo(min) < 0) { + queue.add(node.right); + } + } + } } }