Author: semor Date: Wed Jan 9 19:44:37 2008 New Revision: 4580 URL: http://svn.gna.org/viewcvs/relax?rev=4580&view=rev Log: Merged revisions 4579 via svnmerge from svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3 ........ r4579 | semor | 2008-01-09 13:41:37 -0500 (Wed, 09 Jan 2008) | 3 lines Fixed a typo that was introduced in the 4576 commit. ........ Modified: branches/consistency_tests_1.3/ (props changed) branches/consistency_tests_1.3/specific_fns/model_free/model_free.py Propchange: branches/consistency_tests_1.3/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Jan 9 19:44:37 2008 @@ -1,1 +1,1 @@ -/1.3:1-3320,3333-4175,4223,4241-4335,4338-4433,4440-4461,4473,4476-4493,4523-4551,4567-4577 +/1.3:1-3320,3333-4175,4223,4241-4335,4338-4433,4440-4461,4473,4476-4493,4523-4551,4567-4577,4579 Modified: branches/consistency_tests_1.3/specific_fns/model_free/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/model_free/model_free.py?rev=4580&r1=4579&r2=4580&view=diff ============================================================================== --- branches/consistency_tests_1.3/specific_fns/model_free/model_free.py (original) +++ branches/consistency_tests_1.3/specific_fns/model_free/model_free.py Wed Jan 9 19:44:37 2008 @@ -2016,7 +2016,7 @@ return [-100 * 1e-6, -300 * 1e-6] - def minimise(self, run=None, min_algor=None, min_options=None, func_tol=None, grad_tol=None, max_iterations=None, constraints=0, scaling=1, verbosity, sim_index=None): + def minimise(self, run=None, min_algor=None, min_options=None, func_tol=None, grad_tol=None, max_iterations=None, constraints=0, scaling=1, verbosity=0, sim_index=None): """Model-free minimisation. Three types of parameter sets exist for which minimisation is different. These are: