Changeset 1327 for trunk/psLib/test/dataManip

Timestamp:

Jul 28, 2004, 5:54:52 PM (22 years ago)

Author:

evanalst

Message:

Changed the data type Histogram member nums to be of type psU32 per SDR.

Location:

trunk/psLib/test/dataManip

Files:

• tst_psHist00.c (modified) (1 diff)
• tst_psHist01.c (modified) (1 diff)
• tst_psHist02.c (modified) (8 diffs)

trunk/psLib/test/dataManip/tst_psHist00.c

@@ -50 +50 @@
 
         for (i=0;i<numBins;i++) {
-            if (myHist->nums->data.S32[i] != 0) {
-                printf("ERROR: myHist->nums->data.S32[%d] not initialized to 0.\n", i);
+            if (myHist->nums->data.U32[i] != 0) {
+                printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i);
                 testStatus = false;
             }
-            myHist->nums->data.S32[i] = 0;
+            myHist->nums->data.U32[i] = 0;
         }
 

trunk/psLib/test/dataManip/tst_psHist01.c

@@ -56 +56 @@
 
         for (i=0;i<numBins;i++) {
-            if (myHist->nums->data.S32[i] != 0) {
-                printf("ERROR: myHist->nums->data.S32[%d] not initialized to 0.\n", i);
+            if (myHist->nums->data.U32[i] != 0) {
+                printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i);
                 testStatus = false;
             }
-            myHist->nums->data.S32[i] = 0;
+            myHist->nums->data.U32[i] = 0;
         }
 

trunk/psLib/test/dataManip/tst_psHist02.c

@@ -66 +66 @@
 
         myHist = psHistogramAlloc(LOWER, UPPER, numBins);
-        myHist = psHistogramVector(myHist, myData, NULL, 0);
+        myHist = psVectorHistogram(myHist, myData, NULL, 0);
 
         for (i=0;i<numBins;i++) {
@@ -72 +72 @@
                    myHist->bounds->data.F32[i],
                    myHist->bounds->data.F32[i+1],
-                   myHist->nums->data.S32[i]);
+                   myHist->nums->data.U32[i]);
         }
         psMemCheckCorruption(1);
@@ -91 +91 @@
 
         myHist = psHistogramAlloc(LOWER, UPPER, numBins);
-        myHist = psHistogramVector(myHist, myData, myMask, 1);
+        myHist = psVectorHistogram(myHist, myData, myMask, 1);
 
         for (i=0;i<numBins;i++) {
@@ -97 +97 @@
                    myHist->bounds->data.F32[i],
                    myHist->bounds->data.F32[i+1],
-                   myHist->nums->data.S32[i]);
+                   myHist->nums->data.U32[i]);
         }
         psMemCheckCorruption(1);
@@ -112 +112 @@
     printPositiveTestHeader(stdout,
                             "psStats functions",
-                            "Calling psHistogramVector() with various NULL inputs.");
+                            "Calling psVectorHistogram() with various NULL inputs.");
 
     // Verify the return value is null and program execution doesn't stop,
     // if input parameter myHist is null.
 
-    myHist2 = psHistogramVector(NULL, myData, NULL, 0);
+    myHist2 = psVectorHistogram(NULL, myData, NULL, 0);
     if (myHist2 != NULL) {
         printf("ERROR: myHist2!=NULL\n");
@@ -130 +130 @@
 
     myHist = psHistogramAlloc(LOWER, UPPER, numBins);
-    myHist = psHistogramVector(myHist, NULL, NULL, 0);
+    myHist = psVectorHistogram(myHist, NULL, NULL, 0);
     if (myHist == NULL) {
         printf("ERROR: myHist==NULL\n");
@@ -147 +147 @@
     myData->n = myData->nalloc;
     myHist = psHistogramAlloc(LOWER, UPPER, numBins);
-    myHist = psHistogramVector(myHist, NULL, NULL, 0);
+    myHist = psVectorHistogram(myHist, NULL, NULL, 0);
     if (myHist == NULL) {
         printf("ERROR: myHist==NULL\n");
@@ -157 +157 @@
     printFooter(stdout,
                 "psStats functions",
-                "Calling psHistogramVector() with various NULL inputs.",
+                "Calling psVectorHistogram() with various NULL inputs.",
                 testStatus);