Author: semor
Date: Tue Jan 15 21:38:37 2008
New Revision: 4760
URL: http://svn.gna.org/viewcvs/relax?rev=4760&view=rev
Log:
Merged revisions 4698-4701,4712-4717,4745,4748,4759 via svnmerge from
svn+ssh://semor@xxxxxxxxxxx/svn/relax/1.3
........
r4698 | semor | 2008-01-13 20:26:39 -0500 (Sun, 13 Jan 2008) | 3 lines
Added comments to the imports.
........
r4699 | semor | 2008-01-13 23:25:19 -0500 (Sun, 13 Jan 2008) | 3 lines
Added more comments to the imports.
........
r4700 | semor | 2008-01-13 23:31:50 -0500 (Sun, 13 Jan 2008) | 3 lines
Added somemore comments to the imports.
........
r4701 | semor | 2008-01-14 09:49:41 -0500 (Mon, 14 Jan 2008) | 3 lines
Added some comments to the imports and ordered imports alphabetically.
........
r4712 | bugman | 2008-01-15 04:46:52 -0500 (Tue, 15 Jan 2008) | 3 lines
Removed the empty __init__() method and shifted its docstring to that of
the class.
........
r4713 | bugman | 2008-01-15 04:47:09 -0500 (Tue, 15 Jan 2008) | 3 lines
Removed an orphaned comment.
........
r4714 | bugman | 2008-01-15 04:50:04 -0500 (Tue, 15 Jan 2008) | 3 lines
Updated the base class method has_errors() to the new relax design.
........
r4715 | bugman | 2008-01-15 04:52:45 -0500 (Tue, 15 Jan 2008) | 3 lines
Updated the return_data() and return_error() base class methods to the new
relax design.
........
r4716 | bugman | 2008-01-15 04:54:47 -0500 (Tue, 15 Jan 2008) | 3 lines
Updated the base class method sim_return_selected() to the new relax design.
........
r4717 | bugman | 2008-01-15 05:13:30 -0500 (Tue, 15 Jan 2008) | 5 lines
Added a dummy overfit_deselect() method to the base class.
This method does nothing.
........
r4745 | bugman | 2008-01-15 08:40:06 -0500 (Tue, 15 Jan 2008) | 3 lines
Shifted the grid ops tests into the test_grid_ops() base class function.
........
r4748 | bugman | 2008-01-15 08:52:49 -0500 (Tue, 15 Jan 2008) | 3 lines
Fixed a bug in the test_grid_ops() base class method which was preventing
relax from starting.
........
r4759 | semor | 2008-01-15 13:11:09 -0500 (Tue, 15 Jan 2008) | 8 lines
Changed the precision for gX in the mfpar file for use of ModelFree with
the palmer.py script.
The change was from a three decimal precision (-2.713) to a four decimal
precision (-2.7126).
This was discussed in thread starting at:
https://mail.gna.org/public/relax-devel/2008-01/msg00040.html
........
Modified:
branches/consistency_tests_1.3/ (props changed)
branches/consistency_tests_1.3/generic_fns/palmer.py
branches/consistency_tests_1.3/maths_fns/chi2.py
branches/consistency_tests_1.3/maths_fns/correlation_time.py
branches/consistency_tests_1.3/maths_fns/direction_cosine.py
branches/consistency_tests_1.3/maths_fns/jw_mapping.py
branches/consistency_tests_1.3/maths_fns/jw_mf.py
branches/consistency_tests_1.3/maths_fns/jw_mf_comps.py
branches/consistency_tests_1.3/maths_fns/mf.py
branches/consistency_tests_1.3/maths_fns/ri.py
branches/consistency_tests_1.3/maths_fns/ri_comps.py
branches/consistency_tests_1.3/maths_fns/weights.py
branches/consistency_tests_1.3/minimise/bfgs.py
branches/consistency_tests_1.3/minimise/cauchy_point.py
branches/consistency_tests_1.3/minimise/constraint_linear.py
branches/consistency_tests_1.3/minimise/coordinate_descent.py
branches/consistency_tests_1.3/minimise/dogleg.py
branches/consistency_tests_1.3/minimise/exact_trust_region.py
branches/consistency_tests_1.3/minimise/fletcher_reeves_cg.py
branches/consistency_tests_1.3/minimise/generic.py
branches/consistency_tests_1.3/minimise/grid.py
branches/consistency_tests_1.3/minimise/hessian_mods/cholesky.py
branches/consistency_tests_1.3/minimise/hessian_mods/eigenvalue.py
branches/consistency_tests_1.3/minimise/hessian_mods/gmw81.py
branches/consistency_tests_1.3/minimise/hessian_mods/gmw81_old.py
branches/consistency_tests_1.3/minimise/hessian_mods/se99.py
branches/consistency_tests_1.3/minimise/hestenes_stiefel_cg.py
branches/consistency_tests_1.3/minimise/levenberg_marquardt.py
branches/consistency_tests_1.3/minimise/line_search/backtrack.py
branches/consistency_tests_1.3/minimise/line_search/grace.py
branches/consistency_tests_1.3/minimise/line_search/interpolate.py
branches/consistency_tests_1.3/minimise/line_search/more_thuente.py
branches/consistency_tests_1.3/minimise/line_search/nocedal_wright_interpol.py
branches/consistency_tests_1.3/minimise/line_search/nocedal_wright_wolfe.py
branches/consistency_tests_1.3/minimise/line_search/test_functions.py
branches/consistency_tests_1.3/minimise/method_of_multipliers.py
branches/consistency_tests_1.3/minimise/ncg.py
branches/consistency_tests_1.3/minimise/newton.py
branches/consistency_tests_1.3/minimise/polak_ribiere_cg.py
branches/consistency_tests_1.3/minimise/polak_ribiere_plus_cg.py
branches/consistency_tests_1.3/minimise/simplex.py
branches/consistency_tests_1.3/minimise/steepest_descent.py
branches/consistency_tests_1.3/minimise/steihaug_cg.py
branches/consistency_tests_1.3/prompt/angles.py
branches/consistency_tests_1.3/prompt/command.py
branches/consistency_tests_1.3/prompt/dasha.py
branches/consistency_tests_1.3/prompt/eliminate.py
branches/consistency_tests_1.3/prompt/fix.py
branches/consistency_tests_1.3/prompt/grace.py
branches/consistency_tests_1.3/prompt/help.py
branches/consistency_tests_1.3/prompt/interpreter.py
branches/consistency_tests_1.3/prompt/jw_mapping.py
branches/consistency_tests_1.3/prompt/model_selection.py
branches/consistency_tests_1.3/prompt/monte_carlo.py
branches/consistency_tests_1.3/prompt/noe.py
branches/consistency_tests_1.3/prompt/palmer.py
branches/consistency_tests_1.3/prompt/relax_fit.py
branches/consistency_tests_1.3/prompt/results.py
branches/consistency_tests_1.3/prompt/tab_completion.py
branches/consistency_tests_1.3/prompt/unselect.py
branches/consistency_tests_1.3/prompt/view.py
branches/consistency_tests_1.3/prompt/vmd.py
branches/consistency_tests_1.3/sample_scripts/remap.py
branches/consistency_tests_1.3/specific_fns/base_class.py
branches/consistency_tests_1.3/specific_fns/model_free/mf_minimise.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/consistency_tests_1.3/generic_fns/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/generic_fns/palmer.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/chi2.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/chi2.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/correlation_time.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/correlation_time.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/direction_cosine.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/direction_cosine.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/jw_mapping.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/jw_mf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/jw_mf.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/jw_mf_comps.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/jw_mf_comps.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/mf.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/mf.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/ri.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/ri.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/ri_comps.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/ri_comps.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/maths_fns/weights.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/maths_fns/weights.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/bfgs.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/bfgs.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/cauchy_point.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/cauchy_point.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/constraint_linear.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/constraint_linear.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/coordinate_descent.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/coordinate_descent.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/dogleg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/dogleg.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/exact_trust_region.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/exact_trust_region.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/fletcher_reeves_cg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/fletcher_reeves_cg.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/generic.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/generic.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/grid.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/grid.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/hessian_mods/cholesky.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/hessian_mods/cholesky.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/hessian_mods/eigenvalue.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/hessian_mods/eigenvalue.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/hessian_mods/gmw81.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/hessian_mods/gmw81.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/hessian_mods/gmw81_old.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/hessian_mods/gmw81_old.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/hessian_mods/se99.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/hessian_mods/se99.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/hestenes_stiefel_cg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/hestenes_stiefel_cg.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/levenberg_marquardt.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/levenberg_marquardt.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/line_search/backtrack.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/line_search/backtrack.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/line_search/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/line_search/grace.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/line_search/interpolate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/line_search/interpolate.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/line_search/more_thuente.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/line_search/more_thuente.py?rev=4760&r1=4759&r2=4760&view=diff
Modified:
branches/consistency_tests_1.3/minimise/line_search/nocedal_wright_interpol.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/line_search/nocedal_wright_interpol.py?rev=4760&r1=4759&r2=4760&view=diff
Modified:
branches/consistency_tests_1.3/minimise/line_search/nocedal_wright_wolfe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/line_search/nocedal_wright_wolfe.py?rev=4760&r1=4759&r2=4760&view=diff
Modified:
branches/consistency_tests_1.3/minimise/line_search/test_functions.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/line_search/test_functions.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/method_of_multipliers.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/method_of_multipliers.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/ncg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/ncg.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/newton.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/newton.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/polak_ribiere_cg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/polak_ribiere_cg.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/polak_ribiere_plus_cg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/polak_ribiere_plus_cg.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/simplex.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/simplex.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/steepest_descent.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/steepest_descent.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/minimise/steihaug_cg.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/minimise/steihaug_cg.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/angles.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/command.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/command.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/dasha.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/eliminate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/eliminate.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/fix.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/fix.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/grace.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/help.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/help.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/interpreter.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/interpreter.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/jw_mapping.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/model_selection.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/model_selection.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/monte_carlo.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/noe.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/palmer.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/palmer.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/relax_fit.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/results.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/results.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/tab_completion.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/tab_completion.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/unselect.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/unselect.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/view.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/view.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/prompt/vmd.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/prompt/vmd.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/sample_scripts/remap.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/sample_scripts/remap.py?rev=4760&r1=4759&r2=4760&view=diff
Modified: branches/consistency_tests_1.3/specific_fns/base_class.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/base_class.py?rev=4760&r1=4759&r2=4760&view=diff
Modified:
branches/consistency_tests_1.3/specific_fns/model_free/mf_minimise.py
URL:
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/model_free/mf_minimise.py?rev=4760&r1=4759&r2=4760&view=diff
r4760 - in /branches/consistency_tests_1.3: ./ generic_fns/ maths_fns/ minimise/ minimise/hessian_mods/ minimise/line_search...