r9098 - /branches/frame_order/specific_fns/frame_order.py -- June 19, 2009 - 15:27

Author: bugman
Date: Fri Jun 19 15:27:08 2009
New Revision: 9098

URL: http://svn.gna.org/viewcvs/relax?rev=9098&view=rev
Log:
Fixes for the minimise() method.


Modified:
    branches/frame_order/specific_fns/frame_order.py

Modified: branches/frame_order/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/specific_fns/frame_order.py?rev=9098&r1=9097&r2=9098&view=diff
==============================================================================
--- branches/frame_order/specific_fns/frame_order.py (original)
+++ branches/frame_order/specific_fns/frame_order.py Fri Jun 19 15:27:08 2009
@@ -232,10 +232,10 @@
             param_vector = array([cdp.alpha, cdp.beta, cdp.gamma, 
cdp.theta], float64)
 
             # Set up the optimisation function.
-            model = frame_order_models.Frame_order()
+            target = frame_order_models.Frame_order(model=cdp.model)
 
         # Minimisation.
-        results = generic_minimise(func=model.func, args=(), 
x0=param_vector, min_algor=MIN_ALGOR, full_output=1, print_flag=1)
+        results = generic_minimise(func=target.func, 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)
 
         # Unpack the results.
         self.__unpack_opt_results(results)