[cig-commits] r20432 - in cs/spatialdata/trunk: libsrc/spatialdb tests/libtests/spatialdb
brad at geodynamics.org
brad at geodynamics.org
Thu Jun 28 15:44:41 PDT 2012
Author: brad
Date: 2012-06-28 15:44:40 -0700 (Thu, 28 Jun 2012)
New Revision: 20432
Added:
cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.cc
cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.hh
Removed:
cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.cc
cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.hh
Modified:
cs/spatialdata/trunk/libsrc/spatialdb/GeoProjGridDB.cc
cs/spatialdata/trunk/tests/libtests/spatialdb/Makefile.am
cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDB.cc
Log:
Enabled C++ unit tests of volume interpolation for GeoProjGridDB. Query tests not passing yet.
Modified: cs/spatialdata/trunk/libsrc/spatialdb/GeoProjGridDB.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/GeoProjGridDB.cc 2012-06-28 22:15:18 UTC (rev 20431)
+++ cs/spatialdata/trunk/libsrc/spatialdb/GeoProjGridDB.cc 2012-06-28 22:44:40 UTC (rev 20432)
@@ -173,7 +173,7 @@
if (iName >= numNames) {
std::ostringstream msg;
msg
- << "Could not find value " << names[iVal] << " in spatial database\n"
+ << "Could not find value " << names[iVal] << " in spatial database "
<< label() << ". Available values are:";
for (int iName=0; iName < numNames; ++iName)
msg << "\n " << _names[iName];
@@ -600,7 +600,6 @@
} // if
} // _checkCompatibility
-#include <iostream>
// ----------------------------------------------------------------------
// Bilinear search for coordinate.
double
Modified: cs/spatialdata/trunk/tests/libtests/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata/trunk/tests/libtests/spatialdb/Makefile.am 2012-06-28 22:15:18 UTC (rev 20431)
+++ cs/spatialdata/trunk/tests/libtests/spatialdb/Makefile.am 2012-06-28 22:44:40 UTC (rev 20432)
@@ -41,6 +41,7 @@
TestTimeHistoryIO.cc \
TestUniformDB.cc \
TestGeoProjGridDB.cc \
+ TestGeoProjGridDBCases.cc \
testcquery.c \
testspatial.cc
@@ -61,6 +62,7 @@
TestTimeHistoryIO.hh \
TestUniformDB.hh \
TestGeoProjGridDB.hh \
+ TestGeoProjGridDBCases.hh \
testcquery.h \
TestSpatialDB.hh
Modified: cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDB.cc
===================================================================
--- cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDB.cc 2012-06-28 22:15:18 UTC (rev 20431)
+++ cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDB.cc 2012-06-28 22:44:40 UTC (rev 20432)
@@ -205,6 +205,14 @@
delete[] db->_names; db->_names = 0;
delete[] db->_units; db->_units = 0;
+ db->label("GeoProjGrid test database");
+ db->_numValues = data.numVals;
+ db->_spaceDim = data.spaceDim;
+ db->_dataDim = data.dataDim;
+ db->_numX = data.numX;
+ db->_numY = data.numY;
+ db->_numZ = data.numZ;
+
int numLocs = 1;
if (data.numX > 1) {
numLocs *= data.numX;
Copied: cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.cc (from rev 20431, cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.cc)
===================================================================
--- cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.cc (rev 0)
+++ cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.cc 2012-06-28 22:44:40 UTC (rev 20432)
@@ -0,0 +1,47 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2012 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+#include <portinfo>
+
+#include "TestGeoProjGridDBCases.hh" // Implementation of class methods
+
+#include "data/GeoProjGridDBTestDataVolume3D.hh"
+
+// ----------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION( spatialdata::spatialdb::TestGeoProjGridDBVolume3D );
+
+// ----------------------------------------------------------------------
+// Test queryLinear()
+void
+spatialdata::spatialdb::TestGeoProjGridDBVolume3D::testQueryLinear(void)
+{ // testQueryLinear
+ GeoProjGridDBTestDataVolume3D data;
+
+ _testQueryLinear(data);
+} // testQueryLinear
+
+// ----------------------------------------------------------------------
+// Test queryNearest()
+void
+spatialdata::spatialdb::TestGeoProjGridDBVolume3D::testQueryNearest(void)
+{ // testQueryNearest
+ GeoProjGridDBTestDataVolume3D data;
+
+ _testQueryNearest(data);
+} // testQueryNearest
+
+
+// End of file
Copied: cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.hh (from rev 20431, cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.hh)
===================================================================
--- cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.hh (rev 0)
+++ cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBCases.hh 2012-06-28 22:44:40 UTC (rev 20432)
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2012 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+/** @file tests/libtests/spatialdb/TestGeoProjGridDBCases.hh
+ *
+ * @brief C++ TestGeoProjGridDBVolume3D object
+ *
+ * C++ unit testing for GeoProjGridDB.
+ */
+
+#if !defined(spatialdata_spatialdb_testgeoprojgriddbcases_hh)
+#define spatialdata_spatialdb_testgeoprojgriddbcases_hh
+
+#include "TestGeoProjGridDB.hh" // ISA TestGeoProjGridDB
+
+/// Namespace for spatial package
+namespace spatialdata {
+ namespace spatialdb {
+ class TestGeoProjGridDBVolume3D;
+ } // spatialdb
+} // spatialdata
+
+/// C++ unit testing for GeoProjGridDB with volume data.
+class spatialdata::spatialdb::TestGeoProjGridDBVolume3D : public TestGeoProjGridDB
+{ // class TestGeoProjGridDBVolume3D
+
+ // CPPUNIT TEST SUITE /////////////////////////////////////////////////
+ CPPUNIT_TEST_SUITE( TestGeoProjGridDBVolume3D );
+
+ CPPUNIT_TEST( testQueryNearest );
+ CPPUNIT_TEST( testQueryLinear );
+
+ CPPUNIT_TEST_SUITE_END();
+
+ // PUBLIC METHODS /////////////////////////////////////////////////////
+public :
+
+ /// Test queryNearest()
+ void testQueryNearest(void);
+
+ /// Test queryLinear()
+ void testQueryLinear(void);
+
+}; // class TestGeoProjGridDBVolume3D
+
+#endif // spatialdata_spatialdb_testgeoprojgriddbvolume3d_hh
+
+
+// End of file
Deleted: cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.cc
===================================================================
--- cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.cc 2012-06-28 22:15:18 UTC (rev 20431)
+++ cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.cc 2012-06-28 22:44:40 UTC (rev 20432)
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-//
-// ----------------------------------------------------------------------
-//
-// Brad T. Aagaard, U.S. Geological Survey
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2012 University of California, Davis
-//
-// See COPYING for license information.
-//
-// ----------------------------------------------------------------------
-//
-
-#include <portinfo>
-
-#include "TestGeoProjGridDBVolume3D.hh" // Implementation of class methods
-
-#include "data/GeoProjGridDBTestDataVolume3D.hh"
-
-// ----------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_REGISTRATION( spatialdata::spatialdb::TestGeoProjGridDBVolume3D );
-
-// ----------------------------------------------------------------------
-// Test queryLinear()
-void
-spatialdata::spatialdb::TestGeoProjGridDBVolume3D::testQueryLinear(void)
-{ // testQueryLinear
- GeoProjGridDBTestDataVolume3D data;
-
- _testQueryLinear(data);
-} // testQueryLinear
-
-// ----------------------------------------------------------------------
-// Test queryNearest()
-void
-spatialdata::spatialdb::TestGeoProjGridDBVolume3D::testQueryNearest(void)
-{ // testQueryNearest
- GeoProjGridDBTestDataVolume3D data;
-
- _testQueryNearest(data);
-} // testQueryNearest
-
-
-// End of file
Deleted: cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.hh
===================================================================
--- cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.hh 2012-06-28 22:15:18 UTC (rev 20431)
+++ cs/spatialdata/trunk/tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.hh 2012-06-28 22:44:40 UTC (rev 20432)
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-//
-// ----------------------------------------------------------------------
-//
-// Brad T. Aagaard, U.S. Geological Survey
-//
-// This code was developed as part of the Computational Infrastructure
-// for Geodynamics (http://geodynamics.org).
-//
-// Copyright (c) 2010-2012 University of California, Davis
-//
-// See COPYING for license information.
-//
-// ----------------------------------------------------------------------
-//
-
-/** @file tests/libtests/spatialdb/TestGeoProjGridDBVolume3D.hh
- *
- * @brief C++ TestGeoProjGridDBVolume3D object
- *
- * C++ unit testing for GeoProjGridDB. This object tests the volumetric
- * interpolation.
- */
-
-#if !defined(spatialdata_spatialdb_testgeoprojgriddbvolume3d_hh)
-#define spatialdata_spatialdb_testgeoprojgriddbvolume3d_hh
-
-#include "TestGeoProjGridDB.hh" // ISA TestGeoProjGridDB
-
-/// Namespace for spatial package
-namespace spatialdata {
- namespace spatialdb {
- class TestGeoProjGridDBVolume3D;
- } // spatialdb
-} // spatialdata
-
-/// C++ unit testing for GeoProjGridDB
-class spatialdata::spatialdb::TestGeoProjGridDBVolume3D : public TestGeoProjGridDB
-{ // class TestGeoProjGridDBVolume3D
-
- // CPPUNIT TEST SUITE /////////////////////////////////////////////////
- CPPUNIT_TEST_SUITE( TestGeoProjGridDBVolume3D );
-
- CPPUNIT_TEST( testQueryNearest );
- CPPUNIT_TEST( testQueryLinear );
-
- CPPUNIT_TEST_SUITE_END();
-
- // PUBLIC METHODS /////////////////////////////////////////////////////
-public :
-
- /// Test queryNearest()
- void testQueryNearest(void);
-
- /// Test queryLinear()
- void testQueryLinear(void);
-
-}; // class TestGeoProjGridDBVolume3D
-
-#endif // spatialdata_spatialdb_testgeoprojgriddbvolume3d_hh
-
-
-// End of file
More information about the CIG-COMMITS
mailing list