[cig-commits] r8316 - in cs/spatialdata-0.1/trunk: .
tests/pytests/spatialdb
brad at geodynamics.org
brad at geodynamics.org
Wed Nov 21 15:05:31 PST 2007
Author: brad
Date: 2007-11-21 15:05:30 -0800 (Wed, 21 Nov 2007)
New Revision: 8316
Added:
cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py.in
Removed:
cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py
Modified:
cs/spatialdata-0.1/trunk/configure.ac
cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am
Log:
Fixed setting SCEC CVM-H data directory in Python unit test. Value is set from configure, not hardwired.
Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac 2007-11-21 22:32:50 UTC (rev 8315)
+++ cs/spatialdata-0.1/trunk/configure.ac 2007-11-21 23:05:30 UTC (rev 8316)
@@ -91,6 +91,7 @@
])
AM_CONDITIONAL([ENABLE_SCEC_CVM_H], [test "$enable_scec_cvm_h" != no])
if test "x$enable_scec_cvm_h" != "xno" ; then
+ AC_SUBST([SCECCVMH_DATADIR], ["$enable_scec_cvm_h"])
AC_CHECK_FILE([$enable_scec_cvm_h/topo.vo], [], [
AC_MSG_ERROR([SCEC CVM-H data file topo.vo not found])])
AC_CHECK_FILE([$enable_scec_cvm_h/moho.vo], [], [
Modified: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am 2007-11-21 22:32:50 UTC (rev 8315)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/Makefile.am 2007-11-21 23:05:30 UTC (rev 8316)
@@ -35,6 +35,12 @@
testgen1din2d_two.odb \
gensimpledb.cfg
+do_build = sed -e s%[@]SCECCVMH_DATADIR[@]%${SCECCVMH_DATADIR}%g
+
+$(srcdir)/TestSCECCVMH.py: $(srcdir)/TestSCECCVMH.py.in Makefile
+ $(do_build) < $< > $@
+testspatial.py: $(srcdir)/TestSCECCVMH.py
+
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests/pytests/spatialdb
export-data: $(data_DATA)
@@ -43,6 +49,7 @@
BUILT_SOURCES = export-data
CLEANFILES = \
+ $(srcdir)/TestSCECCVMH.py \
$(export_datadir)/$(data_DATA)
# End of file
Deleted: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py 2007-11-21 22:32:50 UTC (rev 8315)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py 2007-11-21 23:05:30 UTC (rev 8316)
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-#
-# ======================================================================
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# {LicenseText}
-#
-# ======================================================================
-#
-
-import unittest
-
-import numpy
-
-class TestSCECCVMH(unittest.TestCase):
-
- def setUp(self):
- from spatialdata.spatialdb.SCECCVMH import SCECCVMH
- db = SCECCVMH()
- db._configure()
- db.dataDir = "/Users/brad/data/sceccvm-h/vx52/bin"
- db.initialize()
- self._db = db
- return
-
-
- def test_query(self):
- locs = numpy.array( [[-118.520000, 34.120000, -1400.00],
- [-116.400000, 32.340000, -1000.00]],
- numpy.float64)
- from spatialdata.geocoords.CSGeo import CSGeo
- cs = CSGeo()
- cs._configure()
- cs.datumHoriz = "NAD27"
- cs.datumVert = "mean sea level"
- cs.ellipsoid = "clrk66"
- cs.initialize()
- queryVals = ["topo-elev", "moho-depth", "density"]
- dataE = numpy.array([[489.975189, -31178.105469, 2660.851074],
- [801.209961, -34526.414062, 3022.192708]],
- numpy.float64)
- errE = numpy.array( [0]*2, numpy.int32)
-
- self._db.open()
- self._db.queryVals(queryVals)
- (data, err) = self._db.query(locs, cs, 3)
- data = numpy.array(data)
- err = numpy.array(err)
-
- self.assertEqual(len(errE.shape), len(err.shape))
- for dE, d in zip(errE.shape, err.shape):
- self.assertEqual(dE, d)
- for vE, v in zip(numpy.reshape(errE, -1), numpy.reshape(err, -1)):
- self.assertEqual(vE, v)
-
- self.assertEqual(len(dataE.shape), len(data.shape))
- for dE, d in zip(dataE.shape, data.shape):
- self.assertEqual(dE, d)
- for vE, v in zip(numpy.reshape(dataE, -1), numpy.reshape(data, -1)):
- self.assertAlmostEqual(vE, v, 6)
-
- self._db.close()
- return
-
-
-# End of file
Copied: cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py.in (from rev 8315, cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py)
===================================================================
--- cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py 2007-11-21 22:32:50 UTC (rev 8315)
+++ cs/spatialdata-0.1/trunk/tests/pytests/spatialdb/TestSCECCVMH.py.in 2007-11-21 23:05:30 UTC (rev 8316)
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+#
+# ======================================================================
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# {LicenseText}
+#
+# ======================================================================
+#
+
+import unittest
+
+import numpy
+
+class TestSCECCVMH(unittest.TestCase):
+
+ def setUp(self):
+ from spatialdata.spatialdb.SCECCVMH import SCECCVMH
+ db = SCECCVMH()
+ db._configure()
+ db.dataDir = "@SCECCVMH_DATADIR@"
+ db.initialize()
+ self._db = db
+ return
+
+
+ def test_query(self):
+ locs = numpy.array( [[-118.520000, 34.120000, -1400.00],
+ [-116.400000, 32.340000, -1000.00]],
+ numpy.float64)
+ from spatialdata.geocoords.CSGeo import CSGeo
+ cs = CSGeo()
+ cs._configure()
+ cs.datumHoriz = "NAD27"
+ cs.datumVert = "mean sea level"
+ cs.ellipsoid = "clrk66"
+ cs.initialize()
+ queryVals = ["topo-elev", "moho-depth", "density"]
+ dataE = numpy.array([[489.975189, -31178.105469, 2660.851074],
+ [801.209961, -34526.414062, 3022.192708]],
+ numpy.float64)
+ errE = numpy.array( [0]*2, numpy.int32)
+
+ self._db.open()
+ self._db.queryVals(queryVals)
+ (data, err) = self._db.query(locs, cs, 3)
+ data = numpy.array(data)
+ err = numpy.array(err)
+
+ self.assertEqual(len(errE.shape), len(err.shape))
+ for dE, d in zip(errE.shape, err.shape):
+ self.assertEqual(dE, d)
+ for vE, v in zip(numpy.reshape(errE, -1), numpy.reshape(err, -1)):
+ self.assertEqual(vE, v)
+
+ self.assertEqual(len(dataE.shape), len(data.shape))
+ for dE, d in zip(dataE.shape, data.shape):
+ self.assertEqual(dE, d)
+ for vE, v in zip(numpy.reshape(dataE, -1), numpy.reshape(data, -1)):
+ self.assertAlmostEqual(vE, v, 6)
+
+ self._db.close()
+ return
+
+
+# End of file
More information about the cig-commits
mailing list