Changeset 831 for trunk/psLib/test/collections/tst_psVector_01.c

Timestamp:

Jun 2, 2004, 1:29:39 PM (22 years ago)

Author:

harman

Message:

Changed psVector to be consistent with psImage

File:

• trunk/psLib/test/collections/tst_psVector_01.c (modified) (3 diffs)

trunk/psLib/test/collections/tst_psVector_01.c

@@ -4 +4 @@
  *
  *  This test driver contains the following tests for psVector test point 1:
- *     A)  Create INT32 vector
- *     B)  Add data to INT32 vector
- *     C)  Reallocate INT32 vector bigger
- *     D)  Reallocate INT32 vector smaller
- *     E)  Free INT32 vector
+ *     A)  Create S32 vector
+ *     B)  Add data to S32 vector
+ *     C)  Reallocate S32 vector bigger
+ *     D)  Reallocate S32 vector smaller
+ *     E)  Free S32 vector
  *
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-05-18 19:22:34 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-02 23:29:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +27 @@
 
 
-    // Test A - Create INT32 vector
-    printPositiveTestHeader(stdout,"psVector", "Create INT32 vector");
-    psVector *psVec = psVectorAlloc(PS_TYPE_INT32, 5);
+    // Test A - Create S32 vector
+    printPositiveTestHeader(stdout,"psVector", "Create S32 vector");
+    psVector *psVec = psVectorAlloc(5, PS_TYPE_S32);
     printf("Vector size = %d\n", psVec->nalloc);
     printf("Vector population = %d\n", psVec->n);
-    printFooter(stdout, "psVector", "Create INT32 vector", true);
+    printFooter(stdout, "psVector", "Create S32 vector", true);
 
 
     // Test B - Add data to integer vector
-    printPositiveTestHeader(stdout, "psVector", "Add data to INT32 vector");
+    printPositiveTestHeader(stdout, "psVector", "Add data to S32 vector");
     for(int i = 0; i < 5; i++) {
-        psVec->vec.i32[i] = i*10;
+        psVec->data.S32[i] = i*10;
         psVec->n++;
-        printf("Elem %d = %d\n", i, psVec->vec.i32[i]);
+        printf("Elem %d = %d\n", i, psVec->data.S32[i]);
     }
     printf("Vector size = %d\n", psVec->nalloc);
     printf("Vector population = %d\n", psVec->n);
-    printFooter(stdout, "psVector", "Add data to INT32 vector", true);
+    printFooter(stdout, "psVector", "Add data to S32 vector", true);
 
 
-    // Test C - Reallocate INT32 vector bigger
-    printPositiveTestHeader(stdout,"psVector", "Reallocate INT32 vector bigger");
-    psVec = psVectorRealloc(psVec, 10);
-    printf("Adding more elements to INT32 vector...\n");
+    // Test C - Reallocate S32 vector bigger
+    printPositiveTestHeader(stdout,"psVector", "Reallocate S32 vector bigger");
+    psVec = psVectorRealloc(10, psVec);
+    printf("Adding more elements to S32 vector...\n");
     for(int i = 5; i < 10; i++) {
-        psVec->vec.i32[i] = i*10;
+        psVec->data.S32[i] = i*10;
         psVec->n++;
-        printf("Elem %d = %d\n", i, psVec->vec.i32[i]);
+        printf("Elem %d = %d\n", i, psVec->data.S32[i]);
     }
     printf("Vector size = %d\n", psVec->nalloc);
     printf("Vector population = %d\n", psVec->n);
-    printFooter(stdout, "psVector", "Reallocate INT32 vector bigger", true);
+    printFooter(stdout, "psVector", "Reallocate S32 vector bigger", true);
 
 
-    // Test D - Reallocate INT32 vector smaller
-    printPositiveTestHeader(stdout,"psVector","Reallocate INT32 vector smaller");
-    psVec = psVectorRealloc(psVec, 3);
+    // Test D - Reallocate S32 vector smaller
+    printPositiveTestHeader(stdout,"psVector","Reallocate S32 vector smaller");
+    psVec = psVectorRealloc(3, psVec);
     printf("Vector size = %d\n", psVec->nalloc);
     for(int i = 0; i < 3; i++) {
-        printf("Elem %d = %d\n", i, psVec->vec.i32[i]);
+        printf("Elem %d = %d\n", i, psVec->data.S32[i]);
     }
     printf("Vector size = %d\n", psVec->nalloc);
     printf("Vector population = %d\n", psVec->n);
-    printFooter(stdout, "psVector", "Reallocate integer INT32 smaller", true);
+    printFooter(stdout, "psVector", "Reallocate integer S32 smaller", true);
 
 
-    // Test E - Free INT32 vector
-    printPositiveTestHeader(stdout, "psVector", "Free INT32 vector");
+    // Test E - Free S32 vector
+    printPositiveTestHeader(stdout, "psVector", "Free S32 vector");
     psVectorFree(psVec);
     psMemCheckLeaks(0, NULL, stdout);
@@ -81 +81 @@
         printf("ERROR: Found %d bad memory blocks\n", nBad);
     }
-    printFooter(stdout, "psVector" ,"Free INT32 vector", true);
+    printFooter(stdout, "psVector" ,"Free S32 vector", true);
 
     return 0;