Changeset 12431 for trunk/psLib/test/mathtypes

Timestamp:

Mar 13, 2007, 2:39:51 PM (19 years ago)

Author:

Paul Price

Message:

Removing complex number support. No-one was using it, and it prevents compilation on Solaris.

Location:

trunk/psLib/test/mathtypes

Files:

• tap_psImage.c (modified) (3 diffs)
• tap_psScalar.c (modified) (3 diffs)
• tap_psVector.c (modified) (3 diffs)

trunk/psLib/test/mathtypes/tap_psImage.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-03 01:25:22 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-14 00:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -81 +81 @@
     psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64,
                           PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64,
-                          PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64};
+                          PS_TYPE_F32, PS_TYPE_F64 };
 
     for (psU32 t=0;t<types;t++) {
@@ -200 +200 @@
                     }
                     ok(!errorFlag, "psImageAlloc() set data correctly (F64)");
-                }
-                break;
-            case PS_TYPE_C32: {
-                    psU32 rows = numRows[i];
-                    psU32 cols = numCols[i];
-
-                    for (psS32 r=0;r<rows;r++) {
-                        for (psS32 c=0;c<cols;c++) {
-                            image->data.C32[r][c] = r + I * c;
-                        }
-                    }
-                    bool errorFlag = false;
-                    for (psS32 r=0;r<rows;r++) {
-                        for (psS32 c=0;c<cols;c++) {
-                            if(fabsf(crealf(image->data.C32[r][c]) - r) > FLT_EPSILON ||
-                                    fabsf(cimagf(image->data.C32[r][c]) - c) > FLT_EPSILON) {
-                                diag("Set all pixels in complex image at (%d,%d)",c,r);
-                                errorFlag = true;
-                            }
-                        }
-                    }
-                    ok(!errorFlag, "psImageAlloc() set data correctly (C32)");
                 }
                 break;

trunk/psLib/test/mathtypes/tap_psScalar.c

@@ -5 +5 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.1 $
+ *  @version $Revision: 1.2 $
  *           $Name: not supported by cvs2svn $
- *  @date $Date: 2006-12-18 19:10:56 $
+ *  @date $Date: 2007-03-14 00:39:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77 +77 @@
     tstScalarAllocByType(F32,26);
     tstScalarAllocByType(F64,28);
-    tstScalarAllocByType(C32,30);
-    tstScalarAllocByType(C64,32);
 }
 
@@ -107 +105 @@
     tstScalarCopyByType(F32,180);
     tstScalarCopyByType(F64,190);
-    tstScalarCopyByType(C32,200);
-    tstScalarCopyByType(C64,210);
 }
 

trunk/psLib/test/mathtypes/tap_psVector.c

@@ -279 +279 @@
         psFree(vec);
     }
-
-    // XXX: Looks like the C32 case was removed from psVectorInit().
-    if (0) {
-        psVector *vec = psVectorAlloc(1, PS_TYPE_C32);
-        psC32 vC32 = 1.23 + 1.19I;
-        ok(psVectorInit(vec, vC32), "C32 Case");
-        psFree(vec);
-    }
-
-    // XXX: Looks like the C64 case was removed from psVectorInit().
-    if (0) {
-        psVector *vec = psVectorAlloc(1, PS_TYPE_C64);
-        psC64 vC64 = 2.13 + 2.31I;
-        ok(psVectorInit(vec, vC64), "C64 Case");
-        psFree(vec);
-    }
-
 
 
@@ -455 +438 @@
     TEST_VECTOR_TO_STRING(PS_TYPE_F64,5,.123,1,"[0.123,1.123,2.123,3.123,4.123]");
 
-    // Must test complex types separately from macro
-
-    // XXX: Looks like the C32 case was removed from psVectorInit().
-    if (0) {
-        psVector *vec = psVectorAlloc(1, PS_TYPE_C32);
-        vec->n = 1;
-        psC32 vC32 = 1.23 + 1.19I;
-        psVectorInit(vec, vC32);
-        psString result = psVectorToString(vec, 100);
-        \
-        psString expected = "[1.23+1.19i]";
-        ok(strcmp(result,expected) == 0,                                   \
-           "psVectorToString expected:result = %s:%s", expected, result );
-        \
-        psFree(vec);
-    }
-
-    // XXX: Looks like the C64 case was removed from psVectorInit().
-    if (0) {
-        psVector *vec = psVectorAlloc(1, PS_TYPE_C64);
-        vec->n = 1;
-        psC64 vC64 = 2.13 + 2.31I;
-        psVectorInit(vec, vC64);
-        psString result = psVectorToString(vec, 100);
-        \
-        psString expected = "[2.13+2.31i]";
-        ok(strcmp(result,expected) == 0,                                   \
-           "psVectorToString expected:result = %s:%s", expected, result );
-        \
-        psFree(vec);
-    }
-
-
-
 
     diag("p_psVectorGetElementF64() tests");
@@ -526 +475 @@
 
     TEST_VECTOR_GET_ELEMENT_F64(PS_TYPE_F64,2, psF64, -123.123);
-
-    // Need different test for complex types since NAN returned.
-
-    #define TEST_VECTOR_GET_C_ELEMENT_F64(ELEM_TYPE, SIZE, VALUE_TYPE,      \
-                                          INIT_VALUE )                                                        \
-    {                                                                       \
-        psVector *vec = psVectorAlloc(SIZE, ELEM_TYPE);                     \
-        vec->n = SIZE;                                                      \
-        VALUE_TYPE initValue = INIT_VALUE;                                  \
-        psVectorInit(vec, initValue);                                       \
-        psF64 result = p_psVectorGetElementF64(vec, 0);                     \
-        ok(isnan(result),                                                   \
-           "p_psVectorGetElementF64 expected NAN/nan got %f", result);     \
-        \
-        psFree(vec);                                                        \
-    }
-
-    TEST_VECTOR_GET_C_ELEMENT_F64(PS_TYPE_C32,1, psC32, 1.23+1.19I);
-
-    TEST_VECTOR_GET_C_ELEMENT_F64(PS_TYPE_C64,100, psC64, -1.23-1.19I);
-
-