Index: trunk/psLib/test/dataManip/tst_psHist00.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist00.c (revision 2780) +++ trunk/psLib/test/dataManip/tst_psHist00.c (revision 2782) @@ -50,9 +50,9 @@ for (i=0;inums->data.U32[i] != 0) { + if (myHist->nums->data.F32[i] != 0.0) { printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i); testStatus = false; } - myHist->nums->data.U32[i] = 0; + myHist->nums->data.F32[i] = 0.0; } Index: trunk/psLib/test/dataManip/tst_psHist01.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist01.c (revision 2780) +++ trunk/psLib/test/dataManip/tst_psHist01.c (revision 2782) @@ -56,9 +56,9 @@ for (i=0;inums->data.U32[i] != 0) { - printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i); + if (myHist->nums->data.F32[i] != 0.0) { + printf("ERROR: myHist->nums->data.F32[%d] not initialized to 0.\n", i); testStatus = false; } - myHist->nums->data.U32[i] = 0; + myHist->nums->data.F32[i] = 0.0; } Index: trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist02.c (revision 2780) +++ trunk/psLib/test/dataManip/tst_psHist02.c (revision 2782) @@ -69,8 +69,8 @@ for ( i = 0;i < numBins;i++ ) { - printf( "Bin number %d bounds: (%.2f - %.2f) data (%d)\n", i, + printf( "Bin number %d bounds: (%.2f - %.2f) data (%f)\n", i, myHist->bounds->data.F32[ i ], myHist->bounds->data.F32[ i + 1 ], - myHist->nums->data.U32[ i ] ); + myHist->nums->data.F32[ i ] ); } psMemCheckCorruption( 1 ); @@ -94,8 +94,8 @@ for ( i = 0;i < numBins;i++ ) { - printf( "Bin number %d bounds: (%6.3f - %6.3f) data (%d)\n", i, + printf( "Bin number %d bounds: (%6.3f - %6.3f) data (%f)\n", i, myHist->bounds->data.F32[ i ], myHist->bounds->data.F32[ i + 1 ], - myHist->nums->data.U32[ i ] ); + myHist->nums->data.F32[ i ] ); } psMemCheckCorruption( 1 ); Index: trunk/psLib/test/dataManip/tst_psHist03.c =================================================================== --- trunk/psLib/test/dataManip/tst_psHist03.c (revision 2780) +++ trunk/psLib/test/dataManip/tst_psHist03.c (revision 2782) @@ -67,9 +67,9 @@ for (i=0;inums->data.U32[i] != 0) { - printf("ERROR: myHist->nums->data.U32[%d] not initialized to 0.\n", i); + if (myHist->nums->data.F32[i] != 0.0) { + printf("ERROR: myHist->nums->data.F32[%d] not initialized to 0.\n", i); testStatus = false; } - myHist->nums->data.U32[i] = 0; + myHist->nums->data.F32[i] = 0.0; } @@ -91,8 +91,8 @@ myHist = psVectorHistogram( myHist, myData, NULL, NULL, 0 ); for (i=0;ibounds->data.F32[i], myHist->bounds->data.F32[i+1], - myHist->nums->data.S32[i]); + myHist->nums->data.F32[i]); } Index: trunk/psLib/test/dataManip/verified/tst_psHist02.stdout =================================================================== --- trunk/psLib/test/dataManip/verified/tst_psHist02.stdout (revision 2780) +++ trunk/psLib/test/dataManip/verified/tst_psHist02.stdout (revision 2782) @@ -5,5 +5,5 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.00 - 30.00) data (10000) +Bin number 0 bounds: (20.00 - 30.00) data (10000.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c) @@ -15,5 +15,5 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.000 - 30.000) data (5000) +Bin number 0 bounds: (20.000 - 30.000) data (5000.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c) @@ -25,6 +25,6 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.00 - 25.00) data (5000) -Bin number 1 bounds: (25.00 - 30.00) data (5000) +Bin number 0 bounds: (20.00 - 25.00) data (5000.000000) +Bin number 1 bounds: (25.00 - 30.00) data (5000.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c) @@ -36,6 +36,6 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.000 - 25.000) data (5000) -Bin number 1 bounds: (25.000 - 30.000) data (0) +Bin number 0 bounds: (20.000 - 25.000) data (5000.000000) +Bin number 1 bounds: (25.000 - 30.000) data (0.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c) @@ -47,14 +47,14 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.00 - 21.00) data (1000) -Bin number 1 bounds: (21.00 - 22.00) data (1000) -Bin number 2 bounds: (22.00 - 23.00) data (1000) -Bin number 3 bounds: (23.00 - 24.00) data (1000) -Bin number 4 bounds: (24.00 - 25.00) data (1000) -Bin number 5 bounds: (25.00 - 26.00) data (1000) -Bin number 6 bounds: (26.00 - 27.00) data (1000) -Bin number 7 bounds: (27.00 - 28.00) data (1000) -Bin number 8 bounds: (28.00 - 29.00) data (1000) -Bin number 9 bounds: (29.00 - 30.00) data (1000) +Bin number 0 bounds: (20.00 - 21.00) data (1000.000000) +Bin number 1 bounds: (21.00 - 22.00) data (1000.000000) +Bin number 2 bounds: (22.00 - 23.00) data (1000.000000) +Bin number 3 bounds: (23.00 - 24.00) data (1000.000000) +Bin number 4 bounds: (24.00 - 25.00) data (1000.000000) +Bin number 5 bounds: (25.00 - 26.00) data (1000.000000) +Bin number 6 bounds: (26.00 - 27.00) data (1000.000000) +Bin number 7 bounds: (27.00 - 28.00) data (1000.000000) +Bin number 8 bounds: (28.00 - 29.00) data (1000.000000) +Bin number 9 bounds: (29.00 - 30.00) data (1000.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c) @@ -66,14 +66,14 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.000 - 21.000) data (1000) -Bin number 1 bounds: (21.000 - 22.000) data (1000) -Bin number 2 bounds: (22.000 - 23.000) data (1000) -Bin number 3 bounds: (23.000 - 24.000) data (1000) -Bin number 4 bounds: (24.000 - 25.000) data (1000) -Bin number 5 bounds: (25.000 - 26.000) data (0) -Bin number 6 bounds: (26.000 - 27.000) data (0) -Bin number 7 bounds: (27.000 - 28.000) data (0) -Bin number 8 bounds: (28.000 - 29.000) data (0) -Bin number 9 bounds: (29.000 - 30.000) data (0) +Bin number 0 bounds: (20.000 - 21.000) data (1000.000000) +Bin number 1 bounds: (21.000 - 22.000) data (1000.000000) +Bin number 2 bounds: (22.000 - 23.000) data (1000.000000) +Bin number 3 bounds: (23.000 - 24.000) data (1000.000000) +Bin number 4 bounds: (24.000 - 25.000) data (1000.000000) +Bin number 5 bounds: (25.000 - 26.000) data (0.000000) +Bin number 6 bounds: (26.000 - 27.000) data (0.000000) +Bin number 7 bounds: (27.000 - 28.000) data (0.000000) +Bin number 8 bounds: (28.000 - 29.000) data (0.000000) +Bin number 9 bounds: (29.000 - 30.000) data (0.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c) @@ -85,24 +85,24 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.00 - 20.50) data (500) -Bin number 1 bounds: (20.50 - 21.00) data (500) -Bin number 2 bounds: (21.00 - 21.50) data (500) -Bin number 3 bounds: (21.50 - 22.00) data (500) -Bin number 4 bounds: (22.00 - 22.50) data (500) -Bin number 5 bounds: (22.50 - 23.00) data (500) -Bin number 6 bounds: (23.00 - 23.50) data (500) -Bin number 7 bounds: (23.50 - 24.00) data (500) -Bin number 8 bounds: (24.00 - 24.50) data (500) -Bin number 9 bounds: (24.50 - 25.00) data (500) -Bin number 10 bounds: (25.00 - 25.50) data (500) -Bin number 11 bounds: (25.50 - 26.00) data (500) -Bin number 12 bounds: (26.00 - 26.50) data (500) -Bin number 13 bounds: (26.50 - 27.00) data (500) -Bin number 14 bounds: (27.00 - 27.50) data (500) -Bin number 15 bounds: (27.50 - 28.00) data (500) -Bin number 16 bounds: (28.00 - 28.50) data (500) -Bin number 17 bounds: (28.50 - 29.00) data (500) -Bin number 18 bounds: (29.00 - 29.50) data (500) -Bin number 19 bounds: (29.50 - 30.00) data (500) +Bin number 0 bounds: (20.00 - 20.50) data (500.000000) +Bin number 1 bounds: (20.50 - 21.00) data (500.000000) +Bin number 2 bounds: (21.00 - 21.50) data (500.000000) +Bin number 3 bounds: (21.50 - 22.00) data (500.000000) +Bin number 4 bounds: (22.00 - 22.50) data (500.000000) +Bin number 5 bounds: (22.50 - 23.00) data (500.000000) +Bin number 6 bounds: (23.00 - 23.50) data (500.000000) +Bin number 7 bounds: (23.50 - 24.00) data (500.000000) +Bin number 8 bounds: (24.00 - 24.50) data (500.000000) +Bin number 9 bounds: (24.50 - 25.00) data (500.000000) +Bin number 10 bounds: (25.00 - 25.50) data (500.000000) +Bin number 11 bounds: (25.50 - 26.00) data (500.000000) +Bin number 12 bounds: (26.00 - 26.50) data (500.000000) +Bin number 13 bounds: (26.50 - 27.00) data (500.000000) +Bin number 14 bounds: (27.00 - 27.50) data (500.000000) +Bin number 15 bounds: (27.50 - 28.00) data (500.000000) +Bin number 16 bounds: (28.00 - 28.50) data (500.000000) +Bin number 17 bounds: (28.50 - 29.00) data (500.000000) +Bin number 18 bounds: (29.00 - 29.50) data (500.000000) +Bin number 19 bounds: (29.50 - 30.00) data (500.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram, no mask} | tst_psHist02.c) @@ -114,24 +114,24 @@ \**********************************************************************************/ -Bin number 0 bounds: (20.000 - 20.500) data (500) -Bin number 1 bounds: (20.500 - 21.000) data (500) -Bin number 2 bounds: (21.000 - 21.500) data (500) -Bin number 3 bounds: (21.500 - 22.000) data (500) -Bin number 4 bounds: (22.000 - 22.500) data (500) -Bin number 5 bounds: (22.500 - 23.000) data (500) -Bin number 6 bounds: (23.000 - 23.500) data (500) -Bin number 7 bounds: (23.500 - 24.000) data (500) -Bin number 8 bounds: (24.000 - 24.500) data (500) -Bin number 9 bounds: (24.500 - 25.000) data (500) -Bin number 10 bounds: (25.000 - 25.500) data (0) -Bin number 11 bounds: (25.500 - 26.000) data (0) -Bin number 12 bounds: (26.000 - 26.500) data (0) -Bin number 13 bounds: (26.500 - 27.000) data (0) -Bin number 14 bounds: (27.000 - 27.500) data (0) -Bin number 15 bounds: (27.500 - 28.000) data (0) -Bin number 16 bounds: (28.000 - 28.500) data (0) -Bin number 17 bounds: (28.500 - 29.000) data (0) -Bin number 18 bounds: (29.000 - 29.500) data (0) -Bin number 19 bounds: (29.500 - 30.000) data (0) +Bin number 0 bounds: (20.000 - 20.500) data (500.000000) +Bin number 1 bounds: (20.500 - 21.000) data (500.000000) +Bin number 2 bounds: (21.000 - 21.500) data (500.000000) +Bin number 3 bounds: (21.500 - 22.000) data (500.000000) +Bin number 4 bounds: (22.000 - 22.500) data (500.000000) +Bin number 5 bounds: (22.500 - 23.000) data (500.000000) +Bin number 6 bounds: (23.000 - 23.500) data (500.000000) +Bin number 7 bounds: (23.500 - 24.000) data (500.000000) +Bin number 8 bounds: (24.000 - 24.500) data (500.000000) +Bin number 9 bounds: (24.500 - 25.000) data (500.000000) +Bin number 10 bounds: (25.000 - 25.500) data (0.000000) +Bin number 11 bounds: (25.500 - 26.000) data (0.000000) +Bin number 12 bounds: (26.000 - 26.500) data (0.000000) +Bin number 13 bounds: (26.500 - 27.000) data (0.000000) +Bin number 14 bounds: (27.000 - 27.500) data (0.000000) +Bin number 15 bounds: (27.500 - 28.000) data (0.000000) +Bin number 16 bounds: (28.000 - 28.500) data (0.000000) +Bin number 17 bounds: (28.500 - 29.000) data (0.000000) +Bin number 18 bounds: (29.000 - 29.500) data (0.000000) +Bin number 19 bounds: (29.500 - 30.000) data (0.000000) ---> TESTPOINT PASSED (psStats functions{Allocate and Perform Histogram with mask} | tst_psHist02.c)