r6766 - /1.3/specific_fns/model_free/mf_minimise.py -- July 05, 2008 - 21:07

Author: bugman
Date: Sat Jul  5 20:25:46 2008
New Revision: 6766

URL: http://svn.gna.org/viewcvs/relax?rev=6766&view=rev
Log:
Added a few additional comments.


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=6766&r1=6765&r2=6766&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Sat Jul  5 20:25:46 2008
@@ -980,10 +980,15 @@
             # Minimisation.
             ###############
 
+            # Constrained optimisation.
             if constraints:
                 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, A=A, b=b, full_output=1, 
print_flag=verbosity)
+
+            # Unconstrained optimisation.
             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)
+
+            # Disassemble the results.
             if results == None:
                 continue
             param_vector, func, iter, fc, gc, hc, warning = results