mailr12823 - /1.3/specific_fns/model_free/mf_minimise.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on April 15, 2011 - 10:05:
Author: bugman
Date: Fri Apr 15 10:05:49 2011
New Revision: 12823

URL: http://svn.gna.org/viewcvs/relax?rev=12823&view=rev
Log:
Fix for bug #18030 (https://gna.org/bugs/?18030).

The problem was that the grid search limits were being scaled iteratively for 
each successive spin
system.  This only affects certain type of custom grid searches.


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=12823&r1=12822&r2=12823&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Fri Apr 15 10:05:49 2011
@@ -350,12 +350,14 @@
                     self._grid_search_spin_bounds(spin, lower, upper)
 
         # Diagonal scaling of minimisation options.
+        lower_new = []
+        upper_new = []
         for i in xrange(num_params):
-            lower[i] = lower[i] / scaling_matrix[i, i]
-            upper[i] = upper[i] / scaling_matrix[i, i]
+            lower_new.append(lower[i] / scaling_matrix[i, i])
+            upper_new.append(upper[i] / scaling_matrix[i, i])
 
         # Return the minimisation options.
-        return inc, lower, upper
+        return inc, lower_new, upper_new
 
 
     def _grid_search_diff_bounds(self, lower, upper):




Related Messages


Powered by MHonArc, Updated Sun Apr 17 16:00:02 2011