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/psConstants.h

    r4028 r4029  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-05-25 19:25:29 $
     8 *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-05-25 20:26:55 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5959*****************************************************************************/
    6060
    61 #define PS_INT_CHECK_EQUALS(NAME1, NAME2, RVAL) \
     61#define PS_ASSERT_INT_UNEQUAL(NAME1, NAME2, RVAL) \
    6262if (NAME1 == NAME2) { \
    6363    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    6767}
    6868
    69 #define PS_INT_CHECK_NON_EQUALS(NAME1, NAME2, RVAL) \
     69#define PS_ASSERT_INT_EQUAL(NAME1, NAME2, RVAL) \
    7070if (NAME1 != NAME2) { \
    7171    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    7676
    7777// Return an error if the arg is less than zero.
    78 #define PS_INT_CHECK_NEGATIVE(NAME, RVAL) \
     78#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \
    7979if (NAME < 0) { \
    8080    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    8686// XXX: This naming scheme is opposite most other macros.  This should be
    8787// corrected as soon as a fresh checkin/out can be performed.
    88 #define PS_INT_CHECK_NON_NEGATIVE(NAME, RVAL) \
     88#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \
    8989if (NAME < 0) { \
    9090    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    9696// XXX: This naming scheme is opposite most other macros.  This should be
    9797// corrected as soon as a fresh checkin/out can be performed.
    98 #define PS_INT_CHECK_POSITIVE(NAME, RVAL) \
     98#define PS_ASSERT_INT_POSITIVE(NAME, RVAL) \
    9999if (NAME < 1) { \
    100100    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    104104
    105105// Return an error if the arg is not equal to zero.
    106 #define PS_INT_CHECK_NON_ZERO(NAME, RVAL) \
     106#define PS_ASSERT_INT_ZERO(NAME, RVAL) \
    107107if (NAME != 0) { \
    108108    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    112112
    113113// Return an error if the arg is equal to zero.
    114 #define PS_INT_CHECK_ZERO(NAME, RVAL) \
     114#define PS_ASSERT_INT_NONZERO(NAME, RVAL) \
    115115if (NAME == 0) { \
    116116    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    120120
    121121// Return an error if the arg is lies outside the supplied range.
    122 #define PS_INT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \
     122#define PS_ASSERT_INT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
    123123if ((int)NAME < LOWER || (int)NAME > UPPER) { \
    124124    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    148148// Generate an error if the two floats are equal.
    149149// XXX: Inconsistent naming.
    150 #define PS_FLOAT_CHECK_NON_EQUAL(NAME1, NAME2, RVAL) \
     150#define PS_ASSERT_FLOAT_NON_EQUAL(NAME1, NAME2, RVAL) \
    151151if (fabs(NAME2 - NAME1) < FLT_EPSILON) { \
    152152    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    157157
    158158// Return an error if the arg is lies outside the supplied range.
    159 #define PS_FLOAT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \
     159#define PS_ASSERT_FLOAT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
    160160if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \
    161161    psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
    … …  
    169169the wrong type.
    170170*****************************************************************************/
    171 #define PS_PTR_CHECK_NULL(NAME, RVAL) PS_PTR_CHECK_NULL_GENERAL(NAME, return RVAL)
    172 #define PS_PTR_CHECK_NULL_GENERAL(NAME, CLEANUP) \
     171#define PS_ASSERT_PTR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, return RVAL)
     172#define PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, CLEANUP) \
    173173if (NAME == NULL) { \
    174174    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
    … …  
    178178}
    179179
    180 #define PS_PTR_CHECK_TYPE(NAME, TYPE, RVAL) \
     180#define PS_ASSERT_PTR_TYPE(NAME, TYPE, RVAL) \
    181181if (NAME->type.type != TYPE) { \
    182182    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    186186}
    187187
    188 #define PS_PTR_CHECK_DIMEN(NAME, DIMEN, RVAL) PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, return RVAL)
    189 #define PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, CLEANUP) \
     188#define PS_ASSERT_PTR_DIMEN(NAME, DIMEN, RVAL) PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, return RVAL)
     189#define PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, CLEANUP) \
    190190if (NAME->type.dimen != DIMEN) { \
    191191    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    195195}
    196196
    197 #define PS_PTR_CHECK_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \
     197#define PS_ASSERT_PTR_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \
    198198if (NAME->type.dimen == DIMEN) { \
    199199    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    204204
    205205
    206 #define PS_PTR_CHECK_SIZE_EQUAL(PTR1, PTR2, RVAL) \
     206#define PS_ASSERT_PTRS_SIZE_EQUAL(PTR1, PTR2, RVAL) \
    207207if (PTR1->n != PTR2->n) { \
    208208    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
    … …  
    212212}
    213213
    214 #define PS_PTR_CHECK_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL)
    215 
    216 #define PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \
     214#define PS_ASSERT_PTR_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL)
     215#define PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \
    217216if (PTR1->type.type != PTR2->type.type) { \
    218217    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    226225    PS_VECTOR macros:
    227226 *****************************************************************************/
    228 #define PS_VECTOR_CHECK_NULL(NAME, RVAL) PS_VECTOR_CHECK_NULL_GENERAL(NAME, return RVAL)
    229 #define PS_VECTOR_CHECK_NULL_GENERAL(NAME, CLEANUP) \
     227#define PS_ASSERT_VECTOR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, return RVAL)
     228#define PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, CLEANUP) \
    230229if (NAME == NULL || NAME->data.U8 == NULL) { \
    231230    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
    … …  
    235234} \
    236235
    237 #define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, return RVAL)
    238 #define PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \
     236#define PS_ASSERT_VECTOR_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, return RVAL)
     237#define PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, CLEANUP) \
    239238if (NAME->n < 1) { \
    240239    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
    … …  
    244243} \
    245244
    246 #define PS_VECTOR_CHECK_TYPE_F32_OR_F64(NAME, RVAL) \
     245#define PS_ASSERT_VECTOR_TYPE_F32_OR_F64(NAME, RVAL) \
    247246if ((NAME->type.type != PS_TYPE_F32) && (NAME->type.type != PS_TYPE_F64)) { \
    248247    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    252251} \
    253252
    254 #define PS_VECTOR_CHECK_TYPE_S16_S32_F32(NAME, RVAL) \
     253#define PS_ASSERT_VECTOR_TYPE_S16_S32_F32(NAME, RVAL) \
    255254if ((NAME->type.type != PS_TYPE_S16) && (NAME->type.type != PS_TYPE_S32) && (NAME->type.type != PS_TYPE_F32)) { \
    256255    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    260259} \
    261260
    262 #define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
     261#define PS_ASSERT_VECTOR_TYPE(NAME, TYPE, RVAL) \
    263262if (NAME->type.type != TYPE) { \
    264263    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    268267}
    269268
    270 #define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
     269#define PS_ASSERT_VECTORS_SIZE_EQUAL(VEC1, VEC2, RVAL) \
    271270if (VEC1->n != VEC2->n) { \
    272271    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
    … …  
    276275}
    277276
    278 #define PS_VECTOR_CHECK_TYPE_EQUAL(VEC1, VEC2, RVAL) \
     277#define PS_ASSERT_VECTOR_TYPE_EQUAL(VEC1, VEC2, RVAL) \
    279278if (VEC1->type.type != VEC2->type.type) { \
    280279    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
    … …  
    428427    PS_POLY macros:
    429428*****************************************************************************/
    430 #define PS_POLY_CHECK_NULL(NAME, RVAL) \
     429#define PS_ASSERT_POLY_NON_NULL(NAME, RVAL) \
    431430if (NAME == NULL || NAME->coeff == NULL) { \
    432431    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
    … …  
    436435} \
    437436
    438 #define PS_POLY_CHECK_TYPE(NAME, TYPE, RVAL) \
     437#define PS_ASSERT_POLY_TYPE(NAME, TYPE, RVAL) \
    439438if (NAME->type != TYPE) { \
    440439    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    508507    PS_IMAGE macros:
    509508*****************************************************************************/
    510 #define PS_IMAGE_CHECK_NULL(NAME, RVAL) PS_IMAGE_CHECK_NULL_GENERAL(NAME, return RVAL)
    511 #define PS_IMAGE_CHECK_NULL_GENERAL(NAME, CLEANUP) \
     509#define PS_ASSERT_IMAGE_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, return RVAL)
     510#define PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, CLEANUP) \
    512511if (NAME == NULL || NAME->data.V == NULL) { \
    513512    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
    … …  
    517516}
    518517
    519 #define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, return RVAL)
    520 #define PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \
     518#define PS_ASSERT_IMAGE_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, return RVAL)
     519#define PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, CLEANUP) \
    521520if (NAME->numCols < 1 || NAME->numRows < 1) { \
    522521    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
    … …  
    526525}
    527526
    528 #define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \
     527#define PS_ASSERT_IMAGE_TYPE(NAME, TYPE, RVAL) \
    529528if (NAME->type.type != TYPE) { \
    530529    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
    … …  
    534533}
    535534
    536 #define PS_IMAGE_CHECK_SIZE_EQUAL(NAME1, NAME2, RVAL) \
     535#define PS_ASSERT_IMAGES_SIZE_EQUAL(NAME1, NAME2, RVAL) \
    537536if ((NAME1->numCols != NAME2->numCols) || \
    538537        (NAME1->numRows != NAME2->numRows)) { \
    … …  
    543542}
    544543
    545 #define PS_IMAGE_CHECK_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \
     544#define PS_ASSERT_IMAGE_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \
    546545if ((NAME1->numCols != NUM_COLS) || \
    547546        (NAME1->numRows != NUM_ROWS)) { \
    … …  
    634633    PS_READOUT macros:
    635634*****************************************************************************/
    636 #define PS_READOUT_CHECK_NULL(NAME, RVAL) \
     635#define PS_ASSERT_READOUT_NON_NULL(NAME, RVAL) \
    637636if (NAME == NULL || NAME->image == NULL) { \
    638637    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
    … …  
    642641}
    643642
    644 #define PS_READOUT_CHECK_EMPTY(NAME, RVAL) \
     643#define PS_ASSERT_READOUT_NON_EMPTY(NAME, RVAL) \
    645644if (NAME->image->numCols < 1 || NAME->image->numRows < 1) { \
    646645    psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
    … …  
    649648}
    650649
    651 #define PS_READOUT_CHECK_TYPE(NAME, TYPE, RVAL) \
     650#define PS_ASSERT_READOUT_TYPE(NAME, TYPE, RVAL) \
    652651if (NAME->image->type.type != TYPE) { \
    653652    psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
Note: See TracChangeset for help on using the changeset viewer.