projects / anneal.git / blobdiff
? search:
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 96c5c06..d10f63b 100644 (file)
--- 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?
 // - 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 {
 
 
 // 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();
     
 
     public static final Random random = new Random();
     
@@ -35,6 +63,8 @@ public class Main extends MeshViewer {
             Mesh.T t  = goal.newT(p0, p1, p2, n, 0);
         }
 
             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)));
 
         // 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)));
 
@@ -47,55 +77,83 @@ public class Main extends MeshViewer {
         float height = (float)0.08;
         float depth  = (float)0.3;
         */
         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 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 lshift = -(width/2);
 
+        //float halfup = height/2;
+        float halfup = 0;
+
         translations = new Matrix[] {
 
         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,  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(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( width,           0,    0)),
             new Matrix(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 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 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 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 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 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 rbn = new Point(rshift, -(depth/2), -(height/2));
+
         
         Point[] points = new Point[] {
             ltf,
             mtf,
             rtf,
         
         Point[] points = new Point[] {
             ltf,
             mtf,
             rtf,
-            ltn,
-            mtn,
-            rtn,
             lbf,
             mbf,
             rbf,
             lbf,
             mbf,
             rbf,
+
+            ltc,
+            mtc,
+            rtc,
+            lbc,
+            mbc,
+            rbc,
+
+            ltn,
+            mtn,
+            rtn,
             lbn,
             mbn,
             rbn
             lbn,
             mbn,
             rbn
@@ -103,24 +161,40 @@ public class Main extends MeshViewer {
 
 
         // top
 
 
         // 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)
 
         // 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
         // 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)
 
         // 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);
 
         // front
         tile.newT(ltn, mtn, mbn, null, 5);
@@ -160,6 +234,7 @@ public class Main extends MeshViewer {
                         t1.e1().bindEdge(t2.e2());
                         t1.e2().bindEdge(t2.e1());
                     }
                         t1.e1().bindEdge(t2.e2());
                         t1.e2().bindEdge(t2.e1());
                     }
+
                 }
             }
         }
                 }
             }
         }
@@ -168,7 +243,7 @@ public class Main extends MeshViewer {
 
         // rescale to match volume
         float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
 
         // 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())));
 
         // translate to match centroid
         goal.transform(new Matrix(tile.centroid().minus(goal.centroid())));
@@ -190,80 +265,158 @@ public class Main extends MeshViewer {
 
         tile.score_against = goal;
         goal.score_against = tile;
 
         tile.score_against = goal;
         goal.score_against = tile;
+        tile.tilemesh = true;
     }
 
     public synchronized void breakit() {
     }
 
     public synchronized void breakit() {
-        if (verts > 800) return;
-        //while(verts < 800) {
+        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);
         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(int i=0; i<oldverts; i++) {
             Mesh.E e = es.poll();
             verts++;
             //System.out.println("shatter " + e);
             e.shatter();
             Mesh.E e = es.poll();
             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();
         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);
+        Vec v;
         /*
         Matrix inv = p.errorQuadric();
         /*
         Matrix inv = p.errorQuadric();
-        Vec v = new Vec(inv.d, inv.h, inv.l).norm().times(1/(float)1000);
+        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.norm().times(1/(float)300);
+
         boolean good = p.move(v);
         boolean good = p.move(v);
+
+        p.reComputeErrorAround();
+
         double new_tile_score = tile.score();
         double new_goal_score = goal.score();
         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 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);
         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));
         } else {
             p.move(v.times(-1));
+            misses++;
         }
     }
 
         }
     }
 
+    float hits = 0;
+    float misses = 0;
     public void anneal() throws Exception {
     public void anneal() throws Exception {
-        int verts = 0;
+        float hightemp = 10;
+        float temp = hightemp;
+        float last = 10;
         while(true) {
         while(true) {
+            synchronized(this) {
+            double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses));
+            hits = 0;
+            misses = 0;
+            float gamma = 0;
+            double acceptance = ratio;
+            accepts = (int)(Math.ceil(ratio*100));
+            temps = (int)(Math.ceil(temp*1000));
+            vertss = tile.size();
+            if (breaks > 0) { while (breaks>0) {
+                breaks--;
+                    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 if (acceptance > 0.10) {
+                    gamma = 0.98f;
+                } else {
+                    breakit();
+                    //gamma = 1;
+                    gamma = 0.99f;
+                    //gamma = 1;
+                    //temp = last * 0.8f;
+                    //last = temp;
+                    //temp = hightemp;
+                }
+            }
+            temp = temp * gamma;
+
+
             HashSet<Mesh.Vert> hs = new HashSet<Mesh.Vert>();
             for(Mesh.Vert p : tile.vertices()) hs.add(p);
             HashSet<Mesh.Vert> hs = new HashSet<Mesh.Vert>();
             for(Mesh.Vert p : tile.vertices()) hs.add(p);
-            for(int i=0; i<10; i++) {
+            Mesh.Vert[] pts = (Mesh.Vert[])hs.toArray(new Mesh.Vert[0]);
+
+            int count = 0;
+            long then = System.currentTimeMillis();
+            for(int i=0; i<100; i++) {
+                if (anneal) {
+                    count++;
+                    Mesh.Vert v = pts[Math.abs(random.nextInt()) % pts.length];
+                    rand(temp,v);
+                }
+                Thread.yield();
                 repaint();
                 repaint();
-                for(Mesh.Vert v : hs) rand(10,v);
             }
             }
+            System.out.println("temp="+temp + " ratio="+(Math.ceil(ratio*100)) + " " +
+                               "points_per_second=" +
+                               (count*1000)/((double)(System.currentTimeMillis()-then)));
             tile.rebuildPointSet();
             repaint();
             tile.rebuildPointSet();
             repaint();
-            breakit();
+            //breakit();
             repaint();
             goal.unApplyQuadricToNeighborAll();
             repaint();
             tile.recomputeAllFundamentalQuadrics();
             repaint();
             goal.applyQuadricToNeighborAll();
             repaint();
             goal.unApplyQuadricToNeighborAll();
             repaint();
             tile.recomputeAllFundamentalQuadrics();
             repaint();
             goal.applyQuadricToNeighborAll();
+            }
        }
     }
 
     public static void main(String[] s) throws Exception {
         StlFile stlf = new StlFile();
        }
     }
 
     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);
         Frame f = new Frame();
         Main main = new Main(stlf, f);
+        f.pack();
+        f.show();
+        f.setSize(900, 900);
+        f.doLayout();
         main.anneal();
     }
 
         main.anneal();
     }
 
Space Annealer