checkpoint

darcs-hash:20071216011804-5007d-7a1191f3fe6993fd890c781287fff7d7d3ff785a.gz

diff --git a/src/edu/berkeley/qfat/geom/PointSet.java b/src/edu/berkeley/qfat/geom/PointSet.java
index ccb0ca5..5a70261 100644 (file)
--- a/src/edu/berkeley/qfat/geom/PointSet.java
+++ b/src/edu/berkeley/qfat/geom/PointSet.java
@@ -9,11 +9,10 @@ public class PointSet<V extends HasPoint> implements Iterable<V> {
 
     public int size() { return exact.size(); }
 
 
     public int size() { return exact.size(); }
 

-    public Iterator<V> iterator() {
-        return exact.values().iterator();
-    }
+    public Iterator<V> iterator() { return rtree.iterator(); }
+

     public void clear() {
     public void clear() {

-        exact = new HashMap<Point,V>();
+        exact.clear();

         rtree = new RTree<V>();
     }
 
         rtree = new RTree<V>();
     }
 

diff --git a/src/edu/berkeley/qfat/geom/RTree.java b/src/edu/berkeley/qfat/geom/RTree.java
index eaa9f69..cd1d217 100644 (file)
--- a/src/edu/berkeley/qfat/geom/RTree.java
+++ b/src/edu/berkeley/qfat/geom/RTree.java
@@ -15,10 +15,17 @@ public class RTree<V extends HasBoundingBox> implements Iterable<V> {
 
     public Iterator<V> iterator() { return vToId.keySet().iterator(); }
 
 
     public Iterator<V> iterator() { return vToId.keySet().iterator(); }
 

-    public RTree() {
-        Properties props = new Properties();
+    private static final Properties props = new Properties();
+    static {

         props.put("MinNodeEntries", "1");
         props.put("MaxNodeEntries", "5");
         props.put("MinNodeEntries", "1");
         props.put("MaxNodeEntries", "5");

+    }
+
+    public RTree() { clear(); }
+
+    public void clear() {
+        idToV.clear();
+        vToId.clear();

         rtree.init(props);
     }
 
         rtree.init(props);
     }