Author: bugman
Date: Fri Jan 18 13:51:23 2008
New Revision: 4852
URL: http://svn.gna.org/viewcvs/relax?rev=4852&view=rev
Log:
Merged revisions 4839-4850 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r4839 | bugman | 2008-01-17 18:20:36 +0100 (Thu, 17 Jan 2008) | 6 lines
Modified the partition_params() function to better handle when no parameter
name is supplied.
This situation is used for setting the parameter values of the model. The
function now returns the
model_values list to be used later on.
........
r4841 | semor | 2008-01-17 21:50:18 +0100 (Thu, 17 Jan 2008) | 5 lines
Converted another maths_fns module from Numeric to numpy.
The Numeric.matrixmultiply module is deprecated and was thus replaced by
the numpy.dot module.
........
r4842 | semor | 2008-01-17 21:53:51 +0100 (Thu, 17 Jan 2008) | 3 lines
Finished the conversion of maths_fns modules from Numeric to numpy.
........
r4843 | semor | 2008-01-17 21:58:50 +0100 (Thu, 17 Jan 2008) | 3 lines
Converted dx modules from Numeric to numpy.
........
r4844 | semor | 2008-01-17 22:04:34 +0100 (Thu, 17 Jan 2008) | 3 lines
Converted some sample scripts from Numeric to numpy.
........
r4845 | semor | 2008-01-17 22:09:17 +0100 (Thu, 17 Jan 2008) | 3 lines
Converted test_suite modules from Numeric to numpy.
........
r4846 | semor | 2008-01-17 22:13:26 +0100 (Thu, 17 Jan 2008) | 5 lines
Converted a specific_fns module from Numeric to numpy.
The Numeric.matrixmultiply module is deprecated and was thus replaced by
the numpy.dot module.
........
r4847 | semor | 2008-01-17 22:15:32 +0100 (Thu, 17 Jan 2008) | 5 lines
Fully converted a specific_fns module from Numeric to numpy.
The Numeric.matrixmultiply to numpy.dot change had only been made in the
import and not the code.
........
r4848 | semor | 2008-01-17 23:00:51 +0100 (Thu, 17 Jan 2008) | 8 lines
Converted generic_fns modules from Numeric to numpy.
As point in a post by Edward d'Auvergne (minfx-devel mailing list, see
below), the select_sim array
(which calls 'ones()') was specified as a integer array.
https://mail.gna.org/public/minfx-commits/2008-01/msg00004.html (Message-id:
<E1JF9Gs-000081-9c@xxxxxxxxxxxxxxxxxx>)
........
r4849 | bugman | 2008-01-17 23:32:10 +0100 (Thu, 17 Jan 2008) | 5 lines
Initialise the model_values array in the partition_params() function.
This fixes a bug due to model_values not being defined.
........
r4850 | bugman | 2008-01-17 23:33:55 +0100 (Thu, 17 Jan 2008) | 3 lines
Fixes for the unit tests of the partition_params() function.
........
Modified:
branches/N_state_model/ (props changed)
branches/N_state_model/dx/base_map.py
branches/N_state_model/dx/isosurface_3D.py
branches/N_state_model/generic_fns/angles.py
branches/N_state_model/generic_fns/diffusion_tensor.py
branches/N_state_model/generic_fns/grace.py
branches/N_state_model/generic_fns/monte_carlo.py
branches/N_state_model/generic_fns/structure.py
branches/N_state_model/generic_fns/value.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/mf.py
branches/N_state_model/sample_scripts/relax_curve_diff.py
branches/N_state_model/sample_scripts/remap.py
branches/N_state_model/specific_fns/relax_fit.py
branches/N_state_model/test_suite/unit_tests/_data/test_diff_tensor.py
branches/N_state_model/test_suite/unit_tests/_generic_fns/test_value.py
branches/N_state_model/test_suite/unit_tests/_maths_fns/test_chi2.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/N_state_model/dx/base_map.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/dx/base_map.py?rev=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/dx/isosurface_3D.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/dx/isosurface_3D.py?rev=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/generic_fns/angles.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/angles.py?rev=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/generic_fns/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/diffusion_tensor.py?rev=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/generic_fns/grace.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/grace.py?rev=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/generic_fns/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/monte_carlo.py?rev=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/generic_fns/structure.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/structure.py?rev=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/generic_fns/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/value.py?rev=4852&r1=4851&r2=4852&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=4852&r1=4851&r2=4852&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=4852&r1=4851&r2=4852&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=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/sample_scripts/relax_curve_diff.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/sample_scripts/relax_curve_diff.py?rev=4852&r1=4851&r2=4852&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=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/specific_fns/relax_fit.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/relax_fit.py?rev=4852&r1=4851&r2=4852&view=diff
Modified:
branches/N_state_model/test_suite/unit_tests/_data/test_diff_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/unit_tests/_data/test_diff_tensor.py?rev=4852&r1=4851&r2=4852&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=4852&r1=4851&r2=4852&view=diff
Modified: branches/N_state_model/test_suite/unit_tests/_maths_fns/test_chi2.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/test_suite/unit_tests/_maths_fns/test_chi2.py?rev=4852&r1=4851&r2=4852&view=diff
r4852 - in /branches/N_state_model: ./ dx/ generic_fns/ maths_fns/ sample_scripts/ specific_fns/ test_suite/unit_tests/_data...