[cig-commits] r15168 - in cs/spatialdata-0.1/trunk: spatialdata/spatialdb tests/pytests/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2009-06-09 22:24:07 -0700 (Tue, 09 Jun 2009)
New Revision: 15168

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestCompositeDB.py
   cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py
Log:
Merged units into data values for more natural use of units in UniformDB.

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2009-06-10 04:57:08 UTC (rev 15167)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2009-06-10 05:24:07 UTC (rev 15168)
@@ -39,7 +39,6 @@
     ##
     ## \b Properties
     ## @li \b values Names of values in spatial database.
-    ## @li \b units Units of values in spatial database.
     ## @li \b data Values in spatial database.
     ##
     ## \b Facilities
@@ -50,9 +49,6 @@
     values = pyre.inventory.list("values", default=[])
     values.meta['tip'] = "Names of values in spatial database."
 
-    units = pyre.inventory.list("units", default=[])
-    units.meta['tip'] = "Units of values in spatial database."
-
     data = pyre.inventory.list("data", default=[])
     data.meta['tip'] = "Values in spatial database."
 
@@ -75,8 +71,12 @@
     """
     SpatialDBObj._configure(self)
     self._validateParameters(self.inventory)
-    data = map(float, self.inventory.data)
-    self.setData(self.inventory.values, self.inventory.units, data)
+    data = []
+    units = []
+    for x in self.inventory.data:
+      data.append(float(x.value))
+      units.append(x._strDerivation())
+    self.setData(self.inventory.values, units, data)
     return
 
   
@@ -99,7 +99,8 @@
             "'values' has size of %d but 'data' has size of %d." \
             % (self.label, len(params.values), len(params.data))
     try:
-      dataFloat = map(float, params.data)
+      for x in params.data:
+        dataFloat = float(x.value)
     except:
         raise ValueError, \
               "'data' list must contain floating point values."

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestCompositeDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestCompositeDB.py	2009-06-10 04:57:08 UTC (rev 15167)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestCompositeDB.py	2009-06-10 05:24:07 UTC (rev 15168)
@@ -13,8 +13,8 @@
 import unittest
 
 import numpy
+from pyre.units.length import m
 
-
 class TestCompositeDB(unittest.TestCase):
 
   def setUp(self):
@@ -22,15 +22,13 @@
     dbA = UniformDB()
     dbA.inventory.label = "db A"
     dbA.inventory.values = ["one", "two", "three"]
-    dbA.inventory.units = ["none", "none", "none"]
-    dbA.inventory.data = [1.1, 2.2, 3.3]
+    dbA.inventory.data = [1.1*m, 2.2*m, 3.3*m]
     dbA._configure()
     
     dbB = UniformDB()
     dbB.inventory.label = "db B"
     dbB.inventory.values = ["two", "three", "four", "five" ]
-    dbB.inventory.units = ["none", "none", "none", "none" ]
-    dbB.inventory.data = [2.1, 3.1, 4.1, 5.1]
+    dbB.inventory.data = [2.1*m, 3.1*m, 4.1*m, 5.1*m]
     dbB._configure()
 
     from spatialdata.spatialdb.CompositeDB import CompositeDB

Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py	2009-06-10 04:57:08 UTC (rev 15167)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestUniformDB.py	2009-06-10 05:24:07 UTC (rev 15168)
@@ -13,8 +13,8 @@
 import unittest
 
 import numpy
+from pyre.units.length import m,km,cm
 
-
 class TestUniformDB(unittest.TestCase):
 
   def setUp(self):
@@ -22,8 +22,7 @@
     db = UniformDB()
     db.inventory.label = "test"
     db.inventory.values = ["one", "two", "three"]
-    db.inventory.units = ["m", "km", "cm"]
-    db.inventory.data = [1.1, 2.2, 3.3]
+    db.inventory.data = [1.1*m, 2.2*km, 3.3*cm]
     db._configure()
     self._db = db
     return