r4878 - /branches/N_state_model/maths_fns/n_state_model.py -- January 21, 2008 - 17:04

Author: bugman
Date: Mon Jan 21 17:04:45 2008
New Revision: 4878

URL: http://svn.gna.org/viewcvs/relax?rev=4878&view=rev
Log:
Bug fix for the maths_fns.n_state_model.func() optimisation target function.

The dot product is now used for the matrix multiplication R^T.X.R.


Modified:
    branches/N_state_model/maths_fns/n_state_model.py

Modified: branches/N_state_model/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/n_state_model.py?rev=4878&r1=4877&r2=4878&view=diff
==============================================================================
--- branches/N_state_model/maths_fns/n_state_model.py (original)
+++ branches/N_state_model/maths_fns/n_state_model.py Mon Jan 21 17:04:45 2008
@@ -21,7 +21,7 @@
 
###############################################################################
 
 # Python module imports.
-from numpy import array, float64, transpose, zeros
+from numpy import array, dot, float64, transpose, zeros
 
 # relax module imports.
 from chi2 import chi2
@@ -111,7 +111,7 @@
 
             # Back-calculate the reduced tensors for sum element c and add 
these to red_bc.
             for i in xrange(self.num_tensors):
-                self.red_bc[i] = self.red_bc[i]  +  pc * self.RT[c] * 
self.full_tensors[i] * self.R[c]
+                self.red_bc[i] = self.red_bc[i]  +  pc * dot(self.RT[c], 
dot(self.full_tensors[i], self.R[c]))
 
         # 5D vectorise the back-calculated tensors (create red_bc_vector 
from red_bc).
         for i in xrange(self.num_tensors):