[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r4854 - in trunk/Utilities/TestCommon: Inc Src
From:       svn_fdo () osgeo ! org
Date:       2009-07-17 21:29:41
Message-ID: 20090717212941.5336EE00C95 () lists ! osgeo ! org
[Download RAW message or body]

Author: brentrobinson
Date: 2009-07-17 17:29:41 -0400 (Fri, 17 Jul 2009)
New Revision: 4854

Modified:
   trunk/Utilities/TestCommon/Inc/TestCommonExpressionFunction.h
   trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp
   trunk/Utilities/TestCommon/Src/TestCommonExpressionFunctionW.cpp
Log:
Ticket#540: Allow null ordinate values to be customized by provider-specific unit \
tests.

Modified: trunk/Utilities/TestCommon/Inc/TestCommonExpressionFunction.h
===================================================================
--- trunk/Utilities/TestCommon/Inc/TestCommonExpressionFunction.h	2009-07-17 21:28:22 \
                UTC (rev 4853)
+++ trunk/Utilities/TestCommon/Inc/TestCommonExpressionFunction.h	2009-07-17 21:29:41 \
UTC (rev 4854) @@ -821,6 +821,12 @@
 
     virtual bool PointMAlwaysNull();
 
+    virtual double GetNullOrdinate();
+
+    virtual double GetNaNOrdinate();
+
+    virtual bool IsNullOrdinate(double ordinate);
+
     //-------------------------------------------------------------------------
     //                                Variables
     //-------------------------------------------------------------------------

Modified: trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp
===================================================================
--- trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp	2009-07-17 \
                21:28:22 UTC (rev 4853)
+++ trunk/Utilities/TestCommon/Src/TestCommonExpressionFunction.cpp	2009-07-17 \
21:29:41 UTC (rev 4854) @@ -2778,4 +2778,18 @@
     return false;
 }
 
+double TestCommonExpressionFunction::GetNullOrdinate()
+{
+    return -1.25e126;
+}
 
+double TestCommonExpressionFunction::GetNaNOrdinate()
+{
+    return numeric_limits<double>::quiet_NaN();
+}
+
+bool TestCommonExpressionFunction::IsNullOrdinate( double ordinate)
+{
+    return (ordinate == GetNullOrdinate()) || (ordinate != ordinate);
+}
+

Modified: trunk/Utilities/TestCommon/Src/TestCommonExpressionFunctionW.cpp
===================================================================
--- trunk/Utilities/TestCommon/Src/TestCommonExpressionFunctionW.cpp	2009-07-17 \
                21:28:22 UTC (rev 4853)
+++ trunk/Utilities/TestCommon/Src/TestCommonExpressionFunctionW.cpp	2009-07-17 \
21:29:41 UTC (rev 4854) @@ -82,6 +82,9 @@
     FdoPtr<FdoIGeometryCapabilities>     geom_caps;  
     FdoInt32                             dimensionalities;
 
+    FdoDouble                       expNull = IsNullOrdinate(GetNullOrdinate()) ? -1 \
: GetNullOrdinate(); +    FdoDouble                       expNaN = \
IsNullOrdinate(GetNaNOrdinate()) ? -1 : GetNaNOrdinate(); +
     printf("\n");
     printf("========================================================== \n");
     printf(" Current Unit Test Suite: X, Y, Z, M Function Testing      \n");
@@ -127,11 +130,11 @@
     exp_z_values[0][3] = -1;
     exp_z_values[0][4] = -1;
     exp_z_values[1][0] = 303.000000;
-    exp_z_values[1][1] = -1;
-    exp_z_values[1][2] = -1;
+    exp_z_values[1][1] = expNull;
+    exp_z_values[1][2] = expNaN;
     exp_z_values[2][0] = 402.000000;
-    exp_z_values[2][1] = -1;
-    exp_z_values[2][2] = -1;
+    exp_z_values[2][1] = expNull;
+    exp_z_values[2][2] = expNaN;
     exp_z_values[3][0] = -1;
     exp_z_values[3][1] = -1;
     exp_z_values[3][2] = -1;
@@ -145,11 +148,11 @@
     exp_m_values[1][1] = -1;
     exp_m_values[1][2] = -1;
     exp_m_values[2][0] = PointMAlwaysNull() ? -1 : 403.000000;
-    exp_m_values[2][1] = -1;
-    exp_m_values[2][2] = -1;
+    exp_m_values[2][1] = expNull;
+    exp_m_values[2][2] = expNaN;
     exp_m_values[3][0] = PointMAlwaysNull() ? -1 : 303.000000;
-    exp_m_values[3][1] = -1;
-    exp_m_values[3][2] = -1;
+    exp_m_values[3][1] = expNull;
+    exp_m_values[3][2] = expNaN;
 
     exp_xy_indexes[0] = 2;
 
@@ -854,11 +857,11 @@
 
 	  coordinate_3D_null_buffer[0] = 301.0;
       coordinate_3D_null_buffer[1] = 302.0;
-      coordinate_3D_null_buffer[2] = -1.25e126;
+      coordinate_3D_null_buffer[2] = GetNullOrdinate();
 
 	  coordinate_3D_nan_buffer[0] = 301.0;
       coordinate_3D_nan_buffer[1] = 302.0;
-      coordinate_3D_nan_buffer[2] = numeric_limits<double>::quiet_NaN();
+      coordinate_3D_nan_buffer[2] = GetNaNOrdinate();
 
 	  coordinate_4D_buffer[0] = 400.0;
       coordinate_4D_buffer[1] = 401.0;
@@ -867,13 +870,13 @@
 
 	  coordinate_4D_null_buffer[0] = 400.0;
       coordinate_4D_null_buffer[1] = 401.0;
-      coordinate_4D_null_buffer[2] = -1.25e126;
-      coordinate_4D_null_buffer[3] = -1.25e126;
+      coordinate_4D_null_buffer[2] = GetNullOrdinate();
+      coordinate_4D_null_buffer[3] = GetNullOrdinate();
 
 	  coordinate_4D_nan_buffer[0] = 400.0;
       coordinate_4D_nan_buffer[1] = 401.0;
-      coordinate_4D_nan_buffer[2] = numeric_limits<double>::quiet_NaN();
-      coordinate_4D_nan_buffer[3] = numeric_limits<double>::quiet_NaN();
+      coordinate_4D_nan_buffer[2] = GetNaNOrdinate();
+      coordinate_4D_nan_buffer[3] = GetNaNOrdinate();
 
 	  coordinate_line_buffer[0] = 301.0;
       coordinate_line_buffer[1] = 302.0;

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]