Changeset 831 for trunk/psLib/test/collections
- Timestamp:
- Jun 2, 2004, 1:29:39 PM (22 years ago)
- Location:
- trunk/psLib/test/collections
- Files:
-
- 7 edited
-
tst_psSort_01.c (modified) (3 diffs)
-
tst_psSort_02.c (modified) (3 diffs)
-
tst_psSort_03.c (modified) (2 diffs)
-
tst_psSort_04.c (modified) (2 diffs)
-
tst_psVector_01.c (modified) (3 diffs)
-
tst_psVector_02.c (modified) (7 diffs)
-
tst_psVector_03.c (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/test/collections/tst_psSort_01.c
r717 r831 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-0 5-18 19:22:34$12 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-06-02 23:29:29 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 29 29 // Test A - Create float vectors 30 30 printPositiveTestHeader(stdout,"psSort", "Create float vectors"); 31 in = psVectorAlloc( PS_TYPE_FLOAT, 5);31 in = psVectorAlloc(5, PS_TYPE_F32); 32 32 in->n = 5; 33 out = psVectorAlloc( PS_TYPE_FLOAT, 5);33 out = psVectorAlloc(5, PS_TYPE_F32); 34 34 out->n = 5; 35 in-> vec.f[0] = 7.0f;36 in-> vec.f[1] = 9.0f;37 in-> vec.f[2] = 3.0f;38 in-> vec.f[3] = 1.0f;39 in-> vec.f[4] = 5.0f;35 in->data.F32[0] = 7.0f; 36 in->data.F32[1] = 9.0f; 37 in->data.F32[2] = 3.0f; 38 in->data.F32[3] = 1.0f; 39 in->data.F32[4] = 5.0f; 40 40 for(int i=0; i<5; i++) { 41 printf("vec[%d] = %f\n", i, in-> vec.f[i]);41 printf("vec[%d] = %f\n", i, in->data.F32[i]); 42 42 } 43 43 printFooter(stdout, "psSort", "Create float vectors", true); … … 48 48 out = psSort(out, in); 49 49 for(int i=0; i<5; i++) { 50 printf("vec[%d] = %f\n", i, out-> vec.f[i]);50 printf("vec[%d] = %f\n", i, out->data.F32[i]); 51 51 } 52 52 printFooter(stdout, "psSort", "Sort float vector", true); -
trunk/psLib/test/collections/tst_psSort_02.c
r717 r831 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-0 5-18 19:22:34$12 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-06-02 23:29:29 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 29 29 // Test A - Create float vectors 30 30 printPositiveTestHeader(stdout,"psSort", "Create vectors"); 31 in = psVectorAlloc( PS_TYPE_FLOAT, 5);31 in = psVectorAlloc(5, PS_TYPE_F32); 32 32 in->n = 5; 33 out = psVectorAlloc( PS_TYPE_INT32, 5);33 out = psVectorAlloc(5, PS_TYPE_F32); 34 34 out->n = 5; 35 in-> vec.f[0] = 7.0f;36 in-> vec.f[1] = 9.0f;37 in-> vec.f[2] = 3.0f;38 in-> vec.f[3] = 1.0f;39 in-> vec.f[4] = 5.0f;35 in->data.F32[0] = 7.0f; 36 in->data.F32[1] = 9.0f; 37 in->data.F32[2] = 3.0f; 38 in->data.F32[3] = 1.0f; 39 in->data.F32[4] = 5.0f; 40 40 for(int i=0; i<5; i++) { 41 printf("arr[%d] = %f\n", i, in-> vec.f[i]);41 printf("arr[%d] = %f\n", i, in->data.F32[i]); 42 42 } 43 43 printFooter(stdout, "psSort", "Create vectors", true); … … 48 48 out = psSortIndex(out, in); 49 49 for(int i=0; i<5; i++) { 50 printf("arr[%d] = %d\n", i, out-> vec.i32[i]);50 printf("arr[%d] = %d\n", i, out->data.S32[i]); 51 51 } 52 52 printFooter(stdout, "psSort", "Create sorted index vector", true); -
trunk/psLib/test/collections/tst_psSort_03.c
r717 r831 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-0 5-18 19:22:34$12 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-06-02 23:29:29 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 29 29 // Test A - Create float vectors 30 30 printPositiveTestHeader(stdout,"psSort", "Create float vectors of different sizes"); 31 in = psVectorAlloc( PS_TYPE_FLOAT, 5);31 in = psVectorAlloc(5, PS_TYPE_F32); 32 32 in->n = 5; 33 out = psVectorAlloc( PS_TYPE_FLOAT, 6);33 out = psVectorAlloc(6, PS_TYPE_F32); 34 34 out->n = 6; 35 35 in->n = 5; 36 36 for(int i=0; i<5; i++) { 37 printf("arr[%d] = %f\n", i, in-> vec.f[i]);37 printf("arr[%d] = %f\n", i, in->data.F32[i]); 38 38 } 39 39 printFooter(stdout, "psSort", "Create float vectors of different sizes", true); -
trunk/psLib/test/collections/tst_psSort_04.c
r717 r831 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $13 * @date $Date: 2004-0 5-18 19:22:34$12 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2004-06-02 23:29:29 $ 14 14 * 15 15 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 25 25 psVector *badIn = NULL; 26 26 psVector *badOut = NULL; 27 psVector *goodIn = psVectorAlloc( PS_TYPE_FLOAT, 5);28 psVector *goodOut = psVectorAlloc( PS_TYPE_FLOAT, 5);27 psVector *goodIn = psVectorAlloc(5, PS_TYPE_F32); 28 psVector *goodOut = psVectorAlloc(5, PS_TYPE_F32); 29 29 30 30 // Test A - Attempt to sort with null input vector -
trunk/psLib/test/collections/tst_psVector_01.c
r717 r831 4 4 * 5 5 * This test driver contains the following tests for psVector test point 1: 6 * A) Create INT32 vector7 * B) Add data to INT32 vector8 * C) Reallocate INT32 vector bigger9 * D) Reallocate INT32 vector smaller10 * E) Free INT32 vector6 * A) Create S32 vector 7 * B) Add data to S32 vector 8 * C) Reallocate S32 vector bigger 9 * D) Reallocate S32 vector smaller 10 * E) Free S32 vector 11 11 * 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-0 5-18 19:22:34$14 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-06-02 23:29:29 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 27 27 28 28 29 // Test A - Create INT32 vector30 printPositiveTestHeader(stdout,"psVector", "Create INT32 vector");31 psVector *psVec = psVectorAlloc( PS_TYPE_INT32, 5);29 // Test A - Create S32 vector 30 printPositiveTestHeader(stdout,"psVector", "Create S32 vector"); 31 psVector *psVec = psVectorAlloc(5, PS_TYPE_S32); 32 32 printf("Vector size = %d\n", psVec->nalloc); 33 33 printf("Vector population = %d\n", psVec->n); 34 printFooter(stdout, "psVector", "Create INT32 vector", true);34 printFooter(stdout, "psVector", "Create S32 vector", true); 35 35 36 36 37 37 // Test B - Add data to integer vector 38 printPositiveTestHeader(stdout, "psVector", "Add data to INT32 vector");38 printPositiveTestHeader(stdout, "psVector", "Add data to S32 vector"); 39 39 for(int i = 0; i < 5; i++) { 40 psVec-> vec.i32[i] = i*10;40 psVec->data.S32[i] = i*10; 41 41 psVec->n++; 42 printf("Elem %d = %d\n", i, psVec-> vec.i32[i]);42 printf("Elem %d = %d\n", i, psVec->data.S32[i]); 43 43 } 44 44 printf("Vector size = %d\n", psVec->nalloc); 45 45 printf("Vector population = %d\n", psVec->n); 46 printFooter(stdout, "psVector", "Add data to INT32 vector", true);46 printFooter(stdout, "psVector", "Add data to S32 vector", true); 47 47 48 48 49 // Test C - Reallocate INT32 vector bigger50 printPositiveTestHeader(stdout,"psVector", "Reallocate INT32 vector bigger");51 psVec = psVectorRealloc( psVec, 10);52 printf("Adding more elements to INT32 vector...\n");49 // Test C - Reallocate S32 vector bigger 50 printPositiveTestHeader(stdout,"psVector", "Reallocate S32 vector bigger"); 51 psVec = psVectorRealloc(10, psVec); 52 printf("Adding more elements to S32 vector...\n"); 53 53 for(int i = 5; i < 10; i++) { 54 psVec-> vec.i32[i] = i*10;54 psVec->data.S32[i] = i*10; 55 55 psVec->n++; 56 printf("Elem %d = %d\n", i, psVec-> vec.i32[i]);56 printf("Elem %d = %d\n", i, psVec->data.S32[i]); 57 57 } 58 58 printf("Vector size = %d\n", psVec->nalloc); 59 59 printf("Vector population = %d\n", psVec->n); 60 printFooter(stdout, "psVector", "Reallocate INT32 vector bigger", true);60 printFooter(stdout, "psVector", "Reallocate S32 vector bigger", true); 61 61 62 62 63 // Test D - Reallocate INT32 vector smaller64 printPositiveTestHeader(stdout,"psVector","Reallocate INT32 vector smaller");65 psVec = psVectorRealloc( psVec, 3);63 // Test D - Reallocate S32 vector smaller 64 printPositiveTestHeader(stdout,"psVector","Reallocate S32 vector smaller"); 65 psVec = psVectorRealloc(3, psVec); 66 66 printf("Vector size = %d\n", psVec->nalloc); 67 67 for(int i = 0; i < 3; i++) { 68 printf("Elem %d = %d\n", i, psVec-> vec.i32[i]);68 printf("Elem %d = %d\n", i, psVec->data.S32[i]); 69 69 } 70 70 printf("Vector size = %d\n", psVec->nalloc); 71 71 printf("Vector population = %d\n", psVec->n); 72 printFooter(stdout, "psVector", "Reallocate integer INT32 smaller", true);72 printFooter(stdout, "psVector", "Reallocate integer S32 smaller", true); 73 73 74 74 75 // Test E - Free INT32 vector76 printPositiveTestHeader(stdout, "psVector", "Free INT32 vector");75 // Test E - Free S32 vector 76 printPositiveTestHeader(stdout, "psVector", "Free S32 vector"); 77 77 psVectorFree(psVec); 78 78 psMemCheckLeaks(0, NULL, stdout); … … 81 81 printf("ERROR: Found %d bad memory blocks\n", nBad); 82 82 } 83 printFooter(stdout, "psVector" ,"Free INT32 vector", true);83 printFooter(stdout, "psVector" ,"Free S32 vector", true); 84 84 85 85 return 0; -
trunk/psLib/test/collections/tst_psVector_02.c
r717 r831 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-0 5-18 19:22:34$14 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-06-02 23:29:29 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 39 39 // Test A - Create void pointer vector 40 40 printPositiveTestHeader(stdout,"psVector", "Create void pointer vector"); 41 psVector *psVec = psVectorAlloc( PS_TYPE_PTR, 5);41 psVector *psVec = psVectorAlloc(5, PS_TYPE_PTR); 42 42 printf("Vector size = %d\n", psVec->nalloc); 43 43 printf("Vector population = %d\n", psVec->n); … … 52 52 ts->y = 10.1*i; 53 53 mySt[i] = ts; 54 psVec-> vec.vp[i] = ts;54 psVec->data.PTR[i] = ts; 55 55 psVec->n++; 56 56 psMemIncrRefCounter(ts); … … 58 58 59 59 for(int i = 0; i < 5; i++) { 60 testStruct *ts = (testStruct*)psVec-> vec.vp[i];60 testStruct *ts = (testStruct*)psVec->data.PTR[i]; 61 61 printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); 62 62 } … … 68 68 // Test C - Reallocate void pointer vector bigger 69 69 printPositiveTestHeader(stdout,"psVector", "Reallocate void pointer vector bigger"); 70 psVec = psVectorRealloc( psVec, 10);70 psVec = psVectorRealloc(10, psVec); 71 71 printf("Adding more elements to void pointer vector...\n"); 72 72 for(int i = 5; i < 10; i++) { … … 75 75 ts->y = 10.1*i; 76 76 mySt[i] = ts; 77 psVec-> vec.vp[i] = ts;77 psVec->data.PTR[i] = ts; 78 78 psVec->n++; 79 79 psMemIncrRefCounter(ts); 80 80 } 81 81 for(int i = 0; i < 10; i++) { 82 testStruct *ts = (testStruct*)psVec-> vec.vp[i];82 testStruct *ts = (testStruct*)psVec->data.PTR[i]; 83 83 printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); 84 84 } … … 90 90 // Test D - Reallocate void pointer vector smaller 91 91 printPositiveTestHeader(stdout,"psVector","Reallocate void pointer vector smaller"); 92 psVec = psVectorRealloc( psVec, 3);92 psVec = psVectorRealloc(3, psVec); 93 93 for(int i = 0; i < 3; i++) { 94 testStruct *ts = (testStruct*)psVec-> vec.vp[i];94 testStruct *ts = (testStruct*)psVec->data.PTR[i]; 95 95 printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); 96 96 } -
trunk/psLib/test/collections/tst_psVector_03.c
r717 r831 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $15 * @date $Date: 2004-0 5-18 19:22:34$14 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2004-06-02 23:29:29 $ 16 16 * 17 17 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 44 44 // Test A - Create void pointer vector 45 45 printPositiveTestHeader(stdout,"psVector", "Create void pointer vector"); 46 psVector *psVec = psVectorAlloc( PS_TYPE_PTR, 5);46 psVector *psVec = psVectorAlloc(5, PS_TYPE_PTR); 47 47 printf("Vector size = %d\n", psVec->nalloc); 48 48 printf("Vector population = %d\n", psVec->n); … … 57 57 ts->y = 10.1*i; 58 58 mySt[i] = ts; 59 psVec-> vec.vp[i] = ts;59 psVec->data.PTR[i] = ts; 60 60 psVec->n++; 61 61 psMemIncrRefCounter(ts); … … 63 63 64 64 for(int i = 0; i < 5; i++) { 65 testStruct *ts = (testStruct*)psVec-> vec.vp[i];65 testStruct *ts = (testStruct*)psVec->data.PTR[i]; 66 66 printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); 67 67 } … … 73 73 // Test C - Reallocate void pointer vector bigger 74 74 printPositiveTestHeader(stdout,"psVector", "Reallocate void pointer vector bigger"); 75 psVec = psVectorRealloc( psVec, 10);75 psVec = psVectorRealloc(10, psVec); 76 76 printf("Adding more elements to void pointer vector...\n"); 77 77 for(int i = 5; i < 10; i++) { … … 80 80 ts->y = 10.1*i; 81 81 mySt[i] = ts; 82 psVec-> vec.vp[i] = ts;82 psVec->data.PTR[i] = ts; 83 83 psVec->n++; 84 84 psMemIncrRefCounter(ts); 85 85 } 86 86 for(int i = 0; i < 10; i++) { 87 testStruct *ts = (testStruct*)psVec-> vec.vp[i];87 testStruct *ts = (testStruct*)psVec->data.PTR[i]; 88 88 printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); 89 89 } … … 95 95 // Test D - Reallocate void pointer vector smaller 96 96 printPositiveTestHeader(stdout,"psVector","Reallocate void pointer vector smaller"); 97 psVec = psVectorRealloc( psVec, 3);97 psVec = psVectorRealloc(3, psVec); 98 98 for(int i = 0; i < 3; i++) { 99 testStruct *ts = (testStruct*)psVec-> vec.vp[i];99 testStruct *ts = (testStruct*)psVec->data.PTR[i]; 100 100 printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); 101 101 }
Note:
See TracChangeset
for help on using the changeset viewer.
