IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 9, 2004, 1:34:58 PM (22 years ago)
Author:
desonia
Message:

cleanup of some indent-induced madness.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1407 r1440  
    1010 *  @author George Gusciora, MHPCC
    1111 *
    12  *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2004-08-07 00:06:06 $
     12 *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2004-08-09 23:34:57 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    9999    size_t n;                   // Number of data points points in domain.
    100100    int paramCount;             // Number of non-masked parameters.
    101     psVector *restrict initialGuess;
    102     const psImage *restrict domain;
    103     const psVector *restrict data;
    104     const psVector *restrict errors;
    105     const psVector *restrict paramMask;
    106     float (*evalModel) (const psVector *, const psVector *);
    107     float (*d_evalModel) (const psVector *, const psVector *, int);
     101    psVector* restrict initialGuess;
     102    const psImage* restrict domain;
     103    const psVector* restrict data;
     104    const psVector* restrict errors;
     105    const psVector* restrict paramMask;
     106    float (*evalModel) (const psVector* , const psVector* );
     107    float (*d_evalModel) (const psVector* , const psVector* , int);
    108108}
    109109psMinChi2Data;
    … …  
    112112{
    113113    int paramCount;             // Number of non-masked parameters.
    114     psVector *restrict initialGuess;
    115     const psVector *restrict coord;
    116     const psVector *restrict paramMask;
    117     float (*evalModel) (const psVector *, const psVector *);
    118     float (*d_evalModel) (const psVector *, const psVector *, int);
     114    psVector* restrict initialGuess;
     115    const psVector* restrict coord;
     116    const psVector* restrict paramMask;
     117    float (*evalModel) (const psVector* , const psVector* );
     118    float (*d_evalModel) (const psVector* , const psVector* , int);
    119119}
    120120psMinimizeData;
    … …  
    162162    int j;                      // Loop index variable.
    163163    float tmpf;                 // Temporary floating point variable.
    164     const psVector *restrict coord = ((psMinimizeData *) funcData)->coord;
    165     const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask;
    166     psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess;
    167     float (*evalModel) (const psVector *, const psVector *) = ((psMinimizeData *) funcData)->evalModel;
    168     psVector *inputParameterList = NULL;
     164    const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord;
     165    const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask;
     166    psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess;
     167    float (*evalModel) (const psVector* , const psVector* ) = ((psMinimizeData* ) funcData)->evalModel;
     168    psVector* inputParameterList = NULL;
    169169
    170170    // The GSL routines will call this function with the masked parameters
    … …  
    216216    int j;                      // Loop index variable.
    217217    float tmpf;                 // Temporary floating point variable.
    218     const psVector *restrict coord = ((psMinimizeData *) funcData)->coord;
    219     const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask;
    220     psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess;
    221     float (*d_evalModel) (const psVector *, const psVector *, int) =
    222         ((psMinimizeData *) funcData)->d_evalModel;
    223     psVector *inputParameterList = NULL;
     218    const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord;
     219    const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask;
     220    psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess;
     221    float (*d_evalModel) (const psVector* , const psVector* , int) =
     222        ((psMinimizeData* ) funcData)->d_evalModel;
     223    psVector* inputParameterList = NULL;
    224224
    225225    // The GSL routines will call this function with the masked parameters
    … …  
    293293    int j;                      // Loop index variable.
    294294    float tmpf;                 // Temporary floating point variable.
    295     const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain;
    296     const psVector *restrict data = ((psMinChi2Data *) funcData)->data;
    297     const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors;
    298     const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask;
    299     psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess;
    300     float (*evalModel) (const psVector *, const psVector *) = ((psMinChi2Data *) funcData)->evalModel;
    301     psVector *inputParameterList = NULL;
    302     psVector *tmpVecPtr = NULL;
     295    const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain;
     296    const psVector* restrict data = ((psMinChi2Data* ) funcData)->data;
     297    const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors;
     298    const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask;
     299    psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess;
     300    float (*evalModel) (const psVector* , const psVector* ) = ((psMinChi2Data* ) funcData)->evalModel;
     301    psVector* inputParameterList = NULL;
     302    psVector* tmpVecPtr = NULL;
    303303
    304304    tmpVecPtr = psVectorAlloc(domain->numCols, PS_TYPE_F32);
    … …  
    360360int p_psMinChi2FuncDeriv(const gsl_vector * params, void *funcData, gsl_matrix * J)
    361361{
    362     const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain;
    363     const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors;
    364     const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask;
    365     psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess;
    366     psVector *inputParameterList = NULL;
    367     psVector *tmpVecPtr = NULL;
    368     float (*d_evalModel) (const psVector *, const psVector *, int) =
    369         ((psMinChi2Data *) funcData)->d_evalModel;
     362    const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain;
     363    const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors;
     364    const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask;
     365    psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess;
     366    psVector* inputParameterList = NULL;
     367    psVector* tmpVecPtr = NULL;
     368    float (*d_evalModel) (const psVector* , const psVector* , int) =
     369        ((psMinChi2Data* ) funcData)->d_evalModel;
    370370
    371371    size_t i;
    … …  
    426426returned as a psVector sums.
    427427 *****************************************************************************/
    428 void p_psBuildSums1D(double x, int polyOrder, psVector * sums)
     428void p_psBuildSums1D(double x, int polyOrder, psVector* sums)
    429429{
    430430    int i = 0;
    … …  
    442442values of the vector will be scaled uniformly between -1.0 and 1.0.
    443443 *****************************************************************************/
    444 psVector *psBuildImageScalingFactors(int x)
     444psVector* psBuildImageScalingFactors(int x)
    445445{
    446446    int i = 0;                  // loop index variable.
    447     psVector *imageScalingFactors = NULL;
     447    psVector* imageScalingFactors = NULL;
    448448
    449449    imageScalingFactors = psVectorAlloc(x, PS_TYPE_F32);
    … …  
    556556parameters of that function such that the ...
    557557 *****************************************************************************/
    558 psVector *psMinimize(psVector * restrict initialGuess,
    559                      float (*myFunction) (const psVector * restrict, const psVector * restrict),
    560                      float (*myFunctionDeriv) (const psVector * restrict, const psVector * restrict, int),
    561                      const psVector * restrict coord, const psVector * restrict paramMask)
     558psVector* psMinimize(psVector* restrict initialGuess,
     559                     float (*myFunction) (const psVector* restrict, const psVector* restrict),
     560                     float (*myFunctionDeriv) (const psVector* restrict, const psVector* restrict, int),
     561                     const psVector* restrict coord, const psVector* restrict paramMask)
    562562{
    563563    int status;
    … …  
    664664    such that they best fit the supplied data points.
    665665 *****************************************************************************/
    666 psVector *psMinimizeChi2(float (*evalModel) (const psVector * restrict, const psVector * restrict),
    667                          float (*DevalModel) (const psVector * restrict, const psVector * restrict, int),
    668                          const psImage * restrict domain,
    669                          const psVector * restrict data,
    670                          const psVector * restrict errors,
    671                          psVector * restrict initialGuess, const psVector * restrict paramMask, float *chiSq)
     666psVector* psMinimizeChi2(float (*evalModel) (const psVector* restrict, const psVector* restrict),
     667                         float (*DevalModel) (const psVector* restrict, const psVector* restrict, int),
     668                         const psImage* restrict domain,
     669                         const psVector* restrict data,
     670                         const psVector* restrict errors,
     671                         psVector* restrict initialGuess, const psVector* restrict paramMask, float *chiSq)
    672672{
    673673    int numData = domain->numRows;      // Number of data points
    … …  
    847847NOTE: yErr is currently ignored.
    848848 *****************************************************************************/
    849 psPolynomial1D *psVectorFitPolynomial1D(psPolynomial1D * myPoly,
    850                                         const psVector * restrict x,
    851                                         const psVector * restrict y, const psVector * restrict yErr)
     849psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly,
     850                                        const psVector* restrict x,
     851                                        const psVector* restrict y, const psVector* restrict yErr)
    852852{
    853853    int polyOrder = myPoly->n;
    854     psImage *A = NULL;
    855     psImage *ALUD = NULL;
    856     psVector *B = NULL;
    857     psVector *outPerm = NULL;
    858     psVector *X = NULL;         // NOTE: do we need this?
    859     psVector *coeffs = NULL;
     854    psImage* A = NULL;
     855    psImage* ALUD = NULL;
     856    psVector* B = NULL;
     857    psVector* outPerm = NULL;
     858    psVector* X = NULL;         // NOTE: do we need this?
     859    psVector* coeffs = NULL;
    860860    int i = 0;
    861861    int j = 0;
    862862    int k = 0;
    863     psVector *xSums = NULL;
     863    psVector* xSums = NULL;
    864864
    865865    // printf("psVectorFitPolynomial1D()\n");
Note: See TracChangeset for help on using the changeset viewer.