X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=8fcb0ab4e9333c06ce928943d542f9794b421086;hp=6a02d08e1680959921f4d2b266e306525a4ae095;hb=33fcd7732290bcd1c7108ba9388af173fd139ee2;hpb=57376a862c00fa1c8731f9989085fcfceeee0370

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 6a02d08..8fcb0ab 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -26,26 +26,26 @@ import edu.berkeley.qfat.geom.Point;
 //    http://www.cs.cmu.edu/afs/cs/project/quake/public/code/predicates.c
 
 /*
-blender keys
-- middle mouse = option+click
-- right mouse = command+click
+  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
+  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();
     
@@ -63,19 +63,17 @@ public class Main extends MeshViewer {
             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)));
+        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.7;
         float depth  = (float)0.08;
@@ -89,24 +87,24 @@ public class Main extends MeshViewer {
 
         translations = new Matrix[] {
             /*
-            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)),
+            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)),
             */
 
-            new Matrix(new Vec(0,  depth,    halfup)),
-            new Matrix(new Vec(0, -depth,    halfup)),
+              Matrix.translate(new Vec(0,  depth,    halfup)),
+              Matrix.translate(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)),
+            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)),
 
 
-            new Matrix(new Vec( width,           0,    0)),
-            new Matrix(new Vec(-width,           0,    0)),
+            Matrix.translate(new Vec( width,           0,    0)),
+            Matrix.translate(new Vec(-width,           0,    0)),
 
         };
 
@@ -216,37 +214,38 @@ 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().bindEdge(t2.e3());
-                        t1.e2().bindEdge(t2.e2());
-                        t1.e3().bindEdge(t2.e1());
+                        t2.e3().bindEdge(t1.e1(), m);
+                        t2.e2().bindEdge(t1.e2(), m);
+                        t2.e1().bindEdge(t1.e3(), m);
                     }
                     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().bindEdge(t2.e3());
-                        t1.e3().bindEdge(t2.e2());
-                        t1.e1().bindEdge(t2.e1());
+                        t2.e3().bindEdge(t1.e2(), m);
+                        t2.e2().bindEdge(t1.e3(), m);
+                        t2.e1().bindEdge(t1.e1(), m);
                     }
                     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().bindEdge(t2.e3());
-                        t1.e1().bindEdge(t2.e2());
-                        t1.e2().bindEdge(t2.e1());
+                        t2.e3().bindEdge(t1.e3(), m);
+                        t2.e2().bindEdge(t1.e1(), m);
+                        t2.e1().bindEdge(t1.e2(), m);
                     }
 
                 }
             }
         }
 
-        //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();
@@ -263,67 +262,66 @@ 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.tilemesh = true;
+        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<10; 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);
+            //System.out.println("shatter " + e);
+            //e.shatter(e.midpoint(), null, null, true, true);
+            
             e.shatter();
+            Thread.yield();
+            repaint();
         }
         tile.rebindPoints();
-        //}
     }
 
-    public synchronized void rand(float temp, Mesh.Vert p) {
-
-        //p.reComputeError();
-        p.reComputeErrorAround();
-        double tile_score = tile.score();
-        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.norm().times(1/(float)300);
-
-        boolean good = p.move(v);
+    public synchronized void rand(float temp, Mesh.Vertex p) {
 
         p.reComputeErrorAround();
-
-        double new_tile_score = tile.score();
-        double 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 tile_error = tile.error();
+        double goal_error = goal.error();
+
+        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; }
+
+        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) / temp);
+        double swapProbability = Math.exp((-1 * delta) / (((double)temp)/1000000));
         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++;
+            p.goodp = p.p;
         } else {
-            p.move(v.times(-1));
+            p.move(Matrix.translate(v.times(-1)), true);
             misses++;
         }
     }
@@ -331,75 +329,97 @@ public class Main extends MeshViewer {
     float hits = 0;
     float misses = 0;
     public void anneal() throws Exception {
-        int verts = 0;
-        float hightemp = 10;
+        float hightemp = 1;
         float temp = hightemp;
         float last = 10;
+        boolean seek_upward = false;
+        double acceptance = 1;
         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;
-            accepts = (int)(Math.ceil(ratio*100));
-            temps = (int)(Math.ceil(temp*1000));
-            vertss = tile.size();
-            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;
+                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.8f;
+                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++;*/ }
+
+                if (seek_upward) {
+                    if (acceptance > 0.2) seek_upward = false;
+                    else gamma = 2-gamma;
                 }
-            }
-            temp = temp * 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]);
 
-            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) {
-                    if (anneal) rand(temp,v);
+                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();
                 }
+                PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
+                for(Mesh.T t : tile) {
+                    float max = 5;
+                    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 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
+                    }
+                }
+                /*
+                for(int i=0; i<5; i++) {
+                    Mesh.E e = es.poll();
+                    if (e==null) break;
+                    e.shatter();
+                }
+                */
+                tile.rebindPoints();
+
+                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("fish.stl");