Changeset 831 for trunk/psLib/test/collections/tst_psVector_02.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_02.c (modified) (7 diffs)

trunk/psLib/test/collections/tst_psVector_02.c

@@ -12 +12 @@
  *  @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
@@ -39 +39 @@
     // Test A - Create void pointer vector
     printPositiveTestHeader(stdout,"psVector", "Create void pointer vector");
-    psVector *psVec = psVectorAlloc(PS_TYPE_PTR, 5);
+    psVector *psVec = psVectorAlloc(5, PS_TYPE_PTR);
     printf("Vector size = %d\n", psVec->nalloc);
     printf("Vector population = %d\n", psVec->n);
@@ -52 +52 @@
         ts->y = 10.1*i;
         mySt[i] = ts;
-        psVec->vec.vp[i] = ts;
+        psVec->data.PTR[i] = ts;
         psVec->n++;
         psMemIncrRefCounter(ts);
@@ -58 +58 @@
 
     for(int i = 0; i < 5; i++) {
-        testStruct *ts = (testStruct*)psVec->vec.vp[i];
+        testStruct *ts = (testStruct*)psVec->data.PTR[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
     }
@@ -68 +68 @@
     // Test C - Reallocate void pointer vector bigger
     printPositiveTestHeader(stdout,"psVector", "Reallocate void pointer vector bigger");
-    psVec = psVectorRealloc(psVec, 10);
+    psVec = psVectorRealloc(10, psVec);
     printf("Adding more elements to void pointer vector...\n");
     for(int i = 5; i < 10; i++) {
@@ -75 +75 @@
         ts->y = 10.1*i;
         mySt[i] = ts;
-        psVec->vec.vp[i] = ts;
+        psVec->data.PTR[i] = ts;
         psVec->n++;
         psMemIncrRefCounter(ts);
     }
     for(int i = 0; i < 10; i++) {
-        testStruct *ts = (testStruct*)psVec->vec.vp[i];
+        testStruct *ts = (testStruct*)psVec->data.PTR[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
     }
@@ -90 +90 @@
     // Test D - Reallocate void pointer vector smaller
     printPositiveTestHeader(stdout,"psVector","Reallocate void pointer vector smaller");
-    psVec = psVectorRealloc(psVec, 3);
+    psVec = psVectorRealloc(3, psVec);
     for(int i = 0; i < 3; i++) {
-        testStruct *ts = (testStruct*)psVec->vec.vp[i];
+        testStruct *ts = (testStruct*)psVec->data.PTR[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
     }