Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 892) +++ /trunk/psLib/src/dataManip/psStats.c (revision 893) @@ -89,4 +89,10 @@ } + // GUS: Verify that this is the correct action. + if (lower > upper) { + // psAbort(__func__, "psHistogram requested with lower>upper"); + return(NULL); + } + newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); newHist->bounds = psVectorAlloc(n+1, PS_TYPE_F32); @@ -115,4 +121,10 @@ psHistogram *newHist = NULL; int i; + + // GUS: Verify that this is the correct action. + if (bounds == NULL) { + // psAbort(__func__, "psHistogram requested with NULL bounds"); + return(NULL); + } newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); @@ -166,4 +178,16 @@ int binNum = 0; int numBins = 0; + + // GUS: Verify that this is the correct action. + if (out == NULL) { + // psAbort(__func__, "psHistogram requested with NULL struct"); + return(NULL); + } + + // GUS: Verify that this is the correct action. + if (in == NULL) { + // psAbort(__func__, "psHistogram requested with NULL struct"); + return(out); + } numBins = out->nums->n; @@ -1051,5 +1075,8 @@ { if (in == NULL) { - psAbort(__func__, "Input data vector (in) was NULL."); + return(stats); + } + if (stats == NULL) { + return(NULL); } Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 892) +++ /trunk/psLib/src/math/psStats.c (revision 893) @@ -89,4 +89,10 @@ } + // GUS: Verify that this is the correct action. + if (lower > upper) { + // psAbort(__func__, "psHistogram requested with lower>upper"); + return(NULL); + } + newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); newHist->bounds = psVectorAlloc(n+1, PS_TYPE_F32); @@ -115,4 +121,10 @@ psHistogram *newHist = NULL; int i; + + // GUS: Verify that this is the correct action. + if (bounds == NULL) { + // psAbort(__func__, "psHistogram requested with NULL bounds"); + return(NULL); + } newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); @@ -166,4 +178,16 @@ int binNum = 0; int numBins = 0; + + // GUS: Verify that this is the correct action. + if (out == NULL) { + // psAbort(__func__, "psHistogram requested with NULL struct"); + return(NULL); + } + + // GUS: Verify that this is the correct action. + if (in == NULL) { + // psAbort(__func__, "psHistogram requested with NULL struct"); + return(out); + } numBins = out->nums->n; @@ -1051,5 +1075,8 @@ { if (in == NULL) { - psAbort(__func__, "Input data vector (in) was NULL."); + return(stats); + } + if (stats == NULL) { + return(NULL); } Index: /trunk/psLib/test/dataManip/tst_psHist00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist00.c (revision 892) +++ /trunk/psLib/test/dataManip/tst_psHist00.c (revision 893) @@ -7,9 +7,6 @@ #include "psTest.h" #include "psMemory.h" -#define MISC_FLOAT_NUMBER 345.0 -#define MISC_INT_NUMBER 345 #define LOWER 20.0 #define UPPER 30.0 -#define NUM_BINS 200 int main() @@ -19,32 +16,88 @@ int memLeaks = 0; int i = 0; + int nb = 0; + int numBins = 0; int currentId = 0; currentId = psMemGetId(); - /*************************************************************************/ - /* Allocate and initialize data structures */ - /*************************************************************************/ + for (nb=0;nb<4;nb++) { + if (nb == 0) + numBins = 1; + if (nb == 1) + numBins = 2; + if (nb == 2) + numBins = 10; + if (nb == 3) + numBins = 20; + /*********************************************************************/ + /* Allocate and initialize data structures */ + /*********************************************************************/ + printPositiveTestHeader(stdout, + "psStats functions", + "Allocate the psHistogram structure."); + + myHist = psHistogramAlloc(LOWER, UPPER, numBins); + + if (myHist->nums->n != numBins) { + printf("ERROR: myHist->nums->n is wrong size (%d)\n", myHist->nums->n); + testStatus = false; + } + + if (myHist->bounds->n != numBins+1) { + printf("ERROR: myHist->bounds->n is wrong size (%d)\n", myHist->bounds->n); + testStatus = false; + } + + for (i=0;inums->data.S32[i] != 0) { + printf("ERROR: myHist->nums->data.S32[%d] not initialized to 0.\n", i); + testStatus = false; + } + myHist->nums->data.S32[i] = 0; + } + + if (myHist->minNum != 0) { + printf("ERROR: myHist->minNum is %d\n", myHist->minNum); + testStatus = false; + } + + if (myHist->maxNum != 0) { + printf("myHist->maxNum is %d\n", myHist->maxNum); + testStatus = false; + } + + if (myHist->uniform != 1) { + printf("ERROR: myHist->uniform is %d\n", myHist->uniform); + testStatus = false; + } + + for (i=0;ibounds->data.F32[i], + myHist->bounds->data.F32[i+1]); + } + + psMemCheckCorruption(1); + psHistogramFree(myHist); + psMemCheckCorruption(1); + + printFooter(stdout, + "psStats functions", + "Allocate the psHistogram structure.", + testStatus); + } + + printPositiveTestHeader(stdout, "psStats functions", - "Allocate the psHistogram structure."); + "Allocate the psHistogram structure. (UPPERnums->data.S32[i] = MISC_INT_NUMBER; + myHist = psHistogramAlloc(UPPER, LOWER, numBins); + if (myHist != NULL) { + printf("ERROR: myHist != NULL\n"); } - for (i=0;ibounds->data.F32[i], - myHist->bounds->data.F32[i+1]); - } - printf("myHist->minNum is %d\n", myHist->minNum); - printf("myHist->maxNum is %d\n", myHist->maxNum); - printf("myHist->uniform is %d\n", myHist->uniform); - - psMemCheckCorruption(1); - printFooter(stdout, "psStats functions", - "Allocate the psHistogram structure.", + "Allocate the psHistogram structure. (UPPERn = myBounds->nalloc; + for (i=0;idata.F32[i] = LOWER + ((UPPER - LOWER) / (float) numBins) * + (float) i; + } + myHist = psHistogramAllocGeneric(myBounds); + + if (myHist->nums->n != numBins) { + printf("ERROR: myHist->nums->n is wrong size (%d)\n", myHist->nums->n); + testStatus = false; + } + + if (myHist->bounds->n != numBins+1) { + printf("ERROR: myHist->bounds->n is wrong size (%d)\n", myHist->bounds->n); + testStatus = false; + } + + for (i=0;inums->data.S32[i] != 0) { + printf("ERROR: myHist->nums->data.S32[%d] not initialized to 0.\n", i); + testStatus = false; + } + myHist->nums->data.S32[i] = 0; + } + + if (myHist->minNum != 0) { + printf("ERROR: myHist->minNum is %d\n", myHist->minNum); + testStatus = false; + } + + if (myHist->maxNum != 0) { + printf("myHist->maxNum is %d\n", myHist->maxNum); + testStatus = false; + } + + if (myHist->uniform != 0) { + printf("ERROR: myHist->uniform is %d\n", myHist->uniform); + testStatus = false; + } + + for (i=0;ibounds->data.F32[i], + myHist->bounds->data.F32[i+1]); + } + psMemCheckCorruption(1); + psHistogramFree(myHist); + psMemCheckCorruption(1); + psVectorFree(myBounds); + + printFooter(stdout, + "psStats functions", + "Allocate the psHistogram structure.", + testStatus); + } /*************************************************************************/ - /* Allocate and initialize data structures */ - /*************************************************************************/ - printPositiveTestHeader(stdout, - "psStats functions", - "Allocate the psHistogram structure."); - myBounds = psVectorAlloc(NUM_BINS+1, PS_TYPE_F32); - myBounds->n = myBounds->nalloc; - for (i=0;idata.F32[i] = LOWER + ((UPPER - LOWER) / (float) NUM_BINS) * - (float) i; - } - myHist = psHistogramAllocGeneric(myBounds); - - for (i=0;inums->data.S32[i] = MISC_INT_NUMBER; - } - - for (i=0;ibounds->data.F32[i], - myHist->bounds->data.F32[i+1]); - } - printf("myHist->minNum is %d\n", myHist->minNum); - printf("myHist->maxNum is %d\n", myHist->maxNum); - printf("myHist->uniform is %d\n", myHist->uniform); - - psMemCheckCorruption(1); - - printFooter(stdout, - "psStats functions", - "Allocate the psHistogram structure.", - testStatus); - - /*************************************************************************/ - /* Deallocate data structures */ + /* Deallocate data structures */ /*************************************************************************/ printPositiveTestHeader(stdout, "psStats functions", "Deallocate the psHistogram structure."); - psHistogramFree(myHist); - psVectorFree(myBounds); - psMemCheckCorruption(1); memLeaks = psMemCheckLeaks(currentId,NULL,NULL); Index: /trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist02.c (revision 892) +++ /trunk/psLib/test/dataManip/tst_psHist02.c (revision 893) @@ -12,5 +12,4 @@ #define LOWER 20.0 #define UPPER 30.0 -#define NUM_BINS 20 #define NUM_DATA 10000 @@ -18,8 +17,11 @@ { psHistogram *myHist = NULL; + psHistogram *myHist2= NULL; psVector *myData = NULL; psVector *myMask = NULL; int testStatus = true; int memLeaks = 0; + int nb = 0; + int numBins = 0; int i = 0; int currentId = 0; @@ -27,4 +29,7 @@ currentId = psMemGetId(); + /*********************************************************************/ + /* Allocate and initialize data structures */ + /*********************************************************************/ myData = psVectorAlloc(NUM_DATA, PS_TYPE_F32); myData->n = myData->nalloc; @@ -42,47 +47,115 @@ } } - /*************************************************************************/ - /* Allocate and Perform Histogram, no mask */ - /*************************************************************************/ + + for (nb=0;nb<4;nb++) { + if (nb == 0) + numBins = 1; + if (nb == 1) + numBins = 2; + if (nb == 2) + numBins = 10; + if (nb == 3) + numBins = 20; + + /*********************************************************************/ + /* Allocate and Perform Histogram, no mask */ + /*********************************************************************/ + printPositiveTestHeader(stdout, + "psStats functions", + "Allocate and Perform Histogram, no mask"); + + myHist = psHistogramAlloc(LOWER, UPPER, numBins); + myHist = psHistogramVector(myHist, myData, NULL, 0); + + for (i=0;ibounds->data.F32[i], + myHist->bounds->data.F32[i+1], + myHist->nums->data.S32[i]); + } + psMemCheckCorruption(1); + psHistogramFree(myHist); + psMemCheckCorruption(1); + + printFooter(stdout, + "psStats functions", + "Allocate and Perform Histogram, no mask", + testStatus); + + /*********************************************************************/ + /* Allocate and Perform Histogram with mask */ + /*********************************************************************/ + printPositiveTestHeader(stdout, + "psStats functions", + "Allocate and Perform Histogram with mask"); + + myHist = psHistogramAlloc(LOWER, UPPER, numBins); + myHist = psHistogramVector(myHist, myData, myMask, 1); + + for (i=0;ibounds->data.F32[i], + myHist->bounds->data.F32[i+1], + myHist->nums->data.S32[i]); + } + psMemCheckCorruption(1); + psHistogramFree(myHist); + psMemCheckCorruption(1); + + printFooter(stdout, + "psStats functions", + "Allocate and Perform Histogram with mask", + testStatus); + } + psVectorFree(myMask); + printPositiveTestHeader(stdout, "psStats functions", - "Allocate and Perform Histogram, no mask"); + "Calling psHistogramVector() with various NULL inputs."); - myHist = psHistogramAlloc(LOWER, UPPER, NUM_BINS); - myHist = psHistogramVector(myHist, myData, NULL, 0); + // Verify the return value is null and program execution doesn't stop, + // if input parameter myHist is null. - for (i=0;ibounds->data.F32[i], - myHist->bounds->data.F32[i+1], - myHist->nums->data.S32[i]); + myHist2 = psHistogramVector(NULL, myData, NULL, 0); + if (myHist2 != NULL) { + printf("ERROR: myHist2!=NULL\n"); + testStatus = false; + } + psVectorFree(myData); + + + // Verify the retrun value is the same as the input parameter myHist and + // program execution doesn't stop, if the input parameter myArray is + // null. + + myHist = psHistogramAlloc(LOWER, UPPER, numBins); + myHist = psHistogramVector(myHist, NULL, NULL, 0); + if (myHist == NULL) { + printf("ERROR: myHist==NULL\n"); + testStatus = false; } psHistogramFree(myHist); + + // Verify the return value is the same as the input parameter myHist and + // program execution doesn't stop, if the input parameter myArray has no + // elements. + // NOTE: This code segment is commented out because psVectorAlloc returns + // NULL if called with an N element data. + /* + myData = psVectorAlloc(0, PS_TYPE_F32); + myData->n = myData->nalloc; + myHist = psHistogramAlloc(LOWER, UPPER, numBins); + myHist = psHistogramVector(myHist, NULL, NULL, 0); + if (myHist == NULL) { + printf("ERROR: myHist==NULL\n"); + testStatus = false; + } + psHistogramFree(myHist); + psVectorFree(myData); + */ printFooter(stdout, "psStats functions", - "Allocate and Perform Histogram, no mask", - testStatus); - - /*************************************************************************/ - /* Allocate and Perform Histogram with mask */ - /*************************************************************************/ - printPositiveTestHeader(stdout, - "psStats functions", - "Allocate and Perform Histogram with mask"); - - myHist = psHistogramAlloc(LOWER, UPPER, NUM_BINS); - myHist = psHistogramVector(myHist, myData, myMask, 1); - - for (i=0;ibounds->data.F32[i], - myHist->bounds->data.F32[i+1], - myHist->nums->data.S32[i]); - } - - printFooter(stdout, - "psStats functions", - "Allocate and Perform Histogram with mask", + "Calling psHistogramVector() with various NULL inputs.", testStatus); @@ -93,7 +166,4 @@ "psStats functions", "Deallocate the psHistogram structure."); - psHistogramFree(myHist); - psVectorFree(myData); - psVectorFree(myMask); psMemCheckCorruption(1); Index: /trunk/psLib/test/dataManip/tst_psStats00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats00.c (revision 892) +++ /trunk/psLib/test/dataManip/tst_psStats00.c (revision 893) @@ -11,4 +11,5 @@ { psStats *myStats = NULL; + psStats *myStats2 = NULL; int testStatus = true; int globalTestStatus = true; @@ -51,4 +52,6 @@ } } + + realMeanNoMask /= (float) N; realMeanWithMask /= (float) count; @@ -78,9 +81,9 @@ /*************************************************************************/ - /* Call psVectorStats() with vector mask. */ - /*************************************************************************/ - printPositiveTestHeader(stdout, - "psStats functions", - "PS_STAT_SAMPLE_MEAN: with vector mask"); + /* Call psVectorStats() with vector mask=1. */ + /*************************************************************************/ + printPositiveTestHeader(stdout, + "psStats functions", + "PS_STAT_SAMPLE_MEAN: with vector mask=1"); myStats = psVectorStats(myStats, myVector, maskVector, 1); @@ -97,9 +100,85 @@ printFooter(stdout, "psVector functions", - "PS_STAT_SAMPLE_MEAN: with vector mask", - testStatus); - - /*************************************************************************/ - /* Deallocate data structures */ + "PS_STAT_SAMPLE_MEAN: with vector mask=1", + testStatus); + + /*************************************************************************/ + /* Call psVectorStats() with vector mask=2. */ + /*************************************************************************/ + printPositiveTestHeader(stdout, + "psStats functions", + "PS_STAT_SAMPLE_MEAN: with vector mask=2"); + + // Set the mask vector and calculate the expected maximum. + // Set the mask vector. + for (i=0;idata.U8[i] == 1) { + maskVector->data.U8[i] = 2; + } + } + + myStats = psVectorStats(myStats, myVector, maskVector, 2); + mean = myStats->sampleMean; + printf("Called psVectorStats() on a vector with last N/2 elements masked.\n"); + printf("The expected mean was %f; the calculated mean was %f\n", realMeanWithMask, mean); + if (mean == realMeanWithMask) { + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } + + printFooter(stdout, + "psVector functions", + "PS_STAT_SAMPLE_MEAN: with vector mask=2", + testStatus); + + /*************************************************************************/ + /* Call psVectorStats() with vector mask=3. */ + /*************************************************************************/ + printPositiveTestHeader(stdout, + "psStats functions", + "PS_STAT_SAMPLE_MEAN: with vector mask=3"); + + // Set the mask vector and calculate the expected maximum. + // Set the mask vector. + for (i=0;idata.U8[i] == 2) { + maskVector->data.U8[i] = 3; + } + } + + myStats = psVectorStats(myStats, myVector, maskVector, 3); + mean = myStats->sampleMean; + printf("Called psVectorStats() on a vector with last N/2 elements masked.\n"); + printf("The expected mean was %f; the calculated mean was %f\n", realMeanWithMask, mean); + if (mean == realMeanWithMask) { + testStatus = true; + } else { + testStatus = false; + globalTestStatus = false; + } + + printFooter(stdout, + "psVector functions", + "PS_STAT_SAMPLE_MEAN: with vector mask=3", + testStatus); + /*************************************************************************/ + /* Call psVectorStats() with NULL inputs. */ + /*************************************************************************/ + printPositiveTestHeader(stdout, + "psStats functions", + "PS_STAT_SAMPLE_MEAN: NULL inputs"); + + myStats = psVectorStats(myStats, NULL, NULL, 0); + myStats2 = psVectorStats(NULL, myVector, NULL, 0); + + printFooter(stdout, + "psVector functions", + "PS_STAT_SAMPLE_MEAN: NULL inputs", + testStatus); + + /*************************************************************************/ + /* Deallocate data structures */ /*************************************************************************/ printPositiveTestHeader(stdout, Index: /trunk/psLib/test/dataManip/tst_psStats05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats05.c (revision 892) +++ /trunk/psLib/test/dataManip/tst_psStats05.c (revision 893) @@ -73,4 +73,16 @@ testStatus); + + + printPositiveTestHeader(stdout, + "psStats functions", + "Deallocate NULL psStats structure."); + psStatsFree(NULL); + printFooter(stdout, + "psStats functions", + "Deallocate NULL psStats structure.", + testStatus); + + return (!testStatus); } Index: /trunk/psLib/test/dataManip/verified/tst_psHist00.stdout =================================================================== --- /trunk/psLib/test/dataManip/verified/tst_psHist00.stdout (revision 892) +++ /trunk/psLib/test/dataManip/verified/tst_psHist00.stdout (revision 893) @@ -5,209 +5,75 @@ \----------------------------------------------------------------------------------/ -Bin number 0 bounds: (20.000000 - 20.049999) -Bin number 1 bounds: (20.049999 - 20.100000) -Bin number 2 bounds: (20.100000 - 20.150000) -Bin number 3 bounds: (20.150000 - 20.200001) -Bin number 4 bounds: (20.200001 - 20.250000) -Bin number 5 bounds: (20.250000 - 20.299999) -Bin number 6 bounds: (20.299999 - 20.350000) -Bin number 7 bounds: (20.350000 - 20.400000) -Bin number 8 bounds: (20.400000 - 20.450001) -Bin number 9 bounds: (20.450001 - 20.500000) -Bin number 10 bounds: (20.500000 - 20.549999) -Bin number 11 bounds: (20.549999 - 20.600000) -Bin number 12 bounds: (20.600000 - 20.650000) -Bin number 13 bounds: (20.650000 - 20.700001) -Bin number 14 bounds: (20.700001 - 20.750000) -Bin number 15 bounds: (20.750000 - 20.799999) -Bin number 16 bounds: (20.799999 - 20.850000) -Bin number 17 bounds: (20.850000 - 20.900000) -Bin number 18 bounds: (20.900000 - 20.950001) -Bin number 19 bounds: (20.950001 - 21.000000) -Bin number 20 bounds: (21.000000 - 21.049999) -Bin number 21 bounds: (21.049999 - 21.100000) -Bin number 22 bounds: (21.100000 - 21.150000) -Bin number 23 bounds: (21.150000 - 21.200001) -Bin number 24 bounds: (21.200001 - 21.250000) -Bin number 25 bounds: (21.250000 - 21.299999) -Bin number 26 bounds: (21.299999 - 21.350000) -Bin number 27 bounds: (21.350000 - 21.400000) -Bin number 28 bounds: (21.400000 - 21.450001) -Bin number 29 bounds: (21.450001 - 21.500000) -Bin number 30 bounds: (21.500000 - 21.549999) -Bin number 31 bounds: (21.549999 - 21.600000) -Bin number 32 bounds: (21.600000 - 21.650000) -Bin number 33 bounds: (21.650000 - 21.700001) -Bin number 34 bounds: (21.700001 - 21.750000) -Bin number 35 bounds: (21.750000 - 21.799999) -Bin number 36 bounds: (21.799999 - 21.850000) -Bin number 37 bounds: (21.850000 - 21.900000) -Bin number 38 bounds: (21.900000 - 21.950001) -Bin number 39 bounds: (21.950001 - 22.000000) -Bin number 40 bounds: (22.000000 - 22.049999) -Bin number 41 bounds: (22.049999 - 22.100000) -Bin number 42 bounds: (22.100000 - 22.150000) -Bin number 43 bounds: (22.150000 - 22.200001) -Bin number 44 bounds: (22.200001 - 22.250000) -Bin number 45 bounds: (22.250000 - 22.299999) -Bin number 46 bounds: (22.299999 - 22.350000) -Bin number 47 bounds: (22.350000 - 22.400000) -Bin number 48 bounds: (22.400000 - 22.450001) -Bin number 49 bounds: (22.450001 - 22.500000) -Bin number 50 bounds: (22.500000 - 22.549999) -Bin number 51 bounds: (22.549999 - 22.600000) -Bin number 52 bounds: (22.600000 - 22.650000) -Bin number 53 bounds: (22.650000 - 22.700001) -Bin number 54 bounds: (22.700001 - 22.750000) -Bin number 55 bounds: (22.750000 - 22.799999) -Bin number 56 bounds: (22.799999 - 22.850000) -Bin number 57 bounds: (22.850000 - 22.900000) -Bin number 58 bounds: (22.900000 - 22.950001) -Bin number 59 bounds: (22.950001 - 23.000000) -Bin number 60 bounds: (23.000000 - 23.049999) -Bin number 61 bounds: (23.049999 - 23.100000) -Bin number 62 bounds: (23.100000 - 23.150000) -Bin number 63 bounds: (23.150000 - 23.200001) -Bin number 64 bounds: (23.200001 - 23.250000) -Bin number 65 bounds: (23.250000 - 23.299999) -Bin number 66 bounds: (23.299999 - 23.350000) -Bin number 67 bounds: (23.350000 - 23.400000) -Bin number 68 bounds: (23.400000 - 23.450001) -Bin number 69 bounds: (23.450001 - 23.500000) -Bin number 70 bounds: (23.500000 - 23.549999) -Bin number 71 bounds: (23.549999 - 23.600000) -Bin number 72 bounds: (23.600000 - 23.650000) -Bin number 73 bounds: (23.650000 - 23.700001) -Bin number 74 bounds: (23.700001 - 23.750000) -Bin number 75 bounds: (23.750000 - 23.799999) -Bin number 76 bounds: (23.799999 - 23.850000) -Bin number 77 bounds: (23.850000 - 23.900000) -Bin number 78 bounds: (23.900000 - 23.950001) -Bin number 79 bounds: (23.950001 - 24.000000) -Bin number 80 bounds: (24.000000 - 24.049999) -Bin number 81 bounds: (24.049999 - 24.100000) -Bin number 82 bounds: (24.100000 - 24.150000) -Bin number 83 bounds: (24.150000 - 24.200001) -Bin number 84 bounds: (24.200001 - 24.250000) -Bin number 85 bounds: (24.250000 - 24.299999) -Bin number 86 bounds: (24.299999 - 24.350000) -Bin number 87 bounds: (24.350000 - 24.400000) -Bin number 88 bounds: (24.400000 - 24.450001) -Bin number 89 bounds: (24.450001 - 24.500000) -Bin number 90 bounds: (24.500000 - 24.549999) -Bin number 91 bounds: (24.549999 - 24.600000) -Bin number 92 bounds: (24.600000 - 24.650000) -Bin number 93 bounds: (24.650000 - 24.700001) -Bin number 94 bounds: (24.700001 - 24.750000) -Bin number 95 bounds: (24.750000 - 24.799999) -Bin number 96 bounds: (24.799999 - 24.850000) -Bin number 97 bounds: (24.850000 - 24.900000) -Bin number 98 bounds: (24.900000 - 24.950001) -Bin number 99 bounds: (24.950001 - 25.000000) -Bin number 100 bounds: (25.000000 - 25.049999) -Bin number 101 bounds: (25.049999 - 25.100000) -Bin number 102 bounds: (25.100000 - 25.150000) -Bin number 103 bounds: (25.150000 - 25.200001) -Bin number 104 bounds: (25.200001 - 25.250000) -Bin number 105 bounds: (25.250000 - 25.299999) -Bin number 106 bounds: (25.299999 - 25.350000) -Bin number 107 bounds: (25.350000 - 25.400000) -Bin number 108 bounds: (25.400000 - 25.450001) -Bin number 109 bounds: (25.450001 - 25.500000) -Bin number 110 bounds: (25.500000 - 25.549999) -Bin number 111 bounds: (25.549999 - 25.600000) -Bin number 112 bounds: (25.600000 - 25.650000) -Bin number 113 bounds: (25.650000 - 25.700001) -Bin number 114 bounds: (25.700001 - 25.750000) -Bin number 115 bounds: (25.750000 - 25.799999) -Bin number 116 bounds: (25.799999 - 25.850000) -Bin number 117 bounds: (25.850000 - 25.900000) -Bin number 118 bounds: (25.900000 - 25.950001) -Bin number 119 bounds: (25.950001 - 26.000000) -Bin number 120 bounds: (26.000000 - 26.049999) -Bin number 121 bounds: (26.049999 - 26.100000) -Bin number 122 bounds: (26.100000 - 26.150000) -Bin number 123 bounds: (26.150000 - 26.200001) -Bin number 124 bounds: (26.200001 - 26.250000) -Bin number 125 bounds: (26.250000 - 26.299999) -Bin number 126 bounds: (26.299999 - 26.350000) -Bin number 127 bounds: (26.350000 - 26.400000) -Bin number 128 bounds: (26.400000 - 26.450001) -Bin number 129 bounds: (26.450001 - 26.500000) -Bin number 130 bounds: (26.500000 - 26.549999) -Bin number 131 bounds: (26.549999 - 26.600000) -Bin number 132 bounds: (26.600000 - 26.650000) -Bin number 133 bounds: (26.650000 - 26.700001) -Bin number 134 bounds: (26.700001 - 26.750000) -Bin number 135 bounds: (26.750000 - 26.799999) -Bin number 136 bounds: (26.799999 - 26.850000) -Bin number 137 bounds: (26.850000 - 26.900000) -Bin number 138 bounds: (26.900000 - 26.950001) -Bin number 139 bounds: (26.950001 - 27.000000) -Bin number 140 bounds: (27.000000 - 27.049999) -Bin number 141 bounds: (27.049999 - 27.100000) -Bin number 142 bounds: (27.100000 - 27.150000) -Bin number 143 bounds: (27.150000 - 27.200001) -Bin number 144 bounds: (27.200001 - 27.250000) -Bin number 145 bounds: (27.250000 - 27.299999) -Bin number 146 bounds: (27.299999 - 27.350000) -Bin number 147 bounds: (27.350000 - 27.400000) -Bin number 148 bounds: (27.400000 - 27.450001) -Bin number 149 bounds: (27.450001 - 27.500000) -Bin number 150 bounds: (27.500000 - 27.549999) -Bin number 151 bounds: (27.549999 - 27.600000) -Bin number 152 bounds: (27.600000 - 27.650000) -Bin number 153 bounds: (27.650000 - 27.700001) -Bin number 154 bounds: (27.700001 - 27.750000) -Bin number 155 bounds: (27.750000 - 27.799999) -Bin number 156 bounds: (27.799999 - 27.850000) -Bin number 157 bounds: (27.850000 - 27.900000) -Bin number 158 bounds: (27.900000 - 27.950001) -Bin number 159 bounds: (27.950001 - 28.000000) -Bin number 160 bounds: (28.000000 - 28.049999) -Bin number 161 bounds: (28.049999 - 28.100000) -Bin number 162 bounds: (28.100000 - 28.150000) -Bin number 163 bounds: (28.150000 - 28.200001) -Bin number 164 bounds: (28.200001 - 28.250000) -Bin number 165 bounds: (28.250000 - 28.299999) -Bin number 166 bounds: (28.299999 - 28.350000) -Bin number 167 bounds: (28.350000 - 28.400000) -Bin number 168 bounds: (28.400000 - 28.450001) -Bin number 169 bounds: (28.450001 - 28.500000) -Bin number 170 bounds: (28.500000 - 28.549999) -Bin number 171 bounds: (28.549999 - 28.600000) -Bin number 172 bounds: (28.600000 - 28.650000) -Bin number 173 bounds: (28.650000 - 28.700001) -Bin number 174 bounds: (28.700001 - 28.750000) -Bin number 175 bounds: (28.750000 - 28.799999) -Bin number 176 bounds: (28.799999 - 28.850000) -Bin number 177 bounds: (28.850000 - 28.900000) -Bin number 178 bounds: (28.900000 - 28.950001) -Bin number 179 bounds: (28.950001 - 29.000000) -Bin number 180 bounds: (29.000000 - 29.049999) -Bin number 181 bounds: (29.049999 - 29.100000) -Bin number 182 bounds: (29.100000 - 29.150000) -Bin number 183 bounds: (29.150000 - 29.200001) -Bin number 184 bounds: (29.200001 - 29.250000) -Bin number 185 bounds: (29.250000 - 29.299999) -Bin number 186 bounds: (29.299999 - 29.350000) -Bin number 187 bounds: (29.350000 - 29.400000) -Bin number 188 bounds: (29.400000 - 29.450001) -Bin number 189 bounds: (29.450001 - 29.500000) -Bin number 190 bounds: (29.500000 - 29.549999) -Bin number 191 bounds: (29.549999 - 29.600000) -Bin number 192 bounds: (29.600000 - 29.650000) -Bin number 193 bounds: (29.650000 - 29.700001) -Bin number 194 bounds: (29.700001 - 29.750000) -Bin number 195 bounds: (29.750000 - 29.799999) -Bin number 196 bounds: (29.799999 - 29.850000) -Bin number 197 bounds: (29.850000 - 29.900000) -Bin number 198 bounds: (29.900000 - 29.950001) -Bin number 199 bounds: (29.950001 - 30.000000) -myHist->minNum is 0 -myHist->maxNum is 0 -myHist->uniform is 1 +Bin number 0 bounds: (20.000000 - 30.000000) ---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist00.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist00.c | +| TestPoint: psStats functions{Allocate the psHistogram structure.} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 25.000000) +Bin number 1 bounds: (25.000000 - 30.000000) + +---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist00.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist00.c | +| TestPoint: psStats functions{Allocate the psHistogram structure.} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 21.000000) +Bin number 1 bounds: (21.000000 - 22.000000) +Bin number 2 bounds: (22.000000 - 23.000000) +Bin number 3 bounds: (23.000000 - 24.000000) +Bin number 4 bounds: (24.000000 - 25.000000) +Bin number 5 bounds: (25.000000 - 26.000000) +Bin number 6 bounds: (26.000000 - 27.000000) +Bin number 7 bounds: (27.000000 - 28.000000) +Bin number 8 bounds: (28.000000 - 29.000000) +Bin number 9 bounds: (29.000000 - 30.000000) + +---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist00.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist00.c | +| TestPoint: psStats functions{Allocate the psHistogram structure.} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 20.500000) +Bin number 1 bounds: (20.500000 - 21.000000) +Bin number 2 bounds: (21.000000 - 21.500000) +Bin number 3 bounds: (21.500000 - 22.000000) +Bin number 4 bounds: (22.000000 - 22.500000) +Bin number 5 bounds: (22.500000 - 23.000000) +Bin number 6 bounds: (23.000000 - 23.500000) +Bin number 7 bounds: (23.500000 - 24.000000) +Bin number 8 bounds: (24.000000 - 24.500000) +Bin number 9 bounds: (24.500000 - 25.000000) +Bin number 10 bounds: (25.000000 - 25.500000) +Bin number 11 bounds: (25.500000 - 26.000000) +Bin number 12 bounds: (26.000000 - 26.500000) +Bin number 13 bounds: (26.500000 - 27.000000) +Bin number 14 bounds: (27.000000 - 27.500000) +Bin number 15 bounds: (27.500000 - 28.000000) +Bin number 16 bounds: (28.000000 - 28.500000) +Bin number 17 bounds: (28.500000 - 29.000000) +Bin number 18 bounds: (29.000000 - 29.500000) +Bin number 19 bounds: (29.500000 - 30.000000) + +---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist00.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist00.c | +| TestPoint: psStats functions{Allocate the psHistogram structure. (UPPER TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure. (UPPERminNum is 0 -myHist->maxNum is 0 -myHist->uniform is 0 +Bin number 0 bounds: (20.000000 - 30.000000) + +---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist01.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist01.c | +| TestPoint: psStats functions{Allocate the psHistogram structure.} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 25.000000) +Bin number 1 bounds: (25.000000 - 30.000000) + +---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist01.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist01.c | +| TestPoint: psStats functions{Allocate the psHistogram structure.} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 21.000000) +Bin number 1 bounds: (21.000000 - 22.000000) +Bin number 2 bounds: (22.000000 - 23.000000) +Bin number 3 bounds: (23.000000 - 24.000000) +Bin number 4 bounds: (24.000000 - 25.000000) +Bin number 5 bounds: (25.000000 - 26.000000) +Bin number 6 bounds: (26.000000 - 27.000000) +Bin number 7 bounds: (27.000000 - 28.000000) +Bin number 8 bounds: (28.000000 - 29.000000) +Bin number 9 bounds: (29.000000 - 30.000000) + +---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist01.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist01.c | +| TestPoint: psStats functions{Allocate the psHistogram structure.} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 20.500000) +Bin number 1 bounds: (20.500000 - 21.000000) +Bin number 2 bounds: (21.000000 - 21.500000) +Bin number 3 bounds: (21.500000 - 22.000000) +Bin number 4 bounds: (22.000000 - 22.500000) +Bin number 5 bounds: (22.500000 - 23.000000) +Bin number 6 bounds: (23.000000 - 23.500000) +Bin number 7 bounds: (23.500000 - 24.000000) +Bin number 8 bounds: (24.000000 - 24.500000) +Bin number 9 bounds: (24.500000 - 25.000000) +Bin number 10 bounds: (25.000000 - 25.500000) +Bin number 11 bounds: (25.500000 - 26.000000) +Bin number 12 bounds: (26.000000 - 26.500000) +Bin number 13 bounds: (26.500000 - 27.000000) +Bin number 14 bounds: (27.000000 - 27.500000) +Bin number 15 bounds: (27.500000 - 28.000000) +Bin number 16 bounds: (28.000000 - 28.500000) +Bin number 17 bounds: (28.500000 - 29.000000) +Bin number 18 bounds: (29.000000 - 29.500000) +Bin number 19 bounds: (29.500000 - 30.000000) ---> TESTPOINT PASSED (psStats functions{Allocate the psHistogram structure.} | tst_psHist01.c) Index: /trunk/psLib/test/dataManip/verified/tst_psHist02.stdout =================================================================== --- /trunk/psLib/test/dataManip/verified/tst_psHist02.stdout (revision 892) +++ /trunk/psLib/test/dataManip/verified/tst_psHist02.stdout (revision 893) @@ -1,2 +1,82 @@ +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist02.c | +| TestPoint: psStats functions{Allocate and Perform Histogram, no mask} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 30.000000) data (10000) + +---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist02.c | +| TestPoint: psStats functions{Allocate and Perform Histogram with mask} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 30.000000) data (5000) + +---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist02.c | +| TestPoint: psStats functions{Allocate and Perform Histogram, no mask} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 25.000000) data (5000) +Bin number 1 bounds: (25.000000 - 30.000000) data (5000) + +---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist02.c | +| TestPoint: psStats functions{Allocate and Perform Histogram with mask} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 25.000000) data (5000) +Bin number 1 bounds: (25.000000 - 30.000000) data (0) + +---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist02.c | +| TestPoint: psStats functions{Allocate and Perform Histogram, no mask} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 21.000000) data (1000) +Bin number 1 bounds: (21.000000 - 22.000000) data (1000) +Bin number 2 bounds: (22.000000 - 23.000000) data (1000) +Bin number 3 bounds: (23.000000 - 24.000000) data (1000) +Bin number 4 bounds: (24.000000 - 25.000000) data (1000) +Bin number 5 bounds: (25.000000 - 26.000000) data (1000) +Bin number 6 bounds: (26.000000 - 27.000000) data (1000) +Bin number 7 bounds: (27.000000 - 28.000000) data (1000) +Bin number 8 bounds: (28.000000 - 29.000000) data (1000) +Bin number 9 bounds: (29.000000 - 30.000000) data (1000) + +---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist02.c | +| TestPoint: psStats functions{Allocate and Perform Histogram with mask} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + +Bin number 0 bounds: (20.000000 - 21.000000) data (1000) +Bin number 1 bounds: (21.000000 - 22.000000) data (1000) +Bin number 2 bounds: (22.000000 - 23.000000) data (1000) +Bin number 3 bounds: (23.000000 - 24.000000) data (1000) +Bin number 4 bounds: (24.000000 - 25.000000) data (1000) +Bin number 5 bounds: (25.000000 - 26.000000) data (0) +Bin number 6 bounds: (26.000000 - 27.000000) data (0) +Bin number 7 bounds: (27.000000 - 28.000000) data (0) +Bin number 8 bounds: (28.000000 - 29.000000) data (0) +Bin number 9 bounds: (29.000000 - 30.000000) data (0) + +---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c) + /----------------------------- TESTPOINT ------------------------------------------\ | TestFile: tst_psHist02.c | @@ -59,4 +139,13 @@ /----------------------------- TESTPOINT ------------------------------------------\ | TestFile: tst_psHist02.c | +| TestPoint: psStats functions{Calling psHistogramVector() with various NULL inputs.} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + + +---> TESTPOINT PASSED (psStats functions{Calling psHistogramVector() with various NULL inputs.} | tst_psHist02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psHist02.c | | TestPoint: psStats functions{Deallocate the psHistogram structure.} | | TestType: Positive | Index: /trunk/psLib/test/sysUtils/tst_psTrace02.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psTrace02.c (revision 892) +++ /trunk/psLib/test/sysUtils/tst_psTrace02.c (revision 893) @@ -12,41 +12,48 @@ { FILE *fp; + int nb = 0; - printPositiveTestHeader(stdout, - "psTrace functions", - "psTrace()"); + fp = fopen("tst_psTrace02_OUT", "w"); + for (nb = 0 ; nb<4;nb++) { + if (nb == 0) + psTraceSetDestination(stdout); + if (nb == 1) + psTraceSetDestination(stderr); + if (nb == 2) + psTraceSetDestination(NULL); + if (nb == 3) + psTraceSetDestination(fp); - psSetTraceLevel(".", 4); - psTrace(".", 5, "(0) This message should not be displayed (%x)\n", - 0xbeefface); - psSetTraceLevel(".", 7); - psTrace(".", 5, "(0) This message should be displayed (%x)\n", - 0xbeefface); + printPositiveTestHeader(stdout, + "psTrace functions", + "psTrace()"); - psSetTraceLevel(".a", 4); - psTrace(".a", 5, "(1) This message should not be displayed (%x)\n", - 0xbeefface); - psSetTraceLevel(".a", 7); - psTrace(".a", 5, "(1) This message should be displayed (%x)\n", - 0xbeefface); + psSetTraceLevel(".", 4); + psTrace(".", 5, "(0) This message should not be displayed (%x)\n", + 0xbeefface); + psSetTraceLevel(".", 7); + psTrace(".", 5, "(0) This message should be displayed (%x)\n", + 0xbeefface); + + psSetTraceLevel(".a", 4); + psTrace(".a", 5, "(1) This message should not be displayed (%x)\n", + 0xbeefface); + psSetTraceLevel(".a", 7); + psTrace(".a", 5, "(1) This message should be displayed (%x)\n", + 0xbeefface); - psSetTraceLevel(".a.b", 4); - psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n", - 0xbeefface); - psSetTraceLevel(".a.b", 7); - psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n", - 0xbeefface); + psSetTraceLevel(".a.b", 4); + psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n", + 0xbeefface); + psSetTraceLevel(".a.b", 7); + psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n", + 0xbeefface); - printFooter(stdout, - "psTrace functions", - "psTrace()", - true); - - - fp = fopen("tst_psTrace02_OUT", "w"); - psTraceSetDestination(fp); - psTrace(".", 5, "(0) This message should be displayed (%x)\n", - 0xbeefface); + printFooter(stdout, + "psTrace functions", + "psTrace()", + true); + } fclose(fp); Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stderr =================================================================== --- /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stderr (revision 892) +++ /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stderr (revision 893) @@ -0,0 +1,3 @@ + (0) This message should be displayed (beefface) + (1) This message should be displayed (beefface) + (2) This message should be displayed (beefface) Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stdout =================================================================== --- /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stdout (revision 892) +++ /trunk/psLib/test/sysUtils/verified/tst_psTrace02.stdout (revision 893) @@ -11,2 +11,32 @@ ---> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c) +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psTrace02.c | +| TestPoint: psTrace functions{psTrace()} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + + +---> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psTrace02.c | +| TestPoint: psTrace functions{psTrace()} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + + (0) This message should be displayed (beefface) + (1) This message should be displayed (beefface) + (2) This message should be displayed (beefface) + +---> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c) + +/----------------------------- TESTPOINT ------------------------------------------\ +| TestFile: tst_psTrace02.c | +| TestPoint: psTrace functions{psTrace()} | +| TestType: Positive | +\----------------------------------------------------------------------------------/ + + +---> TESTPOINT PASSED (psTrace functions{psTrace()} | tst_psTrace02.c) +