use rtree for intersection testing

[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 48fade2..c2fd9b4 100644 (file)
--- a/src/edu/berkeley/qfat/geom/RTree.java
+++ b/src/edu/berkeley/qfat/geom/RTree.java
@@ -20,6 +20,7 @@ public class RTree<V extends HasBoundingBox> {
         rtree.init(props);
     }
 
+    public void add(V v) { insert(v); }
     public void insert(V v) {
         int id = lowid++;
         idToV.put(id, v);
@@ -30,7 +31,9 @@ public class RTree<V extends HasBoundingBox> {
     }
 
     public void remove(V v) {
-        int id = vToId.get(v);
+        Integer idi = vToId.get(v);
+        if (idi==null) return;
+        int id = idi;
         idToV.remove(id);
         vToId.remove(v);
         rtree.delete(new com.infomatiq.jsi.Rectangle(v.getMinX(), v.getMinY(), v.getMinZ(),
@@ -38,9 +41,8 @@ public class RTree<V extends HasBoundingBox> {
                      id);
     }
 
-
+    // gross...
     V found = null;
-
     private IntProcedure finder = new IntProcedure() {
             public boolean execute(int id) {
                 found = idToV.get(id);
@@ -54,4 +56,21 @@ public class RTree<V extends HasBoundingBox> {
         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);
+        visitor = null;
+    }
+
 }