Merge pull request #2 from reimai/master

fixed a bug with lPickSeeds peeking two nulls
rweeks · Feb 22, 2013 · e602eb0 · e602eb0
2 parents 25ebc2e + bfe98a5
commit e602eb0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/com/newbrightidea/util/RTree.java b/src/com/newbrightidea/util/RTree.java
@@ -530,6 +530,7 @@ private RTree<T>.Node[] lPickSeeds(LinkedList<Node> nn)
   {
     @SuppressWarnings("unchecked")
     RTree<T>.Node[] bestPair = new RTree.Node[2];
+    boolean foundBestPair = false;
     float bestSep = 0.0f;
     for (int i = 0; i < numDims; i++)
     {
@@ -564,12 +565,13 @@ private RTree<T>.Node[] lPickSeeds(LinkedList<Node> nn)
         bestPair[0] = nMaxLb;
         bestPair[1] = nMinUb;
         bestSep = sep;
+        foundBestPair = true;
       }
     }
     // In the degenerate case where all points are the same, the above
     // algorithm does not find a best pair.  Just pick the first 2
     // children.
-    if ( bestPair == null )
+    if ( !foundBestPair )
     {
       bestPair = new RTree.Node[] { nn.get(0), nn.get(1) };
     }