Index: unk/psLib/test/collections/tst_psVectorSort_01.c~
===================================================================
--- /trunk/psLib/test/collections/tst_psVectorSort_01.c~	(revision 1811)
+++ 	(revision )
@@ -1,83 +1,0 @@
-/** @file  tst_psSort_01.c
- *
- *  @brief Test driver for psSort functions
- *
- *  This test driver contains the following tests for psSort test point 1:
- *     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.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-07-15 23:52:34 $
- *
- *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
- *
- */
-
-#include "pslib.h"
-#include "psTest.h"
-
-int main(int argc,
-         char* argv[])
-{
-    psVector *in = NULL;
-    psVector *out = NULL;
-    psVector *tempVec = NULL;
-
-
-    // Test A - Create float vectors
-    printPositiveTestHeader(stdout,"psSort", "Create float vectors");
-    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;
-    in->data.F32[2] = 3.0f;
-    in->data.F32[3] = 1.0f;
-    in->data.F32[4] = 5.0f;
-    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]);
-    }
-    printFooter(stdout, "psSort", "Create float vectors", true);
-
-
-    // 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<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 - 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");
-    psFree(in);
-    psFree(out);
-    psMemCheckLeaks(0, NULL, stdout);
-    int nBad = psMemCheckCorruption(0);
-    if(nBad) {
-        printf("ERROR: Found %d bad memory blocks\n", nBad);
-    }
-    printFooter(stdout, "psSort", "Free float vectors", true);
-
-    return 0;
-}
Index: unk/psLib/test/collections/tst_psVectorSort_02.c~
===================================================================
--- /trunk/psLib/test/collections/tst_psVectorSort_02.c~	(revision 1811)
+++ 	(revision )
@@ -1,66 +1,0 @@
-/** @file  tst_psSort_02.c
- *
- *  @brief Test driver for psSort functions
- *
- *  This test driver contains the following tests for psSort test point 2:
- *     A)  Create vectors
- *     B)  Sort integer vector of indices based on pre-sort order of floating point vector
- *     C)  Free vectors
- *
- *  @author  Ross Harman, MHPCC
- *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-07-15 23:52:34 $
- *
- *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
- *
- */
-
-#include "pslib.h"
-#include "psTest.h"
-
-int main(int argc,
-         char* argv[])
-{
-    psVector *in = NULL;
-    psVector *out = NULL;
-
-
-    // Test A - Create float vectors
-    printPositiveTestHeader(stdout,"psSort", "Create vectors");
-    in = psVectorAlloc(5, PS_TYPE_F32);
-    in->n = 5;
-    out = psVectorAlloc(5, PS_TYPE_F32);
-    out->n = 5;
-    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->data.F32[i]);
-    }
-    printFooter(stdout, "psSort", "Create vectors", true);
-
-
-    // Test B - Sort integer vector of indices based on pre-sort order of floating point vector
-    printPositiveTestHeader(stdout,"psSort", "Create sorted index vector");
-    out = psSortIndex(out, in);
-    for(int i=0; i<5; i++) {
-        printf("arr[%d] = %d\n", i, out->data.S32[i]);
-    }
-    printFooter(stdout, "psSort", "Create sorted index vector", true);
-
-
-    // Test C - Free vectors
-    printPositiveTestHeader(stdout,"psSort", "Free vectors");
-    psFree(in);
-    psFree(out);
-    psMemCheckLeaks(0, NULL, stdout);
-    int nBad = psMemCheckCorruption(0);
-    if(nBad) {
-        printf("ERROR: Found %d bad memory blocks\n", nBad);
-    }
-    printFooter(stdout, "psSort", "Free vectors", true);
-
-}
Index: unk/psLib/test/collections/tst_psVectorSort_03.c~
===================================================================
--- /trunk/psLib/test/collections/tst_psVectorSort_03.c~	(revision 1811)
+++ 	(revision )
@@ -1,60 +1,0 @@
-/** @file  tst_psSort_03.c
- *
- *  @brief Test driver for psSort functions
- *
- *  This test driver contains the following tests for psSort test point 3:
- *     A)  Create float vectors of different sizes
- *     B)  Attempt to sort vectors...should get errors
- *     C)  Free float vectors
- *
- *  @author  Ross Harman, MHPCC
- *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-07-15 23:52:34 $
- *
- *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
- *
- */
-
-#include "pslib.h"
-#include "psTest.h"
-
-int main(int argc,
-         char* argv[])
-{
-    psVector *in = NULL;
-    psVector *out = NULL;
-
-
-    // Test A - Create float vectors
-    printPositiveTestHeader(stdout,"psSort", "Create float vectors of different sizes");
-    in = psVectorAlloc(5, PS_TYPE_F32);
-    in->n = 5;
-    out = psVectorAlloc(6, PS_TYPE_F32);
-    out->n = 6;
-    in->n = 5;
-    for(int i=0; i<5; i++) {
-        printf("arr[%d] = %f\n", i, in->data.F32[i]);
-    }
-    printFooter(stdout, "psSort", "Create float vectors of different sizes", true);
-
-
-    // Test B - Sort input float vector and put results into output float vector
-    printNegativeTestHeader(stdout,"psSort", "Sort float vector",
-                            "Input and output vector sizes are not equal", 0);
-    out = psSort(out, in);
-    printFooter(stdout, "psSort", "Sort float vector", true);
-
-
-    // Test C - Free float vectors
-    printPositiveTestHeader(stdout,"psSort", "Free float vectors");
-    psFree(in);
-    psFree(out);
-    psMemCheckLeaks(0, NULL, stdout);
-    int nBad = psMemCheckCorruption(0);
-    if(nBad) {
-        printf("ERROR: Found %d bad memory blocks\n", nBad);
-    }
-    printFooter(stdout, "psSort", "Free float vectors", true);
-
-}
Index: unk/psLib/test/collections/tst_psVectorSort_04.c~
===================================================================
--- /trunk/psLib/test/collections/tst_psVectorSort_04.c~	(revision 1811)
+++ 	(revision )
@@ -1,44 +1,0 @@
-/** @file  tst_psSort_04.c
- *
- *  @brief Test driver for psSort functions
- *
- *  This test driver contains the following tests for psSort test point 4:
- *     A)  Attempt to sort with null input vector
- *     B)  Free vectors
- *
- *  @author  Ross Harman, MHPCC
- *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-07-15 23:52:34 $
- *
- *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
- *
- */
-
-#include "pslib.h"
-#include "psTest.h"
-
-int main(int argc,
-         char* argv[])
-{
-    psVector *badIn = NULL;
-    psVector *goodOut = psVectorAlloc(5, PS_TYPE_F32);
-
-    // Test A - Attempt to sort with null input vector
-    printNegativeTestHeader(stdout,"psSort", "Attempt to sort with null input vector",
-                            "Null input vector", 0);
-    goodOut = psSort(goodOut, badIn);
-    printFooter(stdout, "psSort", "Attempt to sort with null input vector", true);
-
-    // Test B - Free vectors
-    printPositiveTestHeader(stdout, "psSort", "Free vectors");
-    psFree(goodOut);
-    psMemCheckLeaks(0, NULL, stdout);
-    int nBad = psMemCheckCorruption(0);
-    if(nBad) {
-        printf("ERROR: Found %d bad memory blocks\n", nBad);
-    }
-    printFooter(stdout, "psSort", "Free arays", true);
-
-    return 0;
-}