Index: unk/psLib/test/math/tst_psMinimize00.c
===================================================================
--- /trunk/psLib/test/math/tst_psMinimize00.c	(revision 4860)
+++ 	(revision )
@@ -1,167 +1,0 @@
-/*****************************************************************************
-    This routine must ensure that the psMinimizeChi2 function correctly
-    minimizes an arbitrary function.
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib_strict.h"
-#include "psTest.h"
-#include "psMemory.h"
-#include "psVector.h"
-#include "psImage.h"
-#include "psFunctions.h"
-#include "psMinimize.h"
-#include <math.h>
-#define NUM_DATA 10
-#define DATA_WIDTH 2
-#define NUM_PARAMS 4
-
-float myFunc(const psVector *restrict myData,
-             const psVector *restrict myParams)
-{
-    float x = myData->data.F32[0];
-    float y = myData->data.F32[1];
-    float A = myParams->data.F32[0];
-    float B = myParams->data.F32[1];
-    float C = myParams->data.F32[2];
-    float D = myParams->data.F32[3];
-    float tmp = 0.0;
-
-    tmp = (A * x) + (B*x*x) + (C*y*y) + (D*x*x*y);
-    //    printf("--------- myFunc((%.1f %.1f) %.1f %.1f %.1f %.1f) is %.1f ---------\n",
-    //           x, y, A, B, C, D, tmp);
-
-    return(tmp);
-}
-
-float myFuncDeriv(const psVector *restrict myData,
-                  const psVector *restrict myParams,
-                  psS32 whichParamDeriv)
-{
-    float x = myData->data.F32[0];
-    float y = myData->data.F32[1];
-    float tmp = 0.0;
-
-    if (whichParamDeriv == 0) {
-        tmp = 1.0;
-        tmp = x;
-    } else
-        if (whichParamDeriv == 1) {
-            tmp = x;
-            tmp = x*x;
-        } else
-            if (whichParamDeriv == 2) {
-                tmp = y;
-                tmp = y*y;
-            } else
-                if (whichParamDeriv == 3) {
-                    tmp = x * x * y;
-                }
-
-    //    printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f %.1f %.1f (%d)) is %.1f ---------\n",
-    //            x, y, myParams->data.F32[0], myParams->data.F32[1],
-    //            myParams->data.F32[2], myParams->data.F32[3], whichParamDeriv, tmp);
-    return(tmp);
-}
-
-
-psS32 main()
-{
-    psLogSetFormat("HLNM");
-    psImage *domain = NULL;
-    psVector *data = NULL;
-    psVector *errors = NULL;
-    psVector *initialGuess = NULL;
-    psVector *paramMask = NULL;
-    psVector *tmpVecPtr = NULL;
-    float chiSq = 0.0;
-    psS32 i = 0;
-    psS32 j = 0;
-    psS32 currentId = psMemGetId();
-    psS32 testStatus = true;
-    psS32 memLeaks = 0;
-    psVector *theParams = NULL;
-
-    domain = psImageAlloc(DATA_WIDTH, NUM_DATA, PS_TYPE_F32);
-    data = psVectorAlloc(NUM_DATA, PS_TYPE_F32);
-    errors = psVectorAlloc(NUM_DATA, PS_TYPE_F32);
-    initialGuess = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    paramMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    tmpVecPtr = psVectorAlloc(DATA_WIDTH, PS_TYPE_F32);
-
-
-    //--------- myFunc((0.0 1.0) -8.6 -7.6 14.6 5.0) is 6.0 ---------
-
-    initialGuess->data.F32[0] = -8.6;
-    initialGuess->data.F32[1] = -7.6;
-    initialGuess->data.F32[2] = 14.6;
-    initialGuess->data.F32[3] = 5.0;
-
-    // Build the data.
-    initialGuess->data.F32[0] = 2.0;
-    initialGuess->data.F32[1] = 3.0;
-    initialGuess->data.F32[2] = 4.0;
-    initialGuess->data.F32[3] = 5.0;
-
-
-    for (i = 0; i<NUM_DATA; i++) {
-        for (j=0; j<DATA_WIDTH; j++) {
-            domain->data.F32[i][j] = (float) (i + j);
-        }
-    }
-    for (i = 0; i<NUM_DATA; i++) {
-        errors->data.F32[i] = 0.1;
-    }
-
-    //    printf("========== Setting Data Values ==========\n");
-    for (i = 0; i<NUM_DATA; i++) {
-        for (j=0; j<DATA_WIDTH; j++) {
-            tmpVecPtr->data.F32[j] = domain->data.F32[i][j];
-        }
-        data->data.F32[i] = myFunc(tmpVecPtr, initialGuess);
-    }
-    //    printf("=========================================\n");
-
-    for (i=0;i<NUM_PARAMS;i++) {
-        initialGuess->data.F32[i]+= 1.0;
-    }
-
-    printPositiveTestHeader(stdout,
-                            "psMinimize functions",
-                            "psMinimizeChi2(): no masks");
-
-    theParams = psMinimizeChi2(myFunc,
-                               myFuncDeriv,
-                               domain,
-                               data,
-                               errors,
-                               initialGuess,
-                               NULL,
-                               &chiSq);
-    for (i=0;i<NUM_PARAMS;i++) {
-        printf("theParams[%d] is %.1f\n", i, theParams->data.F32[i]);
-    }
-
-    printf("chiSq is %f\n", chiSq);
-    psMemCheckCorruption(1);
-    printFooter(stdout,
-                "psMinimize functions",
-                "psMinimizeChi2(): no masks",
-                testStatus);
-
-
-    psMemCheckCorruption(1);
-    psFree(domain);
-    psFree(data);
-    psFree(errors);
-    psFree(initialGuess);
-    psFree(paramMask);
-    psFree(tmpVecPtr);
-
-    psMemCheckCorruption(1);
-    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
-    if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
-    }
-
-    return (!testStatus);
-}
Index: unk/psLib/test/math/tst_psMinimize01.c
===================================================================
--- /trunk/psLib/test/math/tst_psMinimize01.c	(revision 4860)
+++ 	(revision )
@@ -1,173 +1,0 @@
-/*****************************************************************************
-    This routine must ensure that the psMinimizeChi2 function correctly
-    minimizes an arbitrary function.
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib_strict.h"
-#include "psTest.h"
-#include "psMemory.h"
-#include "psVector.h"
-#include "psImage.h"
-#include "psFunctions.h"
-#include "psMinimize.h"
-#include <math.h>
-#define NUM_DATA 40
-#define DATA_WIDTH 1
-#define NUM_PARAMS 3
-
-// The function is f(x) = (A * e^(lambda x)) + b
-
-float myFunc(const psVector *restrict myData,
-             const psVector *restrict myParams)
-{
-    float x = myData->data.F32[0];
-    float A = myParams->data.F32[0];
-    float lambda = myParams->data.F32[1];
-    float b = myParams->data.F32[2];
-    float tmp = A * exp(-lambda * x) + b;
-
-    //    printf("--------- myFunc((%.1f) %.1f %.1f %.1f) is %.1f ---------\n",
-    //           x, A, lambda, b, tmp);
-
-    return(tmp);
-}
-
-float myFuncDeriv(const psVector *restrict myData,
-                  const psVector *restrict myParams,
-                  psS32 whichParamDeriv)
-{
-    float x = myData->data.F32[0];
-    float A = myParams->data.F32[0];
-    float lambda = myParams->data.F32[1];
-    float tmp = 0.0;
-
-    if (whichParamDeriv == 0) {
-        tmp = exp(-lambda * x);
-    } else
-        if (whichParamDeriv == 1) {
-            tmp = -x * A * exp(-lambda * x);
-        } else
-            if (whichParamDeriv == 2) {
-                tmp = 1.0;
-            }
-
-    //    printf("--------- myFuncDeriv((%.1f) %.1f %.1f %.1f, %d) is %.1f ---------\n",
-    //           x, A, lambda, myParams->data.F32[2], whichParamDeriv, tmp);
-
-    return(tmp);
-}
-
-psS32 main()
-{
-    psLogSetFormat("HLNM");
-    psImage *domain = NULL;
-    psVector *data = NULL;
-    psVector *errors = NULL;
-    psVector *initialGuess = NULL;
-    psVector *paramMask = NULL;
-    psVector *tmpVecPtr = NULL;
-    float chiSq = 0.0;
-    psS32 i = 0;
-    psVector *theParams = NULL;
-    psS32 currentId = psMemGetId();
-    psS32 testStatus = true;
-    psS32 memLeaks = 0;
-
-    domain = psImageAlloc(DATA_WIDTH, NUM_DATA, PS_TYPE_F32);
-    data = psVectorAlloc(NUM_DATA, PS_TYPE_F32);
-    errors = psVectorAlloc(NUM_DATA, PS_TYPE_F32);
-    initialGuess = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    paramMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    tmpVecPtr = psVectorAlloc(DATA_WIDTH, PS_TYPE_F32);
-
-    // Build the data.
-    initialGuess->data.F32[0] = 1.0;
-    initialGuess->data.F32[1] = 0.0;
-    initialGuess->data.F32[2] = 0.0;
-
-    for (i = 0; i<NUM_DATA; i++) {
-        errors->data.F32[i] = 0.1;
-        domain->data.F32[i][0] = (float) i;
-    }
-
-    printf("========== Setting Data Values ==========\n");
-    data->data.F32[0] = 6.013392;
-    data->data.F32[1] = 5.515377;
-    data->data.F32[2] = 5.261095;
-    data->data.F32[3] = 4.777455;
-    data->data.F32[4] = 4.451353;
-    data->data.F32[5] = 3.904903;
-    data->data.F32[6] = 3.504387;
-    data->data.F32[7] = 3.414999;
-    data->data.F32[8] = 3.242736;
-    data->data.F32[9] = 3.122204;
-    data->data.F32[10] = 2.837632;
-    data->data.F32[11] = 2.534700;
-    data->data.F32[12] = 2.439173;
-    data->data.F32[13] = 2.380830;
-    data->data.F32[14] = 2.316090;
-    data->data.F32[15] = 2.060826;
-    data->data.F32[16] = 1.945679;
-    data->data.F32[17] = 1.914126;
-    data->data.F32[18] = 1.759509;
-    data->data.F32[19] = 1.665067;
-    data->data.F32[20] = 1.737926;
-    data->data.F32[21] = 1.575523;
-    data->data.F32[22] = 1.525066;
-    data->data.F32[23] = 1.409607;
-    data->data.F32[24] = 1.395209;
-    data->data.F32[25] = 1.416887;
-    data->data.F32[26] = 1.376042;
-    data->data.F32[27] = 1.260955;
-    data->data.F32[28] = 1.289627;
-    data->data.F32[29] = 1.422672;
-    data->data.F32[30] = 1.228287;
-    data->data.F32[31] = 1.199176;
-    data->data.F32[32] = 1.189989;
-    data->data.F32[33] = 0.930076;
-    data->data.F32[34] = 1.224608;
-    data->data.F32[35] = 1.147376;
-    data->data.F32[36] = 1.114001;
-    data->data.F32[37] = 1.195118;
-    data->data.F32[38] = 1.269581;
-    data->data.F32[39] = 1.061982;
-
-    printPositiveTestHeader(stdout,
-                            "psMinimize functions",
-                            "psMinimizeChi2(): no masks");
-
-    theParams = psMinimizeChi2(myFunc,
-                               myFuncDeriv,
-                               domain,
-                               data,
-                               errors,
-                               initialGuess,
-                               NULL,
-                               &chiSq);
-
-    for (i=0;i<NUM_PARAMS;i++) {
-        printf("theParams[%d] is %.1f\n", i, theParams->data.F32[i]);
-    }
-    printf("chiSq is %f\n", chiSq);
-
-    psMemCheckCorruption(1);
-    printFooter(stdout,
-                "psMinimize functions",
-                "psMinimizeChi2(): no masks",
-                testStatus);
-    psMemCheckCorruption(1);
-    psFree(domain);
-    psFree(data);
-    psFree(errors);
-    psFree(initialGuess);
-    psFree(paramMask);
-    psFree(tmpVecPtr);
-
-    psMemCheckCorruption(1);
-    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
-    if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
-    }
-
-    return (!testStatus);
-}
Index: unk/psLib/test/math/tst_psMinimize02.c
===================================================================
--- /trunk/psLib/test/math/tst_psMinimize02.c	(revision 4860)
+++ 	(revision )
@@ -1,169 +1,0 @@
-/*****************************************************************************
-    This routine must ensure that the psMinimize function correctly
-    minimizes an arbitrary function.
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib_strict.h"
-#include "psTest.h"
-#include "psMemory.h"
-#include "psVector.h"
-#include "psImage.h"
-#include "psFunctions.h"
-#include "psMinimize.h"
-#include <math.h>
-#define DATA_WIDTH 2
-#define NUM_PARAMS 2
-
-float myFunc0(const psVector *restrict myParams,
-              const psVector *restrict myCoords)
-{
-    float P0 = myCoords->data.F32[0];
-    float P1 = myCoords->data.F32[1];
-    float x = myParams->data.F32[0];
-    float y = myParams->data.F32[1];
-    float tmp = 0.0;
-
-    tmp = 10.0 * (x - P0) * (x - P0) + 20.0 * (y - P1) * (y - P1) + 30.0;
-    //    printf("--------- myFunc((%.1f %.1f) %.1f %.1f) is %.1f ---------\n",
-    //    printf("--------- myFunc() params: (%.1f %.1f) coords: (%.1f %.1f) is %.1f ---------\n",
-    //           x, y, P0, P1, tmp);
-
-    return(tmp);
-}
-
-float myFuncDeriv0(const psVector *restrict myParams,
-                   const psVector *restrict myCoords,
-                   psS32 whichParamDeriv)
-{
-    float P0 = myCoords->data.F32[0];
-    float P1 = myCoords->data.F32[1];
-    float x = myParams->data.F32[0];
-    float y = myParams->data.F32[1];
-    float tmp = 0.0;
-
-    if (whichParamDeriv == 0) {
-        tmp = 20.0 * (x - P0);
-    } else
-        if (whichParamDeriv == 1) {
-            tmp = 40.0 * (y - P1);
-        }
-
-    //    printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f (%d)) is %.1f ---------\n",
-    //            x, y, myParams->data.F32[0], myParams->data.F32[1], whichParamDeriv, tmp);
-    return(tmp);
-}
-
-
-float myFunc(const psVector *restrict myParams,
-             const psVector *restrict myCoords)
-{
-    float x = myCoords->data.F32[0];
-    float y = myCoords->data.F32[1];
-    float A = myParams->data.F32[0];
-    float B = myParams->data.F32[1];
-    float C = myParams->data.F32[2];
-    float D = myParams->data.F32[3];
-    float tmp = 0.0;
-
-    tmp = (A * x) + (B*x*x) + (C*y*y) + (D*x*x*y);
-    printf("--------- myFunc((%.1f %.1f) %.1f %.1f %.1f %.1f) is %.1f ---------\n",
-           x, y, A, B, C, D, tmp);
-
-    return(tmp);
-}
-
-float myFuncDeriv(const psVector *restrict myParams,
-                  const psVector *restrict myCoords,
-                  psS32 whichParamDeriv)
-{
-    float x = myCoords->data.F32[0];
-    float y = myCoords->data.F32[1];
-    float tmp = 0.0;
-
-    if (whichParamDeriv == 0) {
-        tmp = 1.0;
-        tmp = x;
-    } else
-        if (whichParamDeriv == 1) {
-            tmp = x;
-            tmp = x*x;
-        } else
-            if (whichParamDeriv == 2) {
-                tmp = y;
-                tmp = y*y;
-            } else
-                if (whichParamDeriv == 3) {
-                    tmp = x * x * y;
-                }
-
-    printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f %.1f %.1f (%d)) is %.1f ---------\n",
-           x, y, myParams->data.F32[0], myParams->data.F32[1],
-           myParams->data.F32[2], myParams->data.F32[3], whichParamDeriv, tmp);
-    return(tmp);
-}
-
-
-psS32 main()
-{
-    psLogSetFormat("HLNM");
-    psVector *initialGuess = NULL;
-    psVector *paramMask = NULL;
-    psVector *coord = NULL;
-    psS32 i = 0;
-    psS32 currentId = psMemGetId();
-    psS32 testStatus = true;
-    psS32 memLeaks = 0;
-    psVector *theParams = NULL;
-
-    initialGuess = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    paramMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    coord = psVectorAlloc(DATA_WIDTH, PS_TYPE_F32);
-
-
-    //--------- myFunc((0.0 1.0) -8.6 -7.6 14.6 5.0) is 6.0 ---------
-
-    // Build the data.
-    initialGuess->data.F32[0] = 5.0;
-    initialGuess->data.F32[1] = 7.0;
-
-    for (i=0;i<DATA_WIDTH;i++) {
-        coord->data.F32[i] = (float) i;
-    }
-    coord->data.F32[0] = 1.0;
-    coord->data.F32[1] = 2.0;
-
-    printPositiveTestHeader(stdout,
-                            "psMinimize functions",
-                            "psMinimize(): no masks");
-
-    for (i=0;i<NUM_PARAMS;i++)
-        printf("Initial parameter %d is: %.1f\n", i, initialGuess->data.F32[i]);
-
-    theParams = psMinimize(initialGuess,
-                           myFunc0,
-                           myFuncDeriv0,
-                           coord,
-                           NULL);
-
-    for (i=0;i<NUM_PARAMS;i++)
-        printf("Parameter %d is: %.1f\n", i, theParams->data.F32[i]);
-
-    psMemCheckCorruption(1);
-    printFooter(stdout,
-                "psMinimize functions",
-                "psMinimize(): no masks",
-                testStatus);
-
-    psMemCheckCorruption(1);
-    psFree(initialGuess);
-    psFree(paramMask);
-    psFree(coord);
-
-    psMemCheckCorruption(1);
-    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
-    if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
-    }
-
-    return (!testStatus);
-}
Index: unk/psLib/test/math/tst_psMinimize03.c
===================================================================
--- /trunk/psLib/test/math/tst_psMinimize03.c	(revision 4860)
+++ 	(revision )
@@ -1,173 +1,0 @@
-/*****************************************************************************
-    This routine must ensure that the psMinimize function correctly
-    minimizes an arbitrary function.
- *****************************************************************************/
-#include <stdio.h>
-#include "pslib_strict.h"
-#include "psTest.h"
-#include "psMemory.h"
-#include "psVector.h"
-#include "psImage.h"
-#include "psFunctions.h"
-#include "psMinimize.h"
-#include <math.h>
-#define DATA_WIDTH 2
-#define NUM_PARAMS 4
-
-float myFunc0(const psVector *restrict myParams,
-              const psVector *restrict myCoords)
-{
-    float P0 = myCoords->data.F32[0];
-    float P1 = myCoords->data.F32[1];
-    float x = myParams->data.F32[0];
-    float y = myParams->data.F32[1];
-    float tmp = 0.0;
-
-    tmp = 10.0 * (x - P0) * (x - P0) + 20.0 * (y - P1) * (y - P1) + 30.0;
-    //    printf("--------- myFunc((%.1f %.1f) %.1f %.1f) is %.1f ---------\n",
-    //    printf("--------- myFunc() params: (%.1f %.1f) coords: (%.1f %.1f) is %.1f ---------\n",
-    //           x, y, P0, P1, tmp);
-
-    return(tmp);
-}
-
-float myFuncDeriv0(const psVector *restrict myParams,
-                   const psVector *restrict myCoords,
-                   psS32 whichParamDeriv)
-{
-    float P0 = myCoords->data.F32[0];
-    float P1 = myCoords->data.F32[1];
-    float x = myParams->data.F32[0];
-    float y = myParams->data.F32[1];
-    float tmp = 0.0;
-
-    if (whichParamDeriv == 0) {
-        tmp = 20.0 * (x - P0);
-    } else
-        if (whichParamDeriv == 1) {
-            tmp = 40.0 * (y - P1);
-        }
-
-    //    printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f (%d)) is %.1f ---------\n",
-    //            x, y, myParams->data.F32[0], myParams->data.F32[1], whichParamDeriv, tmp);
-    return(tmp);
-}
-
-
-float myFunc(const psVector *restrict myParams,
-             const psVector *restrict myCoords)
-{
-    float x = myCoords->data.F32[0];
-    float y = myCoords->data.F32[1];
-    float A = myParams->data.F32[0];
-    float B = myParams->data.F32[1];
-    float C = myParams->data.F32[2];
-    float D = myParams->data.F32[3];
-    float tmp = 0.0;
-
-    tmp = (A * x) + (B*x*x) + (C*y*y) + (D*x*x*y);
-    printf("-- myFunc() params: (%.1f %.1f %.1f %.1f) coords: (%.1f %.1f) is %.1f ---------\n",
-           A, B, C, D, x, y, tmp);
-
-    return(tmp);
-}
-
-float myFuncDeriv(const psVector *restrict myParams,
-                  const psVector *restrict myCoords,
-                  psS32 whichParamDeriv)
-{
-    float x = myCoords->data.F32[0];
-    float y = myCoords->data.F32[1];
-    float tmp = 0.0;
-
-    if (whichParamDeriv == 0) {
-        tmp = 1.0;
-        tmp = x;
-    } else
-        if (whichParamDeriv == 1) {
-            tmp = x;
-            tmp = x*x;
-        } else
-            if (whichParamDeriv == 2) {
-                tmp = y;
-                tmp = y*y;
-            } else
-                if (whichParamDeriv == 3) {
-                    tmp = x * x * y;
-                }
-
-    printf("--------- myFuncDeriv((%.1f %.1f) %.1f %.1f %.1f %.1f (%d)) is %.1f ---------\n",
-           x, y, myParams->data.F32[0], myParams->data.F32[1],
-           myParams->data.F32[2], myParams->data.F32[3], whichParamDeriv, tmp);
-    return(tmp);
-}
-
-
-psS32 main()
-{
-    psLogSetFormat("HLNM");
-    psVector *initialGuess = NULL;
-    psVector *paramMask = NULL;
-    psVector *coord = NULL;
-    psS32 i = 0;
-    psS32 currentId = psMemGetId();
-    psS32 testStatus = true;
-    psS32 memLeaks = 0;
-    psVector *theParams = NULL;
-
-    initialGuess = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    paramMask = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
-    coord = psVectorAlloc(DATA_WIDTH, PS_TYPE_F32);
-
-
-    //--------- myFunc((0.0 1.0) -8.6 -7.6 14.6 5.0) is 6.0 ---------
-
-    // Build the data.
-    initialGuess->data.F32[0] = 2.0;
-    initialGuess->data.F32[1] = 3.0;
-    initialGuess->data.F32[2] = 4.0;
-    initialGuess->data.F32[3] = 5.0;
-
-    for (i=0;i<DATA_WIDTH;i++) {
-        coord->data.F32[i] = (float) i;
-    }
-    coord->data.F32[0] = 1.0;
-    coord->data.F32[1] = 2.0;
-
-    printPositiveTestHeader(stdout,
-                            "psMinimize functions",
-                            "psMinimize(): no masks");
-
-    for (i=0;i<NUM_PARAMS;i++)
-        printf("Initial parameter %d is: %.1f\n", i, initialGuess->data.F32[i]);
-
-    theParams = psMinimize(initialGuess,
-                           myFunc,
-                           myFuncDeriv,
-                           coord,
-                           NULL);
-
-    for (i=0;i<NUM_PARAMS;i++)
-        printf("Parameter %d is: %.1f\n", i, theParams->data.F32[i]);
-
-    printf("Function is %.1f\n", myFunc(theParams, coord));
-
-    psMemCheckCorruption(1);
-    printFooter(stdout,
-                "psMinimize functions",
-                "psMinimize(): no masks",
-                testStatus);
-
-    psMemCheckCorruption(1);
-    psFree(initialGuess);
-    psFree(paramMask);
-    psFree(coord);
-
-    psMemCheckCorruption(1);
-    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
-    if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
-    }
-
-    return (!testStatus);
-}
Index: /trunk/psLib/test/math/tst_psStats07.c
===================================================================
--- /trunk/psLib/test/math/tst_psStats07.c	(revision 4860)
+++ /trunk/psLib/test/math/tst_psStats07.c	(revision 4861)
@@ -42,8 +42,4 @@
 
     psTraceSetLevel(".psLib.dataManip", 0);
-    psTraceSetLevel(".psLib.dataManip.psMinimize", 0);
-    psTraceSetLevel(".psLib.dataManip.psMinimizeLMChi2Gauss1D", 0);
-    psTraceSetLevel(".psLib.dataManip.psFunctions.psGaussian", 0);
-    psTraceSetLevel(".psLib.dataManip.psFunctions", 0);
 
     /*************************************************************************/
@@ -256,4 +252,8 @@
                  testStatus );
 
+    if (globalTestStatus == false)
+        printf("Returning FALSE\n");
+    else
+        printf("Returning TRUE\n");
     return ( !globalTestStatus );
 }
@@ -489,4 +489,9 @@
                  testStatus );
 
+    if (globalTestStatus == false)
+        printf("Returning FALSE\n");
+    else
+        printf("Returning TRUE\n");
+
     return ( !globalTestStatus );
 }
@@ -495,5 +500,7 @@
 {
     psLogSetFormat("HLNM");
-    t00();
-    t01();
+    psBool rc = t00();
+    rc |= t01();
+
+    return(rc);
 }