r14160 - /branches/gui_testing/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py -- August 05, 2011 - 09:17

Author: bugman
Date: Fri Aug  5 09:17:41 2011
New Revision: 14160

URL: http://svn.gna.org/viewcvs/relax?rev=14160&view=rev
Log:
The dauvergne_protocol system test is now much less precise and is limited.

This cuts calculation time from over an hour to a few minutes.


Modified:
    
branches/gui_testing/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py

Modified: 
branches/gui_testing/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py?rev=14160&r1=14159&r2=14160&view=diff
==============================================================================
--- 
branches/gui_testing/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py
 (original)
+++ 
branches/gui_testing/test_suite/system_tests/scripts/model_free/dauvergne_protocol.py
 Fri Aug  5 09:17:41 2011
@@ -216,9 +216,14 @@
 
 # The results dir.
 if not hasattr(ds, 'tmpdir'):
-    results_dir = 'dauvergne_protocol'
+    results_dir = status.install_path + sep + 'dauvergne_protocol'
 else:
     results_dir = ds.tmpdir
 
+# Change some opt params.
+dAuvergne_protocol.opt_func_tol = 1e-5
+dAuvergne_protocol.opt_max_iterations = 1000
+
+# Loop over all global models.
 for global_model in ['local_tm', 'sphere', 'prolate', 'oblate', 'ellipsoid', 
'final']:
-    dAuvergne_protocol(pipe_name=name, results_dir=results_dir, 
diff_model=global_model, mf_models=MF_MODELS, 
local_tm_models=LOCAL_TM_MODELS, grid_inc=GRID_INC, min_algor=MIN_ALGOR, 
mc_sim_num=MC_NUM, conv_loop=CONV_LOOP)
+    dAuvergne_protocol(pipe_name=name, results_dir=results_dir, 
diff_model=global_model, mf_models=MF_MODELS, 
local_tm_models=LOCAL_TM_MODELS, grid_inc=GRID_INC, 
diff_tensor_grid_inc={'sphere': 5, 'prolate': 5, 'oblate': 5, 'ellipsoid': 
3}, min_algor=MIN_ALGOR, mc_sim_num=MC_NUM, max_iter=5, conv_loop=CONV_LOOP)