mailr4847 - /1.3/specific_fns/relax_fit.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by sebastien . morin . 1 on January 17, 2008 - 22:15:
Author: semor
Date: Thu Jan 17 22:15:32 2008
New Revision: 4847

URL: http://svn.gna.org/viewcvs/relax?rev=4847&view=rev
Log:
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.


Modified:
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=4847&r1=4846&r2=4847&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Thu Jan 17 22:15:32 2008
@@ -662,7 +662,7 @@
 
             # Diagonal scaling.
             self.assemble_scaling_matrix(index=i, scaling=scaling)
-            self.param_vector = matrixmultiply(inverse(self.scaling_matrix), 
self.param_vector)
+            self.param_vector = dot(inverse(self.scaling_matrix), 
self.param_vector)
 
             # Get the grid search minimisation options.
             if match('^[Gg]rid', min_algor):
@@ -733,7 +733,7 @@
 
             # Scaling.
             if scaling:
-                self.param_vector = matrixmultiply(self.scaling_matrix, 
self.param_vector)
+                self.param_vector = dot(self.scaling_matrix, 
self.param_vector)
 
             # Disassemble the parameter vector.
             self.disassemble_param_vector(index=i, sim_index=sim_index)




Related Messages


Powered by MHonArc, Updated Thu Jan 17 23:20:14 2008