checkpoint

darcs-hash:20071216070903-5007d-17998aab7203a5357b8bcda6883494adcb9a0923.gz

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index ef6c19f..fa69058 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -310,7 +310,7 @@ public class Main extends MeshViewer {
         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 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) / (((double)temp)/10000));
+        double swapProbability = Math.exp((-1 * delta) / (((double)temp)/100000));

         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 && (Math.random() < swapProbability);
         //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
         //boolean doSwap = good && (tile_delta + goal_delta <= 0);

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index a2e175b..7083d76 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -597,5 +597,17 @@ public class Mesh implements Iterable<Mesh.T> {
             return true;
         }
 
             return true;
         }
 

+        /** issue gl.glVertex() for each of the triangle's points */
+        public void glVertices(GL gl) {
+            norm().glNormal(gl);
+            Point p1 = v1().oldp;
+            Point p2 = v2().oldp;
+            Point p3 = v3().oldp;
+            if (p1==null || p2==null || p3==null) return;
+            p1.glVertex(gl);
+            p2.glVertex(gl);
+            p3.glVertex(gl);
+        }
+

     }
 }
     }
 }