Author: bugman
Date: Fri Jan 8 11:02:23 2010
New Revision: 10158
URL: http://svn.gna.org/viewcvs/relax?rev=10158&view=rev
Log:
Merged revisions 10157 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r10157 | bugman | 2010-01-08 10:57:41 +0100 (Fri, 08 Jan 2010) | 6 lines
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:
branches/multi_processor_merge/ (props changed)
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
Propchange: branches/multi_processor_merge/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 8 11:02:23 2010
@@ -1,1 +1,1 @@
-/1.3:1-10117
+/1.3:1-10157
Modified:
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=10158&r1=10157&r2=10158&view=diff
==============================================================================
--- branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
(original)
+++ branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py Fri
Jan 8 11:02:23 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.
#
#
#
@@ -1516,7 +1516,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):
@@ -1617,7 +1617,7 @@
# Normal grid search.
if search('^[Gg]rid', min_algor):
# Minimisation initialisation.
- command = MF_grid_command(self.mf, model_type=model_type,
spin_id=spin_id, inc=inc, lower=lower, upper=upper, A=A, b=b,
verbosity=verbosity)
+ command = MF_grid_command(self.mf, model_type=model_type,
spin_id=spin_id, inc=inc_new, lower=lower_new, upper=upper_new, A=A, b=b,
verbosity=verbosity)
# Minimisation of all other model types.
else:
r10158 - in /branches/multi_processor_merge: ./ specific_fns/model_free/mf_minimise.py