IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 13981


Ignore:
Timestamp:
Jun 26, 2007, 9:27:04 AM (19 years ago)
Author:
magnier
Message:

converting private LMM utility functions to public ones

Location:
trunk/psLib/src/math
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/math/psMinimizeLMM.c

    r11686 r13981  
    1010 *  @author EAM, IfA
    1111 *
    12  *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2007-02-07 23:52:54 $
     12 *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2007-06-26 19:27:04 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5454/*****************************************************************************/
    5555
    56 bool p_psMinLM_GuessABP(
     56bool psMinLM_GuessABP(
    5757    psImage  *Alpha,
    5858    psVector *Beta,
    … …  
    183183
    184184    // XXX should we give up if chisq is nan?
    185     psF32 rcF32 = p_psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
     185    psF32 rcF32 = psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
    186186    if (isnan(rcF32)) {
    187         psTrace ("psLib.math", 5, "p_psMinLM_SetABX() returned a NAN.\n");
     187        psTrace ("psLib.math", 5, "psMinLM_SetABX() returned a NAN.\n");
    188188        rc = false;
    189189    }
    190     psTrace("psLib.math", 5, "p_psMinLM_SetABX() was succesful\n");
     190    psTrace("psLib.math", 5, "psMinLM_SetABX() was succesful\n");
    191191    // dump some useful info if trace is defined
    192192    if (psTraceGetLevel("psLib.math") >= 6) {
    … …  
    196196    }
    197197
    198     bool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0);
     198    bool rcBool = psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, 0.0);
    199199    if (rcBool == false) {
    200         psTrace ("psLib.math", 5, "p_psMinLM_GuessABP() returned FALSE.\n");
     200        psTrace ("psLib.math", 5, "psMinLM_GuessABP() returned FALSE.\n");
    201201        rc = false;
    202202    }
    203     psTrace("psLib.math", 5, "p_psMinLM_GuessABP() was succesful\n");
     203    psTrace("psLib.math", 5, "psMinLM_GuessABP() was succesful\n");
    204204    if (psTraceGetLevel("psLib.math") >= 6) {
    205205        p_psImagePrint(psTraceGetDestination(), Alpha, "alpha guess (1)");
    … …  
    220220
    221221// measure linear model prediction
    222 psF32 p_psMinLM_dLinear(
     222psF32 psMinLM_dLinear(
    223223    const psVector *Beta,
    224224    const psVector *beta,
    … …  
    237237
    238238// alpha, beta, params are already allocated
    239 psF32 p_psMinLM_SetABX(
     239psF32 psMinLM_SetABX(
    240240    psImage  *alpha,
    241241    psVector *beta,
    … …  
    402402
    403403    // calculate initial alpha and beta, set chisq (min->value)
    404     min->value = p_psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
     404    min->value = psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
    405405    if (isnan(min->value)) {
    406406        min->iter = min->maxIter;
    … …  
    422422
    423423        // set a new guess for Alpha, Beta, Params
    424         if (!p_psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda)) {
     424        if (!psMinLM_GuessABP(Alpha, Beta, Params, alpha, beta, params, paramMask, checkLimits, lambda)) {
    425425            min->iter ++;
    426426            lambda *= 10.0;
    … …  
    429429
    430430        // measure linear model prediction
    431         psF32 dLinear = p_psMinLM_dLinear(Beta, beta, lambda);
     431        psF32 dLinear = psMinLM_dLinear(Beta, beta, lambda);
    432432
    433433        // dump some useful info if trace is defined
    … …  
    441441
    442442        // calculate Chisq for new guess, update Alpha & Beta
    443         Chisq = p_psMinLM_SetABX(Alpha, Beta, Params, paramMask, x, y, dy, func);
     443        Chisq = psMinLM_SetABX(Alpha, Beta, Params, paramMask, x, y, dy, func);
    444444        if (isnan(Chisq)) {
    445445            min->iter ++;
    … …  
    480480    // construct & return the covariance matrix (if requested)
    481481    if (covar != NULL) {
    482         if (!p_psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0)) {
     482        if (!psMinLM_GuessABP(covar, Beta, Params, alpha, beta, params, paramMask, NULL, 0.0)) {
    483483            psTrace ("psLib.math", 5, "failure to calculate covariance matrix\n");
    484484        }

  • trunk/psLib/src/math/psMinimizeLMM.h

    r11668 r13981  
    77 * @author GLG, MHPCC
    88 *
    9  * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    10  * @date $Date: 2007-02-06 21:36:09 $
     9 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     10 * @date $Date: 2007-06-26 19:27:04 $
    1111 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1212 */
    … …  
    144144 *  @return psF32:    Chi-squared value for new guess
    145145 */
    146 psF32 p_psMinLM_SetABX (
     146psF32 psMinLM_SetABX (
    147147    psImage  *alpha,                   ///< alpha guess
    148148    psVector *beta,                    ///< beta guess
    … …  
    156156
    157157
    158 bool p_psMinLM_GuessABP(
     158bool psMinLM_GuessABP(
    159159    psImage  *Alpha,
    160160    psVector *Beta,
    … …  
    168168);
    169169
     170psF32 psMinLM_dLinear(
     171    const psVector *Beta,
     172    const psVector *beta,
     173    psF32 lambda);
     174
    170175/// @}
    171176#endif // #ifndef PS_MINIMIZE_LMM_H
Note: See TracChangeset for help on using the changeset viewer.