Author: bugman Date: Mon Aug 31 17:49:38 2009 New Revision: 9413 URL: http://svn.gna.org/viewcvs/relax?rev=9413&view=rev Log: Constraints are now automatically turned off, if the minimisation option is set to True. These are not yet implemented! Modified: 1.3/specific_fns/frame_order.py Modified: 1.3/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/frame_order.py?rev=9413&r1=9412&r2=9413&view=diff ============================================================================== --- 1.3/specific_fns/frame_order.py (original) +++ 1.3/specific_fns/frame_order.py Mon Aug 31 17:49:38 2009 @@ -28,6 +28,7 @@ from math import pi from minfx.generic import generic_minimise from numpy import array, float64, ones, transpose, zeros +from warnings import warn # relax module imports. from float import isNaN, isInf @@ -40,6 +41,7 @@ from maths_fns.rotation_matrix import R_2vect from relax_errors import RelaxError, RelaxInfError, RelaxNaNError, RelaxNoModelError from relax_io import open_write_file +from relax_warnings import RelaxWarning from specific_fns.base_class import Common_functions @@ -672,7 +674,8 @@ # Constraints not implemented yet. if constraints: - raise RelaxError("Constraints are as of yet not implemented.") + constraints = False + warn(RelaxWarning("Constraints are as of yet not implemented - turning this option off.")) # The rigid model. if cdp.model == 'rigid':