r25990 - in /branches/frame_order_cleanup: auto_analyses/ specific_analyses/frame_order/ target_functions/ test_suite/shared...

Wed, 24 Sep 2014 00:53:11 -0700 

Author: bugman
Date: Wed Sep 24 09:52:57 2014
New Revision: 25990

URL: http://svn.gna.org/viewcvs/relax?rev=25990&view=rev
Log:
Reverted r23309, the deletion of the frame_order.quad_int user function and the 
rest of the backend.

The command used was:
svn merge -r23309:23308 .

This is part of restoring the SciPy quadratic integration in the frame order 
target functions.
Although incredibly slow, this will be useful for refining the final results, 
especially for models
whereby the number of Sobol' points collapses to zero.

.....
  r23309 | bugman | 2014-05-21 17:06:17 +0200 (Wed, 21 May 2014) | 4 lines
  Changed paths:
     M /branches/frame_order_cleanup/auto_analyses/frame_order.py
     M 
/branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
     M /branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
     M /branches/frame_order_cleanup/target_functions/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
     M 
/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
     M /branches/frame_order_cleanup/user_functions/frame_order.py
  
  Deletion of the frame_order.quad_int user function.
  
  This no longer has a purpose, as the incredibly slow quadratic integration 
code has been removed
  from relax.
.....


Modified:
    branches/frame_order_cleanup/auto_analyses/frame_order.py
    branches/frame_order_cleanup/specific_analyses/frame_order/optimisation.py
    branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
    branches/frame_order_cleanup/target_functions/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
    
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
    branches/frame_order_cleanup/user_functions/frame_order.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=25990&r1=25989&r2=25990&view=diff

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=25990&r1=25989&r2=25990&view=diff

Modified: branches/frame_order_cleanup/specific_analyses/frame_order/uf.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/uf.py?rev=25990&r1=25989&r2=25990&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=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: 
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff

Modified: branches/frame_order_cleanup/user_functions/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/user_functions/frame_order.py?rev=25990&r1=25989&r2=25990&view=diff


_______________________________________________
relax (http://www.nmr-relax.com)

This is the relax-commits mailing list
[email protected]

To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits

Reply via email to