X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=fa6905892713c92fcdc8f90b368de703987ddc72;hp=96c5c06107d4eb6dd7b7d2cdb4e1813756a88b57;hb=85bf586c55813abe79fab0476e2196700a6d0ea1;hpb=8333b6805df84244a7524fbdc58e9a6820fb0b6c

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 96c5c06..fa69058 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -12,12 +12,40 @@ import edu.berkeley.qfat.geom.Point;
 // - real anneal
 // - solve self-intersection problem
 // - get a better test model?
+// - symmetry constraints withing the tile
+// - rotation matrices
+// - overbinding results in forced equational constraints on the leader
+// - shatter in invertd-triforce pattern brian mentioned
+// - aspect ratio?  non-uniform deformation?
+// - rotational alignment
+
+// - movie-style user interface like
+//      http://www.coleran.com/markcoleranreell.html ?
+
+// - consider recasting the Shewchuk predicates in Java?
+//    http://www.cs.cmu.edu/afs/cs/project/quake/public/code/predicates.c
+
+/*
+  blender keys
+  - middle mouse = option+click
+  - right mouse = command+click
+
+  3,7,1 = view along axes (control for opp direction)
+  4, 8, 7, 2 = rotate in discrete increments (+control to translate)
+  middle trag: rotate space
+  shift+middle drag: translate space
+  wheel: zoom
+  home: home view: take current angle, zoom to whole scnee
+  5 = ortho vs non-ortho
+
+*/
+
 
 // FIXME: re-orient goal (how?)
 
 public class Main extends MeshViewer {
 
-    public static int verts = 0;
+    public static int verts = 1;
 
     public static final Random random = new Random();
     
@@ -36,66 +64,94 @@ public class Main extends MeshViewer {
         }
 
         // 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)));
+        goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2)));
 
         float goal_width  = goal.diagonal().dot(new Vec(1, 0, 0));
         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.6;
+          float height = (float)0.08;
+          float depth  = (float)0.3;
         */
-        float width  = (float)0.6;
+        float width  = (float)0.7;
         float depth  = (float)0.08;
-        float height = (float)0.3;
+        float height = (float)0.4;
 
-        float rshift = width/2;
+        float rshift =   width/2;
         float lshift = -(width/2);
 
+        //float halfup = height/2;
+        float halfup = 0;
+
         translations = new Matrix[] {
 
-            new Matrix(new Vec(lshift,  depth,    0)),
-            new Matrix(new Vec(rshift,  depth,    0)),
-            new Matrix(new Vec(lshift, -depth,    0)),
-            new Matrix(new Vec(rshift, -depth,    0)),
-            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)),
+            Matrix.translate(new Vec(lshift,  depth,    halfup)),
+            Matrix.translate(new Vec(rshift,  depth,    halfup)),
+            Matrix.translate(new Vec(lshift, -depth,    halfup)),
+            Matrix.translate(new Vec(rshift, -depth,    halfup)),
+
+            /*
+              Matrix.translate(new Vec(0,  depth,    halfup)),
+              Matrix.translate(new Vec(0, -depth,    halfup)),
+            */
 
-            new Matrix(new Vec( width,           0,    0)),
-            new Matrix(new Vec(-width,           0,    0)),
+            Matrix.translate(new Vec(lshift,       0,  height)),
+            Matrix.translate(new Vec(rshift,       0,  height)),
+            Matrix.translate(new Vec(lshift,       0, -height)),
+            Matrix.translate(new Vec(rshift,       0, -height)),
+
+
+            Matrix.translate(new Vec( width,           0,    0)),
+            Matrix.translate(new Vec(-width,           0,    0)),
 
-            new Matrix(new Vec(     0,           0,    height)),
-            new Matrix(new Vec(     0,           0,   -height)),
         };
 
+        //   
+
+
 
         Point ltf = new Point(lshift,  (depth/2),  (height/2));
-        Point mtf = new Point( 0.0,        (depth/2),  (height/2));
+        Point mtf = new Point( 0.0,    (depth/2),  (height/2));
         Point rtf = new Point(rshift,  (depth/2),  (height/2));
-        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 lbf = new Point(lshift, -(depth/2),  (height/2));
-        Point mbf = new Point( 0.0,       -(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 mbn = new Point( 0.0,   -(depth/2), -(height/2));
         Point rbn = new Point(rshift, -(depth/2), -(height/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
@@ -103,24 +159,40 @@ public class Main extends MeshViewer {
 
 
         // top
-        tile.newT(ltf, mtf, mtn, null, 1);
-        tile.newT(mtn, ltn, ltf, null, 1);
-        tile.newT(mtf, rtf, rtn, null, 1);
-        tile.newT(rtn, mtn, mtf, null, 1);
+        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, 2);
-        tile.newT(lbn, mbn, lbf, null, 2);
-        tile.newT(rbf, mbf, rbn, null, 2);
-        tile.newT(mbn, rbn, mbf, null, 2);
-        
+        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, 3);
-        tile.newT(lbn, lbf, ltf, null, 3);
+        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, 4);
-        tile.newT(rbf, rbn, rtf, null, 4);
+        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, 5);
@@ -160,18 +232,20 @@ public class Main extends MeshViewer {
                         t1.e1().bindEdge(t2.e2());
                         t1.e2().bindEdge(t2.e1());
                     }
+
                 }
             }
         }
 
-        //xMesh.Vert mid = lbf.getE(mbn).shatter();
+        //xMesh.Vertex mid = lbf.getE(mbn).shatter();
 
         // rescale to match volume
         float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
-        goal.transform(new Matrix(factor));
+        goal.transform(Matrix.scale(factor));
 
         // translate to match centroid
-        goal.transform(new Matrix(tile.centroid().minus(goal.centroid())));
+        goal.transform(Matrix.translate(tile.centroid().minus(goal.centroid())));
+        goal.makeVerticesImmutable();
 
         //tx.e2.shatter();
         //tx.e3.shatter();
@@ -188,82 +262,152 @@ public class Main extends MeshViewer {
         System.out.println("tile volume: " + tile.volume());
         System.out.println("goal volume: " + goal.volume());
 
-        tile.score_against = goal;
-        goal.score_against = tile;
+        tile.error_against = goal;
+        goal.error_against = tile;
     }
 
-    public synchronized void breakit() {
-        if (verts > 800) return;
-        //while(verts < 800) {
+    public void breakit() {
+        int oldverts = verts;
+        System.out.println("doubling vertices.");
         PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
-        for(Mesh.E e : tile.edges()) es.add(e);
-        for(int i=0; i<40; i++) {
+        for(Mesh.T t : tile) {
+            es.add(t.e1());
+            es.add(t.e2());
+            es.add(t.e3());
+            Thread.yield();
+            repaint();
+        }
+        for(int i=0; i<Math.min(oldverts,200); i++) {
             Mesh.E e = es.poll();
             verts++;
             //System.out.println("shatter " + e);
             e.shatter();
-            tile.rebindPoints();
+            Thread.yield();
+            repaint();
         }
-        //}
+        tile.rebindPoints();
     }
 
-    public synchronized void rand(double temperature, Mesh.Vert p) {
-        double tile_score = tile.score();
-        double goal_score = goal.score();
-        p.reComputeError();
+    public synchronized void rand(float temp, Mesh.Vertex p) {
 
+        p.reComputeErrorAround();
+        double tile_error = tile.error();
+        double goal_error = goal.error();
 
-        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);
-        */
-        boolean good = p.move(v);
-        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;
+        float max = p.averageEdgeLength()/10;
+        Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
+        v = v.norm().times((random.nextFloat() - 0.5f) * max);
+        //System.out.println(max + " " + p.averageEdgeLength() + " " + v.mag());
+        Matrix m = Matrix.translate(v);
+
+        boolean good = p.move(m, false);
+        if (!good) { misses++; return; }
+
+        p.reComputeErrorAround();
+
+        double new_tile_error = tile.error();
+        double new_goal_error = goal.error();
+        double tile_delta = (new_tile_error - tile_error) / tile_error;
+        double goal_delta = (new_goal_error - goal_error) / goal_error;
         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) / (((double)temp)/100000));
+        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);
+            tile_error = new_tile_error;
+            goal_error = new_goal_error;
+            //System.out.println("error: " + tile_error + " / " + goal_error);
+            hits++;
         } else {
-            p.move(v.times(-1));
+            p.move(Matrix.translate(v.times(-1)), true);
+            misses++;
         }
     }
 
+    float hits = 0;
+    float misses = 0;
     public void anneal() throws Exception {
-        int verts = 0;
+        float hightemp = 1;
+        float temp = hightemp;
+        float last = 10;
+        boolean seek_upward = false;
+        double acceptance = 1;
         while(true) {
-            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();
-                for(Mesh.Vert v : hs) rand(10,v);
+            synchronized(this) {
+                double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses));
+                hits = 0;
+                misses = 0;
+                float gamma = 1;
+                acceptance = (ratio+acceptance)/2;
+                accepts = (int)(Math.ceil(ratio*100));
+                temps = (int)(Math.ceil(temp*1000));
+                vertss = tile.size();
+                if (breaks > 0) {
+                    while (breaks>0) {
+                        breaks--;
+                        breakit();
+                    }
+                    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.6)    gamma = 0.7f;
+                else if (acceptance > 0.3)    gamma = 0.9f;
+                else if (acceptance > 0.15)   gamma = 0.95f;
+                else if (acceptance > 0.10)   gamma = 0.98f;
+                else breaks++;
+
+                if (seek_upward) {
+                    if (acceptance > 0.3) seek_upward = false;
+                    else gamma = 2-gamma;
+                }
+
+                temp = temp * gamma;
+
+
+                HashSet<Mesh.Vertex> hs = new HashSet<Mesh.Vertex>();
+                for(Mesh.Vertex p : tile.vertices()) hs.add(p);
+                Mesh.Vertex[] pts = (Mesh.Vertex[])hs.toArray(new Mesh.Vertex[0]);
+
+                int count = 0;
+                long then = System.currentTimeMillis();
+                for(int i=0; i<40; i++) {
+                    if (anneal) {
+                        count++;
+                        Mesh.Vertex v = pts[Math.abs(random.nextInt()) % pts.length];
+                        rand(temp,v);
+                        v.recomputeFundamentalQuadricIfStale();
+                        v.recomputeFundamentalQuadricIfNeighborChanged();
+                    }
+                    Thread.yield();
+                    repaint();
+                }
+                System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +
+                                   "points_per_second=" +
+                                   (count*1000)/((double)(System.currentTimeMillis()-then)));
+
+                for(Mesh.Vertex p : goal.vertices()) p.recomputeFundamentalQuadricIfNeighborChanged();
+
+                synchronized(safeTriangles) {
+                    safeTriangles.clear();
+                    for(Mesh.T t : tile) if (t.shouldBeDrawn()) safeTriangles.add(t);
+                }
             }
-            tile.rebuildPointSet();
-            repaint();
-            breakit();
-            repaint();
-            goal.unApplyQuadricToNeighborAll();
-            repaint();
-            tile.recomputeAllFundamentalQuadrics();
-            repaint();
-            goal.applyQuadricToNeighborAll();
-       }
+        }
     }
 
+
     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();
     }