IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2213


Ignore:
Timestamp:
Oct 27, 2004, 10:11:47 AM (22 years ago)
Author:
gusciora
Message:

I've been unifying the naming conventions for various macros that check
functions parameters for type, size, non-NULL ...

Location:
trunk/psLib/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataManip/psConstants.h

    r2212 r2213  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-10-27 20:07:17 $
     8 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-10-27 20:11:46 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    119119
    120120/** Preprocessor macro to generate error on an incorrect type */
    121 #define PS_CHECK_VECTOR_TYPE(NAME, TYPE, RVAL) \
     121#define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
    122122if (NAME->type.type != TYPE) { \
    123123    psError(__func__,"Unallowable operation: %s has incorrect type.", #NAME); \
    … …  
    126126
    127127/** Preprocessor macro to generate error on a NULL vector */
    128 #define PS_CHECK_NULL_VECTOR(NAME, RVAL) \
     128#define PS_VECTOR_CHEC_NULL(NAME, RVAL) \
    129129if (NAME == NULL || NAME->data.V == NULL) { \
    130130    psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
    … …  
    133133
    134134/** Preprocessor macro to generate error for zero length vector */
    135 #define PS_CHECK_EMPTY_VECTOR(NAME, RVAL) \
     135#define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \
    136136if (NAME->n < 1) { \
    137137    psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
    … …  
    140140
    141141/** Preprocessor macro to generate error on differing size vectors */
    142 #define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2, RVAL) \
     142#define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
    143143if (VEC1->n != VEC2->n) { \
    144144    psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    … …  
    146146}
    147147
    148 #define PS_PRINT_VECTOR(NAME) \
     148#define PS_VECTOR_PRINT(NAME) \
    149149for (int my_i=0;my_i<NAME->n;my_i++) { \
    150150    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \

  • trunk/psLib/src/dataManip/psMatrix.c

    r2204 r2213  
    2020 *  @author Ross Harman, MHPCC
    2121 *   
    22  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    23  *  @date $Date: 2004-10-27 00:57:31 $
     22 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     23 *  @date $Date: 2004-10-27 20:11:47 $
    2424 *
    2525 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4242
    4343/** Preprocessor macro to generate error a NULL image */
    44 #define PS_CHECK_NULL_VECTOR(NAME, RETURN)                                                          \
     44#define PS_VECTOR_CHEC_NULL(NAME, RETURN)                                                          \
    4545if (NAME == NULL || NAME->data.V == NULL) {                                                         \
    4646    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
    … …  
    135135    PS_CHECK_SIZE_IMAGE(outImage, outImage);
    136136    PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type);
    137     PS_CHECK_NULL_VECTOR(outPerm, outImage);
     137    PS_VECTOR_CHEC_NULL(outPerm, outImage);
    138138    PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage);
    139139
    … …  
    181181    PS_CHECK_SIZE_IMAGE(inImage, outVector);
    182182    PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type);
    183     PS_CHECK_NULL_VECTOR(outVector, outVector);
     183    PS_VECTOR_CHEC_NULL(outVector, outVector);
    184184    PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector);
    185     PS_CHECK_NULL_VECTOR(inVector, outVector);
     185    PS_VECTOR_CHEC_NULL(inVector, outVector);
    186186    PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector);
    187     PS_CHECK_NULL_VECTOR(inPerm, outVector);
     187    PS_VECTOR_CHEC_NULL(inPerm, outVector);
    188188    PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector);
    189189
    … …  
    456456    }
    457457
    458     PS_CHECK_NULL_VECTOR(outVector, outVector);
     458    PS_VECTOR_CHEC_NULL(outVector, outVector);
    459459
    460460    // More checks
    … …  
    498498
    499499    // Error checks
    500     PS_CHECK_NULL_VECTOR(inVector, outImage);
     500    PS_VECTOR_CHEC_NULL(inVector, outImage);
    501501
    502502    if (inVector->type.dimen == PS_DIMEN_VECTOR) {

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

    r2212 r2213  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 20:07:17 $
     11 *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 20:11:47 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    274274        CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
    275275    }
    276     PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
    277     PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
     276    PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
     277    PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL);
    278278
    279279    if (y32->n != (1 + mySpline->n)) {
    … …  
    426426{
    427427    PS_PTR_CHECK_NULL(min, NULL);
    428     PS_CHECK_NULL_VECTOR(params, NULL);
    429     PS_CHECK_EMPTY_VECTOR(params, NULL);
     428    PS_VECTOR_CHEC_NULL(params, NULL);
     429    PS_VECTOR_CHECK_EMPTY(params, NULL);
    430430    PS_PTR_CHECK_NULL(x, NULL);
    431     PS_CHECK_NULL_VECTOR(y, NULL);
    432     PS_CHECK_EMPTY_VECTOR(y, NULL);
    433     PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
     431    PS_VECTOR_CHEC_NULL(y, NULL);
     432    PS_VECTOR_CHECK_EMPTY(y, NULL);
     433    PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
    434434    if (paramMask != NULL) {
    435         PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
     435        PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
    436436    }
    437437    if (yErr != NULL) {
    438         PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
     438        PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
    439439    }
    440440
    … …  
    856856    psPolynomial1D *tmpPoly;
    857857    PS_CHECK_NULL_POLY(myPoly, NULL);
    858     PS_CHECK_NULL_VECTOR(y, NULL);
    859     PS_CHECK_EMPTY_VECTOR(y, NULL);
     858    PS_VECTOR_CHEC_NULL(y, NULL);
     859    PS_VECTOR_CHECK_EMPTY(y, NULL);
    860860    psVector *x64 = NULL;
    861861    psVector *y64 = NULL;
    … …  
    888888        CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
    889889    }
    890     PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
    891     PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
     890    PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);
     891    PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL);
    892892
    893893    // Call the appropriate vector fitting routine.
    … …  
    13191319                        psMinimizePowellFunc func)
    13201320{
    1321     PS_CHECK_NULL_VECTOR(params, NULL);
    1322     PS_CHECK_EMPTY_VECTOR(params, NULL);
     1321    PS_VECTOR_CHEC_NULL(params, NULL);
     1322    PS_VECTOR_CHECK_EMPTY(params, NULL);
    13231323    PS_PTR_CHECK_NULL(min, NULL);
    13241324    PS_PTR_CHECK_NULL(coords, NULL);
    … …  
    13631363        myParamMask = (psVector *) paramMask;
    13641364    }
    1365     PS_CHECK_VECTOR_SIZE_EQUAL(params, myParamMask, NULL);
     1365    PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL);
    13661366
    13671367    // 1: Set v[i] to be the unit vectors for each dimension in params

  • trunk/psLib/src/dataManip/psStats.c

    r2212 r2213  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 20:07:17 $
     11 *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 20:11:47 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    17461746
    17471747    if (mask != NULL) {
    1748         PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
    1749         PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
     1748        PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, NULL);
     1749        PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
    17501750    }
    17511751    // ************************************************************************

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

    r2212 r2213  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-10-27 20:07:17 $
     8 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-10-27 20:11:46 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    119119
    120120/** Preprocessor macro to generate error on an incorrect type */
    121 #define PS_CHECK_VECTOR_TYPE(NAME, TYPE, RVAL) \
     121#define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
    122122if (NAME->type.type != TYPE) { \
    123123    psError(__func__,"Unallowable operation: %s has incorrect type.", #NAME); \
    … …  
    126126
    127127/** Preprocessor macro to generate error on a NULL vector */
    128 #define PS_CHECK_NULL_VECTOR(NAME, RVAL) \
     128#define PS_VECTOR_CHEC_NULL(NAME, RVAL) \
    129129if (NAME == NULL || NAME->data.V == NULL) { \
    130130    psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
    … …  
    133133
    134134/** Preprocessor macro to generate error for zero length vector */
    135 #define PS_CHECK_EMPTY_VECTOR(NAME, RVAL) \
     135#define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \
    136136if (NAME->n < 1) { \
    137137    psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
    … …  
    140140
    141141/** Preprocessor macro to generate error on differing size vectors */
    142 #define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2, RVAL) \
     142#define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
    143143if (VEC1->n != VEC2->n) { \
    144144    psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    … …  
    146146}
    147147
    148 #define PS_PRINT_VECTOR(NAME) \
     148#define PS_VECTOR_PRINT(NAME) \
    149149for (int my_i=0;my_i<NAME->n;my_i++) { \
    150150    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \

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

    r2204 r2213  
    2020 *  @author Ross Harman, MHPCC
    2121 *   
    22  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    23  *  @date $Date: 2004-10-27 00:57:31 $
     22 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     23 *  @date $Date: 2004-10-27 20:11:47 $
    2424 *
    2525 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4242
    4343/** Preprocessor macro to generate error a NULL image */
    44 #define PS_CHECK_NULL_VECTOR(NAME, RETURN)                                                          \
     44#define PS_VECTOR_CHEC_NULL(NAME, RETURN)                                                          \
    4545if (NAME == NULL || NAME->data.V == NULL) {                                                         \
    4646    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
    … …  
    135135    PS_CHECK_SIZE_IMAGE(outImage, outImage);
    136136    PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type);
    137     PS_CHECK_NULL_VECTOR(outPerm, outImage);
     137    PS_VECTOR_CHEC_NULL(outPerm, outImage);
    138138    PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage);
    139139
    … …  
    181181    PS_CHECK_SIZE_IMAGE(inImage, outVector);
    182182    PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type);
    183     PS_CHECK_NULL_VECTOR(outVector, outVector);
     183    PS_VECTOR_CHEC_NULL(outVector, outVector);
    184184    PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector);
    185     PS_CHECK_NULL_VECTOR(inVector, outVector);
     185    PS_VECTOR_CHEC_NULL(inVector, outVector);
    186186    PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector);
    187     PS_CHECK_NULL_VECTOR(inPerm, outVector);
     187    PS_VECTOR_CHEC_NULL(inPerm, outVector);
    188188    PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector);
    189189
    … …  
    456456    }
    457457
    458     PS_CHECK_NULL_VECTOR(outVector, outVector);
     458    PS_VECTOR_CHEC_NULL(outVector, outVector);
    459459
    460460    // More checks
    … …  
    498498
    499499    // Error checks
    500     PS_CHECK_NULL_VECTOR(inVector, outImage);
     500    PS_VECTOR_CHEC_NULL(inVector, outImage);
    501501
    502502    if (inVector->type.dimen == PS_DIMEN_VECTOR) {

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

    r2212 r2213  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 20:07:17 $
     11 *  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 20:11:47 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    274274        CONVERT_VECTOR_F64_TO_F32(x, x32, x32Static);
    275275    }
    276     PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
    277     PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
     276    PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL);
     277    PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL);
    278278
    279279    if (y32->n != (1 + mySpline->n)) {
    … …  
    426426{
    427427    PS_PTR_CHECK_NULL(min, NULL);
    428     PS_CHECK_NULL_VECTOR(params, NULL);
    429     PS_CHECK_EMPTY_VECTOR(params, NULL);
     428    PS_VECTOR_CHEC_NULL(params, NULL);
     429    PS_VECTOR_CHECK_EMPTY(params, NULL);
    430430    PS_PTR_CHECK_NULL(x, NULL);
    431     PS_CHECK_NULL_VECTOR(y, NULL);
    432     PS_CHECK_EMPTY_VECTOR(y, NULL);
    433     PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
     431    PS_VECTOR_CHEC_NULL(y, NULL);
     432    PS_VECTOR_CHECK_EMPTY(y, NULL);
     433    PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL);
    434434    if (paramMask != NULL) {
    435         PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
     435        PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL);
    436436    }
    437437    if (yErr != NULL) {
    438         PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
     438        PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL);
    439439    }
    440440
    … …  
    856856    psPolynomial1D *tmpPoly;
    857857    PS_CHECK_NULL_POLY(myPoly, NULL);
    858     PS_CHECK_NULL_VECTOR(y, NULL);
    859     PS_CHECK_EMPTY_VECTOR(y, NULL);
     858    PS_VECTOR_CHEC_NULL(y, NULL);
     859    PS_VECTOR_CHECK_EMPTY(y, NULL);
    860860    psVector *x64 = NULL;
    861861    psVector *y64 = NULL;
    … …  
    888888        CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
    889889    }
    890     PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
    891     PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
     890    PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL);
     891    PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL);
    892892
    893893    // Call the appropriate vector fitting routine.
    … …  
    13191319                        psMinimizePowellFunc func)
    13201320{
    1321     PS_CHECK_NULL_VECTOR(params, NULL);
    1322     PS_CHECK_EMPTY_VECTOR(params, NULL);
     1321    PS_VECTOR_CHEC_NULL(params, NULL);
     1322    PS_VECTOR_CHECK_EMPTY(params, NULL);
    13231323    PS_PTR_CHECK_NULL(min, NULL);
    13241324    PS_PTR_CHECK_NULL(coords, NULL);
    … …  
    13631363        myParamMask = (psVector *) paramMask;
    13641364    }
    1365     PS_CHECK_VECTOR_SIZE_EQUAL(params, myParamMask, NULL);
     1365    PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL);
    13661366
    13671367    // 1: Set v[i] to be the unit vectors for each dimension in params

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

    r2212 r2213  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 20:07:17 $
     11 *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 20:11:47 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    17461746
    17471747    if (mask != NULL) {
    1748         PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
    1749         PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
     1748        PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, NULL);
     1749        PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
    17501750    }
    17511751    // ************************************************************************
Note: See TracChangeset for help on using the changeset viewer.