r3017 - in /1.3: data/diff_tensor.py test_suite/unit_tests/data/test_diff_tensor.py -- February 18, 2007 - 01:25

Author: bugman
Date: Sun Feb 18 01:25:05 2007
New Revision: 3017

URL: http://svn.gna.org/viewcvs/relax?rev=3017&view=rev
Log:
Modifications to the DiffTensorSimList object.

The self.__setitem__() function now sets the value and the parent 
DiffTensorElement is now passed
into the DiffTensorSimList object.


Modified:
    1.3/data/diff_tensor.py
    1.3/test_suite/unit_tests/data/test_diff_tensor.py

Modified: 1.3/data/diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/diff_tensor.py?rev=3017&r1=3016&r2=3017&view=diff
==============================================================================
--- 1.3/data/diff_tensor.py (original)
+++ 1.3/data/diff_tensor.py Sun Feb 18 01:25:05 2007
@@ -278,7 +278,7 @@
             # Only update the MC simulation object if its dependancies exist.
             if not missing_dep:
                 # Initialise an empty array to store the MC simulation 
object elements.
-                sim_values = DiffTensorSimList()
+                sim_values = DiffTensorSimList(self)
 
                 # Loop over the simulations.
                 for i in xrange(num_sim):
@@ -298,17 +298,20 @@
 class DiffTensorSimList(ListType):
     """Empty data container for Monte Carlo simulation diffusion tensor 
data."""
 
+    def __init__(self, diff_element):
+        """Make the parent object accessible to this list object."""
+
+        self.__diff_element = diff_element
+
+
     def __setitem__(self, index, value):
         """Set the value."""
-        print "index: " + `index`
-        print "value: " + `value`
+
+        ListType.__setitem__(self, index, value)
+
 
     def append(self, value):
         """Replacement function for the normal self.append() method."""
 
-        print
-        print "append: " + `value`
-
         # Append the value to the list.
         self[len(self):len(self)] = [value]
-        print self

Modified: 1.3/test_suite/unit_tests/data/test_diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/unit_tests/data/test_diff_tensor.py?rev=3017&r1=3016&r2=3017&view=diff
==============================================================================
--- 1.3/test_suite/unit_tests/data/test_diff_tensor.py (original)
+++ 1.3/test_suite/unit_tests/data/test_diff_tensor.py Sun Feb 18 01:25:05 
2007
@@ -90,10 +90,10 @@
         self.diff_data.type = 'spheroid'
 
         # Set the MC sim diffusion parameter lists.
-        self.diff_data.tm_sim = DiffTensorSimList()
-        self.diff_data.Da_sim = DiffTensorSimList()
-        self.diff_data.theta_sim = DiffTensorSimList()
-        self.diff_data.phi_sim = DiffTensorSimList()
+        self.diff_data.tm_sim = DiffTensorSimList(self.diff_data)
+        self.diff_data.Da_sim = DiffTensorSimList(self.diff_data)
+        self.diff_data.theta_sim = DiffTensorSimList(self.diff_data)
+        self.diff_data.phi_sim = DiffTensorSimList(self.diff_data)
 
         # Append the values.
         self.diff_data.tm_sim.append(tm)
@@ -252,16 +252,17 @@
         self.diff_data.type = 'spheroid'
 
         # Set the MC sim diffusion parameter lists.
-        self.diff_data.tm_sim = DiffTensorSimList()
-        self.diff_data.Da_sim = DiffTensorSimList()
-        self.diff_data.theta_sim = DiffTensorSimList()
-        self.diff_data.phi_sim = DiffTensorSimList()
+        self.diff_data.tm_sim = DiffTensorSimList(self.diff_data)
+        self.diff_data.Da_sim = DiffTensorSimList(self.diff_data)
+        self.diff_data.theta_sim = DiffTensorSimList(self.diff_data)
+        self.diff_data.phi_sim = DiffTensorSimList(self.diff_data)
 
         # Append the initial values.
         self.diff_data.tm_sim.append(2e-9)
         self.diff_data.Da_sim.append(1e5)
         self.diff_data.theta_sim.append(0.0)
         self.diff_data.phi_sim.append(2.0 * pi)
+        print self.diff_data
 
         # The new MC sim parameter values.
         tm = 0.5e-9
@@ -276,6 +277,7 @@
         self.diff_data.phi_sim[0] = phi
 
         # Test the set values.
+        print self.diff_data
         self.assertEqual(self.diff_data.type, 'spheroid')
         self.assertEqual(self.diff_data.tm_sim[0], tm)
         self.assertEqual(self.diff_data.Da_sim[0], Da)