mailr24516 - /branches/frame_order_cleanup/specific_analyses/frame_order/api.py


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

Header


Content

Posted by edward on July 10, 2014 - 18:27:
Author: bugman
Date: Thu Jul 10 18:27:10 2014
New Revision: 24516

URL: http://svn.gna.org/viewcvs/relax?rev=24516&view=rev
Log:
Constraints are now properly turned off in the minimise user function for the 
frame order analysis.

The A and b matrices from linear_constraints() are now set to None if they 
are returned as empty
arrays.


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=24516&r1=24515&r2=24516&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/frame_order/api.py   
(original)
+++ branches/frame_order_cleanup/specific_analyses/frame_order/api.py   Thu 
Jul 10 18:27:10 2014
@@ -595,7 +595,8 @@
         if A != None and len(A) == 0:
             if verbosity:
                 warn(RelaxWarning("The '%s' model parameters are not 
constrained, turning the linear constraint algorithm off." % cdp.model))
-            constraints = False
+            A = None
+            b = None
 
             # Pop out the log barrier algorithm.
             if min_algor == 'Log barrier':




Related Messages


Powered by MHonArc, Updated Thu Jul 10 19:20:03 2014