Changeset 11374

Timestamp:

Jan 29, 2007, 11:32:50 AM (19 years ago)

Author:

gusciora

Message:

Latest version. Removed VERBOSE macro.

File:

• trunk/psLib/test/math/tap_psPolynomialEval1D.c (modified) (13 diffs)

trunk/psLib/test/math/tap_psPolynomialEval1D.c

@@ -1 @@
-/** tst_psFunc08.c
+/**
 *
 *  This test driver will exercise the psPolynomialXDEval functions for both
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-12-15 00:41:49 $
+*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2007-01-29 21:32:50 $
 *
 *  XXX: Probably should test single- and multi-dimensional polynomials in
@@ -25 +25 @@
 #define TESTPOINTS   5
 #define ERROR_TOL    0.001
-#define VERBOSE 0
 
 psF32 poly1DCoeff[TERMS]        = { -4.3, 2.3, -3.2, 1.9};
@@ -45 +44 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-
     plan_tests(24);
-    diag("psPolynomial1DEval() tests");
 
     // Allocate and evaluate an ordinary polynomial structure
@@ -54 +51 @@
 
         // Allocate polynomial structure
-        diag("Allocate a 1D polynomial with psPolynomial1DAlloc()");
         psPolynomial1D* polyOrd = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, TERMS-1);
         ok(polyOrd != NULL, "Ordinary psPolynomial1D successfully allocated");
@@ -67 +63 @@
 
         // Evaluate test points and verify results
-        psBool errorFlag = false;
+        bool errorFlag = false;
         for(psS32 i = 0; i < TESTPOINTS; i++)
         {
             psF64 result = psPolynomial1DEval(polyOrd,poly1DXValue[i]);
-            if(fabs(poly1DXResult[i]-result) > ERROR_TOL ) {
-                if (VERBOSE) {
-                    psError(PS_ERR_UNKNOWN,true,"Evaluated value %g not as expected %g",
-                            result, poly1DXResult[i]);
-                }
+            if (fabs(poly1DXResult[i]-result) > ERROR_TOL ) {
+                diag("Evaluated value %g not as expected %g", result, poly1DXResult[i]);
                 errorFlag = true;
             }
@@ -88 +81 @@
     // Allocate Cheby polynomial structure
     {
-        psBool errorFlag = false;
-        psMemId id = psMemGetId();
-        diag("Allocate a 1D polynomial with psPolynomial1DAlloc()");
+        bool errorFlag = false;
+        psMemId id = psMemGetId();
         psPolynomial1D*  polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1);
         ok(polyCheb != NULL, "Chebyshev psPolynomial1D successfully allocated");
@@ -105 +97 @@
         {
             psF64 resultCheb = psPolynomial1DEval(polyCheb,poly1DXChebValue[i]);
-            if(fabs(poly1DXChebResult[i]-resultCheb) > ERROR_TOL ) {
-                if (VERBOSE) {
-                    psError(PS_ERR_UNKNOWN,true,"Evaluated value %g not as expected %g",
-                            resultCheb, poly1DXChebResult[i]);
-                }
+            if (fabs(poly1DXChebResult[i]-resultCheb) > ERROR_TOL ) {
+                diag("Evaluated value %g not as expected %g", resultCheb, poly1DXChebResult[i]);
                 errorFlag = true;
             }
@@ -121 +110 @@
     // Allocate polynomial with unallowable type
     {
-        diag("Allocate a 1D polynomial with an unallowed type");
         psMemId id = psMemGetId();
         psPolynomial1D* polyOrd = psPolynomial1DAlloc(99, TERMS-1);
@@ -127 +115 @@
         skip_start(polyOrd!=NULL, 1, "Skipping tests because psPolynomial1DAlloc() failed");
 
-        diag("Attempt to evaluate an 1D polynomial with an unallowed type");
         // Attempt to evaluation invalid polynomial type
         psF64 result = psPolynomial1DEval(polyOrd, 0.0);
@@ -139 +126 @@
     // Allocate polynomial, test the psPolynomial1DEvalVector() routines
     {
-        diag("Test psPolynomial1DEvalVector(), ordinary polynomials");
         psMemId id = psMemGetId();
         psPolynomial1D* polyOrd = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, TERMS-1);
@@ -166 +152 @@
 
         // Verify the results
-        psBool errorFlag = false;
-        for(psS32 i = 0; i < TESTPOINTS; i++)
-        {
-            if(fabs(poly1DXResult[i]-outputOrd->data.F64[i]) > ERROR_TOL) {
-                if (VERBOSE) {
-                    psError(PS_ERR_UNKNOWN,true,"Result[%d] %lg not equal to expected %lg",
-                            i, outputOrd->data.F64[i], poly1DXResult[i]);
-                }
+        bool errorFlag = false;
+        for(psS32 i = 0; i < TESTPOINTS; i++)
+        {
+            if (fabs(poly1DXResult[i]-outputOrd->data.F64[i]) > ERROR_TOL) {
+                diag("Result[%d] %lg not equal to expected %lg",
+                     i, outputOrd->data.F64[i], poly1DXResult[i]);
                 errorFlag = TRUE;
             }
@@ -199 +183 @@
     // Allocate polynomial, test the psPolynomial1DEvalVector() routines (Chebyshev)
     {
-        diag("Test psPolynomial1DEvalVector(), Cheby polynomials");
         psMemId id = psMemGetId();
         psPolynomial1D* polyCheb = psPolynomial1DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1);
@@ -226 +209 @@
 
         // Verify the results
-        psBool errorFlag = false;
-        for(psS32 i = 0; i < TESTPOINTS; i++)
-        {
-            if(fabs(poly1DXChebResult[i]-outputCheb->data.F64[i]) > ERROR_TOL) {
-                if (VERBOSE) {
-                    psError(PS_ERR_UNKNOWN,true,"ResultCheb[%d] %lg not equal to expected %lg",
-                            i, outputCheb->data.F64[i], poly1DXChebResult[i]);
-                }
+        bool errorFlag = false;
+        for(psS32 i = 0; i < TESTPOINTS; i++)
+        {
+            if (fabs(poly1DXChebResult[i]-outputCheb->data.F64[i]) > ERROR_TOL) {
+                diag("ResultCheb[%d] %lg not equal to expected %lg",
+                     i, outputCheb->data.F64[i], poly1DXChebResult[i]);
                 errorFlag = TRUE;
             }