projects
/
anneal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
415f5dd
)
checkpoint
author
adam
<adam@megacz.com>
Sun, 16 Dec 2007 01:40:17 +0000
(17:40 -0800)
committer
adam
<adam@megacz.com>
Sun, 16 Dec 2007 01:40:17 +0000
(17:40 -0800)
darcs-hash:
20071216014017
-5007d-
11146f0964f32d8b5d45526331c66afb94e13eca
.gz
src/edu/berkeley/qfat/Mesh.java
patch
|
blob
|
history
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 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;
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; }
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 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;
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;
}
this.color = color;
this.colorclass = colorclass;
- ts.add(this);
tris.add(this);
}
public E e1() { return e1; }
tris.add(this);
}
public E e1() { return e1; }