r24506 - in /branches/frame_order_cleanup: auto_analyses/ specific_analyses/frame_order/ target_functions/ test_suite/system...r24506 - in /branches/frame_order_cleanup: auto_analyses/ specific_analyses/frame_order/ target_functions/ test_suite/system...Author: bugman Date: Thu Jul 10 10:36:20 2014 New Revision: 24506 URL: http://svn.gna.org/viewcvs/relax?rev=24506&view=rev Log: The specific_analyses.frame_order.variables module is now used throughout the frame order code. The target function code, auto-analysis, and test suite now all use the variables defined in this module rather than having hardcoded strings. The MODEL_LIST_NONREDUNDANT variable has been created to exclude the redundant free rotor pseudo-ellipse which cannot be optimised, and this is used by the auto-analysis. Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py branches/frame_order_cleanup/specific_analyses/frame_order/variables.py branches/frame_order_cleanup/target_functions/frame_order.py branches/frame_order_cleanup/test_suite/system_tests/frame_order.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/double_rotor.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/double_rotor_large_angle.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rigid.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor2.py branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_cleanup/auto_analyses/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/frame_order.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/specific_analyses/frame_order/variables.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/variables.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/target_functions/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/target_functions/frame_order.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/frame_order.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/frame_order.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/double_rotor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/double_rotor.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/double_rotor_large_angle.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/double_rotor_large_angle.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rigid.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rigid.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor2.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor2.py?rev=24506&r1=24505&r2=24506&view=diff Modified: branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py?rev=24506&r1=24505&r2=24506&view=diff