r11167 - /1.3/specific_fns/n_state_model.py -- April 28, 2010 - 19:48

Author: bugman
Date: Wed Apr 28 19:48:53 2010
New Revision: 11167

URL: http://svn.gna.org/viewcvs/relax?rev=11167&view=rev
Log:
Bug fix for the 'population' N-state model optimisation.

Constraints must be used at all times for this to work!!!


Modified:
    1.3/specific_fns/n_state_model.py

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=11167&r1=11166&r2=11167&view=diff
==============================================================================
--- 1.3/specific_fns/n_state_model.py (original)
+++ 1.3/specific_fns/n_state_model.py Wed Apr 28 19:48:53 2010
@@ -1609,6 +1609,15 @@
                 min_algor = min_options[0]
                 min_options = min_options[1:]
 
+        # And constraints absolutely must be used for the 'population' model.
+        if not constraints and cdp.model == 'population':
+            warn(RelaxWarning("Turning constraints on.  These absolutely 
must be used for the 'population' model."))
+            constraints = True
+
+            # Add the Method of Multipliers algorithm.
+            min_options = (min_algor,) + min_options
+            min_algor = 'Method of Multipliers'
+
         # Linear constraints.
         if constraints:
             A, b = self._linear_constraints(data_types=data_types, 
scaling_matrix=scaling_matrix)