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
d085fd9
..
12a82fc
100644
(file)
--- a/
src/edu/berkeley/qfat/Main.java
+++ b/
src/edu/berkeley/qfat/Main.java
@@
-267,7
+267,6
@@
public class Main extends MeshViewer {
}
public void breakit() {
}
public void breakit() {
- /*
int oldverts = verts;
System.out.println("doubling vertices.");
PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
int oldverts = verts;
System.out.println("doubling vertices.");
PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
@@
-282,12
+281,12
@@
public class Main extends MeshViewer {
Mesh.E e = es.poll();
verts++;
//System.out.println("shatter " + e);
Mesh.E e = es.poll();
verts++;
//System.out.println("shatter " + e);
- e.shatter();
+ //e.shatter(e.midpoint(), null, null, true, true);
+ e.shatter(e.midpoint(), null, null, true, false);
Thread.yield();
repaint();
}
tile.rebindPoints();
Thread.yield();
repaint();
}
tile.rebindPoints();
- */
}
public synchronized void rand(float temp, Mesh.Vertex p) {
}
public synchronized void rand(float temp, Mesh.Vertex p) {
@@
-303,7
+302,7
@@
public class Main extends MeshViewer {
Matrix m = Matrix.translate(v);
boolean good = p.move(m, false);
Matrix m = Matrix.translate(v);
boolean good = p.move(m, false);
- if (!good) { misses++; return; }
+ if (!good) { /*misses++;*/ return; }
double new_tile_error = tile.error();
double new_goal_error = goal.error();
double new_tile_error = tile.error();
double new_goal_error = goal.error();
@@
-319,6
+318,7
@@
public class Main extends MeshViewer {
goal_error = new_goal_error;
//System.out.println("error: " + tile_error + " / " + goal_error);
hits++;
goal_error = new_goal_error;
//System.out.println("error: " + tile_error + " / " + goal_error);
hits++;
+ p.goodp = p.p;
} else {
p.move(Matrix.translate(v.times(-1)), true);
misses++;
} else {
p.move(Matrix.translate(v.times(-1)), true);
misses++;
@@
-346,9
+346,9
@@
public class Main extends MeshViewer {
if (breaks > 0) {
while (breaks>0) {
breaks--;
if (breaks > 0) {
while (breaks>0) {
breaks--;
- //breakit();
+ breakit();
}
}
- //seek_upward = true;
+ seek_upward = true;
} else if (acceptance > 0.96) gamma = 0.4f;
else if (acceptance > 0.9) gamma = 0.5f;
else if (acceptance > 0.8) gamma = 0.65f;
} else if (acceptance > 0.96) gamma = 0.4f;
else if (acceptance > 0.9) gamma = 0.5f;
else if (acceptance > 0.8) gamma = 0.65f;
@@
-357,7
+357,7
@@
public class Main extends MeshViewer {
else if (acceptance > 0.15) gamma = 0.9f;
else if (acceptance > 0.05) gamma = 0.95f;
else if (acceptance > 0.01) gamma = 0.98f;
else if (acceptance > 0.15) gamma = 0.9f;
else if (acceptance > 0.05) gamma = 0.95f;
else if (acceptance > 0.01) gamma = 0.98f;
- else breaks++;
+ else { /*breaks++;*/ }
if (seek_upward) {
if (acceptance > 0.2) seek_upward = false;
if (seek_upward) {
if (acceptance > 0.2) seek_upward = false;
@@
-390,11
+390,11
@@
public class Main extends MeshViewer {
for(Mesh.E e : new Mesh.E[] { t.e1(), t.e2(), t.e3() }) {
if (e==null) continue;
if (e.stretchRatio() > max) es.add(e);
for(Mesh.E e : new Mesh.E[] { t.e1(), t.e2(), t.e3() }) {
if (e==null) continue;
if (e.stretchRatio() > max) es.add(e);
- if (t.aspect() < 0.1) es.add(e);
+ if (t.aspect() < 0.1 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
}
}
}
}
- for(int i=0; i<1; i++) {
+ for(int i=0; i<5; i++) {
Mesh.E e = es.poll();
if (e==null) break;
e.shatter();
Mesh.E e = es.poll();
if (e==null) break;
e.shatter();
@@
-409,7
+409,9
@@
public class Main extends MeshViewer {
synchronized(safeTriangles) {
safeTriangles.clear();
synchronized(safeTriangles) {
safeTriangles.clear();
- for(Mesh.T t : tile) if (t.shouldBeDrawn()) safeTriangles.add(t);
+ for(Mesh.T t : tile)
+ if (t.shouldBeDrawn())
+ safeTriangles.add(t);
}
}
}
}
}
}