Author: bugman Date: Wed Sep 24 09:31:51 2014 New Revision: 25987 URL: http://svn.gna.org/viewcvs/relax?rev=25987&view=rev Log: Reverted r23202. The command used was: svn merge -r23202:23201 . 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. ..... r23202 | bugman | 2014-05-16 14:31:11 +0200 (Fri, 16 May 2014) | 6 lines Changed paths: M /branches/frame_order_cleanup/lib/frame_order/iso_cone.py M /branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py M /branches/frame_order_cleanup/lib/frame_order/matrix_ops.py M /branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py M /branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py M /branches/frame_order_cleanup/lib/frame_order/rotor.py Deletion of all of the Scipy quadratic integration functions for the PCS in the relax library. These are no longer used, as they are far too slow. The quasi-random functions have long replaced these. ..... Modified: branches/frame_order_cleanup/lib/frame_order/iso_cone.py branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py branches/frame_order_cleanup/lib/frame_order/matrix_ops.py branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py branches/frame_order_cleanup/lib/frame_order/rotor.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_cleanup/lib/frame_order/iso_cone.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/iso_cone.py?rev=25987&r1=25986&r2=25987&view=diff Modified: branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/iso_cone_torsionless.py?rev=25987&r1=25986&r2=25987&view=diff Modified: branches/frame_order_cleanup/lib/frame_order/matrix_ops.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/matrix_ops.py?rev=25987&r1=25986&r2=25987&view=diff Modified: branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse.py?rev=25987&r1=25986&r2=25987&view=diff Modified: branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/pseudo_ellipse_torsionless.py?rev=25987&r1=25986&r2=25987&view=diff Modified: branches/frame_order_cleanup/lib/frame_order/rotor.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/frame_order/rotor.py?rev=25987&r1=25986&r2=25987&view=diff