[cig-commits] r18328 - in cs/spatialdata/trunk: . libsrc/spatialdb spatialdata/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2011-05-06 08:27:54 -0700 (Fri, 06 May 2011)
New Revision: 18328

Modified:
   cs/spatialdata/trunk/CHANGES
   cs/spatialdata/trunk/README
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc
   cs/spatialdata/trunk/setup.py
   cs/spatialdata/trunk/spatialdata/spatialdb/UniformDB.py
Log:
Added check for more than one point when using zero data dimension (this is an error). Incremented version number.

Modified: cs/spatialdata/trunk/CHANGES
===================================================================
--- cs/spatialdata/trunk/CHANGES	2011-05-06 06:14:06 UTC (rev 18327)
+++ cs/spatialdata/trunk/CHANGES	2011-05-06 15:27:54 UTC (rev 18328)
@@ -1,3 +1,11 @@
+2011/05/06 (version 0.7.0)
+
+  Added check for more than one point in SimpleDB with zero data
+  dimension.
+
+  Permit whitespace in values and data for UniformDB.
+
+
 2010/06/08 (version 0.6.0)
 
   Permit nondimensionl values in spatial databases.

Modified: cs/spatialdata/trunk/README
===================================================================
--- cs/spatialdata/trunk/README	2011-05-06 06:14:06 UTC (rev 18327)
+++ cs/spatialdata/trunk/README	2011-05-06 15:27:54 UTC (rev 18328)
@@ -17,8 +17,8 @@
 /** @mainpage
  *
  * @author Brad Aagaard
- * @date 2010/06/08
- * @version 0.6.0
+ * @date 2011/05/06
+ * @version 0.7.0
  *
  * @section summary Summary
  *

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc	2011-05-06 06:14:06 UTC (rev 18327)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleIO.cc	2011-05-06 15:27:54 UTC (rev 18328)
@@ -56,22 +56,26 @@
   const int numLocs = data.numLocs();
   const int spaceDim = data.spaceDim();
   const int dataDim = data.dataDim();
+  std::ostringstream msg;
   if (numLocs < 1 + dataDim) {
-    std::ostringstream msg;
     msg << "Spatial distribution with data dimensions of " << dataDim 
-	<< " must have at least " << 1+dataDim << " points. "
+	<< " must have at least " << 1+dataDim << " points.\n"
 	<< "Found " << numLocs << " points in distribution.";
     throw std::runtime_error(msg.str());
   } // if
+  if (0 == dataDim && numLocs > 1) {
+    msg << "Spatial distribution with data dimensions of " << dataDim 
+	<< " cannot have more than one point.\n"
+	<< "Found " << numLocs << " points in distribution.";
+    throw std::runtime_error(msg.str());
+  } // if
   if (dataDim > spaceDim) {
-    std::ostringstream msg;
     msg << "Dimension of data in spatial distribution (" << dataDim
 	<< ") exceeds the number of dimensions of the coordinates ("
 	<< spaceDim << ").";
     throw std::runtime_error(msg.str());
   } // if
   if (spaceDim != pCS->spaceDim()) {
-    std::ostringstream msg;
     msg << "Number of dimensions in coordinates of spatial distribution ("
 	<< spaceDim << ") does not match number of dimensions in coordinate "
 	<< "system (" << pCS->spaceDim() << ")";

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc	2011-05-06 06:14:06 UTC (rev 18327)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleIOAscii.cc	2011-05-06 15:27:54 UTC (rev 18328)
@@ -216,11 +216,11 @@
     ok = false;
     msg << "SimpleDB settings must include 'num-locs'.\n";
   } // if
-  if (0 == names) {
+  if (!names) {
     ok = false;
       msg << "SimpleDB settings must include 'value-names'.\n";
   } // if
-  if (0 == units) {
+  if (!units) {
     ok = false;
     msg << "SimpleDB settings must include 'value-units'.\n";
   } // if

Modified: cs/spatialdata/trunk/setup.py
===================================================================
--- cs/spatialdata/trunk/setup.py	2011-05-06 06:14:06 UTC (rev 18327)
+++ cs/spatialdata/trunk/setup.py	2011-05-06 15:27:54 UTC (rev 18328)
@@ -20,7 +20,7 @@
 setup(
     
     name = 'spatialdata', 
-    version = '0.6.0',
+    version = '0.7.0',
 
     zip_safe = False,
     packages = find_packages(),

Modified: cs/spatialdata/trunk/spatialdata/spatialdb/UniformDB.py
===================================================================
--- cs/spatialdata/trunk/spatialdata/spatialdb/UniformDB.py	2011-05-06 06:14:06 UTC (rev 18327)
+++ cs/spatialdata/trunk/spatialdata/spatialdb/UniformDB.py	2011-05-06 15:27:54 UTC (rev 18328)
@@ -87,7 +87,10 @@
       else:
         data.append(float(x))
         units.append("none")
-    self.setData(self.inventory.values, units, data)
+    values = []
+    for v in self.inventory.values:
+      values.append(v.lstrip().rstrip())
+    self.setData(values, units, data)
     return