Author: bugman Date: Thu Feb 18 17:33:34 2010 New Revision: 10748 URL: http://svn.gna.org/viewcvs/relax?rev=10748&view=rev Log: Fixes for all the N-state model system tests. The scripts were moved to a sub-directory! Modified: 1.3/test_suite/system_tests/n_state_model.py Modified: 1.3/test_suite/system_tests/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/n_state_model.py?rev=10748&r1=10747&r2=10748&view=diff ============================================================================== --- 1.3/test_suite/system_tests/n_state_model.py (original) +++ 1.3/test_suite/system_tests/n_state_model.py Thu Feb 18 17:33:34 2010 @@ -51,7 +51,7 @@ """ # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'5_state_xz.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'5_state_xz.py') # Test the optimised probabilities. self.assertAlmostEqual(cdp.probs[0], 0.2) @@ -92,7 +92,7 @@ ds.mode = 'all' # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'align_fit.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'align_fit.py') # Test the optimised values. self.assertAlmostEqual(cdp.align_tensors[0].Axx, -0.351261/2000) @@ -115,7 +115,7 @@ ds.rand = True # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'align_fit.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'align_fit.py') # Test the optimised values (these values are from relax, so are not 100% reliable as a check). self.assertAlmostEqual(cdp.align_tensors[0].Axx, -0.000189412096996) @@ -135,7 +135,7 @@ ds.mode = 'pcs' # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'align_fit.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'align_fit.py') # Test the optimised values. self.assertAlmostEqual(cdp.align_tensors[0].Axx, -0.351261/2000) @@ -157,7 +157,7 @@ ds.rand = True # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'align_fit.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'align_fit.py') # Test the optimised values (these values are from relax, so are not 100% reliable as a check). self.assertAlmostEqual(cdp.align_tensors[0].Axx, -0.000189165581069) @@ -176,7 +176,7 @@ ds.mode = 'rdc' # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'align_fit.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'align_fit.py') # Test the optimised values. self.assertAlmostEqual(cdp.align_tensors[0].Axx, -0.351261/2000) @@ -198,7 +198,7 @@ ds.rand = True # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'align_fit.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'align_fit.py') # Test the optimised values (these are about ~10% different from Pales). # Pales: S(zz) S(xx-yy) S(xy) S(xz) S(yz) @@ -216,4 +216,4 @@ """The 4-state model analysis of lactose using RDCs and PCSs.""" # Execute the script. - self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'lactose_n_state.py') + self.interpreter.run(script_file=sys.path[-1] + sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'n_state_model'+sep+'lactose_n_state.py')