r2662 - in /branches/apply/minimise: ./ line_search/r2662 - in /branches/apply/minimise: ./ line_search/Author: macraild Date: Mon Oct 23 11:01:25 2006 New Revision: 2662 URL: http://svn.gna.org/viewcvs/relax?rev=2662&view=rev Log: Merge of revision 2656 from 1.3 line. svn merge -r 2655:2657 svn+ssh://macraild@xxxxxxxxxxx/svn/relax/1.3 This revision was accidentally applied to the 1.3 line. Modified: branches/apply/minimise/base_classes.py branches/apply/minimise/bfgs.py branches/apply/minimise/cauchy_point.py branches/apply/minimise/coordinate_descent.py branches/apply/minimise/dogleg.py branches/apply/minimise/exact_trust_region.py branches/apply/minimise/fletcher_reeves_cg.py branches/apply/minimise/grid.py branches/apply/minimise/hestenes_stiefel_cg.py branches/apply/minimise/levenberg_marquardt.py branches/apply/minimise/line_search/backtrack.py branches/apply/minimise/line_search/more_thuente.py branches/apply/minimise/line_search/nocedal_wright_interpol.py branches/apply/minimise/line_search/nocedal_wright_wolfe.py branches/apply/minimise/line_search/test_functions.py branches/apply/minimise/method_of_multipliers.py branches/apply/minimise/ncg.py branches/apply/minimise/newton.py branches/apply/minimise/polak_ribiere_cg.py branches/apply/minimise/polak_ribiere_plus_cg.py branches/apply/minimise/simplex.py branches/apply/minimise/steepest_descent.py branches/apply/minimise/steihaug_cg.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/apply/minimise/base_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/base_classes.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/bfgs.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/bfgs.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/cauchy_point.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/cauchy_point.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/coordinate_descent.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/coordinate_descent.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/dogleg.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/dogleg.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/exact_trust_region.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/exact_trust_region.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/fletcher_reeves_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/fletcher_reeves_cg.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/grid.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/grid.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/hestenes_stiefel_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/hestenes_stiefel_cg.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/levenberg_marquardt.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/levenberg_marquardt.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/line_search/backtrack.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/line_search/backtrack.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/line_search/more_thuente.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/line_search/more_thuente.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/line_search/nocedal_wright_interpol.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/line_search/nocedal_wright_interpol.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/line_search/nocedal_wright_wolfe.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/line_search/nocedal_wright_wolfe.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/line_search/test_functions.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/line_search/test_functions.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/method_of_multipliers.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/method_of_multipliers.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/ncg.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/ncg.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/newton.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/newton.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/polak_ribiere_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/polak_ribiere_cg.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/polak_ribiere_plus_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/polak_ribiere_plus_cg.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/simplex.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/simplex.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/steepest_descent.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/steepest_descent.py?rev=2662&r1=2661&r2=2662&view=diff Modified: branches/apply/minimise/steihaug_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/apply/minimise/steihaug_cg.py?rev=2662&r1=2661&r2=2662&view=diff