IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2208


Ignore:
Timestamp:
Oct 26, 2004, 3:21:01 PM (22 years ago)
Author:
gusciora
Message:

added PS_CHECK_VECTOR_SIZE_EQUAL() macro

Location:
trunk/psLib/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r2207 r2208  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-10-27 01:17:53 $
     8 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-10-27 01:21:01 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    121121} \
    122122
     123/** Preprocessor macro to generate error on differing size vectors */
     124#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2, RVAL) \
     125if (VEC1->n != VEC2->n) { \
     126    psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
     127    return(RVAL); \
     128}
    123129
    124130
    125 /** Preprocessor macro to generate error on differing size vectors */
    126 #define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(VEC1, VEC2) \
    127 if (VEC1->n != VEC2->n) { \
    128     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    129     return(NULL); \
    130 }
    131131
    132 /** Preprocessor macro to generate error on differing size vectors */
    133 #define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_F0(VEC1, VEC2) \
    134 if (VEC1->n != VEC2->n) { \
    135     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    136     return(0.0); \
    137 }
    138132
    139 /** Preprocessor macro to generate error on differing size vectors */
    140 #define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(VEC1, VEC2) \
    141 if (VEC1->n != VEC2->n) { \
    142     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    143     return(NULL); \
    144 }
     133
    145134
    146135/** Preprocessor macro to generate error on a NULL image */

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

    r2207 r2208  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 01:17:53 $
     11 *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 01:21:01 $
    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_RETURN_NULL(x32, y32);
    277     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr32, y32);
     276    PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
     277    PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
    278278
    279279    if (y32->n != (1 + mySpline->n)) {
    … …  
    431431    PS_CHECK_NULL_VECTOR(y, NULL);
    432432    PS_CHECK_EMPTY_VECTOR(y, NULL);
    433     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x, y);
     433    PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
    434434    if (paramMask != NULL) {
    435         PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, paramMask);
     435        PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
    436436    }
    437437    if (yErr != NULL) {
    438         PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(y, yErr);
     438        PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
    439439    }
    440440
    … …  
    888888        CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
    889889    }
    890     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x64, y64);
    891     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr64, y64);
     890    PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
     891    PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
    892892
    893893    // Call the appropriate vector fitting routine.
    … …  
    13631363        myParamMask = (psVector *) paramMask;
    13641364    }
    1365     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, myParamMask);
     1365    PS_CHECK_VECTOR_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

    r2206 r2208  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 01:15:47 $
     11 *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 01:21:01 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    17461746
    17471747    if (mask != NULL) {
    1748         PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(mask, in);
     1748        PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
    17491749        PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
    17501750    }

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

    r2207 r2208  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2004-10-27 01:17:53 $
     8 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2004-10-27 01:21:01 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    121121} \
    122122
     123/** Preprocessor macro to generate error on differing size vectors */
     124#define PS_CHECK_VECTOR_SIZE_EQUAL(VEC1, VEC2, RVAL) \
     125if (VEC1->n != VEC2->n) { \
     126    psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
     127    return(RVAL); \
     128}
    123129
    124130
    125 /** Preprocessor macro to generate error on differing size vectors */
    126 #define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(VEC1, VEC2) \
    127 if (VEC1->n != VEC2->n) { \
    128     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    129     return(NULL); \
    130 }
    131131
    132 /** Preprocessor macro to generate error on differing size vectors */
    133 #define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_F0(VEC1, VEC2) \
    134 if (VEC1->n != VEC2->n) { \
    135     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    136     return(0.0); \
    137 }
    138132
    139 /** Preprocessor macro to generate error on differing size vectors */
    140 #define PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(VEC1, VEC2) \
    141 if (VEC1->n != VEC2->n) { \
    142     psError(__func__,"Vector %s has size %d, Vector %s has size %d.", #VEC1, VEC1->n, #VEC2, VEC2->n); \
    143     return(NULL); \
    144 }
     133
    145134
    146135/** Preprocessor macro to generate error on a NULL image */

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

    r2207 r2208  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 01:17:53 $
     11 *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 01:21:01 $
    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_RETURN_NULL(x32, y32);
    277     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr32, y32);
     276    PS_CHECK_VECTOR_SIZE_EQUAL(x32, y32, NULL);
     277    PS_CHECK_VECTOR_SIZE_EQUAL(yErr32, y32, NULL);
    278278
    279279    if (y32->n != (1 + mySpline->n)) {
    … …  
    431431    PS_CHECK_NULL_VECTOR(y, NULL);
    432432    PS_CHECK_EMPTY_VECTOR(y, NULL);
    433     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x, y);
     433    PS_CHECK_VECTOR_SIZE_EQUAL(x, y, NULL);
    434434    if (paramMask != NULL) {
    435         PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, paramMask);
     435        PS_CHECK_VECTOR_SIZE_EQUAL(params, paramMask, NULL);
    436436    }
    437437    if (yErr != NULL) {
    438         PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(y, yErr);
     438        PS_CHECK_VECTOR_SIZE_EQUAL(y, yErr, NULL);
    439439    }
    440440
    … …  
    888888        CONVERT_VECTOR_F32_TO_F64(x, x64, x64Static);
    889889    }
    890     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x64, y64);
    891     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(yErr64, y64);
     890    PS_CHECK_VECTOR_SIZE_EQUAL(x64, y64, NULL);
     891    PS_CHECK_VECTOR_SIZE_EQUAL(yErr64, y64, NULL);
    892892
    893893    // Call the appropriate vector fitting routine.
    … …  
    13631363        myParamMask = (psVector *) paramMask;
    13641364    }
    1365     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(params, myParamMask);
     1365    PS_CHECK_VECTOR_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

    r2206 r2208  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-27 01:15:47 $
     11 *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-27 01:21:01 $
    1313 *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    17461746
    17471747    if (mask != NULL) {
    1748         PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(mask, in);
     1748        PS_CHECK_VECTOR_SIZE_EQUAL(mask, in, NULL);
    17491749        PS_CHECK_VECTOR_TYPE(mask, PS_TYPE_U8, NULL);
    17501750    }
Note: See TracChangeset for help on using the changeset viewer.