X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=d10f63b4d698d32ac884cd188c80797434be7573;hp=1582d693849d4cc232f68de565a2fc54d437c4a0;hb=40b6b99bd4b0bd6041b8ab94a22201faab23ed90;hpb=20989b5562ed9a4b438db2da8a4c2c3b9a05801d

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 1582d69..d10f63b 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();
     
@@ -65,15 +93,18 @@ public class Main extends MeshViewer {
             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)),
 
@@ -212,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);
-        goal.transform(new Matrix(factor));
+        goal.transform(Matrix.scale(factor));
 
         // translate to match centroid
         goal.transform(new Matrix(tile.centroid().minus(goal.centroid())));
@@ -238,18 +269,17 @@ public class Main extends MeshViewer {
     }
 
     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);
-        for(int i=0; i<10; i++) {
+        for(int i=0; i<oldverts; i++) {
             Mesh.E e = es.poll();
             verts++;
-            System.out.println("shatter " + e);
+            //System.out.println("shatter " + e);
             e.shatter();
         }
         tile.rebindPoints();
-        //}
     }
 
     public synchronized void rand(float temp, Mesh.Vert p) {
@@ -260,16 +290,18 @@ public class Main extends MeshViewer {
         double goal_score = goal.score();
 
         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;
+        //v = v.plus(v2.norm().times(1/(float)300));
+        v = v2.norm().times(1/(float)300);
 
         boolean good = p.move(v);
 
@@ -281,9 +313,9 @@ public class Main extends MeshViewer {
         double goal_delta = (new_goal_score - goal_score) / goal_score;
         double delta = tile_delta + goal_delta;
         double swapProbability = Math.exp((-1 * delta) / temp);
-        //boolean doSwap = good && (Math.random() < swapProbability);
+        boolean doSwap = good && (Math.random() < swapProbability);
         //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
-        boolean doSwap = good && (tile_delta + goal_delta <= 0);
+        //boolean doSwap = good && (tile_delta + goal_delta <= 0);
         if (doSwap) {
             tile_score = new_tile_score;
             goal_score = new_goal_score;
@@ -298,26 +330,28 @@ public class Main extends MeshViewer {
     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) {
+            synchronized(this) {
             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;
+            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
+                } } else
             if (acceptance > 0.96) gamma = 0.4f;
             else if (acceptance > 0.9) gamma = 0.5f;
             else if (acceptance > 0.8) gamma = 0.65f;
@@ -327,8 +361,10 @@ public class Main extends MeshViewer {
                     gamma = 0.9f;
                 } else if (acceptance > 0.15) {
                     gamma = 0.95f;
+                } else if (acceptance > 0.10) {
+                    gamma = 0.98f;
                 } else {
-                    //breakit();
+                    breakit();
                     //gamma = 1;
                     gamma = 0.99f;
                     //gamma = 1;
@@ -339,12 +375,25 @@ public class Main extends MeshViewer {
             }
             temp = temp * gamma;
 
+
             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();
-                for(Mesh.Vert v : hs) rand(temp,v);
             }
+            System.out.println("temp="+temp + " ratio="+(Math.ceil(ratio*100)) + " " +
+                               "points_per_second=" +
+                               (count*1000)/((double)(System.currentTimeMillis()-then)));
             tile.rebuildPointSet();
             repaint();
             //breakit();
@@ -354,6 +403,7 @@ public class Main extends MeshViewer {
             tile.recomputeAllFundamentalQuadrics();
             repaint();
             goal.applyQuadricToNeighborAll();
+            }
        }
     }