X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FPointSet.java;h=5a7026134ea8ee9710eff34058168be051084fc7;hp=09343367acb9475a933ca456ef92bd6b2531bb1e;hb=719b7ba4c0fe32a0c9e97aeb0156a999794dd0f7;hpb=3685f1880f7505a26574d02102aafcef11b0686e

diff --git a/src/edu/berkeley/qfat/geom/PointSet.java b/src/edu/berkeley/qfat/geom/PointSet.java
index 0934336..5a70261 100644
--- a/src/edu/berkeley/qfat/geom/PointSet.java
+++ b/src/edu/berkeley/qfat/geom/PointSet.java
@@ -1,20 +1,19 @@
 package edu.berkeley.qfat.geom;
-import edu.wlu.cs.levy.CG.KDTree;
 import java.util.*;
 
 public class PointSet<V extends HasPoint> implements Iterable<V> {
 
-    private /*final*/ KDTree kd = new KDTree(3);
-    private final double[] doubles = new double[3];
+    private RTree<V> rtree = new RTree<V>();
 
     private HashMap<Point,V> exact = new HashMap<Point,V>();
 
-    public Iterator<V> iterator() {
-        return exact.values().iterator();
-    }
+    public int size() { return exact.size(); }
+
+    public Iterator<V> iterator() { return rtree.iterator(); }
+
     public void clear() {
-        kd = new KDTree(3);
-        exact = new HashMap<Point,V>();
+        exact.clear();
+        rtree = new RTree<V>();
     }
 
     public V get(Point p) {
@@ -22,10 +21,6 @@ public class PointSet<V extends HasPoint> implements Iterable<V> {
     }
 
     public void rebuild() {
-        HashMap<Point,V> old_exact = exact;
-        exact = new HashMap<Point,V>();
-        kd = new KDTree(3);
-        for(V v : old_exact.values()) add(v);
     }
 
     public void add(V v) {
@@ -33,43 +28,21 @@ public class PointSet<V extends HasPoint> implements Iterable<V> {
         if (x != null && x.equals(v)) return;
         if (x != null) throw new Error("duplicates!");
         Point p = v.getPoint();
-        doubles[0] = p.x;
-        doubles[1] = p.y;
-        doubles[2] = p.z;
-        try {
-            kd.insert(doubles, v);
-        } catch (Exception e) {
-            throw new Error(e);
-        }
+        rtree.insert(v);
         exact.put(p, v);
     }
 
-    public void remove(HasPoint v) { remove(v.getPoint()); }
-    public void remove(Point p) {
-        doubles[0] = p.x;
-        doubles[1] = p.y;
-        doubles[2] = p.z;
-        try {
-            kd.delete(doubles);
-        } catch (Exception e) { }
+    public void remove(V v) {
+        Point p = v.getPoint();
+        rtree.remove(v);
         exact.remove(p);
     }
 
     public V nearest(Point p) {
         if (exact.size()==0) return null;
-        Object[] results;
-        try {
-            doubles[0] = p.x;
-            doubles[1] = p.y;
-            doubles[2] = p.z;
-            results = kd.nearest(doubles,1);
-        } catch (Exception e) {
-            throw new Error(e);
-        }
-        return (V)results[0];
+        return rtree.nearest(p);
     }
 
-
     public Vec diagonal() {
         float min_x = Float.MAX_VALUE;
         float min_y = Float.MAX_VALUE;
@@ -77,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;
@@ -95,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;