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

Timestamp:

Jun 10, 2004, 1:14:22 PM (22 years ago)

Author:

harman

Message:

Added more testpoints

File:

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

trunk/psLib/test/collections/tst_psSort_01.c

@@ -10 +10 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-02 23:29:29 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-10 23:14:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
     psVector *in = NULL;
     psVector *out = NULL;
+    psVector *tempVec = NULL;
 
 
     // Test A - Create float vectors
     printPositiveTestHeader(stdout,"psSort", "Create float vectors");
-    in = psVectorAlloc(5, PS_TYPE_F32);
-    in->n = 5;
-    out = psVectorAlloc(5, PS_TYPE_F32);
-    out->n = 5;
+    in = psVectorAlloc(7, PS_TYPE_F32);
+    in->n = 7;
+    out = psVectorAlloc(7, PS_TYPE_F32);
+    out->n = 7;
     in->data.F32[0] = 7.0f;
     in->data.F32[1] = 9.0f;
@@ -38 +39 @@
     in->data.F32[3] = 1.0f;
     in->data.F32[4] = 5.0f;
-    for(int i=0; i<5; i++) {
+    in->data.F32[5] = 5.0f;
+    in->data.F32[6] = -20.0f;
+    for(int i=0; i<7; i++) {
         printf("vec[%d] = %f\n", i, in->data.F32[i]);
     }
@@ -46 +49 @@
     // Test B - Sort input float vector and put results into output float vector
     printPositiveTestHeader(stdout,"psSort", "Sort float vector");
+    tempVec = out;
     out = psSort(out, in);
-    for(int i=0; i<5; i++) {
+    for(int i=0; i<7; i++) {
         printf("vec[%d] = %f\n", i, out->data.F32[i]);
+    }
+    if(out != tempVec) {
+        printf("Error: Return pointer not equal to output argument pointer\n");
     }
     printFooter(stdout, "psSort", "Sort float vector", true);
 
 
-    // Test C - Free float vectors
+    // Test C - Sort input float vector into itself
+    printPositiveTestHeader(stdout,"psSort", "Sort input float vector into itself");
+    in = psSort(in, in);
+    for(int i=0; i<7; i++) {
+        printf("vec[%d] = %f\n", i, out->data.F32[i]);
+    }
+    printFooter(stdout, "psSort", "Sort input float vector into itself", true);
+
+
+    // Test D - Free float vectors
     printPositiveTestHeader(stdout,"psSort", "Free float vectors");
     psVectorFree(in);