[Swift-commit] r5623 - SwiftApps/SciColSim

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2012-02-15 13:23:55 -0600 (Wed, 15 Feb 2012)
New Revision: 5623

Modified:
   SwiftApps/SciColSim/annealing.swift
Log:
Adjusted rejection calculation (Still buggy but this seems closer). Added upper range limit on Beta.

Modified: SwiftApps/SciColSim/annealing.swift
===================================================================
--- SwiftApps/SciColSim/annealing.swift	2012-02-15 19:10:03 UTC (rev 5622)
+++ SwiftApps/SciColSim/annealing.swift	2012-02-15 19:23:55 UTC (rev 5623)
@@ -115,7 +115,7 @@
                 {
                     dx[i][k] = dx[i-1][k] * 2.0;
                     // FIXME: re-enable: rejection[i][k]=rejection[i-1][k];
-                    trejection[i][k]=rejection[i-1][k];
+                    trejection[i][k]=newrejection;
                 }
                 // FIXME: HANGS? : tracef(color(Red,"Recomputed rejection: i=%d k=%d dx[i][k]=%f\n"), i, k, dx[i][k]);
             }
@@ -157,10 +157,10 @@
                 }
                 tracef( @strcat( "multi_annealing: AR: ", color( 10,"%f" ), " ", color( 9,"%i" ),"\n" ), try_x[j], j );
 
-                if( try_x[2] < -1.4 )
+                if( (try_x[2] < -1.2) || (try_x[2] > 12.0) )  # FIXME: Temp debugging hack: REMOVE THIS!!!
                 {
-                    mlres[i][j].loss = 100.0;
-                    mlres[i][j].sdev = 1.0;
+                    mlres[i][j].loss = 140.0;
+                    mlres[i][j].sdev = 0.8;
                 }
                 else
                 {