r9563 - in /1.3/specific_fns: frame_order.py n_state_model.py relax_fit.py -- September 22, 2009 - 19:52

Author: bugman
Date: Tue Sep 22 19:35:05 2009
New Revision: 9563

URL: http://svn.gna.org/viewcvs/relax?rev=9563&view=rev
Log:
Modified the grid search calls due to changes in minfx.


Modified:
    1.3/specific_fns/frame_order.py
    1.3/specific_fns/n_state_model.py
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/frame_order.py?rev=9563&r1=9562&r2=9563&view=diff
==============================================================================
--- 1.3/specific_fns/frame_order.py (original)
+++ 1.3/specific_fns/frame_order.py Tue Sep 22 19:35:05 2009
@@ -247,12 +247,11 @@
          """
 
         # Disassemble the results.
-        if len(results) == 3:    # Grid search.
-            param_vector, func, iter_count = results
+        if len(results) == 4:    # Grid search.
+            param_vector, func, iter_count, warning = results
             f_count = iter_count
             g_count = 0.0
             h_count = 0.0
-            warning = None
         else:
             param_vector, func, iter_count, f_count, g_count, h_count, 
warning = results
 

Modified: 1.3/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=9563&r1=9562&r2=9563&view=diff
==============================================================================
--- 1.3/specific_fns/n_state_model.py (original)
+++ 1.3/specific_fns/n_state_model.py Tue Sep 22 19:35:05 2009
@@ -1414,11 +1414,10 @@
             results = grid(func=model.func, args=(), 
num_incs=min_options[0], lower=min_options[1], upper=min_options[2], A=A, 
b=b, verbosity=verbosity)
 
             # Unpack the results.
-            param_vector, func, iter_count = results
+            param_vector, func, iter_count, warning = results
             f_count = iter_count
             g_count = 0.0
             h_count = 0.0
-            warning = None
 
         # Minimisation.
         else:

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=9563&r1=9562&r2=9563&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Tue Sep 22 19:35:05 2009
@@ -684,11 +684,10 @@
                 results = grid(func=func, args=(), num_incs=inc, 
lower=lower, upper=upper, A=A, b=b, verbosity=verbosity)
 
                 # Unpack the results.
-                param_vector, chi2, iter_count = results
+                param_vector, chi2, iter_count, warning = results
                 f_count = iter_count
                 g_count = 0.0
                 h_count = 0.0
-                warning = None
 
             # Minimisation.
             else: