r5605 - /1.3/specific_fns/model_free/mf_minimise.py -- April 12, 2008 - 22:37

Author: bugman
Date: Sat Apr 12 22:28:30 2008
New Revision: 5605

URL: http://svn.gna.org/viewcvs/relax?rev=5605&view=rev
Log:
Manually merged r5603 from the 1.2 line.

The command used was:
svn merge -r5603:5604 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2/specific_fns/model_free.py 
specific_fns/model_free/mf_minimise.py

.....
  r5604 | bugman | 2008-04-12 22:20:59 +0200 (Sat, 12 Apr 2008) | 7 lines
  Changed paths:
     M /1.2/specific_fns/model_free.py

  Fix for bug #11476 (https://gna.org/bugs/index.php?11476).

  This bug is fatal for Monte Carlo simulations if model m0 is encountered.  
The problem was that
  there was a 'return' statement instead of 'continue' which caused the Monte 
Carlo simulation
  optimisation as soon as model m0 is encountered.
.....


Modified:
    1.3/specific_fns/model_free/mf_minimise.py

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=5605&r1=5604&r2=5605&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sat Apr 12 22:28:30 2008
@@ -983,7 +983,7 @@
             else:
                 results = generic_minimise(func=self.mf.func, 
dfunc=self.mf.dfunc, d2func=self.mf.d2func, args=(), x0=param_vector, 
min_algor=min_algor, min_options=min_options, func_tol=func_tol, 
grad_tol=grad_tol, maxiter=max_iterations, full_output=1, 
print_flag=verbosity)
             if results == None:
-                return
+                continue
             param_vector, func, iter, fc, gc, hc, warning = results
             iter_count = iter_count + iter
             f_count = f_count + fc