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 03ca6dc..fa69058 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -294,7 +294,7 @@ public class Main extends MeshViewer {
         double tile_error = tile.error();
         double goal_error = goal.error();
 
-        float max = p.averageEdgeLength()/30;
+        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());
@@ -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 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);