checkpoint

darcs-hash:20071216014017-5007d-11146f0964f32d8b5d45526331c66afb94e13eca.gz

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 16722ed..c50e34c 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -14,14 +14,14 @@ public class Mesh implements Iterable<Mesh.T> {
     public static final float EPSILON = (float)0.0001;
     public static final Random random = new Random();
 
-    public HashSet<T> ts = new HashSet<T>();
-    public RTree<T> tris = new RTree<T>();
+    private RTree<T> tris = new RTree<T>();
+    private PointSet<Vert> vertices = new PointSet<Vert>();
+
     public Mesh score_against = null;
     public double score = 0;
     public float score() { return (float)score; }
     public int numedges = 0;
     public float avgedge = 0;
-    private PointSet<Vert> vertices = new PointSet<Vert>();
 
     public int size() { return vertices.size(); }
     public Iterable<Vert> vertices() { return vertices; }
@@ -807,10 +807,7 @@ public class Mesh implements Iterable<Mesh.T> {
         public void removeFromRTree() { tris.remove(this); }
         public void addToRTree() { tris.insert(this); }
 
-        public void destroy() {
-            tris.remove(this);
-            ts.remove(this);
-        }
+        public void destroy() { tris.remove(this); }
 
         T(E e1, int colorclass) {
             this.e1 = e1;
@@ -835,7 +832,6 @@ public class Mesh implements Iterable<Mesh.T> {
             }
             this.color = color;
             this.colorclass = colorclass;
-            ts.add(this);
             tris.add(this);
         }
         public E e1() { return e1; }