r4703 - in /branches/N_state_model: ./ generic_fns/ maths_fns/ minimise/ minimise/hessian_mods/ minimise/line_search/ prompt...r4703 - in /branches/N_state_model: ./ generic_fns/ maths_fns/ minimise/ minimise/hessian_mods/ minimise/line_search/ prompt...Author: bugman Date: Mon Jan 14 17:48:11 2008 New Revision: 4703 URL: http://svn.gna.org/viewcvs/relax?rev=4703&view=rev Log: Reverted the 'svnmerge merge' generated r4702. The command used was: svn merge -r4702:4701 . Not all files had been properly updated due to the following error: svnmerge: command execution failed (exit code: 1) svn log --incremental -r4679 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ssh_exchange_identification: Connection closed by remote host svn: Connection closed unexpectedly Modified: branches/N_state_model/ (props changed) branches/N_state_model/generic_fns/pipes.py branches/N_state_model/maths_fns/chi2.py branches/N_state_model/maths_fns/correlation_time.py branches/N_state_model/maths_fns/direction_cosine.py branches/N_state_model/maths_fns/jw_mapping.py branches/N_state_model/maths_fns/jw_mf.py branches/N_state_model/maths_fns/jw_mf_comps.py branches/N_state_model/maths_fns/mf.py branches/N_state_model/maths_fns/ri.py branches/N_state_model/maths_fns/ri_comps.py branches/N_state_model/maths_fns/weights.py branches/N_state_model/minimise/bfgs.py branches/N_state_model/minimise/cauchy_point.py branches/N_state_model/minimise/constraint_linear.py branches/N_state_model/minimise/coordinate_descent.py branches/N_state_model/minimise/dogleg.py branches/N_state_model/minimise/exact_trust_region.py branches/N_state_model/minimise/fletcher_reeves_cg.py branches/N_state_model/minimise/generic.py branches/N_state_model/minimise/grid.py branches/N_state_model/minimise/hessian_mods/cholesky.py branches/N_state_model/minimise/hessian_mods/eigenvalue.py branches/N_state_model/minimise/hessian_mods/gmw81.py branches/N_state_model/minimise/hessian_mods/gmw81_old.py branches/N_state_model/minimise/hessian_mods/se99.py branches/N_state_model/minimise/hestenes_stiefel_cg.py branches/N_state_model/minimise/levenberg_marquardt.py branches/N_state_model/minimise/line_search/backtrack.py branches/N_state_model/minimise/line_search/grace.py branches/N_state_model/minimise/line_search/interpolate.py branches/N_state_model/minimise/line_search/more_thuente.py branches/N_state_model/minimise/line_search/nocedal_wright_interpol.py branches/N_state_model/minimise/line_search/nocedal_wright_wolfe.py branches/N_state_model/minimise/line_search/test_functions.py branches/N_state_model/minimise/method_of_multipliers.py branches/N_state_model/minimise/ncg.py branches/N_state_model/minimise/newton.py branches/N_state_model/minimise/polak_ribiere_cg.py branches/N_state_model/minimise/polak_ribiere_plus_cg.py branches/N_state_model/minimise/simplex.py branches/N_state_model/minimise/steepest_descent.py branches/N_state_model/minimise/steihaug_cg.py branches/N_state_model/prompt/angles.py branches/N_state_model/prompt/command.py branches/N_state_model/prompt/dasha.py branches/N_state_model/prompt/eliminate.py branches/N_state_model/prompt/fix.py branches/N_state_model/prompt/grace.py branches/N_state_model/prompt/help.py branches/N_state_model/prompt/interpreter.py branches/N_state_model/prompt/jw_mapping.py branches/N_state_model/prompt/model_free.py branches/N_state_model/prompt/model_selection.py branches/N_state_model/prompt/monte_carlo.py branches/N_state_model/prompt/noe.py branches/N_state_model/prompt/palmer.py branches/N_state_model/prompt/relax_fit.py branches/N_state_model/prompt/results.py branches/N_state_model/prompt/tab_completion.py branches/N_state_model/prompt/unselect.py branches/N_state_model/prompt/view.py branches/N_state_model/prompt/vmd.py branches/N_state_model/sample_scripts/full_analysis.py branches/N_state_model/sample_scripts/remap.py branches/N_state_model/specific_fns/__init__.py branches/N_state_model/specific_fns/model_free/__init__.py branches/N_state_model/specific_fns/model_free/model_free.py branches/N_state_model/test_suite/system_tests/model_selection.py branches/N_state_model/test_suite/unit_tests/_generic_fns/test_value.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/N_state_model/generic_fns/pipes.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/pipes.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/chi2.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/chi2.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/correlation_time.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/correlation_time.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/direction_cosine.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/direction_cosine.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/jw_mapping.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/jw_mf.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/jw_mf.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/jw_mf_comps.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/jw_mf_comps.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/mf.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/mf.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/ri.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/ri.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/ri_comps.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/ri_comps.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/maths_fns/weights.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/weights.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/bfgs.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/bfgs.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/cauchy_point.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/cauchy_point.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/constraint_linear.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/constraint_linear.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/coordinate_descent.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/coordinate_descent.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/dogleg.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/dogleg.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/exact_trust_region.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/exact_trust_region.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/fletcher_reeves_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/fletcher_reeves_cg.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/generic.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/generic.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/grid.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/grid.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/hessian_mods/cholesky.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/hessian_mods/cholesky.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/hessian_mods/eigenvalue.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/hessian_mods/eigenvalue.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/hessian_mods/gmw81.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/hessian_mods/gmw81.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/hessian_mods/gmw81_old.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/hessian_mods/gmw81_old.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/hessian_mods/se99.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/hessian_mods/se99.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/hestenes_stiefel_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/hestenes_stiefel_cg.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/levenberg_marquardt.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/levenberg_marquardt.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/line_search/backtrack.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/line_search/backtrack.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/line_search/grace.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/line_search/grace.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/line_search/interpolate.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/line_search/interpolate.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/line_search/more_thuente.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/line_search/more_thuente.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/line_search/nocedal_wright_interpol.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/line_search/nocedal_wright_interpol.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/line_search/nocedal_wright_wolfe.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/line_search/nocedal_wright_wolfe.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/line_search/test_functions.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/line_search/test_functions.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/method_of_multipliers.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/method_of_multipliers.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/ncg.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/ncg.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/newton.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/newton.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/polak_ribiere_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/polak_ribiere_cg.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/polak_ribiere_plus_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/polak_ribiere_plus_cg.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/simplex.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/simplex.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/steepest_descent.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/steepest_descent.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/minimise/steihaug_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/minimise/steihaug_cg.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/angles.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/angles.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/command.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/command.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/dasha.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/dasha.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/eliminate.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/eliminate.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/fix.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/fix.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/grace.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/grace.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/help.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/help.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/interpreter.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/interpreter.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/jw_mapping.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/model_free.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/model_selection.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/model_selection.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/monte_carlo.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/monte_carlo.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/noe.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/palmer.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/palmer.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/relax_fit.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/results.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/results.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/tab_completion.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/tab_completion.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/unselect.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/unselect.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/view.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/view.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/prompt/vmd.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/prompt/vmd.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/sample_scripts/full_analysis.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/sample_scripts/full_analysis.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/sample_scripts/remap.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/sample_scripts/remap.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/specific_fns/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/__init__.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/specific_fns/model_free/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/model_free/__init__.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/specific_fns/model_free/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/model_free/model_free.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/test_suite/system_tests/model_selection.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/system_tests/model_selection.py?rev=4703&r1=4702&r2=4703&view=diff Modified: branches/N_state_model/test_suite/unit_tests/_generic_fns/test_value.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/unit_tests/_generic_fns/test_value.py?rev=4703&r1=4702&r2=4703&view=diff