X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FRTree.java;h=57f20c894faf0d434c820cbf6e91f32781f4d3f4;hp=5a29093ec98bcf1a48b5b9abc3db7ecc77f8fa0b;hb=4561a5ff23ca77f6deb217d3cff6253057735d30;hpb=5239d59bb876c25b263a24dbff11dc7a9082a431

diff --git a/src/edu/berkeley/qfat/geom/RTree.java b/src/edu/berkeley/qfat/geom/RTree.java
index 5a29093..57f20c8 100644
--- a/src/edu/berkeley/qfat/geom/RTree.java
+++ b/src/edu/berkeley/qfat/geom/RTree.java
@@ -11,13 +11,14 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
         new com.infomatiq.jsi.rtree.RTree();
 
     private int lowid = 0;
-    private HashMap<Integer, V> idToV = new HashMap<Integer, V>();
-    private HashMap<V, Integer> vToId = new HashMap<V, Integer>();
+    private HashMap<Integer, V> idToV     = new HashMap<Integer, V>();
+    private HashMap<V, Integer> vToId     = new HashMap<V, Integer>();
+    private HashMap<V, Rectangle> vToRect = new HashMap<V, Rectangle>();
 
     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 Rectangle rect = new 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;
@@ -33,6 +34,7 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
     public void clear() {
         idToV.clear();
         vToId.clear();
+        vToRect.clear();
         rtree.init(props);
     }
 
@@ -41,8 +43,9 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
         int id = lowid++;
         idToV.put(id, v);
         vToId.put(v, id);
-        rect.set(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
+        Rectangle rect = new Rectangle(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
         rtree.add(rect, id);
+        vToRect.put(v, rect);
     }
 
     public void remove(V v) {
@@ -51,8 +54,8 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
         int id = idi;
         idToV.remove(id);
         vToId.remove(v);
-        rect.set(v.getMinX(), v.getMinY(), v.getMinZ(), v.getMaxX(), v.getMaxY(), v.getMaxZ());
-        rtree.delete(rect, id);
+        rtree.delete(vToRect.get(v), id);
+        vToRect.remove(v);
     }
 
     public V nearest(Point p) { return nearest(p, null); }