projects
/
anneal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[anneal.git]
/
src
/
edu
/
berkeley
/
qfat
/
Main.java
diff --git
a/src/edu/berkeley/qfat/Main.java
b/src/edu/berkeley/qfat/Main.java
index
ddb2f97
..
f067158
100644
(file)
--- a/
src/edu/berkeley/qfat/Main.java
+++ b/
src/edu/berkeley/qfat/Main.java
@@
-178,7
+178,7
@@
public class Main extends MeshViewer {
}
public synchronized void breakit() {
}
public synchronized void breakit() {
- if (verts > 200) return;
+ if (verts > 50) return;
PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
for(Mesh.E e : tile.edges()) es.add(e);
for(int i=0; i<10; i++) {
PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
for(Mesh.E e : tile.edges()) es.add(e);
for(int i=0; i<10; i++) {
@@
-186,7
+186,7
@@
public class Main extends MeshViewer {
verts++;
System.out.println("shatter " + e);
e.shatter();
verts++;
System.out.println("shatter " + e);
e.shatter();
- //tile.rebindPoints();
+ tile.rebindPoints();
}
}
}
}
@@
-225,20
+225,19
@@
public class Main extends MeshViewer {
public void anneal() throws Exception {
int verts = 0;
while(true) {
public void anneal() throws Exception {
int verts = 0;
while(true) {
- for(int i=0; i<1; i++) {
+ HashSet<Mesh.Vert> hs = new HashSet<Mesh.Vert>();
+ for(Mesh.Vert p : tile.vertices()) hs.add(p);
+ for(int i=0; i<10; i++) {
repaint();
repaint();
- for(Mesh.T t : tile)
- for(Mesh.Vert p : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) {
- rand(10,p);
- }
- goal.unscore();
- tile.unscore();
- goal.fundamental();
- tile.fundamental();
- goal.rescore();
- tile.rescore();
+ for(Mesh.Vert v : hs) rand(10,v);
}
breakit();
}
breakit();
+ repaint();
+ goal.unscoreAll();
+ repaint();
+ tile.recomputeAllFundamentalQuadrics();
+ repaint();
+ goal.rescoreAll();
}
}
}
}