IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 25, 2005, 10:26:55 AM (21 years ago)
Author:
gusciora
Message:

I renamed many of the PS_CHECK macros to PS_ASSERT...

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r3990 r4029  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.119 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-05-19 23:57:37 $
     11 *  @version $Revision: 1.120 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-05-25 20:26:55 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    174174                         psF32 X)
    175175{
    176     PS_PTR_CHECK_NULL(spline, NAN);
    177     PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN);
    178     PS_VECTOR_CHECK_NULL(spline->domains, NAN);
    179     PS_PTR_CHECK_NULL(spline->p_psDeriv2, NAN);
    180     PS_VECTOR_CHECK_NULL(x, NAN);
    181     PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NAN);
    182     PS_VECTOR_CHECK_NULL(y, NAN);
    183     PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NAN);
    184     PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL);
     176    PS_ASSERT_PTR_NON_NULL(spline, NAN);
     177    PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN);
     178    PS_ASSERT_VECTOR_NON_NULL(spline->domains, NAN);
     179    PS_ASSERT_PTR_NON_NULL(spline->p_psDeriv2, NAN);
     180    PS_ASSERT_VECTOR_NON_NULL(x, NAN);
     181    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NAN);
     182    PS_ASSERT_VECTOR_NON_NULL(y, NAN);
     183    PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NAN);
     184    PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL);
    185185 
    186186    psS32 n;
    … …  
    258258                                const psVector* yErr)     ///< Errors in coordinates, or NULL
    259259{
    260     PS_VECTOR_CHECK_NULL(y, NULL);
    261     PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     260    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     261    PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL);
    262262    if (mySpline != NULL) {
    263         PS_VECTOR_CHECK_TYPE(mySpline->knots, PS_TYPE_F32, NULL);
     263        PS_ASSERT_VECTOR_TYPE(mySpline->knots, PS_TYPE_F32, NULL);
    264264    }
    265265
    … …  
    285285        yErr32 = yErr32Static;
    286286    } else {
    287         PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
     287        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL);
    288288        PS_VECTOR_CONVERT_F64_TO_F32_STATIC(yErr, yErr32, yErr32Static);
    289289    }
    … …  
    294294        x32 = x32Static;
    295295    } else {
    296         PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
     296        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
    297297        PS_VECTOR_CONVERT_F64_TO_F32_STATIC(x, x32, x32Static);
    298298    }
    299     PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
    300     PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL);
     299    PS_ASSERT_VECTORS_SIZE_EQUAL(x32, y32, NULL);
     300    PS_ASSERT_VECTORS_SIZE_EQUAL(yErr32, y32, NULL);
    301301
    302302    /*
    … …  
    310310        mySpline = psSpline1DAllocGeneric(x32, 3);
    311311    }
    312     PS_PTR_CHECK_NULL(mySpline, NULL);
    313     PS_INT_CHECK_NON_NEGATIVE(mySpline->n, NULL);
     312    PS_ASSERT_PTR_NON_NULL(mySpline, NULL);
     313    PS_ASSERT_INT_NONNEGATIVE(mySpline->n, NULL);
    314314
    315315    if (y32->n != (1 + mySpline->n)) {
    … …  
    440440                                  const psArray *coords)
    441441{
    442     PS_PTR_CHECK_NULL(coords, NULL);
    443     PS_PTR_CHECK_NULL(params, NULL);
     442    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     443    PS_ASSERT_PTR_NON_NULL(params, NULL);
    444444
    445445    psTrace(".psLib.dataManip.psMinimize", 4,
    … …  
    457457        deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32);
    458458    } else {
    459         PS_IMAGE_CHECK_SIZE(deriv, params->n, coords->n, NULL);
    460         PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL);
     459        PS_ASSERT_IMAGE_SIZE(deriv, params->n, coords->n, NULL);
     460        PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL);
    461461    }
    462462
    … …  
    513513                                  const psArray *coords)
    514514{
    515     PS_PTR_CHECK_NULL(coords, NULL);
    516     PS_PTR_CHECK_NULL(params, NULL);
     515    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     516    PS_ASSERT_PTR_NON_NULL(params, NULL);
    517517
    518518    psF64 normalization = params->data.F32[0];
    … …  
    527527        deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32);
    528528    } else {
    529         PS_IMAGE_CHECK_SIZE(deriv, 6, coords->n, NULL);
    530         PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL);
     529        PS_ASSERT_IMAGE_SIZE(deriv, 6, coords->n, NULL);
     530        PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL);
    531531    }
    532532
    … …  
    572572                        psMinimizeLMChi2Func func)
    573573{
    574     PS_PTR_CHECK_NULL(min, NULL);
    575     PS_VECTOR_CHECK_NULL(params, NULL);
    576     PS_VECTOR_CHECK_EMPTY(params, NULL);
    577     PS_PTR_CHECK_NULL(x, NULL);
    578     PS_VECTOR_CHECK_NULL(y, NULL);
    579     PS_VECTOR_CHECK_EMPTY(y, NULL);
    580     PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
    581     PS_PTR_CHECK_NULL(func, NULL);
     574    PS_ASSERT_PTR_NON_NULL(min, NULL);
     575    PS_ASSERT_VECTOR_NON_NULL(params, NULL);
     576    PS_ASSERT_VECTOR_NON_EMPTY(params, NULL);
     577    PS_ASSERT_PTR_NON_NULL(x, NULL);
     578    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     579    PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
     580    PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL);
     581    PS_ASSERT_PTR_NON_NULL(func, NULL);
    582582
    583583    // this function has test and current values for several things
    … …  
    923923                           psMinimizeLMChi2Func func)
    924924{
    925     PS_PTR_CHECK_NULL(min, NULL);
    926     PS_VECTOR_CHECK_NULL(params, NULL);
    927     PS_VECTOR_CHECK_EMPTY(params, NULL);
    928     PS_PTR_CHECK_NULL(x, NULL);
    929     PS_VECTOR_CHECK_NULL(y, NULL);
    930     PS_VECTOR_CHECK_EMPTY(y, NULL);
    931     PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
    932     PS_PTR_CHECK_NULL(func, NULL);
     925    PS_ASSERT_PTR_NON_NULL(min, NULL);
     926    PS_ASSERT_VECTOR_NON_NULL(params, NULL);
     927    PS_ASSERT_VECTOR_NON_EMPTY(params, NULL);
     928    PS_ASSERT_PTR_NON_NULL(x, NULL);
     929    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     930    PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
     931    PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL);
     932    PS_ASSERT_PTR_NON_NULL(func, NULL);
    933933
    934934    if (paramMask != NULL) {
    935         PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
     935        PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, NULL);
    936936    }
    937937    if (yErr != NULL) {
    938         PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
     938        PS_ASSERT_VECTORS_SIZE_EQUAL(y, yErr, NULL);
    939939    }
    940940    if (covar != NULL) {
    941         PS_IMAGE_CHECK_SIZE(covar, params->n, params->n, NULL);
     941        PS_ASSERT_IMAGE_SIZE(covar, params->n, params->n, NULL);
    942942    }
    943943
    … …  
    13631363                                        const psVector* yErr)
    13641364{
    1365     PS_POLY_CHECK_NULL(myPoly, NULL);
    1366     PS_INT_CHECK_NON_NEGATIVE(myPoly->n, NULL);
    1367     PS_VECTOR_CHECK_NULL(y, NULL);
    1368     PS_VECTOR_CHECK_EMPTY(y, NULL);
    1369     PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL);
     1365    PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
     1366    PS_ASSERT_INT_NONNEGATIVE(myPoly->n, NULL);
     1367    PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     1368    PS_ASSERT_VECTOR_NON_EMPTY(y, NULL);
     1369    PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL);
    13701370
    13711371    psS32 i;
    … …  
    13831383        yErr64 = yErr64Static;
    13841384    } else {
    1385         PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL);
     1385        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL);
    13861386        PS_VECTOR_CONVERT_F32_TO_F64_STATIC(yErr, yErr64, yErr64Static);
    13871387    }
    … …  
    13951395        x64 = x64Static;
    13961396    } else {
    1397         PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL);
     1397        PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
    13981398        PS_VECTOR_CONVERT_F32_TO_F64_STATIC(x, x64, x64Static);
    13991399        if (myPoly->type == PS_POLYNOMIAL_CHEB) {
    … …  
    14011401        }
    14021402    }
    1403     PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);
    1404     PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL);
     1403    PS_ASSERT_VECTORS_SIZE_EQUAL(x64, y64, NULL);
     1404    PS_ASSERT_VECTORS_SIZE_EQUAL(yErr64, y64, NULL);
    14051405
    14061406    // Call the appropriate vector fitting routine.
    … …  
    14301430                                    psF32 tol)
    14311431{
    1432     PS_INT_CHECK_NON_NEGATIVE(maxIter, NULL);
     1432    PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL);
    14331433
    14341434    psMinimization *min = psAlloc(sizeof(psMinimization));
    … …  
    17651765                  psMinimizePowellFunc func)
    17661766{
    1767     PS_PTR_CHECK_NULL(min, NAN);
    1768     PS_VECTOR_CHECK_NULL(params, NAN);
    1769     PS_VECTOR_CHECK_EMPTY(params, NAN);
    1770     PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NAN);
    1771     PS_VECTOR_CHECK_NULL(line, NAN);
    1772     PS_VECTOR_CHECK_EMPTY(line, NAN);
    1773     PS_VECTOR_CHECK_TYPE(line, PS_TYPE_F32, NAN);
    1774     PS_VECTOR_CHECK_NULL(paramMask, NAN);
    1775     PS_VECTOR_CHECK_EMPTY(paramMask, NAN);
    1776     PS_VECTOR_CHECK_TYPE(paramMask, PS_TYPE_U8, NAN);
    1777     PS_PTR_CHECK_NULL(coords, NAN);
    1778     PS_PTR_CHECK_NULL(func, NAN);
     1767    PS_ASSERT_PTR_NON_NULL(min, NAN);
     1768    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
     1769    PS_ASSERT_VECTOR_NON_EMPTY(params, NAN);
     1770    PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NAN);
     1771    PS_ASSERT_VECTOR_NON_NULL(line, NAN);
     1772    PS_ASSERT_VECTOR_NON_EMPTY(line, NAN);
     1773    PS_ASSERT_VECTOR_TYPE(line, PS_TYPE_F32, NAN);
     1774    PS_ASSERT_VECTOR_NON_NULL(paramMask, NAN);
     1775    PS_ASSERT_VECTOR_NON_EMPTY(paramMask, NAN);
     1776    PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, NAN);
     1777    PS_ASSERT_PTR_NON_NULL(coords, NAN);
     1778    PS_ASSERT_PTR_NON_NULL(func, NAN);
    17791779    psVector *bracket;
    17801780    psF32 a = 0.0;
    … …  
    19191919                        psMinimizePowellFunc func)
    19201920{
    1921     PS_PTR_CHECK_NULL(min, NULL);
    1922     PS_VECTOR_CHECK_NULL(params, NULL);
    1923     PS_VECTOR_CHECK_EMPTY(params, NULL);
    1924     PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NULL);
    1925     PS_PTR_CHECK_NULL(coords, NULL);
    1926     PS_PTR_CHECK_NULL(func, NULL);
     1921    PS_ASSERT_PTR_NON_NULL(min, NULL);
     1922    PS_ASSERT_VECTOR_NON_NULL(params, NULL);
     1923    PS_ASSERT_VECTOR_NON_EMPTY(params, NULL);
     1924    PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NULL);
     1925    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     1926    PS_ASSERT_PTR_NON_NULL(func, NULL);
    19271927    psS32 numDims = params->n;
    19281928    PS_VECTOR_GEN_STATIC_RECYCLED(pQP, numDims, PS_TYPE_F32);
    … …  
    19571957        myParamMask = (psVector *) paramMask;
    19581958    }
    1959     PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL);
     1959    PS_ASSERT_VECTORS_SIZE_EQUAL(params, myParamMask, NULL);
    19601960
    19611961    // 1: Set v[i] to be the unit vectors for each dimension in params
    … …  
    21192119                                      const psArray *coords)
    21202120{
    2121     PS_PTR_CHECK_NULL(coords, NULL);
    2122     PS_PTR_CHECK_NULL(params, NULL);
     2121    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     2122    PS_ASSERT_PTR_NON_NULL(params, NULL);
    21232123
    21242124    psF32 x;
    … …  
    21502150    psTrace(".psLib.dataManip.myPowellChi2Func", 4,
    21512151            "---- myPowellChi2Func() begin ----\n");
    2152     PS_VECTOR_CHECK_NULL(params, NAN);
    2153     PS_VECTOR_CHECK_EMPTY(params, NAN);
    2154     PS_VECTOR_CHECK_NULL(myValue, NAN);
    2155     PS_VECTOR_CHECK_EMPTY(myValue, NAN);
    2156     PS_PTR_CHECK_NULL(coords, NAN);
     2152    PS_ASSERT_VECTOR_NON_NULL(params, NAN);
     2153    PS_ASSERT_VECTOR_NON_EMPTY(params, NAN);
     2154    PS_ASSERT_VECTOR_NON_NULL(myValue, NAN);
     2155    PS_ASSERT_VECTOR_NON_EMPTY(myValue, NAN);
     2156    PS_ASSERT_PTR_NON_NULL(coords, NAN);
    21572157
    21582158    psF32 chi2 = 0.0;
Note: See TracChangeset for help on using the changeset viewer.