Changeset 688 for trunk/psLib/test/collections/tst_psSort_01.c

Timestamp:

May 14, 2004, 11:04:23 AM (22 years ago)

Author:

harman

Message:

Updated tests to reflect major changes to psVector

File:

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

trunk/psLib/test/collections/tst_psSort_01.c

@@ -4 +4 @@
  *
  *  This test driver contains the following tests for psSort test point 1:
- *     A)  Create float arrays
- *     B)  Sort input float array and put results into output float array
- *     C)  Free float arrays
+ *     A)  Create float vectors
+ *     B)  Sort input float vector and put results into output float vector
+ *     C)  Free float vectors
  *
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-05-08 01:19:28 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-05-14 21:04:23 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
          char* argv[])
 {
-    psArray *in = NULL;
-    psArray *out = NULL;
+    psVector *in = NULL;
+    psVector *out = NULL;
 
 
-    // Test A - Create float arrays
-    printPositiveTestHeader(stdout,"psSort", "Create float arrays");
-    in = psFloatArrayAlloc(5);
+    // Test A - Create float vectors
+    printPositiveTestHeader(stdout,"psSort", "Create float vectors");
+    in = psVectorAlloc(PS_TYPE_FLOAT, 5);
     in->n = 5;
-    out = psFloatArrayAlloc(5);
+    out = psVectorAlloc(PS_TYPE_FLOAT, 5);
     out->n = 5;
-    in->arr.fltArr[0] = 7.0f;
-    in->arr.fltArr[1] = 9.0f;
-    in->arr.fltArr[2] = 3.0f;
-    in->arr.fltArr[3] = 1.0f;
-    in->arr.fltArr[4] = 5.0f;
+    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;
     for(int i=0; i<5; i++) {
-        printf("arr[%d] = %f\n", i, in->arr.fltArr[i]);
+        printf("vec[%d] = %f\n", i, in->vec.f[i]);
     }
-    printFooter(stdout, "psSort", "Create float arrays", true);
+    printFooter(stdout, "psSort", "Create float vectors", true);
 
 
-    // Test B - Sort input float array and put results into output float array
-    printPositiveTestHeader(stdout,"psSort", "Sort float array");
+    // Test B - Sort input float vector and put results into output float vector
+    printPositiveTestHeader(stdout,"psSort", "Sort float vector");
     out = psSort(out, in);
     for(int i=0; i<5; i++) {
-        printf("arr[%d] = %f\n", i, out->arr.fltArr[i]);
+        printf("vec[%d] = %f\n", i, out->vec.f[i]);
     }
-    printFooter(stdout, "psSort", "Sort float array", true);
+    printFooter(stdout, "psSort", "Sort float vector", true);
 
 
-    // Test C - Free float arrays
-    printPositiveTestHeader(stdout,"psSort", "Free float arrays");
-    psFloatArrayFree(in);
-    psFloatArrayFree(out);
+    // Test C - Free float vectors
+    printPositiveTestHeader(stdout,"psSort", "Free float vectors");
+    psVectorFree(in);
+    psVectorFree(out);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
@@ -62 +62 @@
         printf("ERROR: Found %d bad memory blocks\n", nBad);
     }
-    printFooter(stdout, "psSort", "Free float arrays", true);
+    printFooter(stdout, "psSort", "Free float vectors", true);
 
+    return 0;
 }