Index: trunk/psLib/test/math/tst_psMinimizePowell.c =================================================================== --- trunk/psLib/test/math/tst_psMinimizePowell.c (revision 6280) +++ trunk/psLib/test/math/tst_psMinimizePowell.c (revision 6280) @@ -0,0 +1,283 @@ +/***************************************************************************** + This routine must ensure that psMinimizePowell() works correctly. + + We test with a NULL and non-NULL paramMask. + + XXX: Must verify the stderr for the NULL parameter tests. + *****************************************************************************/ +#include +#include +#include "pslib.h" +#include "psTest.h" +#define N 5 +#define MIN_VALUE 20.0 +#define NUM_PARAMS 10 +#define ERROR_TOLERANCE 0.10 +float expectedParm[NUM_PARAMS]; +psS32 testStatus = true; + +/***************************************************************************** +myFunc(): This routine subtracts the associate value in expectedParm[] from +each parameter and then squares it, then sums that for all parameters, then +adds MIN_VALUE to it. The minimum for this function will be MIN_VALUE, and +will occur when each parameter equals the associated value in expectedParm[]. + +This procedure ignores the coordinates, other than to ensure that they were +passed correctly from psMinimizePowell(). + *****************************************************************************/ +float myFunc(psVector *myParams, + psArray *myCoords) +{ + float sum = 0.0; + float coordData = 0.0; + float expData = 0.0; + psS32 i; + + // + // Simply ensure that the coordinate data was passed correctly. + // + for (i=0;idata[i]))->data.F32[0]; + expData = (float) (i+10); + if (fabs(coordData - expData) > FLT_EPSILON) { + printf("ERROR(1): coordinate data was incorrectly passed to myFunc()\n"); + printf("ERROR(1): was (%f) should be (%f)\n", coordData, expData); + testStatus = false; + } + coordData = ((psVector *) (myCoords->data[i]))->data.F32[1]; + expData = (float) (i+3); + if (fabs(coordData - expData) > FLT_EPSILON) { + printf("ERROR(2): coordinate data was incorrectly passed to myFunc()\n"); + printf("ERROR(2): was (%f) should be (%f)\n", coordData, expData); + testStatus = false; + } + } + + + sum = 0.0; + for (i=0;idata.F32[i] - expectedParm[i]) * (myParams->data.F32[i] - expectedParm[i]); + } + sum = MIN_VALUE + (sum * sum); + + return(sum); +} + + +psS32 t00() +{ + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; + psS32 i = 0; + psArray *myCoords; + psVector *myParams; + psVector *myParamMask; + psMinimization *min; + + psTraceSetLevel(".psLib", 0); + /************************************************************************** + *************************************************************************/ + myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32); + myParamMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_U8); + min = psMinimizationAlloc(100, 0.01); + + myCoords = psArrayAlloc(N); + for (i=0;idata[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32); + ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10); + ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3); + } + for (i=0;idata.F32[i] = 0.0; + myParams->data.F32[i] = (float) i; + myParamMask->data.U8[i] = 0; + } + + printPositiveTestHeader(stdout, + "psMinimize functions", + "psMinimizePowell()"); + + psMinimizePowell(min, + myParams, + myParamMask, + myCoords, + (psMinimizePowellFunc) myFunc); + + printf("\nThe minimum is %f (expected: %f)\n", min->value, MIN_VALUE); + + for (i=0;idata.F32[i], expectedParm[i]); + + if (fabs(myParams->data.F32[i] - expectedParm[i]) > fabs(ERROR_TOLERANCE * expectedParm[i])) { + printf("ERROR: Parameter %d: (%.1f), expected was (%.1f)\n", + i, myParams->data.F32[i], expectedParm[i]); + testStatus = false; + } else { + printf("Parameter %d: (%.1f), expected was (%.1f)\n", + i, myParams->data.F32[i], expectedParm[i]); + } + } + + + psFree(myCoords); + psFree(myParams); + psFree(myParamMask); + psFree(min); + + psMemCheckCorruption(1); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); + if (0 != memLeaks) { + psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); + } + printFooter(stdout, + "psMinimize functions", + "psMinimizePowell()", + testStatus); + + + return (!testStatus); +} + +psS32 t01() +{ + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; + psS32 i = 0; + psArray *myCoords; + psVector *myParams; + psMinimization *min; + + psTraceSetLevel(".psLib", 0); + /************************************************************************** + *************************************************************************/ + myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32); + min = psMinimizationAlloc(100, 0.01); + + myCoords = psArrayAlloc(N); + for (i=0;idata[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32); + ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10); + ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3); + } + for (i=0;idata.F32[i] = 0.0; + myParams->data.F32[i] = (float) i; + } + + printPositiveTestHeader(stdout, + "psMinimize functions", + "psMinimizePowell()"); + + psMinimizePowell(min, + myParams, + NULL, + myCoords, + (psMinimizePowellFunc) myFunc); + + printf("\nThe minimum is %f (expected: %f)\n", min->value, MIN_VALUE); + + for (i=0;idata.F32[i], expectedParm[i]); + + if (fabs(myParams->data.F32[i] - expectedParm[i]) > fabs(ERROR_TOLERANCE * expectedParm[i])) { + printf("ERROR: Parameter %d: (%.1f), expected was (%.1f)\n", + i, myParams->data.F32[i], expectedParm[i]); + testStatus = false; + } else { + printf("Parameter %d: (%.1f), expected was (%.1f)\n", + i, myParams->data.F32[i], expectedParm[i]); + } + } + + + psFree(myCoords); + psFree(myParams); + psFree(min); + + psMemCheckCorruption(1); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); + if (0 != memLeaks) { + psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); + } + printFooter(stdout, + "psMinimize functions", + "psMinimizePowell()", + testStatus); + + + return (!testStatus); +} + +psS32 t02() +{ + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; + psS32 i = 0; + psArray *myCoords; + psVector *myParams; + psVector *myParamMask; + psMinimization *min; + + psTraceSetLevel(".psLib", 0); + /************************************************************************** + *************************************************************************/ + myParams = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32); + myParamMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_U8); + min = psMinimizationAlloc(100, 0.01); + + myCoords = psArrayAlloc(N); + for (i=0;idata[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32); + ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10); + ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3); + } + for (i=0;idata.F32[i] = 0.0; + myParams->data.F32[i] = (float) i; + myParamMask->data.U8[i] = 0; + } + + printPositiveTestHeader(stdout, + "psMinimize functions", + "psMinimizePowell(): various NULL inputs"); + + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error for null minimize."); + psMinimizePowell(NULL, myParams, myParamMask, myCoords, (psMinimizePowellFunc) myFunc); + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error for null parameter vector"); + psMinimizePowell(min, NULL, myParamMask, myCoords,(psMinimizePowellFunc) myFunc); + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error for null coords."); + psMinimizePowell(min, myParams, myParamMask, NULL, (psMinimizePowellFunc) myFunc); + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error for null function"); + psMinimizePowell(min, myParams, myParamMask, myCoords, NULL); + + psFree(myCoords); + psFree(myParams); + psFree(myParamMask); + psFree(min); + + psMemCheckCorruption(1); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); + if (0 != memLeaks) { + psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); + } + printFooter(stdout, + "psMinimize functions", + "psMinimizePowell(): various NULL inputs", + testStatus); + + + return (!testStatus); +} + +psS32 main() +{ + psLogSetFormat("HLNM"); + t00(); + t01(); + t02(); +} Index: trunk/psLib/test/math/verified/tst_psMinimizePowell.stderr =================================================================== --- trunk/psLib/test/math/verified/tst_psMinimizePowell.stderr (revision 6280) +++ trunk/psLib/test/math/verified/tst_psMinimizePowell.stderr (revision 6280) @@ -0,0 +1,16 @@ +|I|t02 + Following should generate error for null minimize. +|E|psMinimizePowell (FILE:LINENO) + Unallowable operation: min is NULL. +|I|t02 + Following should generate error for null parameter vector +|E|psMinimizePowell (FILE:LINENO) + Unallowable operation: psVector params or its data is NULL. +|I|t02 + Following should generate error for null coords. +|E|psMinimizePowell (FILE:LINENO) + Unallowable operation: coords is NULL. +|I|t02 + Following should generate error for null function +|E|psMinimizePowell (FILE:LINENO) + Unallowable operation: func is NULL. Index: trunk/psLib/test/math/verified/tst_psMinimizePowell.stdout =================================================================== --- trunk/psLib/test/math/verified/tst_psMinimizePowell.stdout (revision 6280) +++ trunk/psLib/test/math/verified/tst_psMinimizePowell.stdout (revision 6280) @@ -0,0 +1,71 @@ +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMinimizePowell.c * +* TestPoint: psMinimize functions{psMinimizePowell()} * +* TestType: Positive * +\**********************************************************************************/ + + +The minimum is 20.000000 (expected: 20.000000) +Parameter 0 at the minimum is 2.307660 (expected: 2.320000) +Parameter 0: (2.3), expected was (2.3) +Parameter 1 at the minimum is 4.310108 (expected: 4.320000) +Parameter 1: (4.3), expected was (4.3) +Parameter 2 at the minimum is 6.305460 (expected: 6.320000) +Parameter 2: (6.3), expected was (6.3) +Parameter 3 at the minimum is 8.309398 (expected: 8.320000) +Parameter 3: (8.3), expected was (8.3) +Parameter 4 at the minimum is 10.311120 (expected: 10.320000) +Parameter 4: (10.3), expected was (10.3) +Parameter 5 at the minimum is 12.309612 (expected: 12.320000) +Parameter 5: (12.3), expected was (12.3) +Parameter 6 at the minimum is 14.320016 (expected: 14.320000) +Parameter 6: (14.3), expected was (14.3) +Parameter 7 at the minimum is 16.318933 (expected: 16.320000) +Parameter 7: (16.3), expected was (16.3) +Parameter 8 at the minimum is 18.323397 (expected: 18.320000) +Parameter 8: (18.3), expected was (18.3) +Parameter 9 at the minimum is 20.314043 (expected: 20.320000) +Parameter 9: (20.3), expected was (20.3) + +---> TESTPOINT PASSED (psMinimize functions{psMinimizePowell()} | tst_psMinimizePowell.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMinimizePowell.c * +* TestPoint: psMinimize functions{psMinimizePowell()} * +* TestType: Positive * +\**********************************************************************************/ + + +The minimum is 20.000000 (expected: 20.000000) +Parameter 0 at the minimum is 2.307660 (expected: 2.320000) +Parameter 0: (2.3), expected was (2.3) +Parameter 1 at the minimum is 4.310108 (expected: 4.320000) +Parameter 1: (4.3), expected was (4.3) +Parameter 2 at the minimum is 6.305460 (expected: 6.320000) +Parameter 2: (6.3), expected was (6.3) +Parameter 3 at the minimum is 8.309398 (expected: 8.320000) +Parameter 3: (8.3), expected was (8.3) +Parameter 4 at the minimum is 10.311120 (expected: 10.320000) +Parameter 4: (10.3), expected was (10.3) +Parameter 5 at the minimum is 12.309612 (expected: 12.320000) +Parameter 5: (12.3), expected was (12.3) +Parameter 6 at the minimum is 14.320016 (expected: 14.320000) +Parameter 6: (14.3), expected was (14.3) +Parameter 7 at the minimum is 16.318933 (expected: 16.320000) +Parameter 7: (16.3), expected was (16.3) +Parameter 8 at the minimum is 18.323397 (expected: 18.320000) +Parameter 8: (18.3), expected was (18.3) +Parameter 9 at the minimum is 20.314043 (expected: 20.320000) +Parameter 9: (20.3), expected was (20.3) + +---> TESTPOINT PASSED (psMinimize functions{psMinimizePowell()} | tst_psMinimizePowell.c) + +/***************************** TESTPOINT ******************************************\ +* TestFile: tst_psMinimizePowell.c * +* TestPoint: psMinimize functions{psMinimizePowell(): various NULL inputs} * +* TestType: Positive * +\**********************************************************************************/ + + +---> TESTPOINT PASSED (psMinimize functions{psMinimizePowell(): various NULL inputs} | tst_psMinimizePowell.c) +