[test](Convergence surface fixed trial moves): Fix vfsa number of ite…

…ration and test Use different values of c0 and temp0 for fixed trial moves and build the convergence surface
Dirack · Feb 8, 2024 · 680cd90 · 680cd90
1 parent 47654a5
commit 680cd90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/test/test_parameters/fixed_trial_moves/Makefile b/test/test_parameters/fixed_trial_moves/Makefile
@@ -4,7 +4,7 @@ generate_data: SConstruct
 	scons
 
 generate_plot: plot_test.py
-	python plot_test.py
+	python plot_test.py > surface.asc
 
 view: SConscript
-	scons -f $< view
+	scons -f $< view
diff --git a/test/test_parameters/fixed_trial_moves/SConscript b/test/test_parameters/fixed_trial_moves/SConscript
@@ -19,8 +19,8 @@
 from rsf.proj import *
 
 s="surface"
-Flow(s,s+'.asc','dd type=float form=native')
+Flow(s,s+'.asc','dd type=float form=native | smooth rect1=5 rect2=5 repeat=1')
 
 Result(s,'grey color=j scalebar=y')
 
-End()
+End()
diff --git a/test/test_parameters/fixed_trial_moves/SConstruct b/test/test_parameters/fixed_trial_moves/SConstruct
@@ -52,12 +52,12 @@ Flow('dataCube','gaussianReflector reflectorDip',
 
 
 oc0=0.
-dc0=0.033
-nc0=31
+dc0=0.01
+nc0=100
 
 otemp0=0.
-dtemp0=0.1
-ntemp0=31
+dtemp0=0.03
+ntemp0=100
 
 om0=5
 dm0=0.1
@@ -77,7 +77,8 @@ for temp0i in range(ntemp0):
         # Very Fast Simulated Aneelling Global Optimization (VFSA)
         Flow(parameters,'dataCube',
                 '''
-                vfsacrsnh om0=%g dm0=%g nm0=%d ot0=%g dt0=%g nt0=%d v0=%g verb=y repeat=1
+                vfsacrsnh itmax=200
+                om0=%g dm0=%g nm0=%d ot0=%g dt0=%g nt0=%d v0=%g verb=y repeat=1
                 half=y
                 c0=%g temp0=%g
                 ''' % (om0,dm0,nm0,ot0,dt0,nt0,v0,c0,temp0))