Changeset 678 for trunk/psLib

Timestamp:

May 13, 2004, 3:12:32 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/test/dataManip

Files:

• Makefile (modified) (2 diffs)
• tst_psStats00.c (modified) (4 diffs)
• tst_psStats01.c (added)
• tst_psStats02.c (added)

trunk/psLib/test/dataManip/Makefile

@@ -3 +3 @@
 ##  Makefile:   test/sysUtils
 ##
-##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-05-13 06:06:34 $
+##  $Revision: 1.3 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-05-14 01:12:32 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 PSLIB_LIB_DIR = ../../lib
 
-TARGET = tst_psStats00
+TARGET = tst_psStats00 \
+         tst_psStats01 \
+         tst_psStats02
 
 all: $(TARGET)
 
 tst_psStats00:          tst_psStats00.o
+tst_psStats01:          tst_psStats01.o
+tst_psStats02:          tst_psStats02.o
 
 clean:

trunk/psLib/test/dataManip/tst_psStats00.c

@@ -14 +14 @@
     int testStatus      = true;
     int i               = 0;
-    psType dummyFloatType;
-    psType dummyIntType;
     psVector *myVector  = NULL;
     psVector *maskVector= NULL;
@@ -25 +23 @@
     printPositiveTestHeader(stdout,
                             "psStats functions",
-                            "hmmm");
+                            "PS_STAT_SAMPLE_MEAN");
 
     myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN);
-    dummyFloatType.type = PS_TYPE_FLOAT;
-    dummyFloatType.dimen = PS_DIMEN_VECTOR;
-    dummyIntType.type = PS_TYPE_INT;
-    dummyIntType.dimen = PS_DIMEN_VECTOR;
-    myVector = psVectorAlloc(dummyFloatType, N);
+    myVector = psVectorAlloc(PS_TYPE_FLOAT, N);
     myVector->n = N;
-    maskVector = psVectorAlloc(dummyIntType, N);
+    maskVector = psVectorAlloc(PS_TYPE_UINT8, N);
     maskVector->n = N;
 
@@ -42 +36 @@
         myVector->vec.f[i] = (float) i;
         if (i < (N/2)) {
-            maskVector->vec.i[i] = 0;
+            maskVector->vec.ui8[i] = 0;
             realMean2+= myVector->vec.f[i];
             count++;
         } else {
             printf("Masking element %d\n", i);
-            maskVector->vec.i[i] = 1;
+            maskVector->vec.ui8[i] = 1;
         }
         realMean1+= myVector->vec.f[i];
@@ -69 +63 @@
     printf("Called psArrayStats() on a vector with last N/2 elements masked.\n");
     printf("The expected mean was %f; the calculated mean was %f\n", realMean2, mean);
+    if (mean == realMean2) {
+        testStatus = true;
+    } else {
+        testStatus = false;
+    }
 
     printFooter(stdout,