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

trunk/psLib/test/collections/tst_psSort_02.c

@@ -10 +10 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-05-18 19:22:34 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-02 23:29:29 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
     // Test A - Create float vectors
     printPositiveTestHeader(stdout,"psSort", "Create vectors");
-    in = psVectorAlloc(PS_TYPE_FLOAT, 5);
+    in = psVectorAlloc(5, PS_TYPE_F32);
     in->n = 5;
-    out = psVectorAlloc(PS_TYPE_INT32, 5);
+    out = psVectorAlloc(5, PS_TYPE_F32);
     out->n = 5;
-    in->vec.f[0] = 7.0f;
-    in->vec.f[1] = 9.0f;
-    in->vec.f[2] = 3.0f;
-    in->vec.f[3] = 1.0f;
-    in->vec.f[4] = 5.0f;
+    in->data.F32[0] = 7.0f;
+    in->data.F32[1] = 9.0f;
+    in->data.F32[2] = 3.0f;
+    in->data.F32[3] = 1.0f;
+    in->data.F32[4] = 5.0f;
     for(int i=0; i<5; i++) {
-        printf("arr[%d] = %f\n", i, in->vec.f[i]);
+        printf("arr[%d] = %f\n", i, in->data.F32[i]);
     }
     printFooter(stdout, "psSort", "Create vectors", true);
@@ -48 +48 @@
     out = psSortIndex(out, in);
     for(int i=0; i<5; i++) {
-        printf("arr[%d] = %d\n", i, out->vec.i32[i]);
+        printf("arr[%d] = %d\n", i, out->data.S32[i]);
     }
     printFooter(stdout, "psSort", "Create sorted index vector", true);