[cig-commits] r5635 - cs/spatialdata-0.1/trunk/tests/libtests/geocoords

[brad at geodynamics.org]

Author: brad
Date: 2007-01-03 08:13:50 -0800 (Wed, 03 Jan 2007)
New Revision: 5635

Modified:
   cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSCart.cc
   cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSGeo.cc
Log:
Added spaceDim to CoordSys and eliminated overloading of spaceDim to prevent conflicts (only set method is inherited).

Modified: cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSCart.cc
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSCart.cc	2007-01-03 16:13:35 UTC (rev 5634)
+++ cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSCart.cc	2007-01-03 16:13:50 UTC (rev 5635)
@@ -49,7 +49,7 @@
 { // testSpaceDim
   CSCart cs;
   const int spaceDim = 2;
-  cs.spaceDim(spaceDim);
+  cs.setSpaceDim(spaceDim);
   CPPUNIT_ASSERT_EQUAL(spaceDim, cs.spaceDim());
 } // testSpaceDim
 
@@ -71,7 +71,7 @@
   const double toMeters = 5.4;
   const int spaceDim = 2;
   csA.toMeters(toMeters);
-  csA.spaceDim(spaceDim);
+  csA.setSpaceDim(spaceDim);
 
   std::stringstream s;
   csA.pickle(s);

Modified: cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSGeo.cc
===================================================================
--- cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSGeo.cc	2007-01-03 16:13:35 UTC (rev 5634)
+++ cs/spatialdata-0.1/trunk/tests/libtests/geocoords/TestCSGeo.cc	2007-01-03 16:13:50 UTC (rev 5635)
@@ -98,7 +98,7 @@
   CSGeo cs;
   CPPUNIT_ASSERT_EQUAL(3, cs.spaceDim());
   const int spaceDim = 2;
-  cs.spaceDim(spaceDim);
+  cs.setSpaceDim(spaceDim);
   CPPUNIT_ASSERT_EQUAL(spaceDim, cs.spaceDim());
 } // testSpaceDim
 
@@ -129,7 +129,7 @@
 			      -12.0, 65.7,
 			      64.3, -163.0 };
     cs.isGeocentric(true);
-    cs.spaceDim(numDims);
+    cs.setSpaceDim(numDims);
     const int size = numLocs * numDims;
     double* vals = new double[size];
     memcpy(vals, coords, size*sizeof(double));
@@ -155,7 +155,7 @@
 			      -12.0, 65.7, 12.6,
 			      64.3, -163.0, -1.5 };
     cs.isGeocentric(true);
-    cs.spaceDim(numDims);
+    cs.setSpaceDim(numDims);
     const int size = numLocs * numDims;
     double* vals = new double[size];
     memcpy(vals, coords, size*sizeof(double));
@@ -196,7 +196,7 @@
 			       -12.0, 65.7,
 			       64.3, -163.0 };
     cs.isGeocentric(true);
-    cs.spaceDim(numDims);
+    cs.setSpaceDim(numDims);
     const int size = numLocs * numDims;
     double* vals = new double[size];
     memcpy(vals, coords, size*sizeof(double));
@@ -222,7 +222,7 @@
 			       -12.0, 65.7, 12.6,
 			       64.3, -163.0, -1.5 };
     cs.isGeocentric(true);
-    cs.spaceDim(numDims);
+    cs.setSpaceDim(numDims);
     const int size = numLocs * numDims;
     double* vals = new double[size];
     memcpy(vals, coords, size*sizeof(double));
@@ -264,7 +264,7 @@
   csA.datumVert(datumVert);
   csA.isGeocentric(isGeocentric);
   csA.toMeters(toMeters);
-  csA.spaceDim(spaceDim);
+  csA.setSpaceDim(spaceDim);
 
   std::stringstream s;
   csA.pickle(s);