checkpoint

[anneal.git] / src / edu / berkeley / qfat / geom / RTree.java

diff --git a/src/edu/berkeley/qfat/geom/RTree.java b/src/edu/berkeley/qfat/geom/RTree.java
index cd1d217..2fab5f5 100644 (file)
--- a/src/edu/berkeley/qfat/geom/RTree.java
+++ b/src/edu/berkeley/qfat/geom/RTree.java
@@ -9,12 +9,18 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
     private com.infomatiq.jsi.rtree.RTree rtree =
         new com.infomatiq.jsi.rtree.RTree();
 
-    int lowid = 0;
-    HashMap<Integer, V> idToV = new HashMap<Integer, V>();
-    HashMap<V, Integer> vToId = new HashMap<V, Integer>();
+    private int lowid = 0;
+    private HashMap<Integer, V> idToV = new HashMap<Integer, V>();
+    private HashMap<V, Integer> vToId = new HashMap<V, Integer>();
 
     public Iterator<V> iterator() { return vToId.keySet().iterator(); }
 
+    private final MyIntProcedure myIntProcedure = new MyIntProcedure();
+    private final com.infomatiq.jsi.Rectangle rect = new com.infomatiq.jsi.Rectangle(0,0,0,0,0,0);
+    private final com.infomatiq.jsi.Point point = new com.infomatiq.jsi.Point(0,0,0);
+    private V found = null;
+    private Visitor<V> visitor = null;
+
     private static final Properties props = new Properties();
     static {
         props.put("MinNodeEntries", "1");
@@ -34,9 +40,8 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
         int id = lowid++;
         idToV.put(id, v);
         vToId.put(v, id);
-        rtree.add(new com.infomatiq.jsi.Rectangle(v.getMinX(), v.getMinY(), v.getMinZ(),
-                                                  v.getMaxX(), v.getMaxY(), v.getMaxZ()),
-                  id);
+        rect.set(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
+        rtree.add(rect, id);
     }
 
     public void remove(V v) {
@@ -45,40 +50,34 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
         int id = idi;
         idToV.remove(id);
         vToId.remove(v);
-        rtree.delete(new com.infomatiq.jsi.Rectangle(v.getMinX(), v.getMinY(), v.getMinZ(),
-                                                     v.getMaxX(), v.getMaxY(), v.getMaxZ()),
-                     id);
+        rect.set(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
+        rtree.delete(rect, id);
     }
 
-    // gross...
-    V found = null;
-    private IntProcedure finder = new IntProcedure() {
-            public boolean execute(int id) {
+    private class MyIntProcedure implements IntProcedure {
+        public boolean execute(int id) {
+            if (visitor != null) {
+                V v = idToV.get(id);
+                visitor.visit(v);
+                return true;
+            } else {
                 found = idToV.get(id);
                 return false;
             }
-        };
+        }
+    }
 
     public V nearest(Point p) {
-        rtree.nearest(new com.infomatiq.jsi.Point(p.x, p.y, p.z), finder, Float.POSITIVE_INFINITY);
+        point.set(p.x, p.y, p.z);
+        rtree.nearest(point, myIntProcedure, Float.POSITIVE_INFINITY);
         V ret = found;
         found = null;
         return ret;
     }
 
-    Visitor<V> visitor = null;
-    private IntProcedure searcher = new IntProcedure() {
-            public boolean execute(int id) {
-                V v = idToV.get(id);
-                visitor.visit(v);
-                return true;
-            }
-        };
     public void range(HasBoundingBox v, Visitor vis) {
         visitor = vis;
-        rtree.intersects(new com.infomatiq.jsi.Rectangle(v.getMinX(), v.getMinY(), v.getMinZ(),
-                                                         v.getMaxX(), v.getMaxY(), v.getMaxZ()),
-                         searcher);
+        rtree.intersects(rect, myIntProcedure);
         visitor = null;
     }