Author: bugman Date: Wed Nov 27 14:31:47 2013 New Revision: 21675 URL: http://svn.gna.org/viewcvs/relax?rev=21675&view=rev Log: Limited the optimisation time in the N_state_model.test_populations system test. This test can take a huge amount of time on Mac OS X and MS Windows (~6 seconds on Linux, ~360 seconds on Mac OS X, and ~120 seconds on MS Windows, all on similar hardware). Now the minimise user function max_iter argument is set to 2000 to speed the test up. Modified: trunk/test_suite/system_tests/scripts/n_state_model/populations.py Modified: trunk/test_suite/system_tests/scripts/n_state_model/populations.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/populations.py?rev=21675&r1=21674&r2=21675&view=diff ============================================================================== --- trunk/test_suite/system_tests/scripts/n_state_model/populations.py (original) +++ trunk/test_suite/system_tests/scripts/n_state_model/populations.py Wed Nov 27 14:31:47 2013 @@ -112,7 +112,7 @@ self._execute_uf(uf_name='value.set', val=0.6005, param='p1') # Minimisation. -self._execute_uf(uf_name='minimise', min_algor='bfgs') +self._execute_uf(uf_name='minimise', min_algor='bfgs', max_iter=2000) # Write out a results file. self._execute_uf(uf_name='results.write', file='devnull', force=True)