r10098 - in /1.3/test_suite/system_tests: model_free.py scripts/bug_15050.py -- January 04, 2010 - 17:14

Author: bugman
Date: Mon Jan  4 17:14:23 2010
New Revision: 10098

URL: http://svn.gna.org/viewcvs/relax?rev=10098&view=rev
Log:
Added a system test for catching bug #15050 
(https://gna.org/bugs/index.php?15050).

This bug was submitted by Tiago Pais (https://gna.org/users/tpais).


Added:
    1.3/test_suite/system_tests/scripts/bug_15050.py
      - copied, changed from r10097, 
1.3/test_suite/system_tests/scripts/bugs_12582_12591_12607.py
Modified:
    1.3/test_suite/system_tests/model_free.py

Modified: 1.3/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_free.py?rev=10098&r1=10097&r2=10098&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/model_free.py (original)
+++ 1.3/test_suite/system_tests/model_free.py Mon Jan  4 17:14:23 2010
@@ -171,6 +171,13 @@
 
         # Execute the script.
         self.relax.interpreter.run(script_file=sys.path[-1] + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'bug_14941_local_tm_global_selection.py')
+
+
+    def test_bug_15050(self):
+        """Test catching bug #14941, the local tm global model selection 
problem as submitted by Mikaela Stewart (mikaela dot stewart att gmail dot 
com)."""
+
+        # Execute the script.
+        self.relax.interpreter.run(script_file=sys.path[-1] + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'model_free'+sep+'bug_15050.py')
 
 
     def test_bugs_12582_12591_12607(self):

Copied: 1.3/test_suite/system_tests/scripts/bug_15050.py (from r10097, 
1.3/test_suite/system_tests/scripts/bugs_12582_12591_12607.py)
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/bug_15050.py?p2=1.3/test_suite/system_tests/scripts/bug_15050.py&p1=1.3/test_suite/system_tests/scripts/bugs_12582_12591_12607.py&r1=10097&r2=10098&rev=10098&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/bugs_12582_12591_12607.py (original)
+++ 1.3/test_suite/system_tests/scripts/bug_15050.py Mon Jan  4 17:14:23 2010
@@ -1,10 +1,4 @@
-"""This system test catches 2 bugs submitted by Chris Brosey.
-
-The bugs include:
-    - Bug #12582 (https://gna.org/bugs/?12582).
-    - Bug #12591 (https://gna.org/bugs/?12591).
-    - Bug #12607 (https://gna.org/bugs/?12607).
-"""
+"""This system test catches bug #15050 (https://gna.org/bugs/?15050) 
submitted by Tiago Pais."""
 
 # Python module imports.
 from os import sep
@@ -15,7 +9,7 @@
 path = sys.path[-1] + 
sep+'test_suite'+sep+'shared_data'+sep+'model_free'+sep+'S2_0.970_te_2048_Rex_0.149'
 
 # Loop over the models.
-for name in ['tm0', 'tm1']:
+for name in ['tm4']:
     # Setup.
     pipe.create(pipe_name=name, pipe_type='mf')
     sequence.read(file='noe.500.out', dir=path, mol_name_col=None, 
res_num_col=1, res_name_col=2, spin_num_col=None, spin_name_col=None, 
sep=None)
@@ -31,21 +25,3 @@
     # Optimisation.
     grid_search(lower=None, upper=None, inc=11, constraints=True, 
verbosity=1)
     minimise('newton', func_tol=1e-25, max_iterations=10000000, 
constraints=True, scaling=True, verbosity=1)
-
-    # Results writing.
-    results.write(file='devnull', force=True, compress_type=1)
-
-# Model selection.
-sequence.display()
-eliminate(function=None, args=None)
-model_selection(method='AIC', modsel_pipe='aic', pipes=['tm0', 'tm1'])
-
-
-
-# Catch bug #12607 (https://gna.org/bugs/?12607).
-#################################################
-
-model_free.remove_tm(spin_id=None)
-diffusion_tensor.init(params=1e-08, time_scale=1.0, d_scale=1.0, 
angle_units='deg', param_types=0, spheroid_type=None, fixed=False)
-fix(element='all_spins', fixed=True)
-grid_search(lower=None, upper=None, inc=11, constraints=True, verbosity=1)