Author: bugman
Date: Mon Jan 13 10:10:45 2014
New Revision: 21958
URL: http://svn.gna.org/viewcvs/relax?rev=21958&view=rev
Log:
Merged revisions 21955 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r21955 | bugman | 2014-01-13 10:06:17 +0100 (Mon, 13 Jan 2014) | 5 lines
Speed ups for the Relax_disp.test_bug_21460_disp_cluster_fail system test.
The optimisation precision is not important for demonstrating this bug.
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/test_suite/system_tests/relax_disp.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 13 10:10:45 2014
@@ -1,1 +1,1 @@
-/trunk:1-21949,21954
+/trunk:1-21956
Modified: branches/double_rotor/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_disp.py?rev=21958&r1=21957&r2=21958&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/relax_disp.py (original)
+++ branches/double_rotor/test_suite/system_tests/relax_disp.py Mon Jan 13
10:10:45 2014
@@ -259,7 +259,9 @@
state = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'saved_states'+sep+'bug_21460_bad_fields.bz2'
self.interpreter.state.load(state, force=True)
- # Execute the auto-analysis.
+ # Execute the auto-analysis (fast).
+ relax_disp.Relax_disp.opt_func_tol = 1e-5
+ relax_disp.Relax_disp.opt_max_iterations = 1000
relax_disp.Relax_disp(pipe_name="origin - relax_disp (Thu Jan 2
13:46:44 2014)", pipe_bundle="relax_disp (Thu Jan 2 13:46:44 2014)",
results_dir=self.tmpdir, models=['R2eff', 'No Rex', 'CR72', 'NS CPMG 2-site
expanded'], grid_inc=3, mc_sim_num=5, modsel='AIC', pre_run_dir=None,
insignificance=1.0, numeric_only=False, mc_sim_all_models=False,
eliminate=True)
r21958 - in /branches/double_rotor: ./ test_suite/system_tests/relax_disp.py