r23283 - /branches/frame_order_cleanup/specific_analyses/frame_order/api.py -- May 21, 2014 - 09:59

Author: bugman
Date: Wed May 21 09:59:51 2014
New Revision: 23283

URL: http://svn.gna.org/viewcvs/relax?rev=23283&view=rev
Log:
Fix for the constraint deactivation in the frame order minimisation when no 
constraints are present.

This problem was introduced at r23211.

Modified:
    branches/frame_order_cleanup/specific_analyses/frame_order/api.py

Modified: branches/frame_order_cleanup/specific_analyses/frame_order/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/api.py?rev=23283&r1=23282&r2=23283&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/api.py   
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/api.py   Wed 
May 21 09:59:51 2014
@@ -554,8 +554,8 @@
         if constraints:
             A, b = linear_constraints(scaling_matrix=scaling_matrix)
 
-        # No constraints.
-        if len(A) == 0:
+        # Constraint flag set but no constraints present.
+        if A != None and len(A) == 0:
             warn(RelaxWarning("The '%s' model parameters are not 
constrained, turning the linear constraint algorithm off." % cdp.model))
             constraints = False