r9903 - in /1.3/specific_fns: model_free/main.py model_free/mf_minimise.py n_state_model.py relax_fit.py -- November 24, 2009 - 11:45

Author: bugman
Date: Tue Nov 24 11:45:10 2009
New Revision: 9903

URL: http://svn.gna.org/viewcvs/relax?rev=9903&view=rev
Log:
Removed assemble_scaling_matrix() from the specific analysis API.


Modified:
    1.3/specific_fns/model_free/main.py
    1.3/specific_fns/model_free/mf_minimise.py
    1.3/specific_fns/n_state_model.py
    1.3/specific_fns/relax_fit.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=9903&r1=9902&r2=9903&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Tue Nov 24 11:45:10 2009
@@ -364,7 +364,7 @@
         return array(param_vector, float64)
 
 
-    def assemble_scaling_matrix(self, num_params, model_type=None, 
spin=None, spin_id=None, scaling=True):
+    def _assemble_scaling_matrix(self, num_params, model_type=None, 
spin=None, spin_id=None, scaling=True):
         """Create and return the scaling matrix.
 
         If the spin argument is supplied, then the spin_id argument will be 
ignored.

Modified: 1.3/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/mf_minimise.py?rev=9903&r1=9902&r2=9903&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/mf_minimise.py (original)
+++ 1.3/specific_fns/model_free/mf_minimise.py Tue Nov 24 11:45:10 2009
@@ -878,7 +878,7 @@
                 num_params = len(param_vector)
 
                 # Diagonal scaling.
-                scaling_matrix = self.assemble_scaling_matrix(num_params, 
model_type=model_type, spin=spin, scaling=scaling)
+                scaling_matrix = self._assemble_scaling_matrix(num_params, 
model_type=model_type, spin=spin, scaling=scaling)
                 if len(scaling_matrix):
                     param_vector = dot(inv(scaling_matrix), param_vector)
 

Modified: 1.3/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=9903&r1=9902&r2=9903&view=diff
==============================================================================
--- 1.3/specific_fns/n_state_model.py (original)
+++ 1.3/specific_fns/n_state_model.py Tue Nov 24 11:45:10 2009
@@ -123,7 +123,7 @@
         return array(param_vector, float64)
 
 
-    def __assemble_scaling_matrix(self, data_types=None, scaling=True):
+    def _assemble_scaling_matrix(self, data_types=None, scaling=True):
         """Create and return the scaling matrix.
 
         @keyword data_types:    The base data types used in the 
optimisation.  This list can contain
@@ -1385,7 +1385,7 @@
         data_types = self.__base_data_types()
 
         # Diagonal scaling.
-        scaling_matrix = 
self.__assemble_scaling_matrix(data_types=data_types, scaling=scaling)
+        scaling_matrix = 
self._assemble_scaling_matrix(data_types=data_types, scaling=scaling)
         param_vector = dot(inv(scaling_matrix), param_vector)
 
         # Linear constraints.

Modified: 1.3/specific_fns/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/relax_fit.py?rev=9903&r1=9902&r2=9903&view=diff
==============================================================================
--- 1.3/specific_fns/relax_fit.py (original)
+++ 1.3/specific_fns/relax_fit.py Tue Nov 24 11:45:10 2009
@@ -92,7 +92,7 @@
         return array(param_vector, float64)
 
 
-    def assemble_scaling_matrix(self, spin=None, scaling=True):
+    def _assemble_scaling_matrix(self, spin=None, scaling=True):
         """Create and return the scaling matrix.
 
         @keyword spin:          The spin data container.
@@ -147,7 +147,7 @@
         param_vector = self._assemble_param_vector(spin=spin)
 
         # Create a scaling matrix.
-        scaling_matrix = self.assemble_scaling_matrix(spin=spin, 
scaling=False)
+        scaling_matrix = self._assemble_scaling_matrix(spin=spin, 
scaling=False)
 
         # Initialise the relaxation fit functions.
         setup(num_params=len(spin.params), num_times=len(cdp.relax_times), 
values=spin.intensities, sd=spin.intensity_err, relax_times=cdp.relax_times, 
scaling_matrix=scaling_matrix)
@@ -614,7 +614,7 @@
             param_vector = self._assemble_param_vector(spin=spin)
 
             # Diagonal scaling.
-            scaling_matrix = self.assemble_scaling_matrix(spin=spin, 
scaling=scaling)
+            scaling_matrix = self._assemble_scaling_matrix(spin=spin, 
scaling=scaling)
             if len(scaling_matrix):
                 param_vector = dot(inv(scaling_matrix), param_vector)