r2836 - in /branches/tensor_pdb: ./ docs/ docs/latex/ docs/latex/images/ docs/latex/images/model_free/ dx/ generic_fns/ mini...r2836 - in /branches/tensor_pdb: ./ docs/ docs/latex/ docs/latex/images/ docs/latex/images/model_free/ dx/ generic_fns/ mini...Author: bugman Date: Mon Nov 13 06:11:29 2006 New Revision: 2836 URL: http://svn.gna.org/viewcvs/relax?rev=2836&view=rev Log: Ported everything from r2732 to r2833 of the 1.3 line. This brings this branch into sync with 1.3. The command used was: svn merge -r2731:2833 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 Added: branches/tensor_pdb/docs/data_model_redesign - copied unchanged from r2833, 1.3/docs/data_model_redesign branches/tensor_pdb/docs/latex/images/model_free/ - copied from r2833, 1.3/docs/latex/images/model_free/ Modified: branches/tensor_pdb/docs/CHANGES branches/tensor_pdb/docs/Release_Checklist branches/tensor_pdb/docs/latex/develop.tex branches/tensor_pdb/docs/latex/docstring.tex branches/tensor_pdb/docs/latex/images/core_design.eps.gz branches/tensor_pdb/docs/latex/images/core_design.svg branches/tensor_pdb/docs/latex/model-free.tex branches/tensor_pdb/docs/relax.pdf branches/tensor_pdb/dx/isosurface_3D.py branches/tensor_pdb/float.py branches/tensor_pdb/generic_fns/intensity.py branches/tensor_pdb/generic_fns/model_selection.py branches/tensor_pdb/generic_fns/pdb.py branches/tensor_pdb/minimise/base_classes.py branches/tensor_pdb/minimise/bfgs.py branches/tensor_pdb/minimise/cauchy_point.py branches/tensor_pdb/minimise/coordinate_descent.py branches/tensor_pdb/minimise/dogleg.py branches/tensor_pdb/minimise/exact_trust_region.py branches/tensor_pdb/minimise/fletcher_reeves_cg.py branches/tensor_pdb/minimise/grid.py branches/tensor_pdb/minimise/hestenes_stiefel_cg.py branches/tensor_pdb/minimise/levenberg_marquardt.py branches/tensor_pdb/minimise/line_search/backtrack.py branches/tensor_pdb/minimise/line_search/more_thuente.py branches/tensor_pdb/minimise/line_search/nocedal_wright_interpol.py branches/tensor_pdb/minimise/line_search/nocedal_wright_wolfe.py branches/tensor_pdb/minimise/line_search/test_functions.py branches/tensor_pdb/minimise/method_of_multipliers.py branches/tensor_pdb/minimise/ncg.py branches/tensor_pdb/minimise/newton.py branches/tensor_pdb/minimise/polak_ribiere_cg.py branches/tensor_pdb/minimise/polak_ribiere_plus_cg.py branches/tensor_pdb/minimise/simplex.py branches/tensor_pdb/minimise/steepest_descent.py branches/tensor_pdb/minimise/steihaug_cg.py branches/tensor_pdb/relax branches/tensor_pdb/sconstruct branches/tensor_pdb/specific_fns/hybrid.py branches/tensor_pdb/specific_fns/model_free.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/tensor_pdb/docs/CHANGES URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/CHANGES?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/docs/Release_Checklist URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/Release_Checklist?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/docs/latex/develop.tex URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/latex/develop.tex?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/docs/latex/docstring.tex URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/latex/docstring.tex?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/docs/latex/images/core_design.eps.gz URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/latex/images/core_design.eps.gz?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/docs/latex/images/core_design.svg URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/latex/images/core_design.svg?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/docs/latex/model-free.tex URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/latex/model-free.tex?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/docs/relax.pdf URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/docs/relax.pdf?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/dx/isosurface_3D.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/dx/isosurface_3D.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/float.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/float.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/generic_fns/intensity.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/generic_fns/intensity.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/generic_fns/model_selection.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/generic_fns/model_selection.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/generic_fns/pdb.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/generic_fns/pdb.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/base_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/base_classes.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/bfgs.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/bfgs.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/cauchy_point.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/cauchy_point.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/coordinate_descent.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/coordinate_descent.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/dogleg.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/dogleg.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/exact_trust_region.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/exact_trust_region.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/fletcher_reeves_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/fletcher_reeves_cg.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/grid.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/grid.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/hestenes_stiefel_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/hestenes_stiefel_cg.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/levenberg_marquardt.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/levenberg_marquardt.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/line_search/backtrack.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/line_search/backtrack.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/line_search/more_thuente.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/line_search/more_thuente.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/line_search/nocedal_wright_interpol.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/line_search/nocedal_wright_interpol.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/line_search/nocedal_wright_wolfe.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/line_search/nocedal_wright_wolfe.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/line_search/test_functions.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/line_search/test_functions.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/method_of_multipliers.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/method_of_multipliers.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/ncg.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/ncg.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/newton.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/newton.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/polak_ribiere_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/polak_ribiere_cg.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/polak_ribiere_plus_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/polak_ribiere_plus_cg.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/simplex.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/simplex.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/steepest_descent.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/steepest_descent.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/minimise/steihaug_cg.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/minimise/steihaug_cg.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/relax URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/relax?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/sconstruct URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/sconstruct?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/specific_fns/hybrid.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/specific_fns/hybrid.py?rev=2836&r1=2835&r2=2836&view=diff Modified: branches/tensor_pdb/specific_fns/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/tensor_pdb/specific_fns/model_free.py?rev=2836&r1=2835&r2=2836&view=diff
