Changeset 4422 for trunk/psLib/test

Timestamp:

Jun 28, 2005, 2:43:46 PM (21 years ago)

Author:

drobbin

Message:

made requested revisions to psPolynomials per apidelta-report-cycle6

Location:

trunk/psLib/test

Files:

• astronomy/tst_psCoord.c (modified) (4 diffs)
• dataManip/tst_psFunc00.c (modified) (3 diffs)
• dataManip/verified/tst_psFunc00.stderr (modified) (4 diffs)
• dataManip/verified/tst_psFunc08.stderr (modified) (1 diff)
• dataManip/verified/tst_psFunc09.stderr (modified) (1 diff)
• dataManip/verified/tst_psFunc10.stderr (modified) (1 diff)
• dataManip/verified/tst_psFunc11.stderr (modified) (3 diffs)

trunk/psLib/test/astronomy/tst_psCoord.c

@@ -6 +6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-29 00:43:46 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -104 +104 @@
 }
 
-#define NW_TERMS 2
-#define NX_TERMS 3
-#define NY_TERMS 4
-#define NZ_TERMS 5
+#define NX_TERMS 2
+#define NY_TERMS 3
+#define NZ_TERMS 4
+#define NT_TERMS 5
 
 psS32 testPlaneTransformAlloc( void )
@@ -170 +170 @@
 {
     // Invoke function with known parameters
-    psPlaneDistort *myPD = psPlaneDistortAlloc(NW_TERMS, NX_TERMS, NY_TERMS, NZ_TERMS);
+    psPlaneDistort *myPD = psPlaneDistortAlloc(NX_TERMS, NY_TERMS, NZ_TERMS, NT_TERMS);
 
     // Verify NULL is not returned
@@ -178 +178 @@
     }
     // Verify the terms are properly set after allocation
-    if (myPD->x->nW != NW_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->nW is %d, should be %d",
-                myPD->x->nW, NW_TERMS);
-        return 2;
-    }
-    if (myPD->y->nW != NW_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->nW is %d, should be %d",
-                myPD->y->nW, NW_TERMS);
-        return 3;
-    }
     if (myPD->x->nX != NX_TERMS) {
         psError(PS_ERR_UNKNOWN,true,"myPD->x->nX is %d, should be %d",
                 myPD->x->nX, NX_TERMS);
-        return 4;
+        return 2;
     }
     if (myPD->y->nX != NX_TERMS) {
         psError(PS_ERR_UNKNOWN,true,"myPD->y->nX is %d, should be %d",
                 myPD->y->nX, NX_TERMS);
-        return 5;
+        return 3;
     }
     if (myPD->x->nY != NY_TERMS) {
         psError(PS_ERR_UNKNOWN,true,"myPD->x->nY is %d, should be %d",
                 myPD->x->nY, NY_TERMS);
-        return 6;
+        return 4;
     }
     if (myPD->y->nY != NY_TERMS) {
         psError(PS_ERR_UNKNOWN,true,"myPD->y->nY is %d, should be %d",
                 myPD->y->nY, NY_TERMS);
-        return 7;
+        return 5;
     }
     if (myPD->x->nZ != NZ_TERMS) {
         psError(PS_ERR_UNKNOWN,true,"myPD->x->nZ is %d, should be %d",
                 myPD->x->nZ, NZ_TERMS);
-        return 8;
+        return 6;
     }
     if (myPD->y->nZ != NZ_TERMS) {
         psError(PS_ERR_UNKNOWN,true,"myPD->y->nZ is %d, should be %d",
                 myPD->y->nZ, NZ_TERMS);
+        return 7;
+    }
+    if (myPD->x->nT != NT_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->x->nT is %d, should be %d",
+                myPD->x->nT, NT_TERMS);
+        return 8;
+    }
+    if (myPD->y->nT != NT_TERMS) {
+        psError(PS_ERR_UNKNOWN,true,"myPD->y->nT is %d, should be %d",
+                myPD->y->nT, NT_TERMS);
         return 9;
     }

trunk/psLib/test/dataManip/tst_psFunc00.c

@@ -14 +14 @@
 *    orders are created.
 * 
-*    @version $Revision: 1.21 $  $Name: not supported by cvs2svn $
-*    @date $Date: 2005-04-07 20:27:41 $
+*    @version $Revision: 1.22 $  $Name: not supported by cvs2svn $
+*    @date $Date: 2005-06-29 00:43:46 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -466 +466 @@
     }
     // Verify polynomial structure members set properly
-    if(my4DPoly->nX != ORDER) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DPoly->nX, ORDER);
-        return 2;
-    }
-    // Verify polynomial structure members set properly
-    if(my4DPoly->nY != ORDER+1) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DPoly->nY, ORDER+1);
-        return 3;
-    }
-    // Verify polynomial structure members set properly
-    if(my4DPoly->nZ != ORDER+2) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DPoly->nZ, ORDER+2);
+    if(my4DPoly->nY != ORDER) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DPoly->nY, ORDER);
+        return 2;
+    }
+    // Verify polynomial structure members set properly
+    if(my4DPoly->nZ != ORDER+1) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DPoly->nZ, ORDER+1);
+        return 3;
+    }
+    // Verify polynomial structure members set properly
+    if(my4DPoly->nT != ORDER+2) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DPoly->nT, ORDER+2);
         return 4;
     }
     // Verify polynomial structure members set properly
-    if(my4DPoly->nW != ORDER+3) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DPoly->nW, ORDER+3);
+    if(my4DPoly->nX != ORDER+3) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DPoly->nX, ORDER+3);
         return 5;
     }
@@ -560 +560 @@
     }
     // Verify polynomial structure members set properly
-    if(my4DDPoly->nX != ORDER) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DDPoly->nX, ORDER);
-        return 2;
-    }
-    // Verify polynomial structure members set properly
-    if(my4DDPoly->nY != ORDER+1) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DDPoly->nY, ORDER+1);
-        return 3;
-    }
-    // Verify polynomial structure members set properly
-    if(my4DDPoly->nZ != ORDER+2) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DDPoly->nZ, ORDER+2);
+    if(my4DDPoly->nY != ORDER) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DDPoly->nY, ORDER);
+        return 2;
+    }
+    // Verify polynomial structure members set properly
+    if(my4DDPoly->nZ != ORDER+1) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DDPoly->nZ, ORDER+1);
+        return 3;
+    }
+    // Verify polynomial structure members set properly
+    if(my4DDPoly->nT != ORDER+2) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DDPoly->nT, ORDER+2);
         return 4;
     }
     // Verify polynomial structure members set properly
-    if(my4DDPoly->nW != ORDER+3) {
-        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
-                my4DDPoly->nW, ORDER+3);
+    if(my4DDPoly->nX != ORDER+3) {
+        psError(PS_ERR_UNKNOWN,true,"Number of terms %d not as expected %d",
+                my4DDPoly->nX, ORDER+3);
         return 5;
     }

trunk/psLib/test/dataManip/verified/tst_psFunc00.stderr

@@ -59 +59 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
-    Error: nW is 0 or less.
-<DATE><TIME>|<HOST>|I|testPolynomial4DAlloc
-    Following should generate error msg for negative terms
-<DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
     Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testPolynomial4DAlloc
@@ -72 +68 @@
 <DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
     Error: nZ is 0 or less.
+<DATE><TIME>|<HOST>|I|testPolynomial4DAlloc
+    Following should generate error msg for negative terms
+<DATE><TIME>|<HOST>|E|psPolynomial4DAlloc (FILE:LINENO)
+    Error: nT is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psPolynomial4DAlloc} | tst_psFunc00.c)
@@ -135 +135 @@
     Following should generate error msg for negative terms
 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
-    Error: nW is 0 or less.
-<DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc
-    Following should generate error msg for negative terms
-<DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
     Error: nX is 0 or less.
 <DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc
@@ -148 +144 @@
 <DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
     Error: nZ is 0 or less.
+<DATE><TIME>|<HOST>|I|testDPolynomial4DAlloc
+    Following should generate error msg for negative terms
+<DATE><TIME>|<HOST>|E|psDPolynomial4DAlloc (FILE:LINENO)
+    Error: nT is 0 or less.
 
 ---> TESTPOINT PASSED (psPolynomialXD{psDPolynomial4DAlloc} | tst_psFunc00.c)

trunk/psLib/test/dataManip/verified/tst_psFunc08.stderr

@@ -55 +55 @@
     Following should generate an error message for NULL polynomial
 <DATE><TIME>|<HOST>|E|psDPolynomial1DEvalVector (FILE:LINENO)
-    Unallowable operation: polynomial myPoly or its coeffs is NULL.
+    Unallowable operation: polynomial poly or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|testDPoly1DEvalVector
     Following should generate an error message for NULL input vector

trunk/psLib/test/dataManip/verified/tst_psFunc09.stderr

@@ -63 +63 @@
     Following should generate an error message for NULL polynomial
 <DATE><TIME>|<HOST>|E|psDPolynomial2DEvalVector (FILE:LINENO)
-    Unallowable operation: polynomial myPoly or its coeffs is NULL.
+    Unallowable operation: polynomial poly or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|testDPoly2DEvalVector
     Following should generate an error message for NULL input vector

trunk/psLib/test/dataManip/verified/tst_psFunc10.stderr

@@ -71 +71 @@
     Following should generate an error message for NULL polynomial
 <DATE><TIME>|<HOST>|E|psDPolynomial3DEvalVector (FILE:LINENO)
-    Unallowable operation: polynomial myPoly or its coeffs is NULL.
+    Unallowable operation: polynomial poly or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|testDPoly3DEvalVector
     Following should generate an error message for NULL input vector

trunk/psLib/test/dataManip/verified/tst_psFunc11.stderr

@@ -79 +79 @@
     Following should generate an error message for NULL polynomial
 <DATE><TIME>|<HOST>|E|psDPolynomial4DEvalVector (FILE:LINENO)
-    Unallowable operation: polynomial myPoly or its coeffs is NULL.
-<DATE><TIME>|<HOST>|I|testDPoly4DEvalVector
-    Following should generate an error message for NULL input vector
-<DATE><TIME>|<HOST>|E|psDPolynomial4DEvalVector (FILE:LINENO)
-    Unallowable operation: psVector w or its data is NULL.
+    Unallowable operation: polynomial poly or its coeffs is NULL.
 <DATE><TIME>|<HOST>|I|testDPoly4DEvalVector
     Following should generate an error message for NULL input vector
@@ -97 +93 @@
     Unallowable operation: psVector z or its data is NULL.
 <DATE><TIME>|<HOST>|I|testDPoly4DEvalVector
-    Following should generate an error message for invalid input type
+    Following should generate an error message for NULL input vector
 <DATE><TIME>|<HOST>|E|psDPolynomial4DEvalVector (FILE:LINENO)
-    Unallowable operation: psVector x has incorrect type.
+    Unallowable operation: psVector t or its data is NULL.
 <DATE><TIME>|<HOST>|I|testDPoly4DEvalVector
     Following should generate an error message for invalid input type
@@ -111 +107 @@
     Following should generate an error message for invalid input type
 <DATE><TIME>|<HOST>|E|psDPolynomial4DEvalVector (FILE:LINENO)
-    Unallowable operation: psVector w has incorrect type.
+    Unallowable operation: psVector t has incorrect type.
+<DATE><TIME>|<HOST>|I|testDPoly4DEvalVector
+    Following should generate an error message for invalid input type
+<DATE><TIME>|<HOST>|E|psDPolynomial4DEvalVector (FILE:LINENO)
+    Unallowable operation: psVector x has incorrect type.
 
 ---> TESTPOINT PASSED (psPolynomialXDEval{psDPolynomial4DEvalVector} | tst_psFunc11.c)