Changeset 13305 for trunk/psLib/test/mathtypes

Timestamp:

May 7, 2007, 8:21:16 PM (19 years ago)

Author:

gusciora

Message:

Basically, added additional tests to increase overall coverage of these
psLib functions.

Location:

trunk/psLib/test/mathtypes

Files:

• tap_psVectorSort.c (modified) (5 diffs)
• tap_psVectorSortIndex.c (modified) (7 diffs)

trunk/psLib/test/mathtypes/tap_psVectorSort.c

@@ -11 +11 @@
  *  Sort vector with one element
  *  Verify the sort for all supported types.
+ *  Sort input vector into itself
  *  Output vector is smaller than input vector
  *  Output vector is different type from input vector
- *  Sort input float vector into itself
- *  Free float vectors
  *
  *  @author  Ross Harman, GLG, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-04-19 03:50:44 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-05-08 06:21:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  *
  */
-
 #include <pslib.h>
 #include "tap.h"
 #include "pstap.h"
-
+#define VERBOSE 0
 
 #define tstVectorSortByType(datatype, boolOutNull, value) \
@@ -34 +32 @@
     psMemId id = psMemGetId(); \
     psVector *out = NULL; \
-    psVector *in = psVectorAlloc(7,PS_TYPE_##datatype); \
+    psVector *in = psVectorAlloc(7, PS_TYPE_##datatype); \
     if (boolOutNull) { \
         out = NULL; \
@@ -74 +72 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(244);
+    plan_tests(246);
 
 
@@ -90 +88 @@
     {
         psMemId id = psMemGetId();
-        psVector *in = psVectorAlloc(7, PS_TYPE_F32);
-        in->type.type = PS_TYPE_BOOL;
+        psVector *in = psVectorAlloc(7, PS_TYPE_BOOL);
         psVector *out = psVectorSort(NULL, in);
         ok(out == NULL, "Did return NULL on error");
         psFree(in);
+        psFree(out);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -236 +234 @@
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
+
+
+    // Sort large input vector
+    {
+        #define N 1000000
+        psMemId id = psMemGetId();
+        psVector *in = psVectorAlloc(N, PS_TYPE_S32);
+        for (int i = 0 ; i < N ; i++) {
+            in->data.S32[N-i-1] = i;
+        }
+        psVector *out = psVectorSort(NULL, in);
+        skip_start(out == NULL,  7, "Skipping tests because psVectorSort() returned NULL.");
+        bool errorFlag = false;
+        for (int i = 0 ; i < N ; i++) {
+            if (out->data.S32[i] != i) {
+                if (VERBOSE) {
+                    diag("Test error: out[%d] is %d, should be %d\n", i, out->data.S32[i], i);
+                }
+                errorFlag = true;
+            }
+        }
+        ok(!errorFlag, "psVectorSort() correctly sorted a large input vector");
+        skip_end();
+        psFree(in);
+        psFree(out);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 }

trunk/psLib/test/mathtypes/tap_psVectorSortIndex.c

@@ -14 +14 @@
  *  @author  Ross Harman, GLG, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-04-19 03:50:44 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-05-08 06:21:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 #include "tap.h"
 #include "pstap.h"
+#define VERBOSE 0
 
 #define tstVectorSortIndexByType(datatype, boolOutNull, value) \
@@ -28 +29 @@
     psMemId id = psMemGetId(); \
     psVector *out = NULL; \
-    psVector *in = psVectorAlloc( 5, PS_TYPE_##datatype ); \
+    psVector *in = psVectorAlloc(5, PS_TYPE_##datatype); \
     in->data.datatype[0] = 7+value; \
     in->data.datatype[1] = 9+value; \
@@ -37 +38 @@
         out = NULL; \
     } else { \
-        out = psVectorAlloc(5,PS_TYPE_##datatype); \
+        out = psVectorAlloc(5, PS_TYPE_##datatype); \
     } \
     psVector *tempVec = out; \
-    out = psVectorSortIndex(out,in); \
+    out = psVectorSortIndex(out, in); \
     if (!boolOutNull) { \
         ok(tempVec == out, "Return value equal to orignal output argument passed to function"); \
@@ -71 +72 @@
         psVector *out = psVectorSortIndex(NULL, NULL);
         ok(out == NULL, "psVectorSortIndex() return NULL with NULL input specified");
+        psFree(out);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -78 +80 @@
     {
         psMemId id = psMemGetId();
-        psVector *in = psVectorAlloc(5, PS_TYPE_U8);
-        in->type.type = PS_TYPE_BOOL;
+        psVector *in = psVectorAlloc(5, PS_TYPE_BOOL);
         psVector *out = psVectorSortIndex(NULL, in);
         ok(out == NULL, "psVectorSortIndex() returned NULL with unallowed input vector type");
         psFree(in);
+        psFree(out);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -178 +180 @@
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
+
+
+    // Sort large input vector
+    {
+        #define N 1000000
+        psMemId id = psMemGetId();
+        psVector *in = psVectorAlloc(N, PS_TYPE_S32);
+        for (int i = 0 ; i < N ; i++) {
+            in->data.S32[N-i-1] = i;
+        }
+        psVector *out = psVectorSortIndex(NULL, in);
+        skip_start(out == NULL,  7, "Skipping tests because psVectorSort() returned NULL.");
+        bool errorFlag = false;
+        for (int i = 0 ; i < N ; i++) {
+            if (out->data.U32[i] != N-i-1) {
+                if (VERBOSE) {
+                    diag("Test error: out[%d] is %d, should be %d\n", i, out->data.U32[i], i);
+                }
+                errorFlag = true;
+            }
+        }
+        ok(!errorFlag, "psVectorSortIndex() correctly sorted a large input vector");
+        skip_end();
+        psFree(in);
+        psFree(out);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
 }