checkpoint

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

diff --git a/src/edu/berkeley/qfat/geom/PointSet.java b/src/edu/berkeley/qfat/geom/PointSet.java
index 2733daf..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 Iterator<V> iterator() {
-        return exact.values().iterator();
-    }
+    public Iterator<V> iterator() { return rtree.iterator(); }
+
     public void clear() {
-        exact = new HashMap<Point,V>();
+        exact.clear();
         rtree = new RTree<V>();
     }
 
@@ -51,7 +50,8 @@ public class PointSet<V extends HasPoint> implements Iterable<V> {
         float max_x = Float.MIN_VALUE;
         float max_y = Float.MIN_VALUE;
         float max_z = Float.MIN_VALUE;
-        for(Point p : exact.keySet()) {
+        for(V v : this) {
+            Point p = v.getPoint();
             if (p.x < min_x) min_x = p.x;
             if (p.y < min_y) min_y = p.y;
             if (p.z < min_z) min_z = p.z;
@@ -69,7 +69,8 @@ public class PointSet<V extends HasPoint> implements Iterable<V> {
         float max_x = Float.MIN_VALUE;
         float max_y = Float.MIN_VALUE;
         float max_z = Float.MIN_VALUE;
-        for(Point p : exact.keySet()) {
+        for(V v : this) {
+            Point p = v.getPoint();
             if (p.x < min_x) min_x = p.x;
             if (p.y < min_y) min_y = p.y;
             if (p.z < min_z) min_z = p.z;