X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=c50e34ccd2e9629cea45660a136c4122bd680946;hp=16722ed847f6de28fba9ba6e4d57981f179a7a02;hb=f42953f58e189d611803dcb4661bb840d785c30a;hpb=415f5ddcc1c38053f390ec9dc6f55ae3d0101849 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index 16722ed..c50e34c 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -14,14 +14,14 @@ public class Mesh implements Iterable { public static final float EPSILON = (float)0.0001; public static final Random random = new Random(); - public HashSet ts = new HashSet(); - public RTree tris = new RTree(); + private RTree tris = new RTree(); + private PointSet vertices = new PointSet(); + 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 vertices = new PointSet(); public int size() { return vertices.size(); } public Iterable vertices() { return vertices; } @@ -807,10 +807,7 @@ public class Mesh implements Iterable { 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 { } this.color = color; this.colorclass = colorclass; - ts.add(this); tris.add(this); } public E e1() { return e1; }