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

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 6a02d08..d10f63b 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -45,7 +45,7 @@ home: home view: take current angle, zoom to whole scnee
 
 public class Main extends MeshViewer {
 
-    public static int verts = 0;
+    public static int verts = 1;
 
     public static final Random random = new Random();
     
@@ -88,16 +88,16 @@ public class Main extends MeshViewer {
         float halfup = 0;
 
         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)),
-            */
 
+            /*
             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)),
@@ -243,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())));
@@ -269,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) {
@@ -331,14 +330,12 @@ 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;
@@ -346,15 +343,15 @@ public class Main extends MeshViewer {
             accepts = (int)(Math.ceil(ratio*100));
             temps = (int)(Math.ceil(temp*1000));
             vertss = tile.size();
-            if (breaks) {
-                breaks = false;
+            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;
@@ -364,6 +361,8 @@ 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();
                     //gamma = 1;
@@ -379,14 +378,22 @@ public class Main extends MeshViewer {
 
             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);
-                    Thread.yield();
-                    repaint();
+            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();
             }
+            System.out.println("temp="+temp + " ratio="+(Math.ceil(ratio*100)) + " " +
+                               "points_per_second=" +
+                               (count*1000)/((double)(System.currentTimeMillis()-then)));
             tile.rebuildPointSet();
             repaint();
             //breakit();