r23641 - /branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py -- June 04, 2014 - 19:21

Author: bugman
Date: Wed Jun  4 19:21:24 2014
New Revision: 23641

URL: http://svn.gna.org/viewcvs/relax?rev=23641&view=rev
Log:
Removed a terrible hack for handling the frame order analysis without 
constraints.

This is no longer needed as the log-barrier method is now used to constrain 
the optimisation, so
that the torsion angle can no longer be negative.


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

Modified: 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py?rev=23641&r1=23640&r2=23641&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
(original)
+++ 
branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py  
Wed Jun  4 19:21:24 2014
@@ -762,11 +762,6 @@
                 val = getattr(cdp, cdp.params[i])
                 param_vector[i] = wrap_angles(param_vector[i], val-pi, 
val+pi)
 
-            # FIXME: Implement linear constraints via the log-barrier 
algorithm, then delete this.
-            # Handle negative values of the cone_sigma_max parameter.
-            if cdp.params[i] == 'cone_sigma_max':
-                param_vector[i] = abs(param_vector[i])
-
             # Store the value.
             obj = getattr(cdp, cdp.params[i]+'_sim')
             obj[sim_index] = param_vector[i]
@@ -793,11 +788,6 @@
             if cdp.params[i] == 'axis_alpha':
                 param_vector[i] = wrap_angles(param_vector[i], -pi, pi)
 
-            # FIXME: Implement linear constraints via the log-barrier 
algorithm, then delete this.
-            # Handle negative values of the cone_sigma_max parameter.
-            if cdp.params[i] == 'cone_sigma_max':
-                param_vector[i] = abs(param_vector[i])
-
             # Store the value.
             setattr(cdp, cdp.params[i], param_vector[i])