[cig-commits] r15242 - in cs/spatialdata-0.1/trunk/templates: . spatialdb spatialdb/tests
brad at geodynamics.org
brad at geodynamics.org
Sun Jun 14 16:27:10 PDT 2009
Author: brad
Date: 2009-06-14 16:27:09 -0700 (Sun, 14 Jun 2009)
New Revision: 15242
Added:
cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdbcontrib.i
cs/spatialdata-0.1/trunk/templates/spatialdb/tests/
cs/spatialdata-0.1/trunk/templates/spatialdb/tests/Makefile.am
cs/spatialdata-0.1/trunk/templates/spatialdb/tests/TestUniformVelModel.py
cs/spatialdata-0.1/trunk/templates/spatialdb/tests/testcontrib.py
Removed:
cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdatacontrib.i
Modified:
cs/spatialdata-0.1/trunk/templates/Makefile.am
cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am
cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.cc
cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.py
cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac
Log:
Cleaned up installation of template spatial database.
Modified: cs/spatialdata-0.1/trunk/templates/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/templates/Makefile.am 2009-06-14 22:35:38 UTC (rev 15241)
+++ cs/spatialdata-0.1/trunk/templates/Makefile.am 2009-06-14 23:27:09 UTC (rev 15242)
@@ -19,11 +19,13 @@
spatialdb/Makefile.in \
spatialdb/portinfo.in \
spatialdb/configure \
- spatialdb/GeoGridVelModel.hh \
- spatialdb/GeoGridVelModel.icc \
- spatialdb/GeoGridVelModel.cc \
+ spatialdb/UniformVelModel.hh \
+ spatialdb/UniformVelModel.cc \
+ spatialdb/UniformVelModel.i \
+ spatialdb/UniformVelModel.i \
spatialdb/__init__.py \
- spatialdb/GeoGridVelModel.py \
- spatialdb/spatialdb.pyxe.src
+ spatialdb/UniformVelModel.py \
+ spatialdb/tests/testcontrib.py \
+ spatialdb/tests/TestUniformVelModel.py
# End of file
Modified: cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am 2009-06-14 22:35:38 UTC (rev 15241)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am 2009-06-14 23:27:09 UTC (rev 15242)
@@ -12,20 +12,28 @@
ACLOCAL_AMFLAGS = -I ./m4
+SUBDIRS = tests
+subpkgpythondir = $(pythondir)/spatialdata/spatialdb/contrib
+subpkgpyexecdir = $(pyexecdir)/spatialdata/spatialdb/contrib
+
+
# LIBRARY --------------------------------------------------------------
-lib_LTLIBRARIES = libspatialdatacontrib.la
+lib_LTLIBRARIES = libspatialdbcontrib.la
-libspatialdatacontrib_la_SOURCES = \
+libspatialdbcontrib_la_SOURCES = \
UniformVelModel.cc
-libspatialdatacontrib_la_LDFLAGS = $(AM_LDFLAGS)
+noinst_HEADERS = \
+ UniformVelModel.hh
-libspatialdatacontrib_la_LIBADD = \
+libspatialdbcontrib_la_LDFLAGS = $(AM_LDFLAGS)
+
+libspatialdbcontrib_la_LIBADD = \
-lspatialdata \
-lproj
if NO_UNDEFINED
-libspatialdatacontrib_la_LIBADD += \
+libspatialdbcontrib_la_LIBADD += \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
endif
@@ -35,32 +43,34 @@
# MODULE ---------------------------------------------------------------
-pkgpyexec_LTLIBRARIES = _spatialdatacontribmodule.la
+subpkgpyexec_LTLIBRARIES = _spatialdbcontribmodule.la
-pkgpyexec_PYTHON = spatialdatacontrib.py
+subpkgpyexec_PYTHON = \
+ spatialdbcontrib.py \
+ __init__.py
swig_sources = \
- spatialdatacontrib.i \
+ spatialdbcontrib.i \
UniformVelModel.i
swig_generated = \
- spatialdatacontrib_wrap.cxx \
- spatialdatacontrib.py
+ spatialdbcontrib_wrap.cxx \
+ spatialdbcontrib.py
-_spatialdatacontribmodule_la_LDFLAGS = -module -avoid-version \
+_spatialdbcontribmodule_la_LDFLAGS = -module -avoid-version \
$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
-dist__spatialdatacontribmodule_la_SOURCES = $(swig_sources) $(swig_generated)
+dist__spatialdbcontribmodule_la_SOURCES = $(swig_sources) $(swig_generated)
-_spatialdatacontribmodule_la_LIBADD = libspatialdatacontrib.la
+_spatialdbcontribmodule_la_LIBADD = libspatialdbcontrib.la
if NO_UNDEFINED
-_spatialdatacontribmodule_la_LIBADD += \
+_spatialdbcontribmodule_la_LIBADD += \
$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
endif
INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
-$(srcdir)/spatialdatacontrib_wrap.cxx $(srcdir)/spatialdatacontrib.py: $(swig_sources)
+$(srcdir)/spatialdbcontrib_wrap.cxx $(srcdir)/spatialdbcontrib.py: $(swig_sources)
$(SWIG) -Wall -c++ -python $(CPPFLAGS) $<
@@ -70,7 +80,7 @@
# PYTHON ---------------------------------------------------------------
-nobase_pkgpyexec_PYTHON = \
+nobase_subpkgpyexec_PYTHON = \
__init__.py \
UniformVelModel.py
Modified: cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.cc
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.cc 2009-06-14 22:35:38 UTC (rev 15241)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.cc 2009-06-14 23:27:09 UTC (rev 15242)
@@ -176,7 +176,7 @@
throw std::runtime_error(msg.str());
} // if
const int spaceDim = csQuery->spaceDim();
- if (2 != spaceDim || 3 != spaceDim) {
+ if (2 != spaceDim && 3 != spaceDim) {
std::ostringstream msg;
msg << "Spatial dimension of coordinate system for query location must have "
<< "2 or 3 spatial dimensions while querying uniform velocity model "
Modified: cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.py
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.py 2009-06-14 22:35:38 UTC (rev 15241)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/UniformVelModel.py 2009-06-14 23:27:09 UTC (rev 15242)
@@ -16,7 +16,7 @@
## Factory: spatial_database
from spatialdata.spatialdb.SpatialDBObj import SpatialDBObj
-from spatialdatacontrib import UniformVelModel as ModuleUniformVelModel
+from spatialdbcontrib import UniformVelModel as ModuleUniformVelModel
# UniformVelModel class
class UniformVelModel(SpatialDBObj, ModuleUniformVelModel):
Modified: cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac 2009-06-14 22:35:38 UTC (rev 15241)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac 2009-06-14 23:27:09 UTC (rev 15242)
@@ -11,7 +11,7 @@
#
AC_PREREQ(2.59)
-AC_INIT([spatialdatacontrib], [0.0.1], [cig-short at geodynamics.org])
+AC_INIT([spatialdbcontrib], [0.0.1], [cig-short at geodynamics.org])
AC_CONFIG_HEADER([portinfo])
AC_CONFIG_AUX_DIR([./aux-config])
#AC_CONFIG_MACRO_DIR([./m4])
@@ -49,23 +49,6 @@
CIT_NUMPY_INCDIR
AC_PROG_SWIG(1.3.33)
-# CPPUNIT
-if test "$enable_testing" = "yes" ; then
- AC_LANG(C++)
- AC_CHECK_HEADER([cppunit/TestRunner.h], [], [
- AC_MSG_ERROR([CppUnit header not found; try CPPFLAGS="-I<CppUnit include dir>"])
- ])
- AC_MSG_CHECKING([for CppUnit::TestRunner in -lcppunit])
- AC_REQUIRE_CPP
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#include <cppunit/TestRunner.h>]],
- [[CppUnit::TestRunner runner;]])],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)
- AC_MSG_ERROR([CppUnit library not found; try LDFLAGS="-L<CppUnit lib dir>"])
- ])
-fi
-
# SPATIALDATA
AC_LANG(C++)
AC_CHECK_HEADER([spatialdata/spatialdb/SpatialDB.hh], [], [
@@ -90,7 +73,8 @@
AC_C_BIGENDIAN
# ----------------------------------------------------------------------
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile
+ tests/Makefile])
AC_OUTPUT
Deleted: cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdatacontrib.i
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdatacontrib.i 2009-06-14 22:35:38 UTC (rev 15241)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdatacontrib.i 2009-06-14 23:27:09 UTC (rev 15242)
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard
-// U.S. Geological Survey
-//
-// {LicenseText}
-//
-// ======================================================================
-//
-
-// Define the spatialdatacontrib SWIG interface module.
-
-// Set module name
-%module spatialdatacontrib
-
-// Header files for module C++ code.
-%{
-#include "UniformVelModel.hh"
-%}
-
-// Convert standard C++ exceptions to Python exceptions.
-%include "exception.i"
-%exception {
- try {
- $action
- } catch (const std::exception& err) {
- SWIG_exception(SWIG_RuntimeError, err.what());
- } // try/catch
-} // exception
-
-%include "typemaps.i"
-%include "spatialdata/swig/chararray.i"
-
-// Numpy interface stuff
-%{
-#define SWIG_FILE_WITH_INIT
-%}
-%include "spatialdata/swig/numpy.i"
-%init %{
-import_array();
-%}
-
-
-// Interface files.
-%include "spatialdata/spatialdb/swig/SpatialDBObj.i"
-%include "UniformVelModel.i"
-
-
-// End of file
Copied: cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdbcontrib.i (from rev 15241, cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdatacontrib.i)
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdbcontrib.i (rev 0)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/spatialdbcontrib.i 2009-06-14 23:27:09 UTC (rev 15242)
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard
+// U.S. Geological Survey
+//
+// {LicenseText}
+//
+// ======================================================================
+//
+
+// Define the spatialdatacontrib SWIG interface module.
+
+// Set module name
+%module spatialdbcontrib
+
+// Header files for module C++ code.
+%{
+#include "UniformVelModel.hh"
+%}
+
+// Convert standard C++ exceptions to Python exceptions.
+%include "exception.i"
+%exception {
+ try {
+ $action
+ } catch (const std::exception& err) {
+ SWIG_exception(SWIG_RuntimeError, err.what());
+ } // try/catch
+} // exception
+
+%include "typemaps.i"
+%include "spatialdata/swig/chararray.i"
+
+// Numpy interface stuff
+%{
+#define SWIG_FILE_WITH_INIT
+%}
+%include "spatialdata/swig/numpy.i"
+%init %{
+import_array();
+%}
+
+
+// Interface files.
+%include "spatialdata/spatialdb/swig/SpatialDBObj.i"
+%include "UniformVelModel.i"
+
+
+// End of file
Added: cs/spatialdata-0.1/trunk/templates/spatialdb/tests/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/tests/Makefile.am (rev 0)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/tests/Makefile.am 2009-06-14 23:27:09 UTC (rev 15242)
@@ -0,0 +1,22 @@
+# -*- Makefile -*-
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# <LicenseText>
+#
+# ----------------------------------------------------------------------
+#
+
+TESTS = testcontrib.py
+dist_check_SCRIPTS = testcontrib.py
+
+TESTS_ENVIRONMENT = $(PYTHON)
+
+noinst_PYTHON = \
+ TestUniformVelModel.py
+
+
+# End of file
Added: cs/spatialdata-0.1/trunk/templates/spatialdb/tests/TestUniformVelModel.py
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/tests/TestUniformVelModel.py (rev 0)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/tests/TestUniformVelModel.py 2009-06-14 23:27:09 UTC (rev 15242)
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+#
+# ======================================================================
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# {LicenseText}
+#
+# ======================================================================
+#
+
+import unittest
+
+import numpy
+
+class TestUniformVelModel(unittest.TestCase):
+
+ def setUp(self):
+ from spatialdata.spatialdb.contrib.UniformVelModel import UniformVelModel
+ db = UniformVelModel()
+ db._configure()
+ self._db = db
+
+ from spatialdata.geocoords.CSGeo import CSGeo
+ csQ = CSGeo()
+ csQ.inventory.datumHoriz = "NAD27"
+ csQ.inventory.datumVert = "mean sea level"
+ csQ.inventory.ellipsoid = "clrk66"
+ csQ._configure()
+ csQ.initialize()
+ self._csQ = csQ
+ return
+
+
+ def test_queryVp(self):
+ locs = numpy.array( [[-118.520000, 34.120000, -1400.00],
+ [-116.400000, 32.340000, -1000.00]],
+ numpy.float64)
+ queryVals = ["vp"]
+ dataE = numpy.array([[4.5e+3],
+ [4.5e+3]],
+ numpy.float64)
+ errE = [0, 0]
+
+ db = self._db
+ db.open()
+ db.queryVals(queryVals)
+ data = numpy.zeros(dataE.shape, dtype=numpy.float64)
+ err = []
+ nlocs = locs.shape[0]
+ for i in xrange(nlocs):
+ e = db.query(data[i,:], locs[i,:], self._csQ)
+ err.append(e)
+ db.close()
+
+ self.assertEqual(len(errE), len(err))
+ for vE, v in zip(errE, err):
+ 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)
+ return
+
+
+ def test_query(self):
+ locs = numpy.array( [[-118.520000, 34.120000, -1400.00],
+ [-116.400000, 32.340000, -1000.00]],
+ numpy.float64)
+ queryVals = ["density", "vs"]
+ dataE = numpy.array([[2.5e+3, 2.6e+3],
+ [2.5e+3, 2.6e+3]],
+ numpy.float64)
+ errE = [0, 0]
+
+ db = self._db
+ db.open()
+ db.queryVals(queryVals)
+ data = numpy.zeros(dataE.shape, dtype=numpy.float64)
+ err = []
+ nlocs = locs.shape[0]
+ for i in xrange(nlocs):
+ e = db.query(data[i,:], locs[i,:], self._csQ)
+ err.append(e)
+ db.close()
+
+ self.assertEqual(len(errE), len(err))
+ for vE, v in zip(errE, err):
+ 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)
+ return
+
+
+# End of file
Added: cs/spatialdata-0.1/trunk/templates/spatialdb/tests/testcontrib.py
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/tests/testcontrib.py (rev 0)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/tests/testcontrib.py 2009-06-14 23:27:09 UTC (rev 15242)
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+#
+# ======================================================================
+#
+# Brad T. Aagaard
+# U.S. Geological Survey
+#
+# {LicenseText}
+#
+# ======================================================================
+#
+
+import unittest
+
+def suite():
+
+ suite = unittest.TestSuite()
+
+ from TestUniformVelModel import TestUniformVelModel
+ suite.addTest(unittest.makeSuite(TestUniformVelModel))
+
+ return suite
+
+def main():
+ unittest.TextTestRunner(verbosity=2).run(suite())
+ return
+
+if __name__ == '__main__':
+ main()
+
+
+# End of file
Property changes on: cs/spatialdata-0.1/trunk/templates/spatialdb/tests/testcontrib.py
___________________________________________________________________
Name: svn:executable
+ *
More information about the CIG-COMMITS
mailing list