Index: trunk/psModules/test/tst_pmImageCombine.c =================================================================== --- trunk/psModules/test/tst_pmImageCombine.c (revision 4418) +++ trunk/psModules/test/tst_pmImageCombine.c (revision 4579) @@ -9,6 +9,6 @@ * XXX: Must verify the results internally. Don't use stdout file. * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-16 23:13:43 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-19 01:44:48 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -266,5 +266,5 @@ if (questionablePixels->n != numImages) { - printf("TEST ERROR: pmCombineImages(): questionablePixels->n was %d, should have been %d\n", + printf("TEST ERROR: pmCombineImages(): questionablePixels->n was %ld, should have been %d\n", questionablePixels->n, numImages); testStatus = true; @@ -313,5 +313,5 @@ for (psS32 i = 0 ; i < pixelRejects->n ; i++) { psPixels *myPixels = (psPixels *) pixelRejects->data[i]; - printf("tst_pmImageCombine.c: Image %d had %d rejects.\n", i, myPixels->n); + printf("tst_pmImageCombine.c: Image %d had %ld rejects.\n", i, myPixels->n); for (psS32 p = 0 ; p < myPixels->n ; p++) { Index: trunk/psModules/test/tst_pmImageSubtract.c =================================================================== --- trunk/psModules/test/tst_pmImageSubtract.c (revision 4418) +++ trunk/psModules/test/tst_pmImageSubtract.c (revision 4579) @@ -10,6 +10,6 @@ * data. More work need to be done to verify the results. * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-28 23:28:18 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-19 01:44:48 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -337,5 +337,5 @@ // Create a test image and set a single pixel in the center of each stamp. psImage *tstImg = psImageAlloc(numCols, numRows, PS_TYPE_F32); - psS32 numStamps = 0; + int numStamps = 0; PS_IMAGE_SET_F32(tstImg, 0.0); for (psS32 j = 0; j < yNum; j++) { @@ -407,5 +407,5 @@ } else { if (stamps->n != numStamps) { - printf("TEST ERROR: %d stamps were found, %d were expected.\n", + printf("TEST ERROR: %ld stamps were found, %d were expected.\n", stamps->n, numStamps); testStatus = true; @@ -443,5 +443,5 @@ } else { if (stamps->n != numStamps) { - printf("TEST ERROR: %d stamps were found, %d were expected.\n", + printf("TEST ERROR: %ld stamps were found, %d were expected.\n", stamps->n, numStamps); testStatus = true; Index: trunk/psModules/test/tst_pmObjects01.c =================================================================== --- trunk/psModules/test/tst_pmObjects01.c (revision 4418) +++ trunk/psModules/test/tst_pmObjects01.c (revision 4579) @@ -19,6 +19,6 @@ * abd never deallocate, no error is generated. * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-13 19:59:21 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-19 01:44:48 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -128,5 +128,5 @@ } else { if ((tmpModel->params->n != 7) || (tmpModel->dparams->n != 7)) { - printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) allocated an incorrect number of params (%d, %d)\n", + printf("TEST ERROR: pmModelAlloc(PS_MODEL_GAUSS) allocated an incorrect number of params (%ld, %ld)\n", tmpModel->params->n, tmpModel->dparams->n); testStatus = false; @@ -150,5 +150,5 @@ } else { if ((tmpModel->params->n != 7) || (tmpModel->dparams->n != 7)) { - printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) allocated an incorrect number of params (%d, %d)\n", + printf("TEST ERROR: pmModelAlloc(PS_MODEL_PGAUSS) allocated an incorrect number of params (%ld, %ld)\n", tmpModel->params->n, tmpModel->dparams->n); testStatus = false; @@ -172,5 +172,5 @@ } else { if ((tmpModel->params->n != 11) || (tmpModel->dparams->n != 11)) { - printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) allocated an incorrect number of params (%d, %d)\n", + printf("TEST ERROR: pmModelAlloc(PS_MODEL_TWIST_GAUSS) allocated an incorrect number of params (%ld, %ld)\n", tmpModel->params->n, tmpModel->dparams->n); testStatus = false; @@ -194,5 +194,5 @@ } else { if ((tmpModel->params->n != 9) || (tmpModel->dparams->n != 9)) { - printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) allocated an incorrect number of params (%d, %d)\n", + printf("TEST ERROR: pmModelAlloc(PS_MODEL_WAUSS) allocated an incorrect number of params (%ld, %ld)\n", tmpModel->params->n, tmpModel->dparams->n); testStatus = false; @@ -216,5 +216,5 @@ } else { if ((tmpModel->params->n != 8) || (tmpModel->dparams->n != 8)) { - printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) allocated an incorrect number of params (%d, %d)\n", + printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC) allocated an incorrect number of params (%ld, %ld)\n", tmpModel->params->n, tmpModel->dparams->n); testStatus = false; @@ -238,5 +238,5 @@ } else { if ((tmpModel->params->n != 12) || (tmpModel->dparams->n != 12)) { - printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) allocated an incorrect number of params (%d, %d)\n", + printf("TEST ERROR: pmModelAlloc(PS_MODEL_SERSIC_CORE) allocated an incorrect number of params (%ld, %ld)\n", tmpModel->params->n, tmpModel->dparams->n); testStatus = false; @@ -290,5 +290,5 @@ } else { if (outData->n != 1) { - printf("TEST ERROR: outData->n is %d\n", outData->n); + printf("TEST ERROR: outData->n is %ld\n", outData->n); testStatus = false; } @@ -316,5 +316,5 @@ if (outData->n != 0) { - printf("TEST ERROR: outData->n is %d\n", outData->n); + printf("TEST ERROR: outData->n is %ld\n", outData->n); testStatus = false; } @@ -344,5 +344,5 @@ if (outData->n != 1) { - printf("TEST ERROR: outData->n is %d\n", outData->n); + printf("TEST ERROR: outData->n is %ld\n", outData->n); testStatus = false; } @@ -370,5 +370,5 @@ if (outData->n != 0) { - printf("TEST ERROR: outData->n is %d\n", outData->n); + printf("TEST ERROR: outData->n is %ld\n", outData->n); testStatus = false; } @@ -398,5 +398,5 @@ if (outData->n != n/2) { - printf("TEST ERROR: outData->n is %d\n", outData->n); + printf("TEST ERROR: outData->n is %ld\n", outData->n); testStatus = false; } @@ -423,5 +423,5 @@ if (outData->n != 0) { - printf("TEST ERROR: outData->n is %d\n", outData->n); + printf("TEST ERROR: outData->n is %ld\n", outData->n); testStatus = false; } @@ -477,5 +477,5 @@ /****************************************************************************** -test02(): +test02(): // XXX: Must test flat peaks. // XXX: test 1-by-n and n-by-1 images. @@ -539,5 +539,5 @@ } if (outData->n != expectedNumPeaks) { - printf("TEST ERROR: pmFindImagePeaks found %d peaks (should be %d)\n", outData->n, expectedNumPeaks); + printf("TEST ERROR: pmFindImagePeaks found %ld peaks (should be %d)\n", outData->n, expectedNumPeaks); testStatus = false; } @@ -681,5 +681,5 @@ /* XXX: Modify for new pmCullPeaks outData = pmCullPeaks(outData, PS_MAX_F32, NULL); - + if (outData == NULL) { printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n"); @@ -702,8 +702,8 @@ printf("Calling pmCullPeaks with tiny maxValue and NULL psRegion.\n"); outData = pmFindImagePeaks(imgData, 0.0); - printf("pmFindImagePeaks found %d peaks\n", outData->n); + printf("pmFindImagePeaks found %ld peaks\n", outData->n); /* XXX: Modify for new pmCullPeaks outData = pmCullPeaks(outData, 0.0, NULL); - + if (outData == NULL) { printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n"); @@ -726,10 +726,10 @@ printf("Calling pmCullPeaks with large maxValue and disjoint psRegion.\n"); outData = pmFindImagePeaks(imgData, 0.0); - printf("pmFindImagePeaks found %d peaks\n", outData->n); + printf("pmFindImagePeaks found %ld peaks\n", outData->n); psRegion tmpRegion = psRegionSet(10000.0, 20000.0, 10000.0, 20000.0); /* XXX: Modify for new pmCullPeaks outData = pmCullPeaks(outData, PS_MAX_F32, tmpRegion); - + if (outData == NULL) { printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n"); @@ -752,9 +752,9 @@ printf("Calling pmCullPeaks with large maxValue and non-disjoint psRegion.\n"); outData = pmFindImagePeaks(imgData, 0.0); - printf("pmFindImagePeaks found %d peaks\n", outData->n); + printf("pmFindImagePeaks found %ld peaks\n", outData->n); tmpRegion = psRegionSet(-PS_MAX_F32, PS_MAX_F32, -PS_MAX_F32, PS_MAX_F32); /* XXX: Modify for new pmCullPeaks outData = pmCullPeaks(outData, PS_MAX_F32, tmpRegion); - + if (outData == NULL) { printf("TEST ERROR: pmCullPeaks() returned a non-NULL psList.\n"); @@ -1145,5 +1145,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceSetPixelsCircle with subImage endCol > numCols. Should generate error and return NULL.\n"); @@ -1156,5 +1156,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceSetPixelsCircle with subImage startRow < 0. Should generate error and return NULL.\n"); @@ -1167,5 +1167,5 @@ testStatus = false; } - + printf("----------------------------------------------------------------------------------\n"); printf("Calling pmSourceSetPixelsCircle with subImage endRow > numRows. Should generate error and return NULL.\n"); Index: trunk/psModules/test/verified/tst_pmImageCombine.stderr =================================================================== --- trunk/psModules/test/verified/tst_pmImageCombine.stderr (revision 4418) +++ trunk/psModules/test/verified/tst_pmImageCombine.stderr (revision 4579) @@ -24,11 +24,2 @@ ---> TESTPOINT PASSED (Test Point Driver{pmCombineImages()} | tst_pmImageCombine.c) -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmImageCombine.c * -* TestPoint: Test Point Driver{pmRejectPixels()} * -* TestType: Positive * -\**********************************************************************************/ - - ----> TESTPOINT PASSED (Test Point Driver{pmRejectPixels()} | tst_pmImageCombine.c) - Index: trunk/psModules/test/verified/tst_pmImageCombine.stdout =================================================================== --- trunk/psModules/test/verified/tst_pmImageCombine.stdout (revision 4418) +++ trunk/psModules/test/verified/tst_pmImageCombine.stdout (revision 4579) @@ -1,3 +1,13 @@ Testing pmCombineImages(10, 10, 5) +Generating a bad pixel in image (1) at (0, 8) +Generating a bad pixel in image (3) at (7, 5) +Generating a bad pixel in image (1) at (1, 2) +Generating a bad pixel in image (2) at (9, 9) +Generating a bad pixel in image (1) at (3, 9) +Generating a bad pixel in image (2) at (0, 5) +Generating a bad pixel in image (1) at (4, 5) +Generating a bad pixel in image (1) at (3, 8) +Generating a bad pixel in image (2) at (6, 2) +Generating a bad pixel in image (2) at (3, 7) Calling with a NULL images. Should generate error, return NULL. Calling with a long images. Should generate error, return NULL. @@ -19,3 +29,19 @@ Image 2, questionable pixel 3 is (3 7) Image 3, questionable pixel 0 is (7 5) -Testing pmRejectPixels(10, 10, 5, 1.000000, 1.000000) + + + +Calling pmRejectPixels() with acceptable data. Should generate a psArray. +tst_pmImageCombine.c: Image 0 had 0 rejects. +tst_pmImageCombine.c: Image 1 had 4 rejects. +Image 1, rejected pixel 0 is (0 8) +Image 1, rejected pixel 1 is (1 2) +Image 1, rejected pixel 2 is (4 5) +Image 1, rejected pixel 3 is (3 8) +tst_pmImageCombine.c: Image 2 had 3 rejects. +Image 2, rejected pixel 0 is (0 5) +Image 2, rejected pixel 1 is (6 2) +Image 2, rejected pixel 2 is (3 7) +tst_pmImageCombine.c: Image 3 had 1 rejects. +Image 3, rejected pixel 0 is (7 5) +tst_pmImageCombine.c: Image 4 had 0 rejects. Index: trunk/psModules/test/verified/tst_pmImageSubtract.stderr =================================================================== --- trunk/psModules/test/verified/tst_pmImageSubtract.stderr (revision 4418) +++ trunk/psModules/test/verified/tst_pmImageSubtract.stderr (revision 4579) @@ -23,19 +23,19 @@ \**********************************************************************************/ -