X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=1582d693849d4cc232f68de565a2fc54d437c4a0;hb=20989b5562ed9a4b438db2da8a4c2c3b9a05801d;hp=c4dcf5a8b31f26647b726388a29dfaed269f4340;hpb=1229f4eaa0337691b51ecd3e0baebddc2644f2c3;p=anneal.git diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index c4dcf5a..1582d69 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -8,10 +8,17 @@ import java.util.*; import edu.berkeley.qfat.geom.*; import edu.berkeley.qfat.geom.Point; +// TO DO: +// - real anneal +// - solve self-intersection problem +// - get a better test model? + // FIXME: re-orient goal (how?) public class Main extends MeshViewer { + public static int verts = 0; + public static final Random random = new Random(); /** magnification factor */ @@ -25,9 +32,11 @@ public class Main extends MeshViewer { Point p1 = new Point(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG); Point p2 = new Point(stlf.coordArray[i+2].x * MAG, stlf.coordArray[i+2].y * MAG, stlf.coordArray[i+2].z * MAG); Vec n = new Vec(stlf.normArray[i/3].x * MAG, stlf.normArray[i/3].y * MAG, stlf.normArray[i/3].z * MAG); - Mesh.T t = goal.newT(p0, p1, p2, n); + Mesh.T t = goal.newT(p0, p1, p2, n, 0); } + goal.ignorecollision = true; + // rotate to align major axis -- this probably needs to be done by a human. goal.transform(new Matrix(new Vec(0, 0, 1), (float)(Math.PI/2))); @@ -35,52 +44,85 @@ public class Main extends MeshViewer { float goal_height = goal.diagonal().dot(new Vec(0, 1, 0)); float goal_depth = goal.diagonal().dot(new Vec(0, 0, 1)); + /* float width = (float)0.6; float height = (float)0.08; float depth = (float)0.3; + */ + float width = (float)0.7; + float depth = (float)0.08; + float height = (float)0.4; + + float rshift = width/2; + float lshift = -(width/2); + + //float halfup = height/2; + float halfup = 0; + translations = new Matrix[] { - new Matrix(new Vec(-(width/2), height, 0)), - new Matrix(new Vec( (width/2), height, 0)), - new Matrix(new Vec(-(width/2), -height, 0)), - new Matrix(new Vec( (width/2), -height, 0)), - new Matrix(new Vec(-(width/2), 0, depth)), - new Matrix(new Vec( (width/2), 0, depth)), - new Matrix(new Vec(-(width/2), 0, -depth)), - new Matrix(new Vec( (width/2), 0, -depth)), + new Matrix(new Vec(lshift, depth, halfup)), + new Matrix(new Vec(rshift, depth, halfup)), + new Matrix(new Vec(lshift, -depth, halfup)), + new Matrix(new Vec(rshift, -depth, halfup)), + /* + new Matrix(new Vec(0, depth, halfup)), + new Matrix(new Vec(0, -depth, halfup)), + */ + new Matrix(new Vec(lshift, 0, height)), + new Matrix(new Vec(rshift, 0, height)), + new Matrix(new Vec(lshift, 0, -height)), + new Matrix(new Vec(rshift, 0, -height)), new Matrix(new Vec( width, 0, 0)), new Matrix(new Vec(-width, 0, 0)), - /* - new Matrix(new Vec( 0, 0, depth)), - new Matrix(new Vec( 0, 0, -depth)), - */ + }; + // + + + + Point ltf = new Point(lshift, (depth/2), (height/2)); + Point mtf = new Point( 0.0, (depth/2), (height/2)); + Point rtf = new Point(rshift, (depth/2), (height/2)); + Point lbf = new Point(lshift, -(depth/2), (height/2)); + Point mbf = new Point( 0.0, -(depth/2), (height/2)); + Point rbf = new Point(rshift, -(depth/2), (height/2)); + + Point ltc = new Point(lshift, (depth/2), 0); + Point mtc = new Point( 0.0, (depth/2), 0); + Point rtc = new Point(rshift, (depth/2), 0); + Point lbc = new Point(lshift, -(depth/2), 0); + Point mbc = new Point( 0.0, -(depth/2), 0); + Point rbc = new Point(rshift, -(depth/2), 0); + + Point ltn = new Point(lshift, (depth/2), -(height/2)); + Point mtn = new Point( 0.0, (depth/2), -(height/2)); + Point rtn = new Point(rshift, (depth/2), -(height/2)); + Point lbn = new Point(lshift, -(depth/2), -(height/2)); + Point mbn = new Point( 0.0, -(depth/2), -(height/2)); + Point rbn = new Point(rshift, -(depth/2), -(height/2)); - Point ltf = new Point(-(width/2), (height/2), (depth/2)); - Point mtf = new Point( 0.0, (height/2), (depth/2)); - Point rtf = new Point( (width/2), (height/2), (depth/2)); - Point ltn = new Point(-(width/2), (height/2), -(depth/2)); - Point mtn = new Point( 0.0, (height/2), -(depth/2)); - Point rtn = new Point( (width/2), (height/2), -(depth/2)); - Point lbf = new Point(-(width/2), -(height/2), (depth/2)); - Point mbf = new Point( 0.0, -(height/2), (depth/2)); - Point rbf = new Point( (width/2), -(height/2), (depth/2)); - Point lbn = new Point(-(width/2), -(height/2), -(depth/2)); - Point mbn = new Point( 0.0, -(height/2), -(depth/2)); - Point rbn = new Point( (width/2), -(height/2), -(depth/2)); Point[] points = new Point[] { ltf, mtf, rtf, - ltn, - mtn, - rtn, lbf, mbf, rbf, + + ltc, + mtc, + rtc, + lbc, + mbc, + rbc, + + ltn, + mtn, + rtn, lbn, mbn, rbn @@ -88,36 +130,52 @@ public class Main extends MeshViewer { // top - tile.newT(ltf, mtf, mtn, null); - tile.newT(mtn, ltn, ltf, null); - tile.newT(mtf, rtf, rtn, null); - tile.newT(rtn, mtn, mtf, null); + tile.newT(ltf, mtf, mtc, null, 1); + tile.newT(mtc, ltc, ltf, null, 1); + tile.newT(mtf, rtf, rtc, null, 1); + tile.newT(rtc, mtc, mtf, null, 1); + + tile.newT(ltc, mtc, mtn, null, 1); + tile.newT(mtn, ltn, ltc, null, 1); + tile.newT(mtc, rtc, rtn, null, 1); + tile.newT(rtn, mtn, mtc, null, 1); // bottom (swap normals) - tile.newT(mbf, lbf, mbn, null); - tile.newT(lbn, mbn, lbf, null); - tile.newT(rbf, mbf, rbn, null); - tile.newT(mbn, rbn, mbf, null); - + tile.newT(mbf, lbf, mbc, null, 2); + tile.newT(lbc, mbc, lbf, null, 2); + tile.newT(rbf, mbf, rbc, null, 2); + tile.newT(mbc, rbc, mbf, null, 2); + + tile.newT(mbc, lbc, mbn, null, 2); + tile.newT(lbn, mbn, lbc, null, 2); + + tile.newT(rbc, mbc, rbn, null, 2); + tile.newT(mbn, rbn, mbc, null, 2); + + // left - tile.newT(ltf, ltn, lbn, null); - tile.newT(lbn, lbf, ltf, null); + tile.newT(ltf, ltc, lbc, null, 3); + tile.newT(lbc, lbf, ltf, null, 3); + tile.newT(ltc, ltn, lbn, null, 3); + tile.newT(lbn, lbc, ltc, null, 3); // right (swap normals) - tile.newT(rtn, rtf, rbn, null); - tile.newT(rbf, rbn, rtf, null); + tile.newT(rtc, rtf, rbc, null, 4); + tile.newT(rbf, rbc, rtf, null, 4); + tile.newT(rtn, rtc, rbn, null, 4); + tile.newT(rbc, rbn, rtc, null, 4); // front - tile.newT(ltn, mtn, mbn, null); - tile.newT(ltn, mbn, lbn, null); - tile.newT(mtn, rtn, rbn, null); - tile.newT(mtn, rbn, mbn, null); + tile.newT(ltn, mtn, mbn, null, 5); + tile.newT(ltn, mbn, lbn, null, 5); + tile.newT(mtn, rtn, rbn, null, 5); + tile.newT(mtn, rbn, mbn, null, 5); // back - tile.newT(mtf, ltf, mbf, null); - tile.newT(mbf, ltf, lbf, null); - tile.newT(rtf, mtf, rbf, null); - tile.newT(rbf, mtf, mbf, null); + tile.newT(mtf, ltf, mbf, null, 6); + tile.newT(mbf, ltf, lbf, null, 6); + tile.newT(rtf, mtf, rbf, null, 6); + tile.newT(rbf, mtf, mbf, null, 6); for(Matrix m : translations) { for(Mesh.T t1 : tile) { @@ -127,24 +185,25 @@ public class Main extends MeshViewer { if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) && (t1.v2().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) && (t1.v3().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) { - t1.e1().bind(t2.e3().pair); - t1.e2().bind(t2.e2().pair); - t1.e3().bind(t2.e1().pair); + t1.e1().bindEdge(t2.e3()); + t1.e2().bindEdge(t2.e2()); + t1.e3().bindEdge(t2.e1()); } if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) && (t1.v3().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) && (t1.v1().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) { - t1.e2().bind(t2.e3().pair); - t1.e3().bind(t2.e2().pair); - t1.e1().bind(t2.e1().pair); + t1.e2().bindEdge(t2.e3()); + t1.e3().bindEdge(t2.e2()); + t1.e1().bindEdge(t2.e1()); } if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) && (t1.v1().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) && (t1.v2().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) { - t1.e3().bind(t2.e3().pair); - t1.e1().bind(t2.e2().pair); - t1.e2().bind(t2.e1().pair); + t1.e3().bindEdge(t2.e3()); + t1.e1().bindEdge(t2.e2()); + t1.e2().bindEdge(t2.e1()); } + } } } @@ -175,10 +234,12 @@ public class Main extends MeshViewer { tile.score_against = goal; goal.score_against = tile; + tile.tilemesh = true; } public synchronized void breakit() { - if (verts > 50) return; + if (verts > 800) return; + //while(verts < 800) { PriorityQueue es = new PriorityQueue(); for(Mesh.E e : tile.edges()) es.add(e); for(int i=0; i<10; i++) { @@ -186,52 +247,107 @@ public class Main extends MeshViewer { verts++; System.out.println("shatter " + e); e.shatter(); - tile.rebindPoints(); } + tile.rebindPoints(); + //} } - public synchronized void rand(double temperature, Mesh.Vert p) { + public synchronized void rand(float temp, Mesh.Vert p) { + + //p.reComputeError(); + p.reComputeErrorAround(); double tile_score = tile.score(); double goal_score = goal.score(); - p.reComputeError(); - Vec v = new Vec((random.nextFloat() - (float)0.5) / 1000, - (random.nextFloat() - (float)0.5) / 1000, - (random.nextFloat() - (float)0.5) / 1000); - //Matrix inv = p.errorQuadric(); - //Vec v = new Vec(inv.d, inv.h, inv.l).norm().times(1/(float)1000); + Vec v; + Matrix inv = p.errorQuadric(); + v = new Vec(inv.d, inv.h, inv.l).norm().times(1/(float)300); + if (p.quadric_count == 0) { + v = goal.nearest(p.p).p.minus(p.p).norm().times(1/(float)300); + } + Vec v2 = new Vec((random.nextFloat() - (float)0.5) / 500, + (random.nextFloat() - (float)0.5) / 500, + (random.nextFloat() - (float)0.5) / 500); + v = v.plus(v2.norm().times(1/(float)300)); + //v = v2; boolean good = p.move(v); + + p.reComputeErrorAround(); + double new_tile_score = tile.score(); double new_goal_score = goal.score(); - double tile_delta = new_tile_score - tile_score; - double goal_delta = 0;//new_goal_score - goal_score; + double tile_delta = (new_tile_score - tile_score) / tile_score; + double goal_delta = (new_goal_score - goal_score) / goal_score; double delta = tile_delta + goal_delta; - //double swapProbability = Math.exp((-1 * delta) / temperature); - //boolean doSwap = Math.random() < swapProbability; - boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0); - + double swapProbability = Math.exp((-1 * delta) / temp); + //boolean doSwap = good && (Math.random() < swapProbability); + //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0); + boolean doSwap = good && (tile_delta + goal_delta <= 0); if (doSwap) { tile_score = new_tile_score; goal_score = new_goal_score; //System.out.println("score: " + tile_score + " / " + goal_score); + hits++; } else { p.move(v.times(-1)); + misses++; } } - public static int verts = 0; - + float hits = 0; + float misses = 0; public void anneal() throws Exception { int verts = 0; + float hightemp = 10; + float temp = hightemp; + float last = 10; while(true) { + double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses)); + System.out.println("temp="+temp + " ratio="+(Math.ceil(ratio*100))); + hits = 0; + misses = 0; + float gamma = 0; + double acceptance = ratio; + if (breaks) { + breaks = false; + breakit(); + //gamma = 1; + gamma = 1; + //temp = last * 0.8f; + //last = temp; + //temp = hightemp; + } 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.6) gamma = 0.7f; + else { + if (acceptance > 0.3) { + gamma = 0.9f; + } else if (acceptance > 0.15) { + gamma = 0.95f; + } else { + //breakit(); + //gamma = 1; + gamma = 0.99f; + //gamma = 1; + //temp = last * 0.8f; + //last = temp; + //temp = hightemp; + } + } + temp = temp * gamma; + HashSet hs = new HashSet(); for(Mesh.Vert p : tile.vertices()) hs.add(p); for(int i=0; i<10; i++) { repaint(); - for(Mesh.Vert v : hs) rand(10,v); + for(Mesh.Vert v : hs) rand(temp,v); } - breakit(); + tile.rebuildPointSet(); + repaint(); + //breakit(); repaint(); goal.unApplyQuadricToNeighborAll(); repaint(); @@ -243,9 +359,15 @@ public class Main extends MeshViewer { public static void main(String[] s) throws Exception { StlFile stlf = new StlFile(); - stlf.load("simplefish.stl"); + stlf.load("fish.stl"); + //stlf.load("monkey.stl"); Frame f = new Frame(); Main main = new Main(stlf, f); + f.pack(); + f.show(); + f.setSize(900, 900); + f.doLayout(); main.anneal(); } + } \ No newline at end of file