Author: bugman Date: Wed Sep 17 17:11:53 2014 New Revision: 25885 URL: http://svn.gna.org/viewcvs/relax?rev=25885&view=rev Log: Updates to all of the Frame_order.test_count_sobol_points_* system tests. The frame_order.sobol_setup user function is used to set a small maximum number of points (20) to allow the tests to be fast. The value of 20 is also checked for to allow the tests to pass. Modified: branches/frame_order_cleanup/test_suite/system_tests/frame_order.py Modified: branches/frame_order_cleanup/test_suite/system_tests/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/frame_order.py?rev=25885&r1=25884&r2=25885&view=diff ============================================================================== --- branches/frame_order_cleanup/test_suite/system_tests/frame_order.py (original) +++ branches/frame_order_cleanup/test_suite/system_tests/frame_order.py Wed Sep 17 17:11:53 2014 @@ -986,11 +986,14 @@ data_path = status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'frame_order'+sep+'cam'+sep+'free_rotor' self.interpreter.state.load(data_path+sep+'frame_order') + # Reset the number of points. + self.interpreter.frame_order.sobol_setup(20) + # Call the user function. self.interpreter.frame_order.count_sobol_points() # Check the count. - self.assertEqual(cdp.used_sobol_points, 10000) + self.assertEqual(cdp.used_sobol_points, 20) def test_count_sobol_points_iso_cone_free_rotor(self): @@ -1003,11 +1006,14 @@ data_path = status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'frame_order'+sep+'cam'+sep+'iso_cone_free_rotor' self.interpreter.state.load(data_path+sep+'frame_order') + # Reset the number of points. + self.interpreter.frame_order.sobol_setup(20) + # Call the user function. self.interpreter.frame_order.count_sobol_points() # Check the count. - self.assertEqual(cdp.used_sobol_points, 2297) + self.assertEqual(cdp.used_sobol_points, 20) def test_count_sobol_points_rigid(self): @@ -1037,11 +1043,14 @@ data_path = status.install_path + sep+'test_suite'+sep+'shared_data'+sep+'frame_order'+sep+'cam'+sep+'rotor' self.interpreter.state.load(data_path+sep+'frame_order') + # Reset the number of points. + self.interpreter.frame_order.sobol_setup(20) + # Call the user function. self.interpreter.frame_order.count_sobol_points() # Check the count. - self.assertEqual(cdp.used_sobol_points, 1666) + self.assertEqual(cdp.used_sobol_points, 20) def test_frame_order_pdb_model_failed_pivot(self):