Cleaned up the new KdTree pull request

Author: Justin Wetherell

.settings/org.eclipse.jdt.ui.prefs

@@ -1,11 +1,22 @@
 package com.jwetherell.algorithms.data_structures;
 
-import java.util.*;
+import static java.lang.Math.cos;
+import static java.lang.Math.sin;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
-import static java.lang.Math.*;
-
-/** A k-d tree (short for k-dimensional tree) is a space-partitioning data
+/**
+ * A k-d tree (short for k-dimensional tree) is a space-partitioning data
  * structure for organizing points in a k-dimensional space. k-d trees are a
  * useful data structure for several applications, such as searches involving a
  * multidimensional search key (e.g. range searches and nearest neighbor
@@ -316,7 +327,8 @@ private static final List<XYZPoint> getTree(KdNode root) {
         return list;
     }
 
-    /** Searches the K nearest neighbor.
+    /** 
+     * Searches the K nearest neighbor.
      *
      * @param K
      *            Number of neighbors to retrieve. Can return more than K, if
@@ -442,15 +454,18 @@ private static final <T extends KdTree.XYZPoint> void searchNode(T value, KdNode
         }
     }
 
-    /** Adds, in a specified queue, a given node and its related nodes (lesser, greater).
-     * @param node Node to check. May be null.
-     * @param results Queue containing all found entries. Must not be null.
+    /** 
+     * Adds, in a specified queue, a given node and its related nodes (lesser, greater).
+     * 
+     * @param node 
+     *              Node to check. May be null.
+     * 
+     * @param results 
+     *              Queue containing all found entries. Must not be null.
      */
     @SuppressWarnings("unchecked")
-    private static <T extends XYZPoint> void search(final KdNode node, final Deque<T> results)
-    {
-        if (node != null)
-        {
+    private static <T extends XYZPoint> void search(final KdNode node, final Deque<T> results) {
+        if (node != null) {
             results.add((T) node.id);
             search(node.greater, results);
             search(node.lesser, results);
@@ -488,22 +503,26 @@ else if (d2.compareTo(d1) < 0)
         }
     }
 
-    /** Searches all entries from the first to the last entry.
-     * @return Iterator allowing to iterate through a collection containing all found entries.
+    /** 
+     * Searches all entries from the first to the last entry.
+     * 
+     * @return Iterator 
+     *                  allowing to iterate through a collection containing all found entries.
      */
-    public Iterator<T> iterator()
-    {
-        final Deque<T> results = new LinkedList<T>();
+    public Iterator<T> iterator() {
+        final Deque<T> results = new ArrayDeque<T>();
         search(root, results);
         return results.iterator();
     }
 
-    /** Searches all entries from the last to the first entry.
-     * @return Iterator allowing to iterate through a collection containing all found entries.
+    /** 
+     * Searches all entries from the last to the first entry.
+     * 
+     * @return Iterator 
+     *                  allowing to iterate through a collection containing all found entries.
      */
-    public Iterator<T> reverse_iterator()
-    {
-        final Deque<T> results = new LinkedList<T>();
+    public Iterator<T> reverse_iterator() {
+        final Deque<T> results = new ArrayDeque<T>();
         search(root, results);
         return results.descendingIterator();
     }

src/com/jwetherell/algorithms/data_structures/KdTree.java

@@ -1,20 +1,21 @@
 package com.jwetherell.algorithms.data_structures.test;
 
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
-
 import com.jwetherell.algorithms.data_structures.KdTree;
 import com.jwetherell.algorithms.data_structures.KdTree.XYZPoint;
 
 public class KdTreeTests {
 
     @Test
     public void testKdTree() {
-        java.util.List<XYZPoint> points = new ArrayList<XYZPoint>();
+        List<XYZPoint> points = new ArrayList<XYZPoint>();
         XYZPoint p1 = new XYZPoint(2, 3);
         points.add(p1);
         XYZPoint p2 = new XYZPoint(5, 4);
@@ -50,7 +51,7 @@ public void testKdTree() {
 
     @Test
     public void testKdTree_as_iterable() {
-        java.util.List<XYZPoint> points = new ArrayList<XYZPoint>();
+        List<XYZPoint> points = new ArrayList<XYZPoint>();
         XYZPoint p1 = new XYZPoint(2, 3);
         points.add(p1);
         XYZPoint p2 = new XYZPoint(5, 4);