Author: bugman Date: Sun Oct 5 10:49:03 2008 New Revision: 7499 URL: http://svn.gna.org/viewcvs/relax?rev=7499&view=rev Log: Created a system test for model elimination of a model-free model. Added: 1.3/test_suite/system_tests/model_elimination.py - copied, changed from r7441, 1.3/test_suite/system_tests/model_selection.py Modified: 1.3/test_suite/system_tests/__init__.py Modified: 1.3/test_suite/system_tests/__init__.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/__init__.py?rev=7499&r1=7498&r2=7499&view=diff ============================================================================== --- 1.3/test_suite/system_tests/__init__.py (original) +++ 1.3/test_suite/system_tests/__init__.py Sun Oct 5 10:49:03 2008 @@ -38,6 +38,7 @@ from generic import Generic from jw_mapping import Jw from load_spins import Load_spins +from model_elimination import Modelim from model_free import Mf from model_selection import Modsel from n_state_model import N_state_model @@ -58,6 +59,7 @@ 'generic', 'jw_mapping', 'load_spins', + 'model_elimination', 'model_free', 'model_selection', 'n_state_model', @@ -96,6 +98,7 @@ suite_array.append(TestLoader().loadTestsFromTestCase(Generic)) suite_array.append(TestLoader().loadTestsFromTestCase(Jw)) suite_array.append(TestLoader().loadTestsFromTestCase(Load_spins)) + suite_array.append(TestLoader().loadTestsFromTestCase(Modelim)) suite_array.append(TestLoader().loadTestsFromTestCase(Mf)) suite_array.append(TestLoader().loadTestsFromTestCase(Modsel)) suite_array.append(TestLoader().loadTestsFromTestCase(N_state_model)) Copied: 1.3/test_suite/system_tests/model_elimination.py (from r7441, 1.3/test_suite/system_tests/model_selection.py) URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/model_elimination.py?p2=1.3/test_suite/system_tests/model_elimination.py&p1=1.3/test_suite/system_tests/model_selection.py&r1=7441&r2=7499&rev=7499&view=diff ============================================================================== --- 1.3/test_suite/system_tests/model_selection.py (original) +++ 1.3/test_suite/system_tests/model_elimination.py Sun Oct 5 10:49:03 2008 @@ -28,7 +28,7 @@ from data import Relax_data_store; ds = Relax_data_store() -class Modsel(TestCase): +class Modelim(TestCase): """Class for testing model selection.""" def tearDown(self): @@ -36,46 +36,20 @@ ds.__reset__() + def test_te_200ns(self): + """Test the elimination of a model-free model with te = 200 ns.""" - def test_aic_mod_sel_diff_tensor(self): - """AIC model selection between two diffusion tensors.""" + # Read a results file. + self.relax.interpreter._Results.read(file='final_results_trunc_1.3', dir=sys.path[-1] + '/test_suite/shared_data/model_free/OMP') - # Init. - pipes = ['sphere', 'spheroid'] - tensors = [1e-9, (1e-9, 0, 0, 0)] + # Set the te value for residue 11 Leu to 200 ns. + self.relax.interpreter._Value.set(200*1e-9, 'te', spin_id=":11") - # Path of the files. - path = sys.path[-1] + '/test_suite/shared_data/model_free/S2_0.970_te_2048_Rex_0.149' + # Model elimination. + self.relax.interpreter._Eliminate.eliminate() - # Loop over the data pipes. - for i in xrange(2): - # Create the data pipe. - self.relax.interpreter._Pipe.create(pipes[i], 'mf') - - # Read the sequence. - self.relax.interpreter._Sequence.read(file='r1.600.out', dir=path) - - # Select the model. - self.relax.interpreter._Model_free.select_model(model='m4') - - # Read the relaxation data. - self.relax.interpreter._Relax_data.read('R1', '600', 600.0 * 1e6, 'r1.600.out', dir=path) - self.relax.interpreter._Relax_data.read('R2', '600', 600.0 * 1e6, 'r2.600.out', dir=path) - self.relax.interpreter._Relax_data.read('NOE', '600', 600.0 * 1e6, 'noe.600.out', dir=path) - self.relax.interpreter._Relax_data.read('R1', '500', 500.0 * 1e6, 'r1.500.out', dir=path) - self.relax.interpreter._Relax_data.read('R2', '500', 500.0 * 1e6, 'r2.500.out', dir=path) - self.relax.interpreter._Relax_data.read('NOE', '500', 500.0 * 1e6, 'noe.500.out', dir=path) - - # Set the diffusion tensors. - self.relax.interpreter._Diffusion_tensor.init(tensors[i], fixed=False) - - # Set some global stats. - ds['sphere'].chi2 = 200 - ds['spheroid'].chi2 = 0 - - # Model selection. - self.relax.interpreter._Modsel.model_selection(method='AIC', modsel_pipe='aic') - - # Test if the spheroid has been selected. - self.assert_(hasattr(ds['aic'], 'diff_tensor')) - self.assertEqual(ds['aic'].diff_tensor.type, 'spheroid') + # Checks. + self.assert_(return_spin(':9').select) + self.assert_(return_spin(':10').select) + self.assert_(not return_spin(':11').select) + self.assert_(return_spin(':12').select)