r10157 - /1.3/specific_fns/model_free/mf_minimise.py -- January 08, 2010 - 10:57

Author: bugman
Date: Fri Jan  8 10:57:41 2010
New Revision: 10157

URL: http://svn.gna.org/viewcvs/relax?rev=10157&view=rev
Log:
Big bug fix for the model-free grid search!!!

The lower and upper bounds were being scaled iteratively for each spin 
causing the values to be
ridiculously bigger and bigger.  This caused a total failure of the grid 
search.


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=10157&r1=10156&r2=10157&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Fri Jan  8 10:57:41 2010
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2003-2009 Edward d'Auvergne                                  
 #
+# Copyright (C) 2003-2010 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -1391,7 +1391,7 @@
 
             # Configure the grid search.
             if match('^[Gg]rid', min_algor):
-                inc, lower, upper = self._grid_search_config(num_params, 
spin=spin, lower=lower, upper=upper, inc=inc, scaling_matrix=scaling_matrix)
+                inc_new, lower_new, upper_new = 
self._grid_search_config(num_params, spin=spin, lower=lower, upper=upper, 
inc=inc, scaling_matrix=scaling_matrix)
 
             # Scaling of values for the set function.
             if match('^[Ss]et', min_algor):
@@ -1459,7 +1459,7 @@
 
             # Grid search.
             if search('^[Gg]rid', min_algor):
-                results = grid(func=self.mf.func, args=(), num_incs=inc, 
lower=lower, upper=upper, A=A, b=b, verbosity=verbosity)
+                results = grid(func=self.mf.func, args=(), num_incs=inc_new, 
lower=lower_new, upper=upper_new, A=A, b=b, verbosity=verbosity)
 
                 # Unpack the results.
                 param_vector, func, iter, warning = results