Changeset 11397 for trunk/psLib/test/math/tap_psPolynomialEval4D.c

Timestamp:

Jan 29, 2007, 2:11:31 PM (19 years ago)

Author:

gusciora

Message:

Improved skip macro placement for the PolyEval files.

Fist version of tap_psMatrixVectorArithmetic01.c

File:

• trunk/psLib/test/math/tap_psPolynomialEval4D.c (modified) (7 diffs)

trunk/psLib/test/math/tap_psPolynomialEval4D.c

@@ -4 +4 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-12-29 04:38:42 $
+*  @version  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2007-01-30 00:11:31 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -462 +462 @@
     {
         psMemId id = psMemGetId();
-        // Allocate polynomial
-        psPolynomial4D* polyOrd = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
-        ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
-        skip_start(polyOrd == NULL, 8, "Skipping tests because psPolynomial4DAlloc() failed");
-
-        // Set polynomial members
-        for(psS32 i = 0; i < TERMS; i++)
-        {
-            for(psS32 j = 0; j < TERMS; j++) {
-                for(psS32 k = 0; k < TERMS; k++) {
-                    for(psS32 l = 0; l < TERMS; l++) {
-                        polyOrd->coeff[i][j][k][l] = Dpoly4DCoeff[i][j][k][l];
-                        polyOrd->mask[i][j][k][l]  = poly4DMask[i][j][k][l];
-                    }
-                }
-            }
-        }
-
         // Create input vectors
         psVector* inputOrdW  = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
@@ -497 +479 @@
         }
 
+        // Allocate polynomial
+        psPolynomial4D* polyOrd = psPolynomial4DAlloc(PS_POLYNOMIAL_ORD, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
+        ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
+        skip_start(polyOrd == NULL, 12, "Skipping tests because psPolynomial4DAlloc() failed");
+        // Set polynomial members
+        for(psS32 i = 0; i < TERMS; i++)
+        {
+            for(psS32 j = 0; j < TERMS; j++) {
+                for(psS32 k = 0; k < TERMS; k++) {
+                    for(psS32 l = 0; l < TERMS; l++) {
+                        polyOrd->coeff[i][j][k][l] = Dpoly4DCoeff[i][j][k][l];
+                        polyOrd->mask[i][j][k][l]  = poly4DMask[i][j][k][l];
+                    }
+                }
+            }
+        }
+
         // Evaluate the vectors
         psVector* outputOrd = psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ);
@@ -548 +547 @@
         ok(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) == NULL, "psPolynomial4DEvalVector() produced NULL when called with non F64 input vector");
         inputOrdW->type.type = PS_TYPE_F64;
-
+        psFree(outputOrd);
+        skip_end();
         psFree(inputOrdX);
         psFree(inputOrdY);
         psFree(inputOrdZ);
         psFree(inputOrdW);
-        psFree(outputOrd);
         psFree(polyOrd);
-
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -563 +560 @@
     {
         psMemId id = psMemGetId();
-        // Allocate polynomial
-        psPolynomial4D* polyCheb = psPolynomial4DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
-        ok(polyCheb != NULL, "Ordinary polynomial allocation successful");
-        skip_start(polyCheb == NULL, 8, "Skipping tests because psPolynomial4DAlloc() failed");
-
-        // Set polynomial members
-        for(psS32 i = 0; i < TERMS; i++)
-        {
-            for(psS32 j = 0; j < TERMS; j++) {
-                for(psS32 k = 0; k < TERMS; k++) {
-                    for(psS32 l = 0; l < TERMS; l++) {
-                        polyCheb->coeff[i][j][k][l] = 1.0;
-                        polyCheb->mask[i][j][k][l]  = poly4DMask[i][j][k][l];
-                    }
-                }
-            }
-        }
-
         // Create input vectors
         psVector* inputChebW = psVectorAlloc(TESTPOINTS, PS_TYPE_F64);
@@ -598 +577 @@
         }
 
+        // Allocate polynomial
+        psPolynomial4D* polyCheb = psPolynomial4DAlloc(PS_POLYNOMIAL_CHEB, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
+        ok(polyCheb != NULL, "Ordinary polynomial allocation successful");
+        skip_start(polyCheb == NULL, 12, "Skipping tests because psPolynomial4DAlloc() failed");
+
+        // Set polynomial members
+        for(psS32 i = 0; i < TERMS; i++)
+        {
+            for(psS32 j = 0; j < TERMS; j++) {
+                for(psS32 k = 0; k < TERMS; k++) {
+                    for(psS32 l = 0; l < TERMS; l++) {
+                        polyCheb->coeff[i][j][k][l] = 1.0;
+                        polyCheb->mask[i][j][k][l]  = poly4DMask[i][j][k][l];
+                    }
+                }
+            }
+        }
+
         // Evaluate the vectors
         psVector* outputCheb = psPolynomial4DEvalVector(polyCheb,inputChebW,inputChebX,inputChebY,inputChebZ);
@@ -649 +646 @@
         ok(psPolynomial4DEvalVector(polyCheb,inputChebW,inputChebX,inputChebY,inputChebZ) == NULL, "psPolynomial4DEvalVector() produced NULL when called with non F64 input vector");
         inputChebW->type.type = PS_TYPE_F64;
-
+        psFree(outputCheb);
+        skip_end();
         psFree(inputChebW);
         psFree(inputChebX);
         psFree(inputChebY);
         psFree(inputChebZ);
-        psFree(outputCheb);
         psFree(polyCheb);
-
-        skip_end();
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }