r18332 - in /branches/frame_order_testing: ./ test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py -- February 01, 2013 - 11:30

Author: bugman
Date: Fri Feb  1 11:30:39 2013
New Revision: 18332

URL: http://svn.gna.org/viewcvs/relax?rev=18332&view=rev
Log:
Merged revisions 18331 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18331 | bugman | 2013-02-01 11:28:43 +0100 (Fri, 01 Feb 2013) | 6 lines
  
  Clean up of the Mf.test_bug_20464_missing_ri_data system test.
  
  The directories and files created are now placed in a temporary directory 
to be removed by the
  tearDown() method, and the optimisation is now much faster.
........

Modified:
    branches/frame_order_testing/   (props changed)
    
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb  1 11:30:39 2013
@@ -1,1 +1,1 @@
-/trunk:1-18329
+/trunk:1-18331

Modified: 
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py?rev=18332&r1=18331&r2=18332&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py
 (original)
+++ 
branches/frame_order_testing/test_suite/system_tests/scripts/model_free/bug_20464_missing_ri_data.py
 Fri Feb  1 11:30:39 2013
@@ -3,9 +3,11 @@
 
 # Python module imports.
 from os import sep
+from tempfile import mkdtemp
 
 # relax module imports.
 from auto_analyses.dauvergne_protocol import dAuvergne_protocol
+from data import Relax_data_store; ds = Relax_data_store()
 from status import Status; status = Status()
 
 
@@ -14,10 +16,10 @@
 
 # The model-free models.  Do not change these unless absolutely necessary, 
the protocol is likely to fail if these are changed.
 MF_MODELS = ['m0', 'm1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 'm8', 'm9']
-LOCAL_TM_MODELS = ['tm0', 'tm1', 'tm2', 'tm3', 'tm4', 'tm5', 'tm6', 'tm7', 
'tm8', 'tm9']
+LOCAL_TM_MODELS = ['tm0', 'tm4', 'tm9']
 
 # The grid search size (the number of increments per dimension).
-GRID_INC = 11
+GRID_INC = 3
 
 # The optimisation technique.
 MIN_ALGOR = 'newton'
@@ -35,5 +37,12 @@
 # Load the state.
 state.load('bug_20464_mf_missing_ri_data', dir=data_path)
 
+# The results dir.
+ds.tmpdir = mkdtemp()
+
+# Change some opt params.
+dAuvergne_protocol.opt_func_tol = 1e-2
+dAuvergne_protocol.opt_max_iterations = 20
+
 # Do not change!
-dAuvergne_protocol(pipe_name='origin - mf (Thu Jan 31 10:06:25 2013)', 
pipe_bundle='mf (Thu Jan 31 10:06:25 2013)', diff_model=DIFF_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='origin - mf (Thu Jan 31 10:06:25 2013)', 
pipe_bundle='mf (Thu Jan 31 10:06:25 2013)', results_dir=ds.tmpdir, 
diff_model=DIFF_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)