X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=fa6905892713c92fcdc8f90b368de703987ddc72;hp=03ca6dcb96d5f645ca0cf2b84d4859af71841526;hb=85bf586c55813abe79fab0476e2196700a6d0ea1;hpb=0525dcc815af1e875699147e9f203969eeae723d

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 03ca6dc..fa69058 100644
--- 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);