r5604 - /1.2/specific_fns/model_free.py -- April 12, 2008 - 22:37

Author: bugman
Date: Sat Apr 12 22:20:59 2008
New Revision: 5604

URL: http://svn.gna.org/viewcvs/relax?rev=5604&view=rev
Log:
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.2/specific_fns/model_free.py

Modified: 1.2/specific_fns/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/specific_fns/model_free.py?rev=5604&r1=5603&r2=5604&view=diff
==============================================================================
--- 1.2/specific_fns/model_free.py (original)
+++ 1.2/specific_fns/model_free.py Sat Apr 12 22:20:59 2008
@@ -2373,7 +2373,7 @@
             else:
                 results = generic_minimise(func=self.mf.func, 
dfunc=self.mf.dfunc, d2func=self.mf.d2func, args=(), x0=self.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=print_flag)
             if results == None:
-                return
+                continue
             self.param_vector, self.func, iter, fc, gc, hc, self.warning = 
results
             self.iter_count = self.iter_count + iter
             self.f_count = self.f_count + fc