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 b1cef41..1a0239f 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -386,7 +386,7 @@ public class Main extends MeshViewer {
 
             int count = 0;
             long then = System.currentTimeMillis();
-            for(int i=0; i<100; i++) {
+            for(int i=0; i<40; i++) {
                 if (anneal) {
                     count++;
                     Mesh.Vertex v = pts[Math.abs(random.nextInt()) % pts.length];
@@ -398,18 +398,16 @@ public class Main extends MeshViewer {
             System.out.println("temp="+temp + " ratio="+(Math.ceil(ratio*100)) + " " +
                                "points_per_second=" +
                                (count*1000)/((double)(System.currentTimeMillis()-then)));
-            tile.rebuild();
-            repaint();
-            //breakit();
-            repaint();
-            goal.unApplyQuadricToNeighborAll();
+
+            for(Mesh.Vertex p : goal.vertices()) p.recomputeFundamentalQuadricIfNeighborChanged();
             repaint();
-            tile.recomputeAllFundamentalQuadrics();
+            for(Mesh.Vertex p : tile.vertices()) p.recomputeFundamentalQuadric();
             repaint();
-            goal.applyQuadricToNeighborAll();
 
-            safeTriangles.clear();
-            for(Mesh.T t : tile) if (t.shouldBeDrawn()) safeTriangles.add(t);
+            synchronized(safeTriangles) {
+                safeTriangles.clear();
+                for(Mesh.T t : tile) if (t.shouldBeDrawn()) safeTriangles.add(t);
+            }
             }
        }
     }