Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 4028) +++ /trunk/psLib/src/astro/psCoord.c (revision 4029) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-20 00:15:50 $ +* @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -94,7 +94,7 @@ psPlaneTransform *p_psPlaneTransformLinearInvert(psPlaneTransform *transform) { - PS_PTR_CHECK_NULL(transform, 0); - PS_PTR_CHECK_NULL(transform->x, 0); - PS_PTR_CHECK_NULL(transform->y, 0); + PS_ASSERT_PTR_NON_NULL(transform, 0); + PS_ASSERT_PTR_NON_NULL(transform->x, 0); + PS_ASSERT_PTR_NON_NULL(transform->y, 0); psF64 A = 0.0; @@ -160,7 +160,7 @@ psS32 p_psIsProjectionLinear(psPlaneTransform *transform) { - PS_PTR_CHECK_NULL(transform, 0); - PS_PTR_CHECK_NULL(transform->x, 0); - PS_PTR_CHECK_NULL(transform->y, 0); + PS_ASSERT_PTR_NON_NULL(transform, 0); + PS_ASSERT_PTR_NON_NULL(transform->x, 0); + PS_ASSERT_PTR_NON_NULL(transform->y, 0); for (psS32 i=0;i<(transform->x->nX);i++) { @@ -223,6 +223,6 @@ psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2) { - PS_INT_CHECK_NON_NEGATIVE(n1, NULL); - PS_INT_CHECK_NON_NEGATIVE(n2, NULL); + PS_ASSERT_INT_NONNEGATIVE(n1, NULL); + PS_ASSERT_INT_NONNEGATIVE(n2, NULL); psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform)); @@ -238,8 +238,8 @@ const psPlane* coords) { - PS_PTR_CHECK_NULL(transform, NULL); - PS_PTR_CHECK_NULL(transform->x, NULL); - PS_PTR_CHECK_NULL(transform->y, NULL); - PS_PTR_CHECK_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(transform, NULL); + PS_ASSERT_PTR_NON_NULL(transform->x, NULL); + PS_ASSERT_PTR_NON_NULL(transform->y, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); if (out == NULL) { @@ -267,8 +267,8 @@ psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4) { - PS_INT_CHECK_NON_NEGATIVE(n1, NULL); - PS_INT_CHECK_NON_NEGATIVE(n2, NULL); - PS_INT_CHECK_NON_NEGATIVE(n3, NULL); - PS_INT_CHECK_NON_NEGATIVE(n4, NULL); + PS_ASSERT_INT_NONNEGATIVE(n1, NULL); + PS_ASSERT_INT_NONNEGATIVE(n2, NULL); + PS_ASSERT_INT_NONNEGATIVE(n3, NULL); + PS_ASSERT_INT_NONNEGATIVE(n4, NULL); psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort)); @@ -290,8 +290,8 @@ float magnitude) { - PS_PTR_CHECK_NULL(transform, NULL); - PS_PTR_CHECK_NULL(transform->x, NULL); - PS_PTR_CHECK_NULL(transform->y, NULL); - PS_PTR_CHECK_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(transform, NULL); + PS_ASSERT_PTR_NON_NULL(transform->x, NULL); + PS_ASSERT_PTR_NON_NULL(transform->y, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); if (out == NULL) { @@ -364,6 +364,6 @@ const psSphere* coord) { - PS_PTR_CHECK_NULL(transform, NULL); - PS_PTR_CHECK_NULL(coord, NULL); + PS_ASSERT_PTR_NON_NULL(transform, NULL); + PS_ASSERT_PTR_NON_NULL(coord, NULL); if (out == NULL) { @@ -394,5 +394,5 @@ // Check for null parameter - PS_PTR_CHECK_NULL(time, NULL); + PS_ASSERT_PTR_NON_NULL(time, NULL); // Convert psTime to MJD @@ -427,5 +427,5 @@ // Check for null parameter - PS_PTR_CHECK_NULL(time, NULL); + PS_ASSERT_PTR_NON_NULL(time, NULL); // Convert psTime to MJD @@ -498,6 +498,6 @@ const psProjection* projection) { - PS_PTR_CHECK_NULL(coord, NULL); - PS_PTR_CHECK_NULL(projection, NULL); + PS_ASSERT_PTR_NON_NULL(coord, NULL); + PS_ASSERT_PTR_NON_NULL(projection, NULL); psF64 theta = 0.0; @@ -550,6 +550,6 @@ const psProjection* projection) { - PS_PTR_CHECK_NULL(coord, NULL); - PS_PTR_CHECK_NULL(projection, NULL); + PS_ASSERT_PTR_NON_NULL(coord, NULL); + PS_ASSERT_PTR_NON_NULL(projection, NULL); psF64 theta = 0.0; @@ -622,6 +622,6 @@ psSphereOffsetUnit unit) { - PS_PTR_CHECK_NULL(position1, NULL); - PS_PTR_CHECK_NULL(position2, NULL); + PS_ASSERT_PTR_NON_NULL(position1, NULL); + PS_ASSERT_PTR_NON_NULL(position2, NULL); // Check positions near 90 degree and issue warnings if necessary @@ -721,6 +721,6 @@ psSphereOffsetUnit unit) { - PS_PTR_CHECK_NULL(position, NULL); - PS_PTR_CHECK_NULL(offset, NULL); + PS_ASSERT_PTR_NON_NULL(position, NULL); + PS_ASSERT_PTR_NON_NULL(offset, NULL); psSphere* tmp; @@ -811,7 +811,7 @@ { // Check input for NULL pointers - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(fromTime, NULL); - PS_PTR_CHECK_NULL(toTime, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(fromTime, NULL); + PS_ASSERT_PTR_NON_NULL(toTime, NULL); // Calculate Julian centuries @@ -904,6 +904,6 @@ // XXX: This does not yet use region and nSamples: need to modify -rdd - PS_PTR_CHECK_NULL(trans1, NULL); - PS_PTR_CHECK_NULL(trans2, NULL); + PS_ASSERT_PTR_NON_NULL(trans1, NULL); + PS_ASSERT_PTR_NON_NULL(trans2, NULL); //TRACE: printf("psPlaneTransformCombine(%d, %d, %d, %d: %d, %d, %d, %d)\n", trans1->x->nX, trans1->x->nY, trans1->y->nX, trans1->y->nY, trans2->x->nX, trans2->x->nY, trans2->y->nX, trans2->y->nY); // @@ -1047,7 +1047,7 @@ float sigmaClip) { - PS_PTR_CHECK_NULL(trans, NULL); - PS_PTR_CHECK_NULL(source, NULL); - PS_PTR_CHECK_NULL(dest, NULL); + PS_ASSERT_PTR_NON_NULL(trans, NULL); + PS_ASSERT_PTR_NON_NULL(source, NULL); + PS_ASSERT_PTR_NON_NULL(dest, NULL); psS32 numCoords = PS_MIN(source->n, dest->n); @@ -1159,5 +1159,5 @@ int nSamples) { - PS_PTR_CHECK_NULL(in, NULL); + PS_ASSERT_PTR_NON_NULL(in, NULL); // // If the transform is linear, then invert it exactly and return. Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 4028) +++ /trunk/psLib/src/astro/psTime.c (revision 4029) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 22:02:15 $ + * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -178,5 +178,5 @@ } table = (psLookupTable*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(table,0.0); + PS_ASSERT_PTR_NON_NULL(table,0.0); // Attempt to interpolate table @@ -403,6 +403,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); if (time->type == type) { // time already right type. That was easy! @@ -448,6 +448,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Calculate TAI or UTC time based on type of time user passes @@ -519,6 +519,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); if(time->type != PS_TIME_TAI) { @@ -560,5 +560,5 @@ } dut = (psVector*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(dut,0.0); + PS_ASSERT_PTR_NON_NULL(dut,0.0); t = 2000.0 + (mjd - 51544.03)/365.2422; @@ -592,6 +592,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); if(time->type != PS_TIME_TAI) @@ -658,5 +658,5 @@ } xp = (psVector*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(xp,NULL); + PS_ASSERT_PTR_NON_NULL(xp,NULL); // Get yp @@ -667,5 +667,5 @@ } yp = (psVector*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(yp,NULL); + PS_ASSERT_PTR_NON_NULL(yp,NULL); // Calculate "a" and "c" constants @@ -715,6 +715,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Check time metadata @@ -733,5 +733,5 @@ } table = (psLookupTable*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(table,0); + PS_ASSERT_PTR_NON_NULL(table,0); // Determine Julian and modified Julian dates used in table lookup and time delta calculation @@ -767,8 +767,8 @@ // Error checks - PS_PTR_CHECK_NULL(time1,0); - PS_PTR_CHECK_NULL(time2,0); - PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0); - PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0); + PS_ASSERT_PTR_NON_NULL(time1,0); + PS_ASSERT_PTR_NON_NULL(time2,0); + PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0); + PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0); diff = abs((psS64)psTimeGetTAIDelta((psTime*)time1)-(psS64)psTimeGetTAIDelta((psTime*)time2)); @@ -781,6 +781,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Julian date conversion @@ -800,6 +800,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Modified Julian date conversion @@ -823,6 +823,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); tempString = psAlloc(MAX_TIME_STRING_LENGTH); @@ -856,6 +856,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,timevalTime); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,timevalTime); + PS_ASSERT_PTR_NON_NULL(time,timevalTime); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,timevalTime); timevalTime.tv_sec = time->sec; @@ -879,6 +879,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); seconds = time->sec%60; @@ -949,5 +949,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -975,5 +975,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -993,11 +993,11 @@ } - PS_INT_CHECK_NON_NEGATIVE(tmTime.tm_year, outTime); - PS_INT_CHECK_RANGE(tmTime.tm_mon,1,12,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_mday,1,31,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_hour,0,23,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_min,0,59,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_sec,0,59,outTime); - PS_INT_CHECK_RANGE(millisecond,0,999,outTime); + PS_ASSERT_INT_NONNEGATIVE(tmTime.tm_year, outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mon,1,12,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mday,1,31,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_hour,0,23,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_min,0,59,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_sec,0,59,outTime); + PS_ASSERT_INT_WITHIN_RANGE(millisecond,0,999,outTime); tmTime.tm_year -= 1900; @@ -1018,5 +1018,5 @@ // Error check - PS_PTR_CHECK_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); // Allocate psTime struct @@ -1028,5 +1028,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -1046,5 +1046,5 @@ // Error check - PS_PTR_CHECK_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); // Allocate psTime struct @@ -1087,5 +1087,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -1100,6 +1100,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); // Convert time to TAI if necessary, but without changing input arguments @@ -1120,5 +1120,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); // Convert result to same time type as input @@ -1142,8 +1142,8 @@ // Error checks - PS_PTR_CHECK_NULL(time1,0.0); - PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0.0); - PS_PTR_CHECK_NULL(time2,0.0); - PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0.0); + PS_ASSERT_PTR_NON_NULL(time1,0.0); + PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0.0); + PS_ASSERT_PTR_NON_NULL(time2,0.0); + PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0.0); // Convert time to TAI if necessary, but without changing input arguments Index: /trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.c (revision 4028) +++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 4029) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.65 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-19 00:17:05 $ + * @version $Revision: 1.66 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -41,5 +41,5 @@ psImage* tmpImage) { - PS_IMAGE_CHECK_NULL(tmpImage, 0); + PS_ASSERT_IMAGE_NON_NULL(tmpImage, 0); if ((x < 0.0) || (x > (double)tmpImage->numCols) || @@ -154,8 +154,8 @@ psS32 j; - PS_IMAGE_CHECK_NULL(x, NULL); - PS_IMAGE_CHECK_NULL(y, NULL); - PS_IMAGE_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_IMAGE_CHECK_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_IMAGE_NON_NULL(x, NULL); + PS_ASSERT_IMAGE_NON_NULL(y, NULL); + PS_ASSERT_IMAGE_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_IMAGE_TYPE(y, PS_TYPE_F64, NULL); tmp = (psFixedPattern *) psAlloc(sizeof(psFixedPattern)); @@ -211,5 +211,5 @@ const psObservatory* observatory) { - PS_PTR_CHECK_NULL(observatory, NULL); + PS_ASSERT_PTR_NON_NULL(observatory, NULL); psExposure* exp = psAlloc(sizeof(psExposure)); @@ -271,5 +271,5 @@ const psExposure* exp) { - PS_INT_CHECK_NON_NEGATIVE(nChips, NULL); + PS_ASSERT_INT_NONNEGATIVE(nChips, NULL); psFPA* newFPA = psAlloc(sizeof(psFPA)); @@ -315,5 +315,5 @@ psFPA *parentFPA) { - PS_INT_CHECK_NON_NEGATIVE(nCells, NULL); + PS_ASSERT_INT_NONNEGATIVE(nCells, NULL); psChip* chip = psAlloc(sizeof(psChip)); @@ -350,5 +350,5 @@ psChip* parentChip) { - PS_INT_CHECK_NON_NEGATIVE(nReadouts, NULL); + PS_ASSERT_INT_NONNEGATIVE(nReadouts, NULL); psCell* cell = psAlloc(sizeof(psCell)); @@ -406,5 +406,5 @@ psGrommit* psGrommitAlloc(const psExposure* exp) { - PS_PTR_CHECK_NULL(exp, NULL); + PS_ASSERT_PTR_NON_NULL(exp, NULL); double date = psTimeToMJD(exp->time); @@ -436,6 +436,6 @@ const psFPA* FPA) { - PS_PTR_CHECK_NULL(fpaCoord, NULL); - PS_PTR_CHECK_NULL(FPA, NULL); + PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL); + PS_ASSERT_PTR_NON_NULL(FPA, NULL); psChip* tmpChip = NULL; @@ -461,7 +461,7 @@ const psFPA* FPA) { - PS_PTR_CHECK_NULL(fpaCoord, NULL); - PS_PTR_CHECK_NULL(FPA, NULL); - PS_PTR_CHECK_NULL(FPA->chips, NULL); + PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL); + PS_ASSERT_PTR_NON_NULL(FPA, NULL); + PS_ASSERT_PTR_NON_NULL(FPA->chips, NULL); psArray* chips = FPA->chips; @@ -476,6 +476,6 @@ for (psS32 i = 0; i < nChips; i++) { psChip* tmpChip = chips->data[i]; - PS_PTR_CHECK_NULL(tmpChip, NULL); - PS_PTR_CHECK_NULL(tmpChip->fromFPA, NULL); + PS_ASSERT_PTR_NON_NULL(tmpChip, NULL); + PS_ASSERT_PTR_NON_NULL(tmpChip->fromFPA, NULL); psPlaneTransformApply(&chipCoord, tmpChip->fromFPA, fpaCoord); @@ -494,6 +494,6 @@ const psChip* chip) { - PS_PTR_CHECK_NULL(chipCoord, NULL); - PS_PTR_CHECK_NULL(chip, NULL); + PS_ASSERT_PTR_NON_NULL(chipCoord, NULL); + PS_ASSERT_PTR_NON_NULL(chip, NULL); psPlane cellCoord; @@ -511,6 +511,6 @@ for (psS32 i = 0; i < cells->n; i++) { psCell* tmpCell = (psCell* ) cells->data[i]; - PS_PTR_CHECK_NULL(tmpCell, NULL); - PS_PTR_CHECK_NULL(tmpCell->fromChip, NULL); + PS_ASSERT_PTR_NON_NULL(tmpCell, NULL); + PS_ASSERT_PTR_NON_NULL(tmpCell->fromChip, NULL); psArray* readouts = tmpCell->readouts; @@ -518,5 +518,5 @@ for (psS32 j = 0; j < readouts->n; j++) { psReadout* tmpReadout = readouts->data[j]; - PS_READOUT_CHECK_NULL(tmpReadout, NULL); + PS_ASSERT_READOUT_NON_NULL(tmpReadout, NULL); psPlaneTransformApply(&cellCoord, @@ -540,6 +540,6 @@ const psCell* cell) { - PS_PTR_CHECK_NULL(inCoord, NULL); - PS_PTR_CHECK_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(inCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); return (psPlaneTransformApply(outCoord, cell->toChip, inCoord)); @@ -550,6 +550,6 @@ const psChip* chip) { - PS_PTR_CHECK_NULL(inCoord, NULL); - PS_PTR_CHECK_NULL(chip, NULL); + PS_ASSERT_PTR_NON_NULL(inCoord, NULL); + PS_ASSERT_PTR_NON_NULL(chip, NULL); return (psPlaneTransformApply(outCoord, chip->toFPA, inCoord)); @@ -562,6 +562,6 @@ const psFPA* fpa) { - PS_PTR_CHECK_NULL(inCoord, NULL); - PS_PTR_CHECK_NULL(fpa, NULL); + PS_ASSERT_PTR_NON_NULL(inCoord, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); return(psPlaneDistortApply(outCoord, fpa->toTangentPlane, inCoord, @@ -576,6 +576,6 @@ const psGrommit* grommit) { - PS_PTR_CHECK_NULL(tpCoord, NULL); - PS_PTR_CHECK_NULL(grommit, NULL); + PS_ASSERT_PTR_NON_NULL(tpCoord, NULL); + PS_ASSERT_PTR_NON_NULL(grommit, NULL); double AOB = 0.0; @@ -596,6 +596,6 @@ const psCell* cell) { - PS_PTR_CHECK_NULL(cellCoord, NULL); - PS_PTR_CHECK_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cellCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); return (psPlaneTransformApply(fpaCoord, cell->toFPA, cellCoord)); @@ -608,11 +608,11 @@ const psCell* cell) { - PS_PTR_CHECK_NULL(cellCoord, NULL); - PS_PTR_CHECK_NULL(cell, NULL); - PS_PTR_CHECK_NULL(cell->toFPA, NULL); - PS_PTR_CHECK_NULL(cell->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent->toTangentPlane, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent->exposure, NULL); + PS_ASSERT_PTR_NON_NULL(cellCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->toFPA, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent->toTangentPlane, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent->exposure, NULL); psPlane* fpaCoord = NULL; @@ -645,10 +645,10 @@ const psCell* cell) { - PS_PTR_CHECK_NULL(cellCoord, NULL); - PS_PTR_CHECK_NULL(cell, NULL); - PS_PTR_CHECK_NULL(cell->toSky, NULL); - PS_PTR_CHECK_NULL(cell->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent->projection, NULL); + PS_ASSERT_PTR_NON_NULL(cellCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->toSky, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent->projection, NULL); if (cell->toSky) { // XXX: Should we use toTP or toSky? @@ -690,6 +690,6 @@ const psGrommit* grommit) { - PS_PTR_CHECK_NULL(in, NULL); - PS_PTR_CHECK_NULL(grommit, NULL); + PS_ASSERT_PTR_NON_NULL(in, NULL); + PS_ASSERT_PTR_NON_NULL(grommit, NULL); char* type = "RA"; @@ -711,7 +711,7 @@ const psFPA* fpa) { - PS_PTR_CHECK_NULL(tpCoord, NULL); - PS_PTR_CHECK_NULL(fpa, NULL); - PS_PTR_CHECK_NULL(fpa->fromTangentPlane, NULL); + PS_ASSERT_PTR_NON_NULL(tpCoord, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + PS_ASSERT_PTR_NON_NULL(fpa->fromTangentPlane, NULL); return (psPlaneDistortApply(fpaCoord, fpa->fromTangentPlane, @@ -723,7 +723,7 @@ const psChip* chip) { - PS_PTR_CHECK_NULL(fpaCoord, NULL); - PS_PTR_CHECK_NULL(chip, NULL); - PS_PTR_CHECK_NULL(chip->fromFPA, NULL); + PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL); + PS_ASSERT_PTR_NON_NULL(chip, NULL); + PS_ASSERT_PTR_NON_NULL(chip->fromFPA, NULL); chipCoord = psPlaneTransformApply(chipCoord, chip->fromFPA, fpaCoord); @@ -735,7 +735,7 @@ const psCell* cell) { - PS_PTR_CHECK_NULL(chipCoord, NULL); - PS_PTR_CHECK_NULL(cell, NULL); - PS_PTR_CHECK_NULL(cell->fromChip, NULL); + PS_ASSERT_PTR_NON_NULL(chipCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->fromChip, NULL); cellCoord = psPlaneTransformApply(cellCoord, cell->fromChip, chipCoord); @@ -749,9 +749,9 @@ const psCell* cell) { - PS_PTR_CHECK_NULL(skyCoord, NULL); - PS_PTR_CHECK_NULL(cell, NULL); - PS_PTR_CHECK_NULL(cell->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent->grommit, NULL); + PS_ASSERT_PTR_NON_NULL(skyCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent->grommit, NULL); psChip *parChip = cell->parent; @@ -783,10 +783,10 @@ const psCell* cell) { - PS_PTR_CHECK_NULL(skyCoord, NULL); - PS_PTR_CHECK_NULL(cell, NULL); - PS_PTR_CHECK_NULL(cell->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent, NULL); - PS_PTR_CHECK_NULL(cell->parent->parent->projection, NULL); - PS_PTR_CHECK_NULL(cell->toTP, NULL); + PS_ASSERT_PTR_NON_NULL(skyCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent->projection, NULL); + PS_ASSERT_PTR_NON_NULL(cell->toTP, NULL); if (cell->toSky) { // XXX: Should we use toTP or toSky? Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 4028) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 4029) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-20 00:15:50 $ +* @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -94,7 +94,7 @@ psPlaneTransform *p_psPlaneTransformLinearInvert(psPlaneTransform *transform) { - PS_PTR_CHECK_NULL(transform, 0); - PS_PTR_CHECK_NULL(transform->x, 0); - PS_PTR_CHECK_NULL(transform->y, 0); + PS_ASSERT_PTR_NON_NULL(transform, 0); + PS_ASSERT_PTR_NON_NULL(transform->x, 0); + PS_ASSERT_PTR_NON_NULL(transform->y, 0); psF64 A = 0.0; @@ -160,7 +160,7 @@ psS32 p_psIsProjectionLinear(psPlaneTransform *transform) { - PS_PTR_CHECK_NULL(transform, 0); - PS_PTR_CHECK_NULL(transform->x, 0); - PS_PTR_CHECK_NULL(transform->y, 0); + PS_ASSERT_PTR_NON_NULL(transform, 0); + PS_ASSERT_PTR_NON_NULL(transform->x, 0); + PS_ASSERT_PTR_NON_NULL(transform->y, 0); for (psS32 i=0;i<(transform->x->nX);i++) { @@ -223,6 +223,6 @@ psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2) { - PS_INT_CHECK_NON_NEGATIVE(n1, NULL); - PS_INT_CHECK_NON_NEGATIVE(n2, NULL); + PS_ASSERT_INT_NONNEGATIVE(n1, NULL); + PS_ASSERT_INT_NONNEGATIVE(n2, NULL); psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform)); @@ -238,8 +238,8 @@ const psPlane* coords) { - PS_PTR_CHECK_NULL(transform, NULL); - PS_PTR_CHECK_NULL(transform->x, NULL); - PS_PTR_CHECK_NULL(transform->y, NULL); - PS_PTR_CHECK_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(transform, NULL); + PS_ASSERT_PTR_NON_NULL(transform->x, NULL); + PS_ASSERT_PTR_NON_NULL(transform->y, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); if (out == NULL) { @@ -267,8 +267,8 @@ psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4) { - PS_INT_CHECK_NON_NEGATIVE(n1, NULL); - PS_INT_CHECK_NON_NEGATIVE(n2, NULL); - PS_INT_CHECK_NON_NEGATIVE(n3, NULL); - PS_INT_CHECK_NON_NEGATIVE(n4, NULL); + PS_ASSERT_INT_NONNEGATIVE(n1, NULL); + PS_ASSERT_INT_NONNEGATIVE(n2, NULL); + PS_ASSERT_INT_NONNEGATIVE(n3, NULL); + PS_ASSERT_INT_NONNEGATIVE(n4, NULL); psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort)); @@ -290,8 +290,8 @@ float magnitude) { - PS_PTR_CHECK_NULL(transform, NULL); - PS_PTR_CHECK_NULL(transform->x, NULL); - PS_PTR_CHECK_NULL(transform->y, NULL); - PS_PTR_CHECK_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(transform, NULL); + PS_ASSERT_PTR_NON_NULL(transform->x, NULL); + PS_ASSERT_PTR_NON_NULL(transform->y, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); if (out == NULL) { @@ -364,6 +364,6 @@ const psSphere* coord) { - PS_PTR_CHECK_NULL(transform, NULL); - PS_PTR_CHECK_NULL(coord, NULL); + PS_ASSERT_PTR_NON_NULL(transform, NULL); + PS_ASSERT_PTR_NON_NULL(coord, NULL); if (out == NULL) { @@ -394,5 +394,5 @@ // Check for null parameter - PS_PTR_CHECK_NULL(time, NULL); + PS_ASSERT_PTR_NON_NULL(time, NULL); // Convert psTime to MJD @@ -427,5 +427,5 @@ // Check for null parameter - PS_PTR_CHECK_NULL(time, NULL); + PS_ASSERT_PTR_NON_NULL(time, NULL); // Convert psTime to MJD @@ -498,6 +498,6 @@ const psProjection* projection) { - PS_PTR_CHECK_NULL(coord, NULL); - PS_PTR_CHECK_NULL(projection, NULL); + PS_ASSERT_PTR_NON_NULL(coord, NULL); + PS_ASSERT_PTR_NON_NULL(projection, NULL); psF64 theta = 0.0; @@ -550,6 +550,6 @@ const psProjection* projection) { - PS_PTR_CHECK_NULL(coord, NULL); - PS_PTR_CHECK_NULL(projection, NULL); + PS_ASSERT_PTR_NON_NULL(coord, NULL); + PS_ASSERT_PTR_NON_NULL(projection, NULL); psF64 theta = 0.0; @@ -622,6 +622,6 @@ psSphereOffsetUnit unit) { - PS_PTR_CHECK_NULL(position1, NULL); - PS_PTR_CHECK_NULL(position2, NULL); + PS_ASSERT_PTR_NON_NULL(position1, NULL); + PS_ASSERT_PTR_NON_NULL(position2, NULL); // Check positions near 90 degree and issue warnings if necessary @@ -721,6 +721,6 @@ psSphereOffsetUnit unit) { - PS_PTR_CHECK_NULL(position, NULL); - PS_PTR_CHECK_NULL(offset, NULL); + PS_ASSERT_PTR_NON_NULL(position, NULL); + PS_ASSERT_PTR_NON_NULL(offset, NULL); psSphere* tmp; @@ -811,7 +811,7 @@ { // Check input for NULL pointers - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(fromTime, NULL); - PS_PTR_CHECK_NULL(toTime, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(fromTime, NULL); + PS_ASSERT_PTR_NON_NULL(toTime, NULL); // Calculate Julian centuries @@ -904,6 +904,6 @@ // XXX: This does not yet use region and nSamples: need to modify -rdd - PS_PTR_CHECK_NULL(trans1, NULL); - PS_PTR_CHECK_NULL(trans2, NULL); + PS_ASSERT_PTR_NON_NULL(trans1, NULL); + PS_ASSERT_PTR_NON_NULL(trans2, NULL); //TRACE: printf("psPlaneTransformCombine(%d, %d, %d, %d: %d, %d, %d, %d)\n", trans1->x->nX, trans1->x->nY, trans1->y->nX, trans1->y->nY, trans2->x->nX, trans2->x->nY, trans2->y->nX, trans2->y->nY); // @@ -1047,7 +1047,7 @@ float sigmaClip) { - PS_PTR_CHECK_NULL(trans, NULL); - PS_PTR_CHECK_NULL(source, NULL); - PS_PTR_CHECK_NULL(dest, NULL); + PS_ASSERT_PTR_NON_NULL(trans, NULL); + PS_ASSERT_PTR_NON_NULL(source, NULL); + PS_ASSERT_PTR_NON_NULL(dest, NULL); psS32 numCoords = PS_MIN(source->n, dest->n); @@ -1159,5 +1159,5 @@ int nSamples) { - PS_PTR_CHECK_NULL(in, NULL); + PS_ASSERT_PTR_NON_NULL(in, NULL); // // If the transform is linear, then invert it exactly and return. Index: /trunk/psLib/src/astronomy/psTime.c =================================================================== --- /trunk/psLib/src/astronomy/psTime.c (revision 4028) +++ /trunk/psLib/src/astronomy/psTime.c (revision 4029) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 22:02:15 $ + * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -178,5 +178,5 @@ } table = (psLookupTable*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(table,0.0); + PS_ASSERT_PTR_NON_NULL(table,0.0); // Attempt to interpolate table @@ -403,6 +403,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); if (time->type == type) { // time already right type. That was easy! @@ -448,6 +448,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Calculate TAI or UTC time based on type of time user passes @@ -519,6 +519,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); if(time->type != PS_TIME_TAI) { @@ -560,5 +560,5 @@ } dut = (psVector*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(dut,0.0); + PS_ASSERT_PTR_NON_NULL(dut,0.0); t = 2000.0 + (mjd - 51544.03)/365.2422; @@ -592,6 +592,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); if(time->type != PS_TIME_TAI) @@ -658,5 +658,5 @@ } xp = (psVector*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(xp,NULL); + PS_ASSERT_PTR_NON_NULL(xp,NULL); // Get yp @@ -667,5 +667,5 @@ } yp = (psVector*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(yp,NULL); + PS_ASSERT_PTR_NON_NULL(yp,NULL); // Calculate "a" and "c" constants @@ -715,6 +715,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Check time metadata @@ -733,5 +733,5 @@ } table = (psLookupTable*)tableMetadataItem->data.V; - PS_PTR_CHECK_NULL(table,0); + PS_ASSERT_PTR_NON_NULL(table,0); // Determine Julian and modified Julian dates used in table lookup and time delta calculation @@ -767,8 +767,8 @@ // Error checks - PS_PTR_CHECK_NULL(time1,0); - PS_PTR_CHECK_NULL(time2,0); - PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0); - PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0); + PS_ASSERT_PTR_NON_NULL(time1,0); + PS_ASSERT_PTR_NON_NULL(time2,0); + PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0); + PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0); diff = abs((psS64)psTimeGetTAIDelta((psTime*)time1)-(psS64)psTimeGetTAIDelta((psTime*)time2)); @@ -781,6 +781,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Julian date conversion @@ -800,6 +800,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NAN); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NAN); + PS_ASSERT_PTR_NON_NULL(time,NAN); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NAN); // Modified Julian date conversion @@ -823,6 +823,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); tempString = psAlloc(MAX_TIME_STRING_LENGTH); @@ -856,6 +856,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,timevalTime); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,timevalTime); + PS_ASSERT_PTR_NON_NULL(time,timevalTime); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,timevalTime); timevalTime.tv_sec = time->sec; @@ -879,6 +879,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); seconds = time->sec%60; @@ -949,5 +949,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -975,5 +975,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -993,11 +993,11 @@ } - PS_INT_CHECK_NON_NEGATIVE(tmTime.tm_year, outTime); - PS_INT_CHECK_RANGE(tmTime.tm_mon,1,12,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_mday,1,31,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_hour,0,23,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_min,0,59,outTime); - PS_INT_CHECK_RANGE(tmTime.tm_sec,0,59,outTime); - PS_INT_CHECK_RANGE(millisecond,0,999,outTime); + PS_ASSERT_INT_NONNEGATIVE(tmTime.tm_year, outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mon,1,12,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_mday,1,31,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_hour,0,23,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_min,0,59,outTime); + PS_ASSERT_INT_WITHIN_RANGE(tmTime.tm_sec,0,59,outTime); + PS_ASSERT_INT_WITHIN_RANGE(millisecond,0,999,outTime); tmTime.tm_year -= 1900; @@ -1018,5 +1018,5 @@ // Error check - PS_PTR_CHECK_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); // Allocate psTime struct @@ -1028,5 +1028,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -1046,5 +1046,5 @@ // Error check - PS_PTR_CHECK_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); // Allocate psTime struct @@ -1087,5 +1087,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); return outTime; @@ -1100,6 +1100,6 @@ // Error checks - PS_PTR_CHECK_NULL(time,NULL); - PS_INT_CHECK_RANGE(time->nsec,0,1e9-1,NULL); + PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,1e9-1,NULL); // Convert time to TAI if necessary, but without changing input arguments @@ -1120,5 +1120,5 @@ // Error check - PS_INT_CHECK_RANGE(outTime->nsec,0,1e9-1,outTime); + PS_ASSERT_INT_WITHIN_RANGE(outTime->nsec,0,1e9-1,outTime); // Convert result to same time type as input @@ -1142,8 +1142,8 @@ // Error checks - PS_PTR_CHECK_NULL(time1,0.0); - PS_INT_CHECK_RANGE(time1->nsec,0,1e9-1,0.0); - PS_PTR_CHECK_NULL(time2,0.0); - PS_INT_CHECK_RANGE(time2->nsec,0,1e9-1,0.0); + PS_ASSERT_PTR_NON_NULL(time1,0.0); + PS_ASSERT_INT_WITHIN_RANGE(time1->nsec,0,1e9-1,0.0); + PS_ASSERT_PTR_NON_NULL(time2,0.0); + PS_ASSERT_INT_WITHIN_RANGE(time2->nsec,0,1e9-1,0.0); // Convert time to TAI if necessary, but without changing input arguments Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 4028) +++ /trunk/psLib/src/collections/psMetadata.c (revision 4029) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-16 19:43:53 $ +* @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -179,5 +179,5 @@ - PS_PTR_CHECK_NULL(name,NULL); + PS_ASSERT_PTR_NON_NULL(name,NULL); // Allocate metadata item @@ -275,9 +275,9 @@ psMetadataItem *existingEntry = NULL; - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->table,NULL); - PS_PTR_CHECK_NULL(md->list,NULL); - PS_PTR_CHECK_NULL(metadataItem,NULL); - PS_PTR_CHECK_NULL(metadataItem->name,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(metadataItem,NULL); + PS_ASSERT_PTR_NON_NULL(metadataItem->name,NULL); mdTable = md->table; @@ -410,10 +410,10 @@ psBool psMetadataRemove(psMetadata *md, psS32 where, const char *key) { - PS_PTR_CHECK_NULL(md,NULL); - - PS_PTR_CHECK_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + + PS_ASSERT_PTR_NON_NULL(md->list,NULL); psList* mdList = md->list; - PS_PTR_CHECK_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(md->table,NULL); psHash* mdTable = md->table; @@ -482,7 +482,7 @@ - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->table,NULL); - PS_PTR_CHECK_NULL(key,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(key,NULL); mdTable = md->table; @@ -583,6 +583,6 @@ psMetadataItem* entry = NULL; - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->list,NULL); entry = (psMetadataItem*) psListGet(md->list, where); @@ -599,6 +599,6 @@ const char* regex) { - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->list,NULL); psMetadataIterator* newIter = psAlloc(sizeof(psMetadataIterator)); @@ -637,8 +637,8 @@ psMetadataItem* cursor; - PS_PTR_CHECK_NULL(iterator,NULL); + PS_ASSERT_PTR_NON_NULL(iterator,NULL); psListIterator* iter = iterator->iter; - PS_PTR_CHECK_NULL(iterator->iter,NULL); + PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL); regex_t* preg = iterator->preg; @@ -686,8 +686,8 @@ psMetadataItem* oldValue; - PS_PTR_CHECK_NULL(iterator,NULL); + PS_ASSERT_PTR_NON_NULL(iterator,NULL); psListIterator* iter = iterator->iter; - PS_PTR_CHECK_NULL(iterator->iter,NULL); + PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL); regex_t* preg = iterator->preg; @@ -714,8 +714,8 @@ psMetadataItem* oldValue; - PS_PTR_CHECK_NULL(iterator,NULL); + PS_ASSERT_PTR_NON_NULL(iterator,NULL); psListIterator* iter = iterator->iter; - PS_PTR_CHECK_NULL(iterator->iter,NULL); + PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL); regex_t* preg = iterator->preg; Index: /trunk/psLib/src/collections/psMetadataIO.c =================================================================== --- /trunk/psLib/src/collections/psMetadataIO.c (revision 4028) +++ /trunk/psLib/src/collections/psMetadataIO.c (revision 4029) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 20:48:28 $ +* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -368,7 +368,7 @@ psBool success = true; - PS_PTR_CHECK_NULL(fd, success); - PS_PTR_CHECK_NULL(format, success); - PS_PTR_CHECK_NULL(metadataItem, success); + PS_ASSERT_PTR_NON_NULL(fd, success); + PS_ASSERT_PTR_NON_NULL(format, success); + PS_ASSERT_PTR_NON_NULL(metadataItem, success); type = metadataItem->type; @@ -469,5 +469,5 @@ fitsfile *fd = NULL; - PS_PTR_CHECK_NULL(fileName,NULL); + PS_ASSERT_PTR_NON_NULL(fileName,NULL); fits_open_file(&fd, fileName, READONLY, &status); @@ -1086,8 +1086,8 @@ // Check for NULL file name - PS_PTR_CHECK_NULL(fileName,NULL); + PS_ASSERT_PTR_NON_NULL(fileName,NULL); // Check for NULL nFail - PS_PTR_CHECK_NULL(nFail,NULL); + PS_ASSERT_PTR_NON_NULL(nFail,NULL); // Attempt to open specified file @@ -1156,9 +1156,9 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems @@ -1173,5 +1173,5 @@ psHashAdd(htAtts, "tagName", psTagName); } else { - PS_PTR_CHECK_NULL_GENERAL(psTagName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psTagName, return); psFree(htAtts); psFree(psTagName); @@ -1193,5 +1193,5 @@ psFree(psAttValue); } else { - PS_PTR_CHECK_NULL_GENERAL(psAttValue, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psAttValue, return); psFree(htAtts); psFree(psTagName); @@ -1237,17 +1237,17 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); metadataItem = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(metadataItem, return); - PS_PTR_CHECK_NULL_GENERAL(metadataItem->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem->data.list, return); metadataItem = (psMetadataItem*)psListGet(metadataItem->data.list,PS_LIST_TAIL); htAtts = (psHash*)metadataItem->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); fileName = (char*)input->filename; - PS_PTR_CHECK_NULL_GENERAL(fileName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return); lineNumber = input->line; @@ -1386,17 +1386,17 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); tables = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(tables, return); - PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return); table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL); htAtts = (psHash*)table->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); fileName = (char*)input->filename; - PS_PTR_CHECK_NULL_GENERAL(fileName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return); lineNumber = input->line; @@ -1427,5 +1427,5 @@ strValue = psHashLookup(htAtts, "value"); - PS_PTR_CHECK_NULL_GENERAL(strValue, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(strValue, return); @@ -1482,15 +1482,15 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); tables = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(tables, return); - PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return); table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL); htAtts = (psHash*)table->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems @@ -1499,5 +1499,5 @@ // Compare start and end tag names psStartTagName = psHashLookup(htAtts, "tagName"); - PS_PTR_CHECK_NULL_GENERAL(psStartTagName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psStartTagName, return); if(strcmp(psEndTagName, psStartTagName)) { psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_TAG_MISMATCH, psStartTagName, psEndTagName); @@ -1527,5 +1527,5 @@ // Error checks - PS_PTR_CHECK_NULL(fileName, NULL); + PS_ASSERT_PTR_NON_NULL(fileName, NULL); // Allocate metadata if necessary Index: /trunk/psLib/src/dataManip/psBinaryOp.c =================================================================== --- /trunk/psLib/src/dataManip/psBinaryOp.c (revision 4028) +++ /trunk/psLib/src/dataManip/psBinaryOp.c (revision 4029) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-10 02:36:41 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -439,12 +439,12 @@ } - PS_PTR_CHECK_NULL_GENERAL(input1, psBinaryOp_EXIT); - PS_PTR_CHECK_NULL_GENERAL(input2, psBinaryOp_EXIT); - PS_PTR_CHECK_NULL_GENERAL(op, psBinaryOp_EXIT); - - PS_PTR_CHECK_TYPE_EQUAL_GENERAL(input1,input2, psBinaryOp_EXIT); - - PS_PTR_CHECK_DIMEN_GENERAL_NOT(input1, PS_DIMEN_OTHER, psBinaryOp_EXIT); - PS_PTR_CHECK_DIMEN_GENERAL_NOT(input2, PS_DIMEN_OTHER, psBinaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(input1, psBinaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(input2, psBinaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(op, psBinaryOp_EXIT); + + PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(input1,input2, psBinaryOp_EXIT); + + PS_ASSERT_PTR_DIMEN_GENERAL_NOT(input1, PS_DIMEN_OTHER, psBinaryOp_EXIT); + PS_ASSERT_PTR_DIMEN_GENERAL_NOT(input2, PS_DIMEN_OTHER, psBinaryOp_EXIT); psType* psType1 = (psType*)in1; Index: /trunk/psLib/src/dataManip/psConstants.h =================================================================== --- /trunk/psLib/src/dataManip/psConstants.h (revision 4028) +++ /trunk/psLib/src/dataManip/psConstants.h (revision 4029) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 19:25:29 $ + * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ *****************************************************************************/ -#define PS_INT_CHECK_EQUALS(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_INT_UNEQUAL(NAME1, NAME2, RVAL) \ if (NAME1 == NAME2) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -67,5 +67,5 @@ } -#define PS_INT_CHECK_NON_EQUALS(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_INT_EQUAL(NAME1, NAME2, RVAL) \ if (NAME1 != NAME2) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -76,5 +76,5 @@ // Return an error if the arg is less than zero. -#define PS_INT_CHECK_NEGATIVE(NAME, RVAL) \ +#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \ if (NAME < 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -86,5 +86,5 @@ // XXX: This naming scheme is opposite most other macros. This should be // corrected as soon as a fresh checkin/out can be performed. -#define PS_INT_CHECK_NON_NEGATIVE(NAME, RVAL) \ +#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \ if (NAME < 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -96,5 +96,5 @@ // XXX: This naming scheme is opposite most other macros. This should be // corrected as soon as a fresh checkin/out can be performed. -#define PS_INT_CHECK_POSITIVE(NAME, RVAL) \ +#define PS_ASSERT_INT_POSITIVE(NAME, RVAL) \ if (NAME < 1) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -104,5 +104,5 @@ // Return an error if the arg is not equal to zero. -#define PS_INT_CHECK_NON_ZERO(NAME, RVAL) \ +#define PS_ASSERT_INT_ZERO(NAME, RVAL) \ if (NAME != 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -112,5 +112,5 @@ // Return an error if the arg is equal to zero. -#define PS_INT_CHECK_ZERO(NAME, RVAL) \ +#define PS_ASSERT_INT_NONZERO(NAME, RVAL) \ if (NAME == 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -120,5 +120,5 @@ // Return an error if the arg is lies outside the supplied range. -#define PS_INT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ +#define PS_ASSERT_INT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((int)NAME < LOWER || (int)NAME > UPPER) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -148,5 +148,5 @@ // Generate an error if the two floats are equal. // XXX: Inconsistent naming. -#define PS_FLOAT_CHECK_NON_EQUAL(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_FLOAT_NON_EQUAL(NAME1, NAME2, RVAL) \ if (fabs(NAME2 - NAME1) < FLT_EPSILON) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -157,5 +157,5 @@ // Return an error if the arg is lies outside the supplied range. -#define PS_FLOAT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ +#define PS_ASSERT_FLOAT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -169,6 +169,6 @@ the wrong type. *****************************************************************************/ -#define PS_PTR_CHECK_NULL(NAME, RVAL) PS_PTR_CHECK_NULL_GENERAL(NAME, return RVAL) -#define PS_PTR_CHECK_NULL_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_PTR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, return RVAL) +#define PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, CLEANUP) \ if (NAME == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -178,5 +178,5 @@ } -#define PS_PTR_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_PTR_TYPE(NAME, TYPE, RVAL) \ if (NAME->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -186,6 +186,6 @@ } -#define PS_PTR_CHECK_DIMEN(NAME, DIMEN, RVAL) PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, return RVAL) -#define PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, CLEANUP) \ +#define PS_ASSERT_PTR_DIMEN(NAME, DIMEN, RVAL) PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, return RVAL) +#define PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, CLEANUP) \ if (NAME->type.dimen != DIMEN) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -195,5 +195,5 @@ } -#define PS_PTR_CHECK_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \ +#define PS_ASSERT_PTR_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \ if (NAME->type.dimen == DIMEN) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -204,5 +204,5 @@ -#define PS_PTR_CHECK_SIZE_EQUAL(PTR1, PTR2, RVAL) \ +#define PS_ASSERT_PTRS_SIZE_EQUAL(PTR1, PTR2, RVAL) \ if (PTR1->n != PTR2->n) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -212,7 +212,6 @@ } -#define PS_PTR_CHECK_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL) - -#define PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \ +#define PS_ASSERT_PTR_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL) +#define PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \ if (PTR1->type.type != PTR2->type.type) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -226,6 +225,6 @@ PS_VECTOR macros: *****************************************************************************/ -#define PS_VECTOR_CHECK_NULL(NAME, RVAL) PS_VECTOR_CHECK_NULL_GENERAL(NAME, return RVAL) -#define PS_VECTOR_CHECK_NULL_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_VECTOR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, return RVAL) +#define PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, CLEANUP) \ if (NAME == NULL || NAME->data.U8 == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -235,6 +234,6 @@ } \ -#define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, return RVAL) -#define PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_VECTOR_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, return RVAL) +#define PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, CLEANUP) \ if (NAME->n < 1) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -244,5 +243,5 @@ } \ -#define PS_VECTOR_CHECK_TYPE_F32_OR_F64(NAME, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE_F32_OR_F64(NAME, RVAL) \ if ((NAME->type.type != PS_TYPE_F32) && (NAME->type.type != PS_TYPE_F64)) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -252,5 +251,5 @@ } \ -#define PS_VECTOR_CHECK_TYPE_S16_S32_F32(NAME, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE_S16_S32_F32(NAME, RVAL) \ if ((NAME->type.type != PS_TYPE_S16) && (NAME->type.type != PS_TYPE_S32) && (NAME->type.type != PS_TYPE_F32)) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -260,5 +259,5 @@ } \ -#define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE(NAME, TYPE, RVAL) \ if (NAME->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -268,5 +267,5 @@ } -#define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \ +#define PS_ASSERT_VECTORS_SIZE_EQUAL(VEC1, VEC2, RVAL) \ if (VEC1->n != VEC2->n) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -276,5 +275,5 @@ } -#define PS_VECTOR_CHECK_TYPE_EQUAL(VEC1, VEC2, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE_EQUAL(VEC1, VEC2, RVAL) \ if (VEC1->type.type != VEC2->type.type) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -428,5 +427,5 @@ PS_POLY macros: *****************************************************************************/ -#define PS_POLY_CHECK_NULL(NAME, RVAL) \ +#define PS_ASSERT_POLY_NON_NULL(NAME, RVAL) \ if (NAME == NULL || NAME->coeff == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -436,5 +435,5 @@ } \ -#define PS_POLY_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_POLY_TYPE(NAME, TYPE, RVAL) \ if (NAME->type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -508,6 +507,6 @@ PS_IMAGE macros: *****************************************************************************/ -#define PS_IMAGE_CHECK_NULL(NAME, RVAL) PS_IMAGE_CHECK_NULL_GENERAL(NAME, return RVAL) -#define PS_IMAGE_CHECK_NULL_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_IMAGE_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, return RVAL) +#define PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, CLEANUP) \ if (NAME == NULL || NAME->data.V == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -517,6 +516,6 @@ } -#define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, return RVAL) -#define PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_IMAGE_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, return RVAL) +#define PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, CLEANUP) \ if (NAME->numCols < 1 || NAME->numRows < 1) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -526,5 +525,5 @@ } -#define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_IMAGE_TYPE(NAME, TYPE, RVAL) \ if (NAME->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -534,5 +533,5 @@ } -#define PS_IMAGE_CHECK_SIZE_EQUAL(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_IMAGES_SIZE_EQUAL(NAME1, NAME2, RVAL) \ if ((NAME1->numCols != NAME2->numCols) || \ (NAME1->numRows != NAME2->numRows)) { \ @@ -543,5 +542,5 @@ } -#define PS_IMAGE_CHECK_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \ +#define PS_ASSERT_IMAGE_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \ if ((NAME1->numCols != NUM_COLS) || \ (NAME1->numRows != NUM_ROWS)) { \ @@ -634,5 +633,5 @@ PS_READOUT macros: *****************************************************************************/ -#define PS_READOUT_CHECK_NULL(NAME, RVAL) \ +#define PS_ASSERT_READOUT_NON_NULL(NAME, RVAL) \ if (NAME == NULL || NAME->image == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -642,5 +641,5 @@ } -#define PS_READOUT_CHECK_EMPTY(NAME, RVAL) \ +#define PS_ASSERT_READOUT_NON_EMPTY(NAME, RVAL) \ if (NAME->image->numCols < 1 || NAME->image->numRows < 1) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -649,5 +648,5 @@ } -#define PS_READOUT_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_READOUT_TYPE(NAME, TYPE, RVAL) \ if (NAME->image->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 4028) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 4029) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -246,5 +246,5 @@ static psPolynomial1D **createChebyshevPolys(psS32 maxChebyPoly) { - PS_INT_CHECK_NON_NEGATIVE(maxChebyPoly, NULL); + PS_ASSERT_INT_NONNEGATIVE(maxChebyPoly, NULL); psPolynomial1D **chebPolys = NULL; @@ -314,5 +314,5 @@ static psF32 chebPolynomial1DEval(psF32 x, const psPolynomial1D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); // XXX: Create a macro for this in psConstants.h if (myPoly->n < 1) { @@ -398,5 +398,5 @@ const psPolynomial2D* myPoly) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); psS32 loop_x = 0; @@ -422,7 +422,7 @@ static psF32 chebPolynomial2DEval(psF32 x, psF32 y, const psPolynomial2D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); psS32 loop_x = 0; @@ -487,7 +487,7 @@ static psF32 chebPolynomial3DEval(psF32 x, psF32 y, psF32 z, const psPolynomial3D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -565,8 +565,8 @@ static psF32 chebPolynomial4DEval(psF32 w, psF32 x, psF32 y, psF32 z, const psPolynomial4D* myPoly) { - PS_FLOAT_CHECK_RANGE(w, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(w, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_w = 0; psS32 loop_x = 0; @@ -638,5 +638,5 @@ static psF64 dChebPolynomial1DEval(psF64 x, const psDPolynomial1D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); psVector *d; psS32 n; @@ -697,6 +697,6 @@ static psF64 dChebPolynomial2DEval(psF64 x, psF64 y, const psDPolynomial2D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -761,7 +761,7 @@ static psF64 dChebPolynomial3DEval(psF64 x, psF64 y, psF64 z, const psDPolynomial3D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -839,8 +839,8 @@ static psF64 dChebPolynomial4DEval(psF64 w, psF64 x, psF64 y, psF64 z, const psDPolynomial4D* myPoly) { - PS_FLOAT_CHECK_RANGE(w, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(w, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_w = 0; psS32 loop_x = 0; @@ -973,6 +973,6 @@ psF32 x) { - PS_PTR_CHECK_NULL(domain, NAN) - PS_PTR_CHECK_NULL(range, NAN) + PS_ASSERT_PTR_NON_NULL(domain, NAN) + PS_ASSERT_PTR_NON_NULL(range, NAN) // XXX: Check valid values for n, order, and x? @@ -1044,5 +1044,5 @@ psVector* p_psGaussianDev(psF32 mean, psF32 sigma, psS32 Npts) { - PS_INT_CHECK_NON_NEGATIVE(Npts, NULL); + PS_ASSERT_INT_NONNEGATIVE(Npts, NULL); psVector* gauss = NULL; @@ -1072,5 +1072,5 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); psS32 i = 0; @@ -1097,6 +1097,6 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); psS32 x = 0; @@ -1133,7 +1133,7 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 x = 0; @@ -1179,8 +1179,8 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nW, NULL); - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nW, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 w = 0; @@ -1234,5 +1234,5 @@ psF32 psPolynomial1DEval(const psPolynomial1D* myPoly, psF32 x) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1251,7 +1251,7 @@ const psVector *x) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); psVector *tmp; @@ -1267,5 +1267,5 @@ psF32 psPolynomial2DEval(const psPolynomial2D* myPoly, psF32 x, psF32 y) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1286,9 +1286,9 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); psVector *tmp; @@ -1314,5 +1314,5 @@ psF32 psPolynomial3DEval(const psPolynomial3D* myPoly, psF32 x, psF32 y, psF32 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1334,11 +1334,11 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL); psVector *tmp; @@ -1370,5 +1370,5 @@ psF32 psPolynomial4DEval(const psPolynomial4D* myPoly, psF32 w, psF32 x, psF32 y, psF32 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1390,13 +1390,13 @@ const psVector *z) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(w, NULL); - PS_VECTOR_CHECK_TYPE(w, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(w, NULL); + PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL); psVector *tmp; @@ -1434,5 +1434,5 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); psS32 i = 0; @@ -1459,6 +1459,6 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); psS32 x = 0; @@ -1495,7 +1495,7 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 x = 0; @@ -1541,8 +1541,8 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nW, NULL); - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nW, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 w = 0; @@ -1597,5 +1597,5 @@ psF64 psDPolynomial1DEval(const psDPolynomial1D* myPoly, psF64 x) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1615,7 +1615,7 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); psVector *tmp; @@ -1635,5 +1635,5 @@ psF64 y) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1653,9 +1653,9 @@ const psVector *y) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); psVector *tmp; @@ -1685,5 +1685,5 @@ psF64 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1705,11 +1705,11 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F64, NULL); psVector *tmp; @@ -1745,5 +1745,5 @@ psF64 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1765,13 +1765,13 @@ const psVector *z) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(w, NULL); - PS_VECTOR_CHECK_TYPE(w, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(w, NULL); + PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F64, NULL); psVector *tmp; @@ -1828,7 +1828,7 @@ psF32 max) { - PS_INT_CHECK_NON_NEGATIVE(numSplines, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); - PS_FLOAT_CHECK_NON_EQUAL(max, min, NULL); + PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); + PS_ASSERT_FLOAT_NON_EQUAL(max, min, NULL); psSpline1D *tmp = NULL; @@ -1870,7 +1870,7 @@ psS32 order) { - PS_VECTOR_CHECK_NULL(bounds, NULL); - PS_VECTOR_CHECK_EMPTY(bounds, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); + PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(bounds, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); psSpline1D *tmp = NULL; @@ -1983,8 +1983,8 @@ psScalar *x) { - PS_VECTOR_CHECK_NULL(bins, -4); - PS_VECTOR_CHECK_EMPTY(bins, -4); - PS_PTR_CHECK_NULL(x, -6); - PS_PTR_CHECK_TYPE_EQUAL(x, bins, -3); + PS_ASSERT_VECTOR_NON_NULL(bins, -4); + PS_ASSERT_VECTOR_NON_EMPTY(bins, -4); + PS_ASSERT_PTR_NON_NULL(x, -6); + PS_ASSERT_PTR_TYPE_EQUAL(x, bins, -3); char* strType; @@ -2049,11 +2049,11 @@ psScalar *x) { - PS_VECTOR_CHECK_NULL(domain, NULL); - PS_VECTOR_CHECK_NULL(range, NULL); - PS_PTR_CHECK_NULL(x, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(domain, range, NULL); - PS_PTR_CHECK_TYPE_EQUAL(domain, range, NULL); - PS_PTR_CHECK_TYPE_EQUAL(domain, x, NULL); + PS_ASSERT_VECTOR_NON_NULL(domain, NULL); + PS_ASSERT_VECTOR_NON_NULL(range, NULL); + PS_ASSERT_PTR_NON_NULL(x, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(domain, range, NULL); + PS_ASSERT_PTR_TYPE_EQUAL(domain, range, NULL); + PS_ASSERT_PTR_TYPE_EQUAL(domain, x, NULL); psVector *range32 = NULL; @@ -2131,7 +2131,7 @@ ) { - PS_PTR_CHECK_NULL(spline, NAN); - PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NAN); + PS_ASSERT_PTR_NON_NULL(spline, NAN); + PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NAN); psS32 binNum; @@ -2167,8 +2167,8 @@ ) { - PS_PTR_CHECK_NULL(spline, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(spline, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL); psS32 i; Index: /trunk/psLib/src/dataManip/psMatrix.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrix.c (revision 4028) +++ /trunk/psLib/src/dataManip/psMatrix.c (revision 4029) @@ -21,6 +21,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 02:29:39 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -188,8 +188,8 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, psMatrixLUD_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, psMatrixLUD_EXIT); PS_CHECK_POINTERS(inImage, outImage, psMatrixLUD_EXIT); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, psMatrixLUD_EXIT); - PS_PTR_CHECK_NULL_GENERAL(outPerm, psMatrixLUD_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(outPerm, psMatrixLUD_EXIT); outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type); @@ -247,10 +247,10 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, LUSOLVE_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, LUSOLVE_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, LUSOLVE_CLEANUP); - PS_VECTOR_CHECK_NULL_GENERAL(inVector, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_NULL(inVector, LUSOLVE_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, LUSOLVE_CLEANUP); - PS_VECTOR_CHECK_NULL_GENERAL(inPerm, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_NULL(inPerm, LUSOLVE_CLEANUP); outVector = psVectorRecycle(outVector, inImage->numRows, inImage->type.type); @@ -300,9 +300,9 @@ #define INVERT_CLEANUP { psFree(outImage); return NULL; } // Error checks - PS_PTR_CHECK_NULL_GENERAL(det, INVERT_CLEANUP); - PS_IMAGE_CHECK_NULL_GENERAL(inImage, INVERT_CLEANUP); + PS_ASSERT_GENERAL_PTR_NON_NULL(det, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, INVERT_CLEANUP); PS_CHECK_POINTERS(inImage, outImage, INVERT_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, INVERT_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, INVERT_CLEANUP); outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type); @@ -348,7 +348,7 @@ #define DETERMINANT_EXIT { return NULL; } // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, DETERMINANT_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, DETERMINANT_EXIT); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, DETERMINANT_EXIT); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, DETERMINANT_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, DETERMINANT_EXIT); PS_CHECK_SQUARE(inImage, DETERMINANT_EXIT); @@ -383,8 +383,8 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage1, MULTIPLY_CLEANUP); - PS_IMAGE_CHECK_NULL_GENERAL(inImage2, MULTIPLY_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage1, MULTIPLY_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage2, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage1, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage2, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage1, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage2, MULTIPLY_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, MULTIPLY_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage2, PS_DIMEN_IMAGE, MULTIPLY_CLEANUP); @@ -435,7 +435,7 @@ #define TRANSPOSE_CLEANUP { psFree(outImage); return NULL; } // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, TRANSPOSE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, TRANSPOSE_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, TRANSPOSE_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, TRANSPOSE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, TRANSPOSE_CLEANUP); PS_CHECK_POINTERS(inImage, outImage, TRANSPOSE_CLEANUP); @@ -481,7 +481,7 @@ #define EIGENVECTORS_CLEANUP { psFree(outImage); return NULL; } // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, EIGENVECTORS_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, EIGENVECTORS_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, EIGENVECTORS_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, EIGENVECTORS_CLEANUP); PS_CHECK_POINTERS(inImage, outImage, EIGENVECTORS_CLEANUP); @@ -526,7 +526,7 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, psMatrixToVector_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, psMatrixToVector_EXIT); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, psMatrixToVector_EXIT); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, psMatrixToVector_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, psMatrixToVector_EXIT); if (inImage->numRows == 1) { @@ -589,9 +589,9 @@ #define VECTORTOMATRIX_CLEANUP {psFree(outImage); return NULL; } // Error checks - PS_VECTOR_CHECK_NULL_GENERAL(inVector, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_NULL(inVector, VECTORTOMATRIX_CLEANUP); if (inVector->type.dimen == PS_DIMEN_VECTOR) { PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, VECTORTOMATRIX_CLEANUP); - PS_VECTOR_CHECK_EMPTY_GENERAL(inVector, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(inVector, VECTORTOMATRIX_CLEANUP); outImage = psImageRecycle(outImage, 1, inVector->n, inVector->type.type); @@ -614,5 +614,5 @@ } else if (inVector->type.dimen == PS_DIMEN_TRANSV) { PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_TRANSV, VECTORTOMATRIX_CLEANUP); - PS_VECTOR_CHECK_EMPTY_GENERAL(inVector, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(inVector, VECTORTOMATRIX_CLEANUP); outImage = psImageRecycle(outImage, inVector->n, 1, inVector->type.type); // More checks for PS_DIMEN_TRANSV @@ -632,5 +632,5 @@ } - PS_IMAGE_CHECK_NULL_GENERAL(outImage, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(outImage, VECTORTOMATRIX_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, VECTORTOMATRIX_CLEANUP); Index: /trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.c (revision 4028) +++ /trunk/psLib/src/dataManip/psMinimize.c (revision 4029) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.119 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.120 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -174,13 +174,13 @@ psF32 X) { - PS_PTR_CHECK_NULL(spline, NAN); - PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); - PS_VECTOR_CHECK_NULL(spline->domains, NAN); - PS_PTR_CHECK_NULL(spline->p_psDeriv2, NAN); - PS_VECTOR_CHECK_NULL(x, NAN); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_NULL(y, NAN); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(spline, NAN); + PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN); + PS_ASSERT_VECTOR_NON_NULL(spline->domains, NAN); + PS_ASSERT_PTR_NON_NULL(spline->p_psDeriv2, NAN); + PS_ASSERT_VECTOR_NON_NULL(x, NAN); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_NON_NULL(y, NAN); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL); psS32 n; @@ -258,8 +258,8 @@ const psVector* yErr) ///< Errors in coordinates, or NULL { - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL); if (mySpline != NULL) { - PS_VECTOR_CHECK_TYPE(mySpline->knots, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_TYPE(mySpline->knots, PS_TYPE_F32, NULL); } @@ -285,5 +285,5 @@ yErr32 = yErr32Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL); PS_VECTOR_CONVERT_F64_TO_F32_STATIC(yErr, yErr32, yErr32Static); } @@ -294,9 +294,9 @@ x32 = x32Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); PS_VECTOR_CONVERT_F64_TO_F32_STATIC(x, x32, x32Static); } - PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x32, y32, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(yErr32, y32, NULL); /* @@ -310,6 +310,6 @@ mySpline = psSpline1DAllocGeneric(x32, 3); } - PS_PTR_CHECK_NULL(mySpline, NULL); - PS_INT_CHECK_NON_NEGATIVE(mySpline->n, NULL); + PS_ASSERT_PTR_NON_NULL(mySpline, NULL); + PS_ASSERT_INT_NONNEGATIVE(mySpline->n, NULL); if (y32->n != (1 + mySpline->n)) { @@ -440,6 +440,6 @@ const psArray *coords) { - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(params, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(params, NULL); psTrace(".psLib.dataManip.psMinimize", 4, @@ -457,6 +457,6 @@ deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32); } else { - PS_IMAGE_CHECK_SIZE(deriv, params->n, coords->n, NULL); - PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_SIZE(deriv, params->n, coords->n, NULL); + PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL); } @@ -513,6 +513,6 @@ const psArray *coords) { - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(params, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(params, NULL); psF64 normalization = params->data.F32[0]; @@ -527,6 +527,6 @@ deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32); } else { - PS_IMAGE_CHECK_SIZE(deriv, 6, coords->n, NULL); - PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_SIZE(deriv, 6, coords->n, NULL); + PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL); } @@ -572,12 +572,12 @@ psMinimizeLMChi2Func func) { - PS_PTR_CHECK_NULL(min, NULL); - PS_VECTOR_CHECK_NULL(params, NULL); - PS_VECTOR_CHECK_EMPTY(params, NULL); - PS_PTR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_EMPTY(y, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL); - PS_PTR_CHECK_NULL(func, NULL); + PS_ASSERT_PTR_NON_NULL(min, NULL); + PS_ASSERT_VECTOR_NON_NULL(params, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(params, NULL); + PS_ASSERT_PTR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(y, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL); + PS_ASSERT_PTR_NON_NULL(func, NULL); // this function has test and current values for several things @@ -923,21 +923,21 @@ psMinimizeLMChi2Func func) { - PS_PTR_CHECK_NULL(min, NULL); - PS_VECTOR_CHECK_NULL(params, NULL); - PS_VECTOR_CHECK_EMPTY(params, NULL); - PS_PTR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_EMPTY(y, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL); - PS_PTR_CHECK_NULL(func, NULL); + PS_ASSERT_PTR_NON_NULL(min, NULL); + PS_ASSERT_VECTOR_NON_NULL(params, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(params, NULL); + PS_ASSERT_PTR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(y, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL); + PS_ASSERT_PTR_NON_NULL(func, NULL); if (paramMask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, NULL); } if (yErr != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(y, yErr, NULL); } if (covar != NULL) { - PS_IMAGE_CHECK_SIZE(covar, params->n, params->n, NULL); + PS_ASSERT_IMAGE_SIZE(covar, params->n, params->n, NULL); } @@ -1363,9 +1363,9 @@ const psVector* yErr) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_INT_CHECK_NON_NEGATIVE(myPoly->n, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_EMPTY(y, NULL); - PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_INT_NONNEGATIVE(myPoly->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(y, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL); psS32 i; @@ -1383,5 +1383,5 @@ yErr64 = yErr64Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL); PS_VECTOR_CONVERT_F32_TO_F64_STATIC(yErr, yErr64, yErr64Static); } @@ -1395,5 +1395,5 @@ x64 = x64Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); PS_VECTOR_CONVERT_F32_TO_F64_STATIC(x, x64, x64Static); if (myPoly->type == PS_POLYNOMIAL_CHEB) { @@ -1401,6 +1401,6 @@ } } - PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x64, y64, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(yErr64, y64, NULL); // Call the appropriate vector fitting routine. @@ -1430,5 +1430,5 @@ psF32 tol) { - PS_INT_CHECK_NON_NEGATIVE(maxIter, NULL); + PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL); psMinimization *min = psAlloc(sizeof(psMinimization)); @@ -1765,16 +1765,16 @@ psMinimizePowellFunc func) { - PS_PTR_CHECK_NULL(min, NAN); - PS_VECTOR_CHECK_NULL(params, NAN); - PS_VECTOR_CHECK_EMPTY(params, NAN); - PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_NULL(line, NAN); - PS_VECTOR_CHECK_EMPTY(line, NAN); - PS_VECTOR_CHECK_TYPE(line, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_NULL(paramMask, NAN); - PS_VECTOR_CHECK_EMPTY(paramMask, NAN); - PS_VECTOR_CHECK_TYPE(paramMask, PS_TYPE_U8, NAN); - PS_PTR_CHECK_NULL(coords, NAN); - PS_PTR_CHECK_NULL(func, NAN); + PS_ASSERT_PTR_NON_NULL(min, NAN); + PS_ASSERT_VECTOR_NON_NULL(params, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(params, NAN); + PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_NON_NULL(line, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(line, NAN); + PS_ASSERT_VECTOR_TYPE(line, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_NON_NULL(paramMask, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(paramMask, NAN); + PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, NAN); + PS_ASSERT_PTR_NON_NULL(coords, NAN); + PS_ASSERT_PTR_NON_NULL(func, NAN); psVector *bracket; psF32 a = 0.0; @@ -1919,10 +1919,10 @@ psMinimizePowellFunc func) { - PS_PTR_CHECK_NULL(min, NULL); - PS_VECTOR_CHECK_NULL(params, NULL); - PS_VECTOR_CHECK_EMPTY(params, NULL); - PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NULL); - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(func, NULL); + PS_ASSERT_PTR_NON_NULL(min, NULL); + PS_ASSERT_VECTOR_NON_NULL(params, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(params, NULL); + PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(func, NULL); psS32 numDims = params->n; PS_VECTOR_GEN_STATIC_RECYCLED(pQP, numDims, PS_TYPE_F32); @@ -1957,5 +1957,5 @@ myParamMask = (psVector *) paramMask; } - PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(params, myParamMask, NULL); // 1: Set v[i] to be the unit vectors for each dimension in params @@ -2119,6 +2119,6 @@ const psArray *coords) { - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(params, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(params, NULL); psF32 x; @@ -2150,9 +2150,9 @@ psTrace(".psLib.dataManip.myPowellChi2Func", 4, "---- myPowellChi2Func() begin ----\n"); - PS_VECTOR_CHECK_NULL(params, NAN); - PS_VECTOR_CHECK_EMPTY(params, NAN); - PS_VECTOR_CHECK_NULL(myValue, NAN); - PS_VECTOR_CHECK_EMPTY(myValue, NAN); - PS_PTR_CHECK_NULL(coords, NAN); + PS_ASSERT_VECTOR_NON_NULL(params, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(params, NAN); + PS_ASSERT_VECTOR_NON_NULL(myValue, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(myValue, NAN); + PS_ASSERT_PTR_NON_NULL(coords, NAN); psF32 chi2 = 0.0; Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 4028) +++ /trunk/psLib/src/dataManip/psStats.c (revision 4029) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.128 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 19:25:29 $ + * @version $Revision: 1.129 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -424,6 +424,6 @@ psStats* stats) { - PS_VECTOR_CHECK_NULL(myVector, -1); - PS_PTR_CHECK_NULL(stats, -1); + PS_ASSERT_VECTOR_NON_NULL(myVector, -1); + PS_ASSERT_PTR_NON_NULL(stats, -1); psS32 i = 0; // Loop index variable @@ -472,6 +472,6 @@ psStats* stats) { - PS_VECTOR_CHECK_NULL(myVector, -1); - PS_PTR_CHECK_NULL(stats, -1); + PS_ASSERT_VECTOR_NON_NULL(myVector, -1); + PS_ASSERT_PTR_NON_NULL(stats, -1); psS32 i = 0; // Loop index variable psS32 numData = 0; // The number of data points @@ -619,6 +619,6 @@ psF32 sigma) { - PS_PTR_CHECK_NULL(robustHistogram, NULL); - PS_PTR_CHECK_NULL(robustHistogram->bounds, NULL); + PS_ASSERT_PTR_NON_NULL(robustHistogram, NULL); + PS_ASSERT_PTR_NON_NULL(robustHistogram->bounds, NULL); psS32 i = 0; // Loop index variable @@ -1029,12 +1029,12 @@ // Ensure that stats->clipIter is within the proper range. - PS_INT_CHECK_RANGE(stats->clipIter, - PS_CLIPPED_NUM_ITER_LB, - PS_CLIPPED_NUM_ITER_UB, -1); + PS_ASSERT_INT_WITHIN_RANGE(stats->clipIter, + PS_CLIPPED_NUM_ITER_LB, + PS_CLIPPED_NUM_ITER_UB, -1); // Ensure that stats->clipSigma is within the proper range. - PS_INT_CHECK_RANGE(stats->clipSigma, - PS_CLIPPED_SIGMA_LB, - PS_CLIPPED_SIGMA_UB, -1); + PS_ASSERT_INT_WITHIN_RANGE(stats->clipSigma, + PS_CLIPPED_SIGMA_LB, + PS_CLIPPED_SIGMA_UB, -1); // Allocate a psStats structure for calculating the mean, median, and @@ -1263,5 +1263,5 @@ psF32 getThisValue) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); PS_FLOAT_COMPARE(rangeLow, rangeHigh, NAN); // We ensure that the requested f(y) value, which is getThisValue, is @@ -1332,11 +1332,11 @@ psF32 yVal) { - PS_VECTOR_CHECK_NULL(xVec, NAN); - PS_VECTOR_CHECK_NULL(yVec, NAN); - PS_VECTOR_CHECK_TYPE(xVec, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_TYPE(yVec, PS_TYPE_F32, NAN); - // PS_VECTOR_CHECK_SIZE_EQUAL(xVec, yVec, NAN); - PS_INT_CHECK_RANGE(binNum, 0, (xVec->n - 1), NAN); - PS_INT_CHECK_RANGE(binNum, 0, (yVec->n - 1), NAN); + PS_ASSERT_VECTOR_NON_NULL(xVec, NAN); + PS_ASSERT_VECTOR_NON_NULL(yVec, NAN); + PS_ASSERT_VECTOR_TYPE(xVec, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_TYPE(yVec, PS_TYPE_F32, NAN); + // PS_ASSERT_VECTORS_SIZE_EQUAL(xVec, yVec, NAN); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (xVec->n - 1), NAN); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (yVec->n - 1), NAN); // PS_VECTOR_DECLARE_ALLOC_STATIC(x, 3, PS_TYPE_F64); @@ -1827,5 +1827,5 @@ psHistogram* psHistogramAlloc(psF32 lower, psF32 upper, psS32 n) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); PS_FLOAT_COMPARE(lower, upper, NULL); @@ -1875,6 +1875,6 @@ psHistogram* psHistogramAllocGeneric(const psVector* bounds) { - PS_VECTOR_CHECK_NULL(bounds, NULL); - PS_VECTOR_CHECK_TYPE(bounds, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); + PS_ASSERT_VECTOR_TYPE(bounds, PS_TYPE_F32, NULL); PS_INT_COMPARE(2, bounds->n, NULL); @@ -1930,10 +1930,10 @@ psF32 error) { - PS_PTR_CHECK_NULL(out, -1); - PS_PTR_CHECK_NULL(out->bounds, -1); - PS_PTR_CHECK_NULL(out->nums, -1); - PS_INT_CHECK_RANGE(binNum, 0, ((out->nums->n)-1), -2); + PS_ASSERT_PTR_NON_NULL(out, -1); + PS_ASSERT_PTR_NON_NULL(out->bounds, -1); + PS_ASSERT_PTR_NON_NULL(out->nums, -1); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, ((out->nums->n)-1), -2); PS_FLOAT_COMPARE(0.0, error, -3); - PS_FLOAT_CHECK_RANGE(data, out->bounds->data.F32[0], out->bounds->data.F32[(out->bounds->n)-1], -4); + PS_ASSERT_FLOAT_WITHIN_RANGE(data, out->bounds->data.F32[0], out->bounds->data.F32[(out->bounds->n)-1], -4); psF32 boxcarWidth = 2.35 * error; @@ -2019,19 +2019,19 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(out, NULL); - PS_VECTOR_CHECK_NULL(out->bounds, NULL); - PS_VECTOR_CHECK_TYPE(out->bounds, PS_TYPE_F32, NULL); - PS_INT_CHECK_NON_NEGATIVE(out->bounds->n, NULL); - PS_VECTOR_CHECK_NULL(out->nums, NULL); - PS_VECTOR_CHECK_TYPE(out->nums, PS_TYPE_F32, NULL); - PS_INT_CHECK_NON_NEGATIVE(out->nums->n, NULL); - PS_VECTOR_CHECK_NULL(in, out); + PS_ASSERT_PTR_NON_NULL(out, NULL); + PS_ASSERT_VECTOR_NON_NULL(out->bounds, NULL); + PS_ASSERT_VECTOR_TYPE(out->bounds, PS_TYPE_F32, NULL); + PS_ASSERT_INT_NONNEGATIVE(out->bounds->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(out->nums, NULL); + PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, NULL); + PS_ASSERT_INT_NONNEGATIVE(out->nums->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(in, out); if (mask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(in, mask, NULL); - PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, NULL); } if (errors != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(in, errors, NULL); - PS_VECTOR_CHECK_TYPE(errors, in->type.type, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(in, errors, NULL); + PS_ASSERT_VECTOR_TYPE(errors, in->type.type, NULL); } @@ -2216,13 +2216,13 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(stats, NULL); - PS_VECTOR_CHECK_NULL(in, stats); + PS_ASSERT_PTR_NON_NULL(stats, NULL); + PS_ASSERT_VECTOR_NON_NULL(in, stats); if (mask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, stats); - PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, stats); + PS_ASSERT_VECTORS_SIZE_EQUAL(mask, in, stats); + PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, stats); } if (errors != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(errors, in, stats); - PS_VECTOR_CHECK_TYPE(errors, in->type.type, stats); + PS_ASSERT_VECTORS_SIZE_EQUAL(errors, in, stats); + PS_ASSERT_VECTOR_TYPE(errors, in->type.type, stats); } Index: /trunk/psLib/src/dataManip/psUnaryOp.c =================================================================== --- /trunk/psLib/src/dataManip/psUnaryOp.c (revision 4028) +++ /trunk/psLib/src/dataManip/psUnaryOp.c (revision 4029) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-12 00:54:49 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -315,6 +315,6 @@ psType* psTypeIn = (psType* ) in; - PS_PTR_CHECK_NULL_GENERAL(in, psUnaryOp_EXIT); - PS_PTR_CHECK_NULL_GENERAL(op, psUnaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(in, psUnaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(op, psUnaryOp_EXIT); psDimen dimIn = psTypeIn->dimen; Index: /trunk/psLib/src/image/psImageStats.c =================================================================== --- /trunk/psLib/src/image/psImageStats.c (revision 4028) +++ /trunk/psLib/src/image/psImageStats.c (revision 4029) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 22:02:16 $ + * @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -52,10 +52,10 @@ psVector *junkMask = NULL; - PS_PTR_CHECK_NULL(stats, NULL); - PS_INT_CHECK_ZERO(stats->options, NULL); - PS_IMAGE_CHECK_NULL(in, NULL) + PS_ASSERT_PTR_NON_NULL(stats, NULL); + PS_ASSERT_INT_NONZERO(stats->options, NULL); + PS_ASSERT_IMAGE_NON_NULL(in, NULL) if (mask != NULL) { - PS_IMAGE_CHECK_TYPE(mask, PS_TYPE_U8, NULL); - PS_IMAGE_CHECK_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL); + PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL); } @@ -124,9 +124,9 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(out, NULL); - PS_PTR_CHECK_NULL(in, NULL); + PS_ASSERT_PTR_NON_NULL(out, NULL); + PS_ASSERT_PTR_NON_NULL(in, NULL); if (mask != NULL) { - PS_IMAGE_CHECK_TYPE(mask, PS_TYPE_U8, NULL); - PS_IMAGE_CHECK_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL); + PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL); } psVector* junkData = NULL; @@ -200,5 +200,5 @@ double* calcScaleFactors(psS32 n) { - PS_INT_CHECK_NON_NEGATIVE(n, NULL); + PS_ASSERT_INT_NONNEGATIVE(n, NULL); psS32 i = 0; double tmp = 0.0; @@ -217,5 +217,5 @@ psPolynomial1D **p_psCreateChebyshevPolys(psS32 maxChebyPoly) { - PS_INT_CHECK_POSITIVE(maxChebyPoly, NULL); + PS_ASSERT_INT_POSITIVE(maxChebyPoly, NULL); psPolynomial1D **chebPolys = NULL; psS32 i = 0; @@ -265,6 +265,6 @@ const psImage* input) { - PS_IMAGE_CHECK_NULL(input, NULL); - PS_IMAGE_CHECK_EMPTY(input, NULL); + PS_ASSERT_IMAGE_NON_NULL(input, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(input, NULL); if ((input->type.type != PS_TYPE_S8) && (input->type.type != PS_TYPE_U16) && @@ -273,6 +273,6 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unallowable image type.\n"); } - PS_POLY_CHECK_NULL(coeffs, NULL); - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); + PS_ASSERT_POLY_NON_NULL(coeffs, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); psS32 x = 0; psS32 y = 0; @@ -388,6 +388,6 @@ const psImage* input) { - PS_IMAGE_CHECK_NULL(input, NULL); - PS_IMAGE_CHECK_EMPTY(input, NULL); + PS_ASSERT_IMAGE_NON_NULL(input, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(input, NULL); if ((input->type.type != PS_TYPE_S8) && (input->type.type != PS_TYPE_U16) && @@ -396,6 +396,6 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unallowable image type.\n"); } - PS_POLY_CHECK_NULL(coeffs, NULL); - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); + PS_ASSERT_POLY_NON_NULL(coeffs, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); psS32 x = 0; psS32 y = 0; @@ -519,5 +519,5 @@ const psPolynomial2D* coeffs) { - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); psS32 x = 0; @@ -586,5 +586,5 @@ const psPolynomial2D* coeffs) { - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_ORD, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_ORD, NULL); for (int row = 0; row < input->numRows ; row++) { @@ -613,6 +613,6 @@ const psPolynomial2D* coeffs) { - PS_IMAGE_CHECK_NULL(input, NULL); - PS_IMAGE_CHECK_EMPTY(input, NULL); + PS_ASSERT_IMAGE_NON_NULL(input, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(input, NULL); if ((input->type.type != PS_TYPE_S8) && (input->type.type != PS_TYPE_U16) && @@ -622,5 +622,5 @@ "Unallowable image type.\n"); } - PS_POLY_CHECK_NULL(coeffs, NULL); + PS_ASSERT_POLY_NON_NULL(coeffs, NULL); if (coeffs->type == PS_POLYNOMIAL_ORD) { Index: /trunk/psLib/src/imageops/psImageStats.c =================================================================== --- /trunk/psLib/src/imageops/psImageStats.c (revision 4028) +++ /trunk/psLib/src/imageops/psImageStats.c (revision 4029) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 22:02:16 $ + * @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -52,10 +52,10 @@ psVector *junkMask = NULL; - PS_PTR_CHECK_NULL(stats, NULL); - PS_INT_CHECK_ZERO(stats->options, NULL); - PS_IMAGE_CHECK_NULL(in, NULL) + PS_ASSERT_PTR_NON_NULL(stats, NULL); + PS_ASSERT_INT_NONZERO(stats->options, NULL); + PS_ASSERT_IMAGE_NON_NULL(in, NULL) if (mask != NULL) { - PS_IMAGE_CHECK_TYPE(mask, PS_TYPE_U8, NULL); - PS_IMAGE_CHECK_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL); + PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL); } @@ -124,9 +124,9 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(out, NULL); - PS_PTR_CHECK_NULL(in, NULL); + PS_ASSERT_PTR_NON_NULL(out, NULL); + PS_ASSERT_PTR_NON_NULL(in, NULL); if (mask != NULL) { - PS_IMAGE_CHECK_TYPE(mask, PS_TYPE_U8, NULL); - PS_IMAGE_CHECK_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_U8, NULL); + PS_ASSERT_IMAGES_SIZE_EQUAL(in, mask, NULL); } psVector* junkData = NULL; @@ -200,5 +200,5 @@ double* calcScaleFactors(psS32 n) { - PS_INT_CHECK_NON_NEGATIVE(n, NULL); + PS_ASSERT_INT_NONNEGATIVE(n, NULL); psS32 i = 0; double tmp = 0.0; @@ -217,5 +217,5 @@ psPolynomial1D **p_psCreateChebyshevPolys(psS32 maxChebyPoly) { - PS_INT_CHECK_POSITIVE(maxChebyPoly, NULL); + PS_ASSERT_INT_POSITIVE(maxChebyPoly, NULL); psPolynomial1D **chebPolys = NULL; psS32 i = 0; @@ -265,6 +265,6 @@ const psImage* input) { - PS_IMAGE_CHECK_NULL(input, NULL); - PS_IMAGE_CHECK_EMPTY(input, NULL); + PS_ASSERT_IMAGE_NON_NULL(input, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(input, NULL); if ((input->type.type != PS_TYPE_S8) && (input->type.type != PS_TYPE_U16) && @@ -273,6 +273,6 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unallowable image type.\n"); } - PS_POLY_CHECK_NULL(coeffs, NULL); - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); + PS_ASSERT_POLY_NON_NULL(coeffs, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); psS32 x = 0; psS32 y = 0; @@ -388,6 +388,6 @@ const psImage* input) { - PS_IMAGE_CHECK_NULL(input, NULL); - PS_IMAGE_CHECK_EMPTY(input, NULL); + PS_ASSERT_IMAGE_NON_NULL(input, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(input, NULL); if ((input->type.type != PS_TYPE_S8) && (input->type.type != PS_TYPE_U16) && @@ -396,6 +396,6 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Unallowable image type.\n"); } - PS_POLY_CHECK_NULL(coeffs, NULL); - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); + PS_ASSERT_POLY_NON_NULL(coeffs, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); psS32 x = 0; psS32 y = 0; @@ -519,5 +519,5 @@ const psPolynomial2D* coeffs) { - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_CHEB, NULL); psS32 x = 0; @@ -586,5 +586,5 @@ const psPolynomial2D* coeffs) { - PS_POLY_CHECK_TYPE(coeffs, PS_POLYNOMIAL_ORD, NULL); + PS_ASSERT_POLY_TYPE(coeffs, PS_POLYNOMIAL_ORD, NULL); for (int row = 0; row < input->numRows ; row++) { @@ -613,6 +613,6 @@ const psPolynomial2D* coeffs) { - PS_IMAGE_CHECK_NULL(input, NULL); - PS_IMAGE_CHECK_EMPTY(input, NULL); + PS_ASSERT_IMAGE_NON_NULL(input, NULL); + PS_ASSERT_IMAGE_NON_EMPTY(input, NULL); if ((input->type.type != PS_TYPE_S8) && (input->type.type != PS_TYPE_U16) && @@ -622,5 +622,5 @@ "Unallowable image type.\n"); } - PS_POLY_CHECK_NULL(coeffs, NULL); + PS_ASSERT_POLY_NON_NULL(coeffs, NULL); if (coeffs->type == PS_POLYNOMIAL_ORD) { Index: /trunk/psLib/src/math/psBinaryOp.c =================================================================== --- /trunk/psLib/src/math/psBinaryOp.c (revision 4028) +++ /trunk/psLib/src/math/psBinaryOp.c (revision 4029) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-10 02:36:41 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -439,12 +439,12 @@ } - PS_PTR_CHECK_NULL_GENERAL(input1, psBinaryOp_EXIT); - PS_PTR_CHECK_NULL_GENERAL(input2, psBinaryOp_EXIT); - PS_PTR_CHECK_NULL_GENERAL(op, psBinaryOp_EXIT); - - PS_PTR_CHECK_TYPE_EQUAL_GENERAL(input1,input2, psBinaryOp_EXIT); - - PS_PTR_CHECK_DIMEN_GENERAL_NOT(input1, PS_DIMEN_OTHER, psBinaryOp_EXIT); - PS_PTR_CHECK_DIMEN_GENERAL_NOT(input2, PS_DIMEN_OTHER, psBinaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(input1, psBinaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(input2, psBinaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(op, psBinaryOp_EXIT); + + PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(input1,input2, psBinaryOp_EXIT); + + PS_ASSERT_PTR_DIMEN_GENERAL_NOT(input1, PS_DIMEN_OTHER, psBinaryOp_EXIT); + PS_ASSERT_PTR_DIMEN_GENERAL_NOT(input2, PS_DIMEN_OTHER, psBinaryOp_EXIT); psType* psType1 = (psType*)in1; Index: /trunk/psLib/src/math/psConstants.h =================================================================== --- /trunk/psLib/src/math/psConstants.h (revision 4028) +++ /trunk/psLib/src/math/psConstants.h (revision 4029) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 19:25:29 $ + * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ *****************************************************************************/ -#define PS_INT_CHECK_EQUALS(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_INT_UNEQUAL(NAME1, NAME2, RVAL) \ if (NAME1 == NAME2) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -67,5 +67,5 @@ } -#define PS_INT_CHECK_NON_EQUALS(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_INT_EQUAL(NAME1, NAME2, RVAL) \ if (NAME1 != NAME2) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -76,5 +76,5 @@ // Return an error if the arg is less than zero. -#define PS_INT_CHECK_NEGATIVE(NAME, RVAL) \ +#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \ if (NAME < 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -86,5 +86,5 @@ // XXX: This naming scheme is opposite most other macros. This should be // corrected as soon as a fresh checkin/out can be performed. -#define PS_INT_CHECK_NON_NEGATIVE(NAME, RVAL) \ +#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \ if (NAME < 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -96,5 +96,5 @@ // XXX: This naming scheme is opposite most other macros. This should be // corrected as soon as a fresh checkin/out can be performed. -#define PS_INT_CHECK_POSITIVE(NAME, RVAL) \ +#define PS_ASSERT_INT_POSITIVE(NAME, RVAL) \ if (NAME < 1) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -104,5 +104,5 @@ // Return an error if the arg is not equal to zero. -#define PS_INT_CHECK_NON_ZERO(NAME, RVAL) \ +#define PS_ASSERT_INT_ZERO(NAME, RVAL) \ if (NAME != 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -112,5 +112,5 @@ // Return an error if the arg is equal to zero. -#define PS_INT_CHECK_ZERO(NAME, RVAL) \ +#define PS_ASSERT_INT_NONZERO(NAME, RVAL) \ if (NAME == 0) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -120,5 +120,5 @@ // Return an error if the arg is lies outside the supplied range. -#define PS_INT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ +#define PS_ASSERT_INT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((int)NAME < LOWER || (int)NAME > UPPER) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -148,5 +148,5 @@ // Generate an error if the two floats are equal. // XXX: Inconsistent naming. -#define PS_FLOAT_CHECK_NON_EQUAL(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_FLOAT_NON_EQUAL(NAME1, NAME2, RVAL) \ if (fabs(NAME2 - NAME1) < FLT_EPSILON) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -157,5 +157,5 @@ // Return an error if the arg is lies outside the supplied range. -#define PS_FLOAT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \ +#define PS_ASSERT_FLOAT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \ if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \ psError(PS_ERR_BAD_PARAMETER_VALUE, true, \ @@ -169,6 +169,6 @@ the wrong type. *****************************************************************************/ -#define PS_PTR_CHECK_NULL(NAME, RVAL) PS_PTR_CHECK_NULL_GENERAL(NAME, return RVAL) -#define PS_PTR_CHECK_NULL_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_PTR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, return RVAL) +#define PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, CLEANUP) \ if (NAME == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -178,5 +178,5 @@ } -#define PS_PTR_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_PTR_TYPE(NAME, TYPE, RVAL) \ if (NAME->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -186,6 +186,6 @@ } -#define PS_PTR_CHECK_DIMEN(NAME, DIMEN, RVAL) PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, return RVAL) -#define PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, CLEANUP) \ +#define PS_ASSERT_PTR_DIMEN(NAME, DIMEN, RVAL) PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, return RVAL) +#define PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, CLEANUP) \ if (NAME->type.dimen != DIMEN) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -195,5 +195,5 @@ } -#define PS_PTR_CHECK_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \ +#define PS_ASSERT_PTR_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \ if (NAME->type.dimen == DIMEN) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -204,5 +204,5 @@ -#define PS_PTR_CHECK_SIZE_EQUAL(PTR1, PTR2, RVAL) \ +#define PS_ASSERT_PTRS_SIZE_EQUAL(PTR1, PTR2, RVAL) \ if (PTR1->n != PTR2->n) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -212,7 +212,6 @@ } -#define PS_PTR_CHECK_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL) - -#define PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \ +#define PS_ASSERT_PTR_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL) +#define PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \ if (PTR1->type.type != PTR2->type.type) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -226,6 +225,6 @@ PS_VECTOR macros: *****************************************************************************/ -#define PS_VECTOR_CHECK_NULL(NAME, RVAL) PS_VECTOR_CHECK_NULL_GENERAL(NAME, return RVAL) -#define PS_VECTOR_CHECK_NULL_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_VECTOR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, return RVAL) +#define PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, CLEANUP) \ if (NAME == NULL || NAME->data.U8 == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -235,6 +234,6 @@ } \ -#define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, return RVAL) -#define PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_VECTOR_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, return RVAL) +#define PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, CLEANUP) \ if (NAME->n < 1) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -244,5 +243,5 @@ } \ -#define PS_VECTOR_CHECK_TYPE_F32_OR_F64(NAME, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE_F32_OR_F64(NAME, RVAL) \ if ((NAME->type.type != PS_TYPE_F32) && (NAME->type.type != PS_TYPE_F64)) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -252,5 +251,5 @@ } \ -#define PS_VECTOR_CHECK_TYPE_S16_S32_F32(NAME, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE_S16_S32_F32(NAME, RVAL) \ if ((NAME->type.type != PS_TYPE_S16) && (NAME->type.type != PS_TYPE_S32) && (NAME->type.type != PS_TYPE_F32)) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -260,5 +259,5 @@ } \ -#define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE(NAME, TYPE, RVAL) \ if (NAME->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -268,5 +267,5 @@ } -#define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \ +#define PS_ASSERT_VECTORS_SIZE_EQUAL(VEC1, VEC2, RVAL) \ if (VEC1->n != VEC2->n) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -276,5 +275,5 @@ } -#define PS_VECTOR_CHECK_TYPE_EQUAL(VEC1, VEC2, RVAL) \ +#define PS_ASSERT_VECTOR_TYPE_EQUAL(VEC1, VEC2, RVAL) \ if (VEC1->type.type != VEC2->type.type) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -428,5 +427,5 @@ PS_POLY macros: *****************************************************************************/ -#define PS_POLY_CHECK_NULL(NAME, RVAL) \ +#define PS_ASSERT_POLY_NON_NULL(NAME, RVAL) \ if (NAME == NULL || NAME->coeff == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -436,5 +435,5 @@ } \ -#define PS_POLY_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_POLY_TYPE(NAME, TYPE, RVAL) \ if (NAME->type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -508,6 +507,6 @@ PS_IMAGE macros: *****************************************************************************/ -#define PS_IMAGE_CHECK_NULL(NAME, RVAL) PS_IMAGE_CHECK_NULL_GENERAL(NAME, return RVAL) -#define PS_IMAGE_CHECK_NULL_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_IMAGE_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, return RVAL) +#define PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, CLEANUP) \ if (NAME == NULL || NAME->data.V == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -517,6 +516,6 @@ } -#define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, return RVAL) -#define PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \ +#define PS_ASSERT_IMAGE_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, return RVAL) +#define PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, CLEANUP) \ if (NAME->numCols < 1 || NAME->numRows < 1) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -526,5 +525,5 @@ } -#define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_IMAGE_TYPE(NAME, TYPE, RVAL) \ if (NAME->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ @@ -534,5 +533,5 @@ } -#define PS_IMAGE_CHECK_SIZE_EQUAL(NAME1, NAME2, RVAL) \ +#define PS_ASSERT_IMAGES_SIZE_EQUAL(NAME1, NAME2, RVAL) \ if ((NAME1->numCols != NAME2->numCols) || \ (NAME1->numRows != NAME2->numRows)) { \ @@ -543,5 +542,5 @@ } -#define PS_IMAGE_CHECK_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \ +#define PS_ASSERT_IMAGE_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \ if ((NAME1->numCols != NUM_COLS) || \ (NAME1->numRows != NUM_ROWS)) { \ @@ -634,5 +633,5 @@ PS_READOUT macros: *****************************************************************************/ -#define PS_READOUT_CHECK_NULL(NAME, RVAL) \ +#define PS_ASSERT_READOUT_NON_NULL(NAME, RVAL) \ if (NAME == NULL || NAME->image == NULL) { \ psError(PS_ERR_BAD_PARAMETER_NULL, true, \ @@ -642,5 +641,5 @@ } -#define PS_READOUT_CHECK_EMPTY(NAME, RVAL) \ +#define PS_ASSERT_READOUT_NON_EMPTY(NAME, RVAL) \ if (NAME->image->numCols < 1 || NAME->image->numRows < 1) { \ psError(PS_ERR_BAD_PARAMETER_SIZE, true, \ @@ -649,5 +648,5 @@ } -#define PS_READOUT_CHECK_TYPE(NAME, TYPE, RVAL) \ +#define PS_ASSERT_READOUT_TYPE(NAME, TYPE, RVAL) \ if (NAME->image->type.type != TYPE) { \ psError(PS_ERR_BAD_PARAMETER_TYPE, true, \ Index: /trunk/psLib/src/math/psMatrix.c =================================================================== --- /trunk/psLib/src/math/psMatrix.c (revision 4028) +++ /trunk/psLib/src/math/psMatrix.c (revision 4029) @@ -21,6 +21,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-11 02:29:39 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -188,8 +188,8 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, psMatrixLUD_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, psMatrixLUD_EXIT); PS_CHECK_POINTERS(inImage, outImage, psMatrixLUD_EXIT); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, psMatrixLUD_EXIT); - PS_PTR_CHECK_NULL_GENERAL(outPerm, psMatrixLUD_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(outPerm, psMatrixLUD_EXIT); outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type); @@ -247,10 +247,10 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, LUSOLVE_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, LUSOLVE_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, LUSOLVE_CLEANUP); - PS_VECTOR_CHECK_NULL_GENERAL(inVector, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_NULL(inVector, LUSOLVE_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, LUSOLVE_CLEANUP); - PS_VECTOR_CHECK_NULL_GENERAL(inPerm, LUSOLVE_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_NULL(inPerm, LUSOLVE_CLEANUP); outVector = psVectorRecycle(outVector, inImage->numRows, inImage->type.type); @@ -300,9 +300,9 @@ #define INVERT_CLEANUP { psFree(outImage); return NULL; } // Error checks - PS_PTR_CHECK_NULL_GENERAL(det, INVERT_CLEANUP); - PS_IMAGE_CHECK_NULL_GENERAL(inImage, INVERT_CLEANUP); + PS_ASSERT_GENERAL_PTR_NON_NULL(det, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, INVERT_CLEANUP); PS_CHECK_POINTERS(inImage, outImage, INVERT_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, INVERT_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, INVERT_CLEANUP); outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type); @@ -348,7 +348,7 @@ #define DETERMINANT_EXIT { return NULL; } // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, DETERMINANT_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, DETERMINANT_EXIT); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, DETERMINANT_EXIT); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, DETERMINANT_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, DETERMINANT_EXIT); PS_CHECK_SQUARE(inImage, DETERMINANT_EXIT); @@ -383,8 +383,8 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage1, MULTIPLY_CLEANUP); - PS_IMAGE_CHECK_NULL_GENERAL(inImage2, MULTIPLY_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage1, MULTIPLY_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage2, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage1, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage2, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage1, MULTIPLY_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage2, MULTIPLY_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, MULTIPLY_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage2, PS_DIMEN_IMAGE, MULTIPLY_CLEANUP); @@ -435,7 +435,7 @@ #define TRANSPOSE_CLEANUP { psFree(outImage); return NULL; } // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, TRANSPOSE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, TRANSPOSE_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, TRANSPOSE_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, TRANSPOSE_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, TRANSPOSE_CLEANUP); PS_CHECK_POINTERS(inImage, outImage, TRANSPOSE_CLEANUP); @@ -481,7 +481,7 @@ #define EIGENVECTORS_CLEANUP { psFree(outImage); return NULL; } // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, EIGENVECTORS_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, EIGENVECTORS_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, EIGENVECTORS_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, EIGENVECTORS_CLEANUP); PS_CHECK_POINTERS(inImage, outImage, EIGENVECTORS_CLEANUP); @@ -526,7 +526,7 @@ // Error checks - PS_IMAGE_CHECK_NULL_GENERAL(inImage, psMatrixToVector_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, psMatrixToVector_EXIT); PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, psMatrixToVector_EXIT); - PS_IMAGE_CHECK_EMPTY_GENERAL(inImage, psMatrixToVector_EXIT); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, psMatrixToVector_EXIT); if (inImage->numRows == 1) { @@ -589,9 +589,9 @@ #define VECTORTOMATRIX_CLEANUP {psFree(outImage); return NULL; } // Error checks - PS_VECTOR_CHECK_NULL_GENERAL(inVector, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_NULL(inVector, VECTORTOMATRIX_CLEANUP); if (inVector->type.dimen == PS_DIMEN_VECTOR) { PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, VECTORTOMATRIX_CLEANUP); - PS_VECTOR_CHECK_EMPTY_GENERAL(inVector, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(inVector, VECTORTOMATRIX_CLEANUP); outImage = psImageRecycle(outImage, 1, inVector->n, inVector->type.type); @@ -614,5 +614,5 @@ } else if (inVector->type.dimen == PS_DIMEN_TRANSV) { PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_TRANSV, VECTORTOMATRIX_CLEANUP); - PS_VECTOR_CHECK_EMPTY_GENERAL(inVector, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(inVector, VECTORTOMATRIX_CLEANUP); outImage = psImageRecycle(outImage, inVector->n, 1, inVector->type.type); // More checks for PS_DIMEN_TRANSV @@ -632,5 +632,5 @@ } - PS_IMAGE_CHECK_NULL_GENERAL(outImage, VECTORTOMATRIX_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(outImage, VECTORTOMATRIX_CLEANUP); PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, VECTORTOMATRIX_CLEANUP); Index: /trunk/psLib/src/math/psMinimize.c =================================================================== --- /trunk/psLib/src/math/psMinimize.c (revision 4028) +++ /trunk/psLib/src/math/psMinimize.c (revision 4029) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.119 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.120 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -174,13 +174,13 @@ psF32 X) { - PS_PTR_CHECK_NULL(spline, NAN); - PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); - PS_VECTOR_CHECK_NULL(spline->domains, NAN); - PS_PTR_CHECK_NULL(spline->p_psDeriv2, NAN); - PS_VECTOR_CHECK_NULL(x, NAN); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_NULL(y, NAN); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(spline, NAN); + PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN); + PS_ASSERT_VECTOR_NON_NULL(spline->domains, NAN); + PS_ASSERT_PTR_NON_NULL(spline->p_psDeriv2, NAN); + PS_ASSERT_VECTOR_NON_NULL(x, NAN); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_NON_NULL(y, NAN); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL); psS32 n; @@ -258,8 +258,8 @@ const psVector* yErr) ///< Errors in coordinates, or NULL { - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL); if (mySpline != NULL) { - PS_VECTOR_CHECK_TYPE(mySpline->knots, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_TYPE(mySpline->knots, PS_TYPE_F32, NULL); } @@ -285,5 +285,5 @@ yErr32 = yErr32Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL); PS_VECTOR_CONVERT_F64_TO_F32_STATIC(yErr, yErr32, yErr32Static); } @@ -294,9 +294,9 @@ x32 = x32Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); PS_VECTOR_CONVERT_F64_TO_F32_STATIC(x, x32, x32Static); } - PS_VECTOR_CHECK_SIZE_EQUAL(x32, y32, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(yErr32, y32, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x32, y32, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(yErr32, y32, NULL); /* @@ -310,6 +310,6 @@ mySpline = psSpline1DAllocGeneric(x32, 3); } - PS_PTR_CHECK_NULL(mySpline, NULL); - PS_INT_CHECK_NON_NEGATIVE(mySpline->n, NULL); + PS_ASSERT_PTR_NON_NULL(mySpline, NULL); + PS_ASSERT_INT_NONNEGATIVE(mySpline->n, NULL); if (y32->n != (1 + mySpline->n)) { @@ -440,6 +440,6 @@ const psArray *coords) { - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(params, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(params, NULL); psTrace(".psLib.dataManip.psMinimize", 4, @@ -457,6 +457,6 @@ deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32); } else { - PS_IMAGE_CHECK_SIZE(deriv, params->n, coords->n, NULL); - PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_SIZE(deriv, params->n, coords->n, NULL); + PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL); } @@ -513,6 +513,6 @@ const psArray *coords) { - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(params, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(params, NULL); psF64 normalization = params->data.F32[0]; @@ -527,6 +527,6 @@ deriv = psImageAlloc(params->n, coords->n, PS_TYPE_F32); } else { - PS_IMAGE_CHECK_SIZE(deriv, 6, coords->n, NULL); - PS_IMAGE_CHECK_TYPE(deriv, PS_TYPE_F32, NULL); + PS_ASSERT_IMAGE_SIZE(deriv, 6, coords->n, NULL); + PS_ASSERT_IMAGE_TYPE(deriv, PS_TYPE_F32, NULL); } @@ -572,12 +572,12 @@ psMinimizeLMChi2Func func) { - PS_PTR_CHECK_NULL(min, NULL); - PS_VECTOR_CHECK_NULL(params, NULL); - PS_VECTOR_CHECK_EMPTY(params, NULL); - PS_PTR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_EMPTY(y, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL); - PS_PTR_CHECK_NULL(func, NULL); + PS_ASSERT_PTR_NON_NULL(min, NULL); + PS_ASSERT_VECTOR_NON_NULL(params, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(params, NULL); + PS_ASSERT_PTR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(y, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL); + PS_ASSERT_PTR_NON_NULL(func, NULL); // this function has test and current values for several things @@ -923,21 +923,21 @@ psMinimizeLMChi2Func func) { - PS_PTR_CHECK_NULL(min, NULL); - PS_VECTOR_CHECK_NULL(params, NULL); - PS_VECTOR_CHECK_EMPTY(params, NULL); - PS_PTR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_EMPTY(y, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(x, y, NULL); - PS_PTR_CHECK_NULL(func, NULL); + PS_ASSERT_PTR_NON_NULL(min, NULL); + PS_ASSERT_VECTOR_NON_NULL(params, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(params, NULL); + PS_ASSERT_PTR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(y, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x, y, NULL); + PS_ASSERT_PTR_NON_NULL(func, NULL); if (paramMask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(params, paramMask, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(params, paramMask, NULL); } if (yErr != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(y, yErr, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(y, yErr, NULL); } if (covar != NULL) { - PS_IMAGE_CHECK_SIZE(covar, params->n, params->n, NULL); + PS_ASSERT_IMAGE_SIZE(covar, params->n, params->n, NULL); } @@ -1363,9 +1363,9 @@ const psVector* yErr) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_INT_CHECK_NON_NEGATIVE(myPoly->n, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_EMPTY(y, NULL); - PS_VECTOR_CHECK_TYPE_F32_OR_F64(y, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_INT_NONNEGATIVE(myPoly->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(y, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL); psS32 i; @@ -1383,5 +1383,5 @@ yErr64 = yErr64Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(yErr, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(yErr, NULL); PS_VECTOR_CONVERT_F32_TO_F64_STATIC(yErr, yErr64, yErr64Static); } @@ -1395,5 +1395,5 @@ x64 = x64Static; } else { - PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); PS_VECTOR_CONVERT_F32_TO_F64_STATIC(x, x64, x64Static); if (myPoly->type == PS_POLYNOMIAL_CHEB) { @@ -1401,6 +1401,6 @@ } } - PS_VECTOR_CHECK_SIZE_EQUAL(x64, y64, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(yErr64, y64, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(x64, y64, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(yErr64, y64, NULL); // Call the appropriate vector fitting routine. @@ -1430,5 +1430,5 @@ psF32 tol) { - PS_INT_CHECK_NON_NEGATIVE(maxIter, NULL); + PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL); psMinimization *min = psAlloc(sizeof(psMinimization)); @@ -1765,16 +1765,16 @@ psMinimizePowellFunc func) { - PS_PTR_CHECK_NULL(min, NAN); - PS_VECTOR_CHECK_NULL(params, NAN); - PS_VECTOR_CHECK_EMPTY(params, NAN); - PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_NULL(line, NAN); - PS_VECTOR_CHECK_EMPTY(line, NAN); - PS_VECTOR_CHECK_TYPE(line, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_NULL(paramMask, NAN); - PS_VECTOR_CHECK_EMPTY(paramMask, NAN); - PS_VECTOR_CHECK_TYPE(paramMask, PS_TYPE_U8, NAN); - PS_PTR_CHECK_NULL(coords, NAN); - PS_PTR_CHECK_NULL(func, NAN); + PS_ASSERT_PTR_NON_NULL(min, NAN); + PS_ASSERT_VECTOR_NON_NULL(params, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(params, NAN); + PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_NON_NULL(line, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(line, NAN); + PS_ASSERT_VECTOR_TYPE(line, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_NON_NULL(paramMask, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(paramMask, NAN); + PS_ASSERT_VECTOR_TYPE(paramMask, PS_TYPE_U8, NAN); + PS_ASSERT_PTR_NON_NULL(coords, NAN); + PS_ASSERT_PTR_NON_NULL(func, NAN); psVector *bracket; psF32 a = 0.0; @@ -1919,10 +1919,10 @@ psMinimizePowellFunc func) { - PS_PTR_CHECK_NULL(min, NULL); - PS_VECTOR_CHECK_NULL(params, NULL); - PS_VECTOR_CHECK_EMPTY(params, NULL); - PS_VECTOR_CHECK_TYPE(params, PS_TYPE_F32, NULL); - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(func, NULL); + PS_ASSERT_PTR_NON_NULL(min, NULL); + PS_ASSERT_VECTOR_NON_NULL(params, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(params, NULL); + PS_ASSERT_VECTOR_TYPE(params, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(func, NULL); psS32 numDims = params->n; PS_VECTOR_GEN_STATIC_RECYCLED(pQP, numDims, PS_TYPE_F32); @@ -1957,5 +1957,5 @@ myParamMask = (psVector *) paramMask; } - PS_VECTOR_CHECK_SIZE_EQUAL(params, myParamMask, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(params, myParamMask, NULL); // 1: Set v[i] to be the unit vectors for each dimension in params @@ -2119,6 +2119,6 @@ const psArray *coords) { - PS_PTR_CHECK_NULL(coords, NULL); - PS_PTR_CHECK_NULL(params, NULL); + PS_ASSERT_PTR_NON_NULL(coords, NULL); + PS_ASSERT_PTR_NON_NULL(params, NULL); psF32 x; @@ -2150,9 +2150,9 @@ psTrace(".psLib.dataManip.myPowellChi2Func", 4, "---- myPowellChi2Func() begin ----\n"); - PS_VECTOR_CHECK_NULL(params, NAN); - PS_VECTOR_CHECK_EMPTY(params, NAN); - PS_VECTOR_CHECK_NULL(myValue, NAN); - PS_VECTOR_CHECK_EMPTY(myValue, NAN); - PS_PTR_CHECK_NULL(coords, NAN); + PS_ASSERT_VECTOR_NON_NULL(params, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(params, NAN); + PS_ASSERT_VECTOR_NON_NULL(myValue, NAN); + PS_ASSERT_VECTOR_NON_EMPTY(myValue, NAN); + PS_ASSERT_PTR_NON_NULL(coords, NAN); psF32 chi2 = 0.0; Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 4028) +++ /trunk/psLib/src/math/psPolynomial.c (revision 4029) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -246,5 +246,5 @@ static psPolynomial1D **createChebyshevPolys(psS32 maxChebyPoly) { - PS_INT_CHECK_NON_NEGATIVE(maxChebyPoly, NULL); + PS_ASSERT_INT_NONNEGATIVE(maxChebyPoly, NULL); psPolynomial1D **chebPolys = NULL; @@ -314,5 +314,5 @@ static psF32 chebPolynomial1DEval(psF32 x, const psPolynomial1D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); // XXX: Create a macro for this in psConstants.h if (myPoly->n < 1) { @@ -398,5 +398,5 @@ const psPolynomial2D* myPoly) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); psS32 loop_x = 0; @@ -422,7 +422,7 @@ static psF32 chebPolynomial2DEval(psF32 x, psF32 y, const psPolynomial2D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); psS32 loop_x = 0; @@ -487,7 +487,7 @@ static psF32 chebPolynomial3DEval(psF32 x, psF32 y, psF32 z, const psPolynomial3D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -565,8 +565,8 @@ static psF32 chebPolynomial4DEval(psF32 w, psF32 x, psF32 y, psF32 z, const psPolynomial4D* myPoly) { - PS_FLOAT_CHECK_RANGE(w, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(w, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_w = 0; psS32 loop_x = 0; @@ -638,5 +638,5 @@ static psF64 dChebPolynomial1DEval(psF64 x, const psDPolynomial1D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); psVector *d; psS32 n; @@ -697,6 +697,6 @@ static psF64 dChebPolynomial2DEval(psF64 x, psF64 y, const psDPolynomial2D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -761,7 +761,7 @@ static psF64 dChebPolynomial3DEval(psF64 x, psF64 y, psF64 z, const psDPolynomial3D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -839,8 +839,8 @@ static psF64 dChebPolynomial4DEval(psF64 w, psF64 x, psF64 y, psF64 z, const psDPolynomial4D* myPoly) { - PS_FLOAT_CHECK_RANGE(w, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(w, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_w = 0; psS32 loop_x = 0; @@ -973,6 +973,6 @@ psF32 x) { - PS_PTR_CHECK_NULL(domain, NAN) - PS_PTR_CHECK_NULL(range, NAN) + PS_ASSERT_PTR_NON_NULL(domain, NAN) + PS_ASSERT_PTR_NON_NULL(range, NAN) // XXX: Check valid values for n, order, and x? @@ -1044,5 +1044,5 @@ psVector* p_psGaussianDev(psF32 mean, psF32 sigma, psS32 Npts) { - PS_INT_CHECK_NON_NEGATIVE(Npts, NULL); + PS_ASSERT_INT_NONNEGATIVE(Npts, NULL); psVector* gauss = NULL; @@ -1072,5 +1072,5 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); psS32 i = 0; @@ -1097,6 +1097,6 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); psS32 x = 0; @@ -1133,7 +1133,7 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 x = 0; @@ -1179,8 +1179,8 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nW, NULL); - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nW, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 w = 0; @@ -1234,5 +1234,5 @@ psF32 psPolynomial1DEval(const psPolynomial1D* myPoly, psF32 x) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1251,7 +1251,7 @@ const psVector *x) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); psVector *tmp; @@ -1267,5 +1267,5 @@ psF32 psPolynomial2DEval(const psPolynomial2D* myPoly, psF32 x, psF32 y) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1286,9 +1286,9 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); psVector *tmp; @@ -1314,5 +1314,5 @@ psF32 psPolynomial3DEval(const psPolynomial3D* myPoly, psF32 x, psF32 y, psF32 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1334,11 +1334,11 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL); psVector *tmp; @@ -1370,5 +1370,5 @@ psF32 psPolynomial4DEval(const psPolynomial4D* myPoly, psF32 w, psF32 x, psF32 y, psF32 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1390,13 +1390,13 @@ const psVector *z) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(w, NULL); - PS_VECTOR_CHECK_TYPE(w, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(w, NULL); + PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL); psVector *tmp; @@ -1434,5 +1434,5 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); psS32 i = 0; @@ -1459,6 +1459,6 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); psS32 x = 0; @@ -1495,7 +1495,7 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 x = 0; @@ -1541,8 +1541,8 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nW, NULL); - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nW, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 w = 0; @@ -1597,5 +1597,5 @@ psF64 psDPolynomial1DEval(const psDPolynomial1D* myPoly, psF64 x) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1615,7 +1615,7 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); psVector *tmp; @@ -1635,5 +1635,5 @@ psF64 y) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1653,9 +1653,9 @@ const psVector *y) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); psVector *tmp; @@ -1685,5 +1685,5 @@ psF64 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1705,11 +1705,11 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F64, NULL); psVector *tmp; @@ -1745,5 +1745,5 @@ psF64 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1765,13 +1765,13 @@ const psVector *z) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(w, NULL); - PS_VECTOR_CHECK_TYPE(w, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(w, NULL); + PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F64, NULL); psVector *tmp; @@ -1828,7 +1828,7 @@ psF32 max) { - PS_INT_CHECK_NON_NEGATIVE(numSplines, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); - PS_FLOAT_CHECK_NON_EQUAL(max, min, NULL); + PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); + PS_ASSERT_FLOAT_NON_EQUAL(max, min, NULL); psSpline1D *tmp = NULL; @@ -1870,7 +1870,7 @@ psS32 order) { - PS_VECTOR_CHECK_NULL(bounds, NULL); - PS_VECTOR_CHECK_EMPTY(bounds, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); + PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(bounds, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); psSpline1D *tmp = NULL; @@ -1983,8 +1983,8 @@ psScalar *x) { - PS_VECTOR_CHECK_NULL(bins, -4); - PS_VECTOR_CHECK_EMPTY(bins, -4); - PS_PTR_CHECK_NULL(x, -6); - PS_PTR_CHECK_TYPE_EQUAL(x, bins, -3); + PS_ASSERT_VECTOR_NON_NULL(bins, -4); + PS_ASSERT_VECTOR_NON_EMPTY(bins, -4); + PS_ASSERT_PTR_NON_NULL(x, -6); + PS_ASSERT_PTR_TYPE_EQUAL(x, bins, -3); char* strType; @@ -2049,11 +2049,11 @@ psScalar *x) { - PS_VECTOR_CHECK_NULL(domain, NULL); - PS_VECTOR_CHECK_NULL(range, NULL); - PS_PTR_CHECK_NULL(x, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(domain, range, NULL); - PS_PTR_CHECK_TYPE_EQUAL(domain, range, NULL); - PS_PTR_CHECK_TYPE_EQUAL(domain, x, NULL); + PS_ASSERT_VECTOR_NON_NULL(domain, NULL); + PS_ASSERT_VECTOR_NON_NULL(range, NULL); + PS_ASSERT_PTR_NON_NULL(x, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(domain, range, NULL); + PS_ASSERT_PTR_TYPE_EQUAL(domain, range, NULL); + PS_ASSERT_PTR_TYPE_EQUAL(domain, x, NULL); psVector *range32 = NULL; @@ -2131,7 +2131,7 @@ ) { - PS_PTR_CHECK_NULL(spline, NAN); - PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NAN); + PS_ASSERT_PTR_NON_NULL(spline, NAN); + PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NAN); psS32 binNum; @@ -2167,8 +2167,8 @@ ) { - PS_PTR_CHECK_NULL(spline, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(spline, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL); psS32 i; Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 4028) +++ /trunk/psLib/src/math/psSpline.c (revision 4029) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.103 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:37 $ + * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -246,5 +246,5 @@ static psPolynomial1D **createChebyshevPolys(psS32 maxChebyPoly) { - PS_INT_CHECK_NON_NEGATIVE(maxChebyPoly, NULL); + PS_ASSERT_INT_NONNEGATIVE(maxChebyPoly, NULL); psPolynomial1D **chebPolys = NULL; @@ -314,5 +314,5 @@ static psF32 chebPolynomial1DEval(psF32 x, const psPolynomial1D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); // XXX: Create a macro for this in psConstants.h if (myPoly->n < 1) { @@ -398,5 +398,5 @@ const psPolynomial2D* myPoly) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); psS32 loop_x = 0; @@ -422,7 +422,7 @@ static psF32 chebPolynomial2DEval(psF32 x, psF32 y, const psPolynomial2D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); psS32 loop_x = 0; @@ -487,7 +487,7 @@ static psF32 chebPolynomial3DEval(psF32 x, psF32 y, psF32 z, const psPolynomial3D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -565,8 +565,8 @@ static psF32 chebPolynomial4DEval(psF32 w, psF32 x, psF32 y, psF32 z, const psPolynomial4D* myPoly) { - PS_FLOAT_CHECK_RANGE(w, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(w, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_w = 0; psS32 loop_x = 0; @@ -638,5 +638,5 @@ static psF64 dChebPolynomial1DEval(psF64 x, const psDPolynomial1D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); psVector *d; psS32 n; @@ -697,6 +697,6 @@ static psF64 dChebPolynomial2DEval(psF64 x, psF64 y, const psDPolynomial2D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -761,7 +761,7 @@ static psF64 dChebPolynomial3DEval(psF64 x, psF64 y, psF64 z, const psDPolynomial3D* myPoly) { - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_x = 0; psS32 loop_y = 0; @@ -839,8 +839,8 @@ static psF64 dChebPolynomial4DEval(psF64 w, psF64 x, psF64 y, psF64 z, const psDPolynomial4D* myPoly) { - PS_FLOAT_CHECK_RANGE(w, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(x, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(y, -1.0, 1.0, 0.0); - PS_FLOAT_CHECK_RANGE(z, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(w, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(x, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(y, -1.0, 1.0, 0.0); + PS_ASSERT_FLOAT_WITHIN_RANGE(z, -1.0, 1.0, 0.0); psS32 loop_w = 0; psS32 loop_x = 0; @@ -973,6 +973,6 @@ psF32 x) { - PS_PTR_CHECK_NULL(domain, NAN) - PS_PTR_CHECK_NULL(range, NAN) + PS_ASSERT_PTR_NON_NULL(domain, NAN) + PS_ASSERT_PTR_NON_NULL(range, NAN) // XXX: Check valid values for n, order, and x? @@ -1044,5 +1044,5 @@ psVector* p_psGaussianDev(psF32 mean, psF32 sigma, psS32 Npts) { - PS_INT_CHECK_NON_NEGATIVE(Npts, NULL); + PS_ASSERT_INT_NONNEGATIVE(Npts, NULL); psVector* gauss = NULL; @@ -1072,5 +1072,5 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); psS32 i = 0; @@ -1097,6 +1097,6 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); psS32 x = 0; @@ -1133,7 +1133,7 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 x = 0; @@ -1179,8 +1179,8 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nW, NULL); - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nW, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 w = 0; @@ -1234,5 +1234,5 @@ psF32 psPolynomial1DEval(const psPolynomial1D* myPoly, psF32 x) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1251,7 +1251,7 @@ const psVector *x) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); psVector *tmp; @@ -1267,5 +1267,5 @@ psF32 psPolynomial2DEval(const psPolynomial2D* myPoly, psF32 x, psF32 y) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1286,9 +1286,9 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); psVector *tmp; @@ -1314,5 +1314,5 @@ psF32 psPolynomial3DEval(const psPolynomial3D* myPoly, psF32 x, psF32 y, psF32 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1334,11 +1334,11 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL); psVector *tmp; @@ -1370,5 +1370,5 @@ psF32 psPolynomial4DEval(const psPolynomial4D* myPoly, psF32 w, psF32 x, psF32 y, psF32 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1390,13 +1390,13 @@ const psVector *z) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(w, NULL); - PS_VECTOR_CHECK_TYPE(w, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F32, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F32, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(w, NULL); + PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F32, NULL); psVector *tmp; @@ -1434,5 +1434,5 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); psS32 i = 0; @@ -1459,6 +1459,6 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); psS32 x = 0; @@ -1495,7 +1495,7 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 x = 0; @@ -1541,8 +1541,8 @@ psPolynomialType type) { - PS_INT_CHECK_POSITIVE(nW, NULL); - PS_INT_CHECK_POSITIVE(nX, NULL); - PS_INT_CHECK_POSITIVE(nY, NULL); - PS_INT_CHECK_POSITIVE(nZ, NULL); + PS_ASSERT_INT_POSITIVE(nW, NULL); + PS_ASSERT_INT_POSITIVE(nX, NULL); + PS_ASSERT_INT_POSITIVE(nY, NULL); + PS_ASSERT_INT_POSITIVE(nZ, NULL); psS32 w = 0; @@ -1597,5 +1597,5 @@ psF64 psDPolynomial1DEval(const psDPolynomial1D* myPoly, psF64 x) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1615,7 +1615,7 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); psVector *tmp; @@ -1635,5 +1635,5 @@ psF64 y) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1653,9 +1653,9 @@ const psVector *y) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); psVector *tmp; @@ -1685,5 +1685,5 @@ psF64 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1705,11 +1705,11 @@ { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F64, NULL); psVector *tmp; @@ -1745,5 +1745,5 @@ psF64 z) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); if (myPoly->type == PS_POLYNOMIAL_ORD) { @@ -1765,13 +1765,13 @@ const psVector *z) { - PS_POLY_CHECK_NULL(myPoly, NULL); - PS_VECTOR_CHECK_NULL(w, NULL); - PS_VECTOR_CHECK_TYPE(w, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE(x, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(y, NULL); - PS_VECTOR_CHECK_TYPE(y, PS_TYPE_F64, NULL); - PS_VECTOR_CHECK_NULL(z, NULL); - PS_VECTOR_CHECK_TYPE(z, PS_TYPE_F64, NULL); + PS_ASSERT_POLY_NON_NULL(myPoly, NULL); + PS_ASSERT_VECTOR_NON_NULL(w, NULL); + PS_ASSERT_VECTOR_TYPE(w, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(y, NULL); + PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL); + PS_ASSERT_VECTOR_NON_NULL(z, NULL); + PS_ASSERT_VECTOR_TYPE(z, PS_TYPE_F64, NULL); psVector *tmp; @@ -1828,7 +1828,7 @@ psF32 max) { - PS_INT_CHECK_NON_NEGATIVE(numSplines, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); - PS_FLOAT_CHECK_NON_EQUAL(max, min, NULL); + PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); + PS_ASSERT_FLOAT_NON_EQUAL(max, min, NULL); psSpline1D *tmp = NULL; @@ -1870,7 +1870,7 @@ psS32 order) { - PS_VECTOR_CHECK_NULL(bounds, NULL); - PS_VECTOR_CHECK_EMPTY(bounds, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); + PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); + PS_ASSERT_VECTOR_NON_EMPTY(bounds, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); psSpline1D *tmp = NULL; @@ -1983,8 +1983,8 @@ psScalar *x) { - PS_VECTOR_CHECK_NULL(bins, -4); - PS_VECTOR_CHECK_EMPTY(bins, -4); - PS_PTR_CHECK_NULL(x, -6); - PS_PTR_CHECK_TYPE_EQUAL(x, bins, -3); + PS_ASSERT_VECTOR_NON_NULL(bins, -4); + PS_ASSERT_VECTOR_NON_EMPTY(bins, -4); + PS_ASSERT_PTR_NON_NULL(x, -6); + PS_ASSERT_PTR_TYPE_EQUAL(x, bins, -3); char* strType; @@ -2049,11 +2049,11 @@ psScalar *x) { - PS_VECTOR_CHECK_NULL(domain, NULL); - PS_VECTOR_CHECK_NULL(range, NULL); - PS_PTR_CHECK_NULL(x, NULL); - PS_INT_CHECK_NON_NEGATIVE(order, NULL); - PS_VECTOR_CHECK_SIZE_EQUAL(domain, range, NULL); - PS_PTR_CHECK_TYPE_EQUAL(domain, range, NULL); - PS_PTR_CHECK_TYPE_EQUAL(domain, x, NULL); + PS_ASSERT_VECTOR_NON_NULL(domain, NULL); + PS_ASSERT_VECTOR_NON_NULL(range, NULL); + PS_ASSERT_PTR_NON_NULL(x, NULL); + PS_ASSERT_INT_NONNEGATIVE(order, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(domain, range, NULL); + PS_ASSERT_PTR_TYPE_EQUAL(domain, range, NULL); + PS_ASSERT_PTR_TYPE_EQUAL(domain, x, NULL); psVector *range32 = NULL; @@ -2131,7 +2131,7 @@ ) { - PS_PTR_CHECK_NULL(spline, NAN); - PS_INT_CHECK_NON_NEGATIVE(spline->n, NAN); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NAN); + PS_ASSERT_PTR_NON_NULL(spline, NAN); + PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NAN); psS32 binNum; @@ -2167,8 +2167,8 @@ ) { - PS_PTR_CHECK_NULL(spline, NULL); - PS_VECTOR_CHECK_NULL(x, NULL); - PS_VECTOR_CHECK_TYPE_F32_OR_F64(x, NULL); - PS_VECTOR_CHECK_TYPE(spline->knots, PS_TYPE_F32, NULL); + PS_ASSERT_PTR_NON_NULL(spline, NULL); + PS_ASSERT_VECTOR_NON_NULL(x, NULL); + PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL); + PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL); psS32 i; Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 4028) +++ /trunk/psLib/src/math/psStats.c (revision 4029) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.128 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 19:25:29 $ + * @version $Revision: 1.129 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -424,6 +424,6 @@ psStats* stats) { - PS_VECTOR_CHECK_NULL(myVector, -1); - PS_PTR_CHECK_NULL(stats, -1); + PS_ASSERT_VECTOR_NON_NULL(myVector, -1); + PS_ASSERT_PTR_NON_NULL(stats, -1); psS32 i = 0; // Loop index variable @@ -472,6 +472,6 @@ psStats* stats) { - PS_VECTOR_CHECK_NULL(myVector, -1); - PS_PTR_CHECK_NULL(stats, -1); + PS_ASSERT_VECTOR_NON_NULL(myVector, -1); + PS_ASSERT_PTR_NON_NULL(stats, -1); psS32 i = 0; // Loop index variable psS32 numData = 0; // The number of data points @@ -619,6 +619,6 @@ psF32 sigma) { - PS_PTR_CHECK_NULL(robustHistogram, NULL); - PS_PTR_CHECK_NULL(robustHistogram->bounds, NULL); + PS_ASSERT_PTR_NON_NULL(robustHistogram, NULL); + PS_ASSERT_PTR_NON_NULL(robustHistogram->bounds, NULL); psS32 i = 0; // Loop index variable @@ -1029,12 +1029,12 @@ // Ensure that stats->clipIter is within the proper range. - PS_INT_CHECK_RANGE(stats->clipIter, - PS_CLIPPED_NUM_ITER_LB, - PS_CLIPPED_NUM_ITER_UB, -1); + PS_ASSERT_INT_WITHIN_RANGE(stats->clipIter, + PS_CLIPPED_NUM_ITER_LB, + PS_CLIPPED_NUM_ITER_UB, -1); // Ensure that stats->clipSigma is within the proper range. - PS_INT_CHECK_RANGE(stats->clipSigma, - PS_CLIPPED_SIGMA_LB, - PS_CLIPPED_SIGMA_UB, -1); + PS_ASSERT_INT_WITHIN_RANGE(stats->clipSigma, + PS_CLIPPED_SIGMA_LB, + PS_CLIPPED_SIGMA_UB, -1); // Allocate a psStats structure for calculating the mean, median, and @@ -1263,5 +1263,5 @@ psF32 getThisValue) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); PS_FLOAT_COMPARE(rangeLow, rangeHigh, NAN); // We ensure that the requested f(y) value, which is getThisValue, is @@ -1332,11 +1332,11 @@ psF32 yVal) { - PS_VECTOR_CHECK_NULL(xVec, NAN); - PS_VECTOR_CHECK_NULL(yVec, NAN); - PS_VECTOR_CHECK_TYPE(xVec, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_TYPE(yVec, PS_TYPE_F32, NAN); - // PS_VECTOR_CHECK_SIZE_EQUAL(xVec, yVec, NAN); - PS_INT_CHECK_RANGE(binNum, 0, (xVec->n - 1), NAN); - PS_INT_CHECK_RANGE(binNum, 0, (yVec->n - 1), NAN); + PS_ASSERT_VECTOR_NON_NULL(xVec, NAN); + PS_ASSERT_VECTOR_NON_NULL(yVec, NAN); + PS_ASSERT_VECTOR_TYPE(xVec, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_TYPE(yVec, PS_TYPE_F32, NAN); + // PS_ASSERT_VECTORS_SIZE_EQUAL(xVec, yVec, NAN); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (xVec->n - 1), NAN); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (yVec->n - 1), NAN); // PS_VECTOR_DECLARE_ALLOC_STATIC(x, 3, PS_TYPE_F64); @@ -1827,5 +1827,5 @@ psHistogram* psHistogramAlloc(psF32 lower, psF32 upper, psS32 n) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); PS_FLOAT_COMPARE(lower, upper, NULL); @@ -1875,6 +1875,6 @@ psHistogram* psHistogramAllocGeneric(const psVector* bounds) { - PS_VECTOR_CHECK_NULL(bounds, NULL); - PS_VECTOR_CHECK_TYPE(bounds, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); + PS_ASSERT_VECTOR_TYPE(bounds, PS_TYPE_F32, NULL); PS_INT_COMPARE(2, bounds->n, NULL); @@ -1930,10 +1930,10 @@ psF32 error) { - PS_PTR_CHECK_NULL(out, -1); - PS_PTR_CHECK_NULL(out->bounds, -1); - PS_PTR_CHECK_NULL(out->nums, -1); - PS_INT_CHECK_RANGE(binNum, 0, ((out->nums->n)-1), -2); + PS_ASSERT_PTR_NON_NULL(out, -1); + PS_ASSERT_PTR_NON_NULL(out->bounds, -1); + PS_ASSERT_PTR_NON_NULL(out->nums, -1); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, ((out->nums->n)-1), -2); PS_FLOAT_COMPARE(0.0, error, -3); - PS_FLOAT_CHECK_RANGE(data, out->bounds->data.F32[0], out->bounds->data.F32[(out->bounds->n)-1], -4); + PS_ASSERT_FLOAT_WITHIN_RANGE(data, out->bounds->data.F32[0], out->bounds->data.F32[(out->bounds->n)-1], -4); psF32 boxcarWidth = 2.35 * error; @@ -2019,19 +2019,19 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(out, NULL); - PS_VECTOR_CHECK_NULL(out->bounds, NULL); - PS_VECTOR_CHECK_TYPE(out->bounds, PS_TYPE_F32, NULL); - PS_INT_CHECK_NON_NEGATIVE(out->bounds->n, NULL); - PS_VECTOR_CHECK_NULL(out->nums, NULL); - PS_VECTOR_CHECK_TYPE(out->nums, PS_TYPE_F32, NULL); - PS_INT_CHECK_NON_NEGATIVE(out->nums->n, NULL); - PS_VECTOR_CHECK_NULL(in, out); + PS_ASSERT_PTR_NON_NULL(out, NULL); + PS_ASSERT_VECTOR_NON_NULL(out->bounds, NULL); + PS_ASSERT_VECTOR_TYPE(out->bounds, PS_TYPE_F32, NULL); + PS_ASSERT_INT_NONNEGATIVE(out->bounds->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(out->nums, NULL); + PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, NULL); + PS_ASSERT_INT_NONNEGATIVE(out->nums->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(in, out); if (mask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(in, mask, NULL); - PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, NULL); } if (errors != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(in, errors, NULL); - PS_VECTOR_CHECK_TYPE(errors, in->type.type, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(in, errors, NULL); + PS_ASSERT_VECTOR_TYPE(errors, in->type.type, NULL); } @@ -2216,13 +2216,13 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(stats, NULL); - PS_VECTOR_CHECK_NULL(in, stats); + PS_ASSERT_PTR_NON_NULL(stats, NULL); + PS_ASSERT_VECTOR_NON_NULL(in, stats); if (mask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, stats); - PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, stats); + PS_ASSERT_VECTORS_SIZE_EQUAL(mask, in, stats); + PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, stats); } if (errors != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(errors, in, stats); - PS_VECTOR_CHECK_TYPE(errors, in->type.type, stats); + PS_ASSERT_VECTORS_SIZE_EQUAL(errors, in, stats); + PS_ASSERT_VECTOR_TYPE(errors, in->type.type, stats); } Index: /trunk/psLib/src/math/psUnaryOp.c =================================================================== --- /trunk/psLib/src/math/psUnaryOp.c (revision 4028) +++ /trunk/psLib/src/math/psUnaryOp.c (revision 4029) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-12 00:54:49 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -315,6 +315,6 @@ psType* psTypeIn = (psType* ) in; - PS_PTR_CHECK_NULL_GENERAL(in, psUnaryOp_EXIT); - PS_PTR_CHECK_NULL_GENERAL(op, psUnaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(in, psUnaryOp_EXIT); + PS_ASSERT_GENERAL_PTR_NON_NULL(op, psUnaryOp_EXIT); psDimen dimIn = psTypeIn->dimen; Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 4028) +++ /trunk/psLib/src/types/psMetadata.c (revision 4029) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-16 19:43:53 $ +* @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -179,5 +179,5 @@ - PS_PTR_CHECK_NULL(name,NULL); + PS_ASSERT_PTR_NON_NULL(name,NULL); // Allocate metadata item @@ -275,9 +275,9 @@ psMetadataItem *existingEntry = NULL; - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->table,NULL); - PS_PTR_CHECK_NULL(md->list,NULL); - PS_PTR_CHECK_NULL(metadataItem,NULL); - PS_PTR_CHECK_NULL(metadataItem->name,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(metadataItem,NULL); + PS_ASSERT_PTR_NON_NULL(metadataItem->name,NULL); mdTable = md->table; @@ -410,10 +410,10 @@ psBool psMetadataRemove(psMetadata *md, psS32 where, const char *key) { - PS_PTR_CHECK_NULL(md,NULL); - - PS_PTR_CHECK_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + + PS_ASSERT_PTR_NON_NULL(md->list,NULL); psList* mdList = md->list; - PS_PTR_CHECK_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(md->table,NULL); psHash* mdTable = md->table; @@ -482,7 +482,7 @@ - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->table,NULL); - PS_PTR_CHECK_NULL(key,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(key,NULL); mdTable = md->table; @@ -583,6 +583,6 @@ psMetadataItem* entry = NULL; - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->list,NULL); entry = (psMetadataItem*) psListGet(md->list, where); @@ -599,6 +599,6 @@ const char* regex) { - PS_PTR_CHECK_NULL(md,NULL); - PS_PTR_CHECK_NULL(md->list,NULL); + PS_ASSERT_PTR_NON_NULL(md,NULL); + PS_ASSERT_PTR_NON_NULL(md->list,NULL); psMetadataIterator* newIter = psAlloc(sizeof(psMetadataIterator)); @@ -637,8 +637,8 @@ psMetadataItem* cursor; - PS_PTR_CHECK_NULL(iterator,NULL); + PS_ASSERT_PTR_NON_NULL(iterator,NULL); psListIterator* iter = iterator->iter; - PS_PTR_CHECK_NULL(iterator->iter,NULL); + PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL); regex_t* preg = iterator->preg; @@ -686,8 +686,8 @@ psMetadataItem* oldValue; - PS_PTR_CHECK_NULL(iterator,NULL); + PS_ASSERT_PTR_NON_NULL(iterator,NULL); psListIterator* iter = iterator->iter; - PS_PTR_CHECK_NULL(iterator->iter,NULL); + PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL); regex_t* preg = iterator->preg; @@ -714,8 +714,8 @@ psMetadataItem* oldValue; - PS_PTR_CHECK_NULL(iterator,NULL); + PS_ASSERT_PTR_NON_NULL(iterator,NULL); psListIterator* iter = iterator->iter; - PS_PTR_CHECK_NULL(iterator->iter,NULL); + PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL); regex_t* preg = iterator->preg; Index: /trunk/psLib/src/types/psMetadataConfig.c =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.c (revision 4028) +++ /trunk/psLib/src/types/psMetadataConfig.c (revision 4029) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 20:48:28 $ +* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -368,7 +368,7 @@ psBool success = true; - PS_PTR_CHECK_NULL(fd, success); - PS_PTR_CHECK_NULL(format, success); - PS_PTR_CHECK_NULL(metadataItem, success); + PS_ASSERT_PTR_NON_NULL(fd, success); + PS_ASSERT_PTR_NON_NULL(format, success); + PS_ASSERT_PTR_NON_NULL(metadataItem, success); type = metadataItem->type; @@ -469,5 +469,5 @@ fitsfile *fd = NULL; - PS_PTR_CHECK_NULL(fileName,NULL); + PS_ASSERT_PTR_NON_NULL(fileName,NULL); fits_open_file(&fd, fileName, READONLY, &status); @@ -1086,8 +1086,8 @@ // Check for NULL file name - PS_PTR_CHECK_NULL(fileName,NULL); + PS_ASSERT_PTR_NON_NULL(fileName,NULL); // Check for NULL nFail - PS_PTR_CHECK_NULL(nFail,NULL); + PS_ASSERT_PTR_NON_NULL(nFail,NULL); // Attempt to open specified file @@ -1156,9 +1156,9 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems @@ -1173,5 +1173,5 @@ psHashAdd(htAtts, "tagName", psTagName); } else { - PS_PTR_CHECK_NULL_GENERAL(psTagName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psTagName, return); psFree(htAtts); psFree(psTagName); @@ -1193,5 +1193,5 @@ psFree(psAttValue); } else { - PS_PTR_CHECK_NULL_GENERAL(psAttValue, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psAttValue, return); psFree(htAtts); psFree(psTagName); @@ -1237,17 +1237,17 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); metadataItem = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(metadataItem, return); - PS_PTR_CHECK_NULL_GENERAL(metadataItem->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem->data.list, return); metadataItem = (psMetadataItem*)psListGet(metadataItem->data.list,PS_LIST_TAIL); htAtts = (psHash*)metadataItem->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); fileName = (char*)input->filename; - PS_PTR_CHECK_NULL_GENERAL(fileName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return); lineNumber = input->line; @@ -1386,17 +1386,17 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); tables = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(tables, return); - PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return); table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL); htAtts = (psHash*)table->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); fileName = (char*)input->filename; - PS_PTR_CHECK_NULL_GENERAL(fileName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return); lineNumber = input->line; @@ -1427,5 +1427,5 @@ strValue = psHashLookup(htAtts, "value"); - PS_PTR_CHECK_NULL_GENERAL(strValue, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(strValue, return); @@ -1482,15 +1482,15 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); tables = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(tables, return); - PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return); table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL); htAtts = (psHash*)table->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems @@ -1499,5 +1499,5 @@ // Compare start and end tag names psStartTagName = psHashLookup(htAtts, "tagName"); - PS_PTR_CHECK_NULL_GENERAL(psStartTagName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psStartTagName, return); if(strcmp(psEndTagName, psStartTagName)) { psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_TAG_MISMATCH, psStartTagName, psEndTagName); @@ -1527,5 +1527,5 @@ // Error checks - PS_PTR_CHECK_NULL(fileName, NULL); + PS_ASSERT_PTR_NON_NULL(fileName, NULL); // Allocate metadata if necessary Index: /trunk/psLib/src/xml/psXML.c =================================================================== --- /trunk/psLib/src/xml/psXML.c (revision 4028) +++ /trunk/psLib/src/xml/psXML.c (revision 4029) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 20:48:28 $ +* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -368,7 +368,7 @@ psBool success = true; - PS_PTR_CHECK_NULL(fd, success); - PS_PTR_CHECK_NULL(format, success); - PS_PTR_CHECK_NULL(metadataItem, success); + PS_ASSERT_PTR_NON_NULL(fd, success); + PS_ASSERT_PTR_NON_NULL(format, success); + PS_ASSERT_PTR_NON_NULL(metadataItem, success); type = metadataItem->type; @@ -469,5 +469,5 @@ fitsfile *fd = NULL; - PS_PTR_CHECK_NULL(fileName,NULL); + PS_ASSERT_PTR_NON_NULL(fileName,NULL); fits_open_file(&fd, fileName, READONLY, &status); @@ -1086,8 +1086,8 @@ // Check for NULL file name - PS_PTR_CHECK_NULL(fileName,NULL); + PS_ASSERT_PTR_NON_NULL(fileName,NULL); // Check for NULL nFail - PS_PTR_CHECK_NULL(nFail,NULL); + PS_ASSERT_PTR_NON_NULL(nFail,NULL); // Attempt to open specified file @@ -1156,9 +1156,9 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems @@ -1173,5 +1173,5 @@ psHashAdd(htAtts, "tagName", psTagName); } else { - PS_PTR_CHECK_NULL_GENERAL(psTagName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psTagName, return); psFree(htAtts); psFree(psTagName); @@ -1193,5 +1193,5 @@ psFree(psAttValue); } else { - PS_PTR_CHECK_NULL_GENERAL(psAttValue, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psAttValue, return); psFree(htAtts); psFree(psTagName); @@ -1237,17 +1237,17 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); metadataItem = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(metadataItem, return); - PS_PTR_CHECK_NULL_GENERAL(metadataItem->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem->data.list, return); metadataItem = (psMetadataItem*)psListGet(metadataItem->data.list,PS_LIST_TAIL); htAtts = (psHash*)metadataItem->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); fileName = (char*)input->filename; - PS_PTR_CHECK_NULL_GENERAL(fileName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return); lineNumber = input->line; @@ -1386,17 +1386,17 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); tables = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(tables, return); - PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return); table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL); htAtts = (psHash*)table->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); fileName = (char*)input->filename; - PS_PTR_CHECK_NULL_GENERAL(fileName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return); lineNumber = input->line; @@ -1427,5 +1427,5 @@ strValue = psHashLookup(htAtts, "value"); - PS_PTR_CHECK_NULL_GENERAL(strValue, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(strValue, return); @@ -1482,15 +1482,15 @@ // Get and check initial data pointers ctxt = (xmlParserCtxtPtr)ctx; - PS_PTR_CHECK_NULL_GENERAL(ctxt, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return); md = (psMetadata*)ctxt->sax->_private; - PS_PTR_CHECK_NULL_GENERAL(md, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(md, return); input = (xmlParserInputPtr)ctxt->input; - PS_PTR_CHECK_NULL_GENERAL(input, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(input, return); tables = psMetadataLookup(md, "htAtts"); - PS_PTR_CHECK_NULL_GENERAL(tables, return); - PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return); table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL); htAtts = (psHash*)table->data.list; - PS_PTR_CHECK_NULL_GENERAL(htAtts, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return); // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems @@ -1499,5 +1499,5 @@ // Compare start and end tag names psStartTagName = psHashLookup(htAtts, "tagName"); - PS_PTR_CHECK_NULL_GENERAL(psStartTagName, return); + PS_ASSERT_GENERAL_PTR_NON_NULL(psStartTagName, return); if(strcmp(psEndTagName, psStartTagName)) { psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_TAG_MISMATCH, psStartTagName, psEndTagName); @@ -1527,5 +1527,5 @@ // Error checks - PS_PTR_CHECK_NULL(fileName, NULL); + PS_ASSERT_PTR_NON_NULL(fileName, NULL); // Allocate metadata if necessary