r22296 - in /branches/double_rotor: ./ test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/ test_suite/system_t... -- February 25, 2014 - 09:20

Author: bugman
Date: Tue Feb 25 09:20:26 2014
New Revision: 22296

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

........
  r22289 | bugman | 2014-02-24 16:33:08 +0100 (Mon, 24 Feb 2014) | 6 lines
  
  Created the Relax_disp.test_bug_21715_clustered_indexerror system test.
  
  This is to catch bug #21715 (https://gna.org/bugs/?21715), the failure of 
the relaxation dispersion
  auto-analysis when running a clustered analysis due to an IndexError during 
minimisation.
........

Added:
    
branches/double_rotor/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/
      - copied from r22289, 
trunk/test_suite/shared_data/dispersion/bug_21715_clustered_indexerror/
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 Tue Feb 25 09:20:26 2014
@@ -1,1 +1,1 @@
-/trunk:1-22288
+/trunk:1-22289

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=22296&r1=22295&r2=22296&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/relax_disp.py (original)
+++ branches/double_rotor/test_suite/system_tests/relax_disp.py Tue Feb 25 
09:20:26 2014
@@ -295,6 +295,23 @@
         relax_disp.Relax_disp.opt_func_tol = 1e-5
         relax_disp.Relax_disp.opt_max_iterations = 1000
         relax_disp.Relax_disp(pipe_name="compare_128_FT_R2eff", 
pipe_bundle="cpmg_disp_sod1d90a", results_dir=self.tmpdir, models=['R2eff'], 
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)
+
+
+    def test_bug_21715_clustered_indexerror(self):
+        """Catch U{bug #21715<https://gna.org/bugs/?21715>}, the failure of 
a clustered auto-analysis due to an IndexError."""
+
+        # Clear the data store.
+        self.interpreter.reset()
+
+        # Load the state.
+        state = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'bug_21715_clustered_indexerror'+sep+'state.bz2'
+        self.interpreter.state.load(state, force=True)
+
+        # Execute the auto-analysis (fast).
+        pre_run_dir = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'bug_21715_clustered_indexerror'+sep+'non_clustered'
+        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 (Sun Feb 23 
19:36:51 2014)', pipe_bundle='relax_disp (Sun Feb 23 19:36:51 2014)', 
results_dir=self.tmpdir, models=['R2eff', 'No Rex'], grid_inc=11, 
mc_sim_num=2, modsel='AIC', pre_run_dir=pre_run_dir, insignificance=1.0, 
numeric_only=True, mc_sim_all_models=False, eliminate=True)
 
 
     def test_curve_type_cpmg_fixed_time(self):