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

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 982119b..1582d69 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -35,6 +35,8 @@ 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)));
 
@@ -47,11 +49,11 @@ public class Main extends MeshViewer {
         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;
@@ -63,7 +65,10 @@ 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)),
@@ -74,6 +79,9 @@ public class Main extends MeshViewer {
 
         };
 
+        //   
+
+
 
         Point ltf = new Point(lshift,  (depth/2),  (height/2));
         Point mtf = new Point( 0.0,    (depth/2),  (height/2));
@@ -234,7 +242,7 @@ public class Main extends MeshViewer {
         //while(verts < 800) {
         PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
         for(Mesh.E e : tile.edges()) es.add(e);
-        for(int i=0; i<8; i++) {
+        for(int i=0; i<10; i++) {
             Mesh.E e = es.poll();
             verts++;
             System.out.println("shatter " + e);
@@ -251,13 +259,17 @@ public class Main extends MeshViewer {
         double tile_score = tile.score();
         double goal_score = goal.score();
 
-        Vec v = new Vec((random.nextFloat() - (float)0.5) / 200,
-                        (random.nextFloat() - (float)0.5) / 200,
-                        (random.nextFloat() - (float)0.5) / 200);
-        /*
+        Vec v;
         Matrix inv = p.errorQuadric();
-        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;
 
         boolean good = p.move(v);
 
@@ -269,8 +281,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);
         if (doSwap) {
             tile_score = new_tile_score;
             goal_score = new_goal_score;
@@ -300,23 +313,24 @@ public class Main extends MeshViewer {
                 breaks = false;
                     breakit();
                     //gamma = 1;
-                    gamma = 2;
+                    gamma = 1;
                     //temp = last * 0.8f;
                     //last = temp;
                     //temp = hightemp;
             } else
-            if (acceptance > 0.96) gamma = 0.6f;
-            else if (acceptance > 0.9) gamma = 0.7f;
-            else if (acceptance > 0.8) gamma = 0.75f;
-            else if (acceptance > 0.6) gamma = 0.8f;
+            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 = 2;
+                    //breakit();
+                    //gamma = 1;
+                    gamma = 0.99f;
                     //gamma = 1;
                     //temp = last * 0.8f;
                     //last = temp;
@@ -345,7 +359,8 @@ 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();