Index: trunk/psModules/test/objects/tst_pmObjects01.c =================================================================== --- trunk/psModules/test/objects/tst_pmObjects01.c (revision 5255) +++ trunk/psModules/test/objects/tst_pmObjects01.c (revision 5258) @@ -25,6 +25,6 @@ * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-10 19:53:54 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-10-10 21:55:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,5 +46,5 @@ static int test05(void); //static int test06(void); -static int test07(void); +//static int test07(void); /* static int test08(void); @@ -62,5 +62,5 @@ {test05, 001, "pmObjects: pmSourceMoments()", true, false}, // {test06, 001, "pmObjects: pmSourceSetPixelsCircle()", true, false}, - {test07, 001, "pmObjects: pmMin()", true, false}, + // {test07, 001, "pmObjects: pmMin()", true, false}, /* {test08, 001, "pmObjects: pmSourceModelGuess()", true, false}, Index: trunk/psModules/test/objects/verified/tst_pmObjects01.stderr =================================================================== --- trunk/psModules/test/objects/verified/tst_pmObjects01.stderr (revision 5255) +++ trunk/psModules/test/objects/verified/tst_pmObjects01.stderr (revision 5258) @@ -5,4 +5,6 @@ \**********************************************************************************/ +|E|pmModelParameterCount (FILE:LINENO) + Undefined pmModelType ---> TESTPOINT PASSED (Test Point Driver{pmObjects: structure allocators and deallocators} | tst_pmObjects01.c) @@ -56,32 +58,9 @@ |E|pmSourceLocalSky (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. + Unallowable operation: source is NULL. |E|pmSourceLocalSky (FILE:LINENO) - Unallowable operation: psImage image has incorrect type. -|E|pmSourceLocalSky (FILE:LINENO) - Unallowable operation: peak is NULL. -|E|pmSourceLocalSky (FILE:LINENO) - Error: (0.0 > innerRadius) (0.000000 -10.000000) -|E|pmSourceLocalSky (FILE:LINENO) - Error: (innerRadius > outerRadius) (10.000000 5.000000) + Error: Radius is 0 or less. ---> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceLocalSky()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceSetPixelsCircle()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmSourceSetPixelsCircle (FILE:LINENO) - Unallowable operation: source is NULL. -|E|pmSourceSetPixelsCircle (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. -|E|pmSourceSetPixelsCircle (FILE:LINENO) - Unallowable operation: psImage image has incorrect type. -|E|pmSourceSetPixelsCircle (FILE:LINENO) - Error: (0.0 > radius) (0.000000 -10.000000) - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceSetPixelsCircle()} | tst_pmObjects01.c) /***************************** TESTPOINT ******************************************\ @@ -94,120 +73,6 @@ Unallowable operation: source is NULL. |E|pmSourceMoments (FILE:LINENO) - Error: (0.0 > radius) (0.000000 -10.000000) + Error: !(radius > 0.0) (-10.000000 0.000000). ---> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceMoments()} | tst_pmObjects01.c) -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmMin()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmMinLM_Gauss2D (FILE:LINENO) - Unallowable operation: psVector params or its data is NULL. -|E|pmMinLM_Gauss2D (FILE:LINENO) - Unallowable operation: psVector x or its data is NULL. -|E|pmMinLM_PsuedoGauss2D (FILE:LINENO) - Unallowable operation: psVector params or its data is NULL. -|E|pmMinLM_PsuedoGauss2D (FILE:LINENO) - Unallowable operation: psVector x or its data is NULL. -|E|pmMinLM_Wauss2D (FILE:LINENO) - Unallowable operation: psVector params or its data is NULL. -|E|pmMinLM_Wauss2D (FILE:LINENO) - Unallowable operation: psVector x or its data is NULL. -|E|pmMinLM_TwistGauss2D (FILE:LINENO) - Unallowable operation: psVector params or its data is NULL. -|E|pmMinLM_TwistGauss2D (FILE:LINENO) - Unallowable operation: psVector x or its data is NULL. -|E|pmMinLM_Sersic (FILE:LINENO) - This function is not implemented yet. -|E|pmMinLM_Sersic (FILE:LINENO) - Unallowable operation: psVector params or its data is NULL. -|E|pmMinLM_Sersic (FILE:LINENO) - Unallowable operation: psVector x or its data is NULL. -|E|pmMinLM_SersicCore (FILE:LINENO) - This function is not implemented yet. -|E|pmMinLM_SersicCore (FILE:LINENO) - Unallowable operation: psVector params or its data is NULL. -|E|pmMinLM_SersicCore (FILE:LINENO) - Unallowable operation: psVector x or its data is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmMin()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceModelGuess()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmSourceModelGuess (FILE:LINENO) - Unallowable operation: source is NULL. -|E|pmSourceModelGuess (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. -|E|pmSourceModelGuess (FILE:LINENO) - Undefined psModelType -|W|pmSourceModelGuess - WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF). -|W|pmSourceModelGuess - WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF). -|W|pmSourceModelGuess - WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF). -|W|pmSourceModelGuess - WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF). -|W|pmSourceModelGuess - WARNING: source->modelPSF was non-NULL; calling psFree(source->modelPSF). - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceModelGuess()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceContour()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmSourceContour (FILE:LINENO) - Unallowable operation: source is NULL. -|E|pmSourceContour (FILE:LINENO) - Unallowable operation: image is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceContour()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceAddModel()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|sourceAddOrSubModel (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. -|E|sourceAddOrSubModel (FILE:LINENO) - Unallowable operation: src is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceAddModel()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceSubModel()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|sourceAddOrSubModel (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. -|E|sourceAddOrSubModel (FILE:LINENO) - Unallowable operation: src is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceSubModel()} | tst_pmObjects01.c) - -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_pmObjects01.c * -* TestPoint: Test Point Driver{pmObjects: pmSourceSubModel()} * -* TestType: Positive * -\**********************************************************************************/ - -|E|pmSourceFitModel (FILE:LINENO) - Unallowable operation: psImage image or its data is NULL. -|E|pmSourceFitModel (FILE:LINENO) - Unallowable operation: source is NULL. - ----> TESTPOINT PASSED (Test Point Driver{pmObjects: pmSourceSubModel()} | tst_pmObjects01.c) - Index: trunk/psModules/test/objects/verified/tst_pmObjects01.stdout =================================================================== --- trunk/psModules/test/objects/verified/tst_pmObjects01.stdout (revision 5255) +++ trunk/psModules/test/objects/verified/tst_pmObjects01.stdout (revision 5258) @@ -2,9 +2,7 @@ Testing pmMomentsAlloc()... Testing pmModelAlloc(PS_MODEL_GAUSS)... -Testing pmModelAlloc(PS_MODEL_PGAUSS)... -Testing pmModelAlloc(PS_MODEL_TWIST_GAUSS)... -Testing pmModelAlloc(PS_MODEL_WAUSS)... -Testing pmModelAlloc(PS_MODEL_SERSIC)... -Testing pmModelAlloc(PS_MODEL_SERSIC_CORE)... +Testing pmModelAlloc(PS_MODEL_GAUSS)... +Testing pmModelAlloc(PS_MODEL_GAUSS)... +Testing pmModelAlloc(PS_MODEL_GAUSS)... ---------------------------------------------------------------------------------- Calling pmFindVectorPeaks with NULL psVector. Should generate error and return NULL. @@ -77,112 +75,13 @@ ---------------------------------------------------------------------------------- ---------------------------------------------------------------------------------- -Calling pmSourceLocalSky with NULL psImage. Should generate error and return NULL. +Calling pmSourceLocalSky with NULL tmpSource. Should generate error and return FALSE. ---------------------------------------------------------------------------------- -Calling pmSourceLocalSky with wrong-type psImage. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmSourceLocalSky with NULL pmPeak. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmSourceLocalSky with innerRadius<0.0. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmSourceLocalSky with innerRadius>outerRadius. Should generate error and return NULL. +Calling pmSourceLocalSky with Radius<0.0. Should generate error and return FALSE. ---------------------------------------------------------------------------------- Calling pmSourceLocalSky with valid data. ---------------------------------------------------------------------------------- ---------------------------------------------------------------------------------- -Calling pmSourceSetPixelsCircle with NULL pmSource. Should generate error and return NULL. +Calling pmSourceMoments with NULL pmSource. Should generate error and return FALSE. ---------------------------------------------------------------------------------- -Calling pmSourceSetPixelsCircle with NULL psImage. Should generate error and return NULL. +Calling pmSourceMoments with radius < 0.0. Should generate error and return FALSE. ---------------------------------------------------------------------------------- -Calling pmSourceSetPixelsCircle with wrong type psImage. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmSourceSetPixelsCircle with radius < 0.0. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmSourceSetPixelsCircle with valid data. ----------------------------------------------------------------------------------- ----------------------------------------------------------------------------------- -Calling pmSourceMoments with NULL pmSource. Should generate error and return NULL. ----------------------------------------------------------------------------------- -Calling pmSourceMoments with radius < 0.0. Should generate error and return NULL. ----------------------------------------------------------------------------------- ----------------------------------------------------------------------------------- -Calling pmMinLM_Gauss2D with NULL deriv vector. Should not generate error. ----------------------------------------------------------------------------------- -Calling pmMinLM_Gauss2D with NULL params vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_Gauss2D with NULL x vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_PsuedoGauss2D with NULL deriv vector. Should not generate error. ----------------------------------------------------------------------------------- -Calling pmMinLM_PsuedoGauss2D with NULL params vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_PsuedoGauss2D with NULL x vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_Wauss2D with NULL deriv vector. Should not generate error. ----------------------------------------------------------------------------------- -Calling pmMinLM_Wauss2D with NULL params vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_Wauss2D with NULL x vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_TwistGauss2D with NULL deriv vector. Should not generate error. ----------------------------------------------------------------------------------- -Calling pmMinLM_TwistGauss2D with NULL params vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_TwistGauss2D with NULL x vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_Sersic with NULL deriv vector. Should not generate error. ----------------------------------------------------------------------------------- -Calling pmMinLM_Sersic with NULL params vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_Sersic with NULL x vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_SersicCore with NULL deriv vector. Should not generate error. ----------------------------------------------------------------------------------- -Calling pmMinLM_SersicCore with NULL params vector. Should generate error and return NAN. ----------------------------------------------------------------------------------- -Calling pmMinLM_SersicCore with NULL x vector. Should generate error and return NAN. -Calling pmSourceLocalSky with valid data. ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with NULL pmSource. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with NULL psImage. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with bad model type. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with PS_MODEL_GAUSS ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with PS_MODEL_PGAUSS ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with PS_MODEL_TWIST_GAUSS ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with PS_MODEL_WAUSS ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with PS_MODEL_SERSIC ----------------------------------------------------------------------------------- -Calling pmSourceModelGuess with PS_MODEL_SERSIC_CORE -Calling pmSourceLocalSky with valid data. ----------------------------------------------------------------------------------- -Calling pmSourceContour with NULL pmSource . Should generate error, return NULL. ----------------------------------------------------------------------------------- -Calling pmSourceContour with NULL psImage . Should generate error, return NULL. -Calling pmSourceLocalSky with valid data. ----------------------------------------------------------------------------------- -Calling pmSourceAddModel with NULL psImage. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceAddModel with NULL psSrc. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceAddModel with acceptable data. -Calling pmSourceLocalSky with valid data. ----------------------------------------------------------------------------------- -Calling pmSourceSubModel with NULL psImage. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceSubModel with NULL psSrc. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceSubModel with acceptable data. -Calling pmSourceLocalSky with valid data. ----------------------------------------------------------------------------------- -Calling pmSourceFitModel with NULL psImage. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceFitModel with NULL pmSource. Should generate error, return FALSE. ----------------------------------------------------------------------------------- -Calling pmSourceFitModel with acceptable data. -pmSourceFitModel returned 1