Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 2203) +++ /trunk/psLib/src/astro/psCoord.c (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-26 22:32:09 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ } -psPlaneTransform* psPlaneTransformAlloc(int n1, int n2) +psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2) { psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform)); @@ -97,5 +97,5 @@ } -psPlaneDistort* psPlaneDistortAlloc(int n1, int n2, int n3, int n4) +psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4) { psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort)); Index: /trunk/psLib/src/astro/psCoord.h =================================================================== --- /trunk/psLib/src/astro/psCoord.h (revision 2203) +++ /trunk/psLib/src/astro/psCoord.h (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-26 22:32:09 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -173,6 +173,6 @@ psPlaneTransform* psPlaneTransformAlloc( - int n1, ///< The order of the x term in the transform. - int n2 ///< The order of the y term in the transform. + psS32 n1, ///< The order of the x term in the transform. + psS32 n2 ///< The order of the y term in the transform. ); @@ -193,8 +193,8 @@ psPlaneDistort* psPlaneDistortAlloc( - int n1, ///< The order of the w term in the transform. - int n2, ///< The order of the x term in the transform. - int n3, ///< The order of the y term in the transform. - int n4 ///< The order of the z term in the transform. + psS32 n1, ///< The order of the w term in the transform. + psS32 n2, ///< The order of the x term in the transform. + psS32 n3, ///< The order of the y term in the transform. + psS32 n4 ///< The order of the z term in the transform. ); Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 2203) +++ /trunk/psLib/src/astro/psTime.c (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 00:37:44 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -144,5 +144,5 @@ static double lookupSer7Table( const psTime *time, ///< time to lookup. - int col ///< Column to lookup. + psS32 col ///< Column to lookup. ); @@ -150,6 +150,6 @@ { char line[LINESIZE]; - int j = 0; - int maxLines = 100; + psS32 j = 0; + psS32 maxLines = 100; psF64 *ptr = NULL; psImage *table = NULL; @@ -180,5 +180,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; p_psMemSetPersistent(table,true); @@ -191,8 +191,8 @@ static psImage* readSer7File(const char *fileName) { - bool beginRecord = false; + psBool beginRecord = false; char line[LINESIZE]; - int j = 0; - int maxLines = 400; + psS32 j = 0; + psS32 maxLines = 400; psImage *table = NULL; FILE *fd = NULL; @@ -231,5 +231,5 @@ } } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; p_psMemSetPersistent(table,true); @@ -244,7 +244,7 @@ { char line[LINESIZE]; - int i = 0; - int j = 0; - int maxLines = 2500; + psS32 i = 0; + psS32 j = 0; + psS32 maxLines = 2500; psImage *table = NULL; FILE *fd = NULL; @@ -276,5 +276,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; return table; @@ -284,6 +284,6 @@ { char line[LINESIZE]; - int j = 0; - int maxLines = 15000; + psS32 j = 0; + psS32 maxLines = 15000; psImage *table = NULL; FILE *fd = NULL; @@ -346,5 +346,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; return table; @@ -354,7 +354,7 @@ static double lookupTaiUtcTable(const psTime *time) { - int hiIdx = 0; - int loIdx = 0; - int numRows = 0; + psS32 hiIdx = 0; + psS32 loIdx = 0; + psS32 numRows = 0; double jd = 0.0; double mjd = 0.0; @@ -422,9 +422,9 @@ } -static double lookupSer7Table(const psTime *time, int col) -{ - int hiIdx = 0; - int loIdx = 0; - int numRows = 0; +static double lookupSer7Table(const psTime *time, psS32 col) +{ + psS32 hiIdx = 0; + psS32 loIdx = 0; + psS32 numRows = 0; double out = 0.0; double denom = 0.0; @@ -752,7 +752,7 @@ } -long psTimeLeapseconds(const psTime *time1, const psTime *time2) -{ - long diff = 0; +psS64 psTimeLeapseconds(const psTime *time1, const psTime *time2) +{ + psS64 diff = 0; @@ -827,5 +827,5 @@ char* psTimeToISOTime(const psTime *time) { - int ms = 0; + psS32 ms = 0; char *timeString = NULL; char *tempString = NULL; @@ -889,12 +889,12 @@ struct tm* psTimeToTM(const psTime *time) { - long cent = 0; - long year = 0; - long month = 0; - long day = 0; - long hour = 0; - long minute = 0; - long seconds = 0; - long temp = 0; + psS64 cent = 0; + psS64 year = 0; + psS64 month = 0; + psS64 day = 0; + psS64 hour = 0; + psS64 minute = 0; + psS64 seconds = 0; + psS64 temp = 0; struct tm* tmTime = NULL; @@ -975,7 +975,7 @@ seconds = days * SEC_PER_DAY; if(seconds < 0.0) { - outTime->usec = (seconds - (long)seconds) * -1000000.0; // psTime earlier than epoch + outTime->usec = (seconds - (psS64)seconds) * -1000000.0; // psTime earlier than epoch } else { - outTime->usec = (seconds - (long)seconds) * 1000000.0; // psTime greater than epoch + outTime->usec = (seconds - (psS64)seconds) * 1000000.0; // psTime greater than epoch } outTime->sec = seconds; @@ -1003,7 +1003,7 @@ seconds = days * SEC_PER_DAY; if(seconds < 0.0) { - outTime->usec = (seconds - (long)seconds) * -1000000.0; // psTime earlier than epoch + outTime->usec = (seconds - (psS64)seconds) * -1000000.0; // psTime earlier than epoch } else { - outTime->usec = (seconds - (long)seconds) * 1000000.0; // psTime greater than epoch + outTime->usec = (seconds - (psS64)seconds) * 1000000.0; // psTime greater than epoch } outTime->sec = seconds; @@ -1020,11 +1020,11 @@ { char tempString[MAX_TIME_STRING_LENGTH]; - int month; - int day; - int year; - int hour; - int minute; - int second; - int millisecond; + psS32 month; + psS32 day; + psS32 year; + psS32 hour; + psS32 minute; + psS32 second; + psS32 millisecond; struct tm tmTime; psTime *outTime = NULL; @@ -1127,11 +1127,11 @@ psTime* psTimeFromTM(const struct tm* time) { - long year; - long month; - long day; - long hour; - long minute; - long seconds; - long temp; + psS64 year; + psS64 month; + psS64 day; + psS64 hour; + psS64 minute; + psS64 seconds; + psS64 temp; psTime *outTime = NULL; @@ -1194,5 +1194,5 @@ { psF64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1243,5 +1243,5 @@ { psS64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1267,5 +1267,5 @@ outTime = psTimeAlloc(tai1->type); deltaSec = tai1->sec - tai2->sec; - deltaUsec = (long)tai1->usec - (long)tai2->usec; + deltaUsec = (psS64)tai1->usec - (psS64)tai2->usec; // Adjust time in case of microsecond underflow after subtraction @@ -1289,5 +1289,5 @@ { psS64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1313,5 +1313,5 @@ outTime = psTimeAlloc(tai1->type); deltaSec = tai1->sec - tai2->sec; - deltaUsec = (long)tai1->usec - (long)tai2->usec; + deltaUsec = (psS64)tai1->usec - (psS64)tai2->usec; // Adjust time in case of microsecond underflow after subtraction Index: /trunk/psLib/src/astro/psTime.h =================================================================== --- /trunk/psLib/src/astro/psTime.h (revision 2203) +++ /trunk/psLib/src/astro/psTime.h (revision 2204) @@ -54,6 +54,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-20 20:05:58 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -181,5 +181,5 @@ * @return long: leapseconds added between given times */ -long psTimeLeapseconds( +psS64 psTimeLeapseconds( const psTime* time1, ///< First input time. const psTime* time2 ///< Second input time. Index: /trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.c (revision 2203) +++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 2204) @@ -8,6 +8,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 23:45:53 $ + * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,7 +33,7 @@ psImage. *****************************************************************************/ -static int checkValidImageCoords(double x, - double y, - psImage* tmpImage) +static psS32 checkValidImageCoords(double x, + double y, + psImage* tmpImage) { if (tmpImage == NULL) { @@ -56,7 +56,7 @@ cooefficients of order 2 are higher are non-zero, then it is not linear. *****************************************************************************/ -static int isProjectionLinear(psPlaneTransform *transform) -{ - int i = 0; +static psS32 isProjectionLinear(psPlaneTransform *transform) +{ + psS32 i = 0; PS_CHECK_NULL_PTR_RETURN_ZERO(transform); @@ -178,5 +178,5 @@ { if (obs != NULL) { - psFree((void*)obs->name); + psFree((psPtr)obs->name); } } @@ -185,8 +185,8 @@ { if (exp != NULL) { - psFree((void*)exp->time); - psFree((void*)exp->observatory); - psFree((void*)exp->cameraName); - psFree((void*)exp->telescopeName); + psFree((psPtr)exp->time); + psFree((psPtr)exp->observatory); + psFree((psPtr)exp->cameraName); + psFree((psPtr)exp->telescopeName); } } @@ -195,9 +195,9 @@ { if (fp != NULL) { - for (int i = 0; i < fp->p_ps_xRows; i++) { + for (psS32 i = 0; i < fp->p_ps_xRows; i++) { psFree(fp->x[i]); } - for (int j = 0; j < fp->p_ps_yRows; j++) { + for (psS32 j = 0; j < fp->p_ps_yRows; j++) { psFree(fp->y[j]); } @@ -226,6 +226,6 @@ { psFixedPattern *tmp; - int i; - int j; + psS32 i; + psS32 j; PS_CHECK_NULL_IMAGE_RETURN_NULL(x); @@ -301,6 +301,6 @@ *(float *)&exp->wavelength = wavelength; - exp->time = psMemIncrRefCounter((void*)time); - exp->observatory = psMemIncrRefCounter((void*)observatory); + exp->time = psMemIncrRefCounter((psPtr)time); + exp->observatory = psMemIncrRefCounter((psPtr)observatory); // XXX: how is these value derived? @@ -343,5 +343,5 @@ } -psFPA* psFPAAlloc(int nChips, +psFPA* psFPAAlloc(psS32 nChips, const psExposure* exp) { @@ -350,6 +350,6 @@ // create array of NULL chips of the size nChips newFPA->chips = psArrayAlloc(nChips); - void** chips = newFPA->chips->data; - for (int i=0;ichips->data; + for (psS32 i=0;icells = psArrayAlloc(nCells); - void** cells = chip->cells->data; - for (int i=0;icells->data; + for (psS32 i=0;ireadouts = psArrayAlloc(nReadouts); - void** readouts = cell->readouts->data; - for (int i=0;ireadouts->data; + for (psS32 i=0;icolBins = 1; - *(unsigned int*)&readout->rowBins = 1; - *(int*)&readout->col0 = col0; - *(int*)&readout->row0 = row0; + *(psU32*)&readout->colBins = 1; + *(psU32*)&readout->rowBins = 1; + *(psS32*)&readout->col0 = col0; + *(psS32*)&readout->row0 = row0; readout->image = (psImage*)image; @@ -521,5 +521,5 @@ PS_CHECK_NULL_PTR_RETURN_NULL(FPA->chips); psArray* chips = FPA->chips; - int nChips = chips->n; + psS32 nChips = chips->n; psPlane chipCoord; psCell *tmpCell = NULL; @@ -529,5 +529,5 @@ // cells in that chip contain those chip coordinates. - for (int i = 0; i < nChips; i++) { + for (psS32 i = 0; i < nChips; i++) { psChip* tmpChip = chips->data[i]; psPlaneTransformApply(&chipCoord, tmpChip->fromFPA, fpaCoord); @@ -560,10 +560,10 @@ // If so, then we return that cell. - for (int i = 0; i < cells->n; i++) { + for (psS32 i = 0; i < cells->n; i++) { psCell* tmpCell = (psCell* ) cells->data[i]; psArray* readouts = tmpCell->readouts; if (readouts != NULL) { - for (int j = 0; j < readouts->n; j++) { + for (psS32 j = 0; j < readouts->n; j++) { psReadout* tmpReadout = readouts->data[j]; Index: /trunk/psLib/src/astronomy/psAstrometry.h =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.h (revision 2203) +++ /trunk/psLib/src/astronomy/psAstrometry.h (revision 2204) @@ -8,6 +8,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-12 20:53:02 $ +* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -72,6 +72,6 @@ typedef struct { - int nX; ///< Number of elements in x direction - int nY; ///< Number of elements in y direction + psS32 nX; ///< Number of elements in x direction + psS32 nY; ///< Number of elements in y direction double x0; ///< X Position of 0,0 corner on focal plane double y0; ///< Y Position of 0,0 corner on focal plane @@ -79,8 +79,8 @@ double yScale; ///< Scale of the grid in x direction /// XXX: I added the following memvers to facilitate the psFreeing of the x,y data structures. - int p_ps_xRows; ///< Number of rows in the x member - int p_ps_xCols; ///< Number of cols in the x member - int p_ps_yRows; ///< Number of rows in the y member - int p_ps_yCols; ///< Number of cols in the y member + psS32 p_ps_xRows; ///< Number of rows in the x member + psS32 p_ps_xCols; ///< Number of cols in the x member + psS32 p_ps_yRows; ///< Number of rows in the y member + psS32 p_ps_yCols; ///< Number of cols in the y member double **x; ///< The grid of offsets in x double **y; ///< The grid of offsets in y @@ -99,8 +99,8 @@ typedef struct { - const unsigned int colBins; ///< Amount of binning in x-dimension - const unsigned int rowBins; ///< Amount of binning in y-dimension - const int col0; ///< Offset from the left of chip. - const int row0; ///< Offset from the bottom of chip. + const psU32 colBins; ///< Amount of binning in x-dimension + const psU32 rowBins; ///< Amount of binning in y-dimension + const psS32 col0; ///< Offset from the left of chip. + const psS32 row0; ///< Offset from the bottom of chip. psImage* image; ///< Imaging area of readout @@ -304,5 +304,5 @@ */ psFPA* psFPAAlloc( - int nChips, ///< number of chips in the FPA + psS32 nChips, ///< number of chips in the FPA const psExposure* exp ///< the exposure information ); @@ -317,5 +317,5 @@ */ psChip* psChipAlloc( - int nCells, ///< number of cells in Chip + psS32 nCells, ///< number of cells in Chip psFPA* parentFPA ///< parent FPA ); @@ -330,5 +330,5 @@ */ psCell* psCellAlloc( - int nReadouts, ///< number of readouts in cell + psS32 nReadouts, ///< number of readouts in cell psChip* parentChip ///< parent Chip ); @@ -342,6 +342,6 @@ */ psReadout* psReadoutAlloc( - int col0, ///< offset from the left of the cell - int row0, ///< offset from the bottom of the cell + psS32 col0, ///< offset from the left of the cell + psS32 row0, ///< offset from the bottom of the cell const psImage* image ///< image of the readout ); Index: /trunk/psLib/src/astronomy/psAstronomyErrors.dat =================================================================== --- /trunk/psLib/src/astronomy/psAstronomyErrors.dat (revision 2203) +++ /trunk/psLib/src/astronomy/psAstronomyErrors.dat (revision 2204) Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 2203) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-26 22:32:09 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ } -psPlaneTransform* psPlaneTransformAlloc(int n1, int n2) +psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2) { psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform)); @@ -97,5 +97,5 @@ } -psPlaneDistort* psPlaneDistortAlloc(int n1, int n2, int n3, int n4) +psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4) { psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort)); Index: /trunk/psLib/src/astronomy/psCoord.h =================================================================== --- /trunk/psLib/src/astronomy/psCoord.h (revision 2203) +++ /trunk/psLib/src/astronomy/psCoord.h (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-26 22:32:09 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -173,6 +173,6 @@ psPlaneTransform* psPlaneTransformAlloc( - int n1, ///< The order of the x term in the transform. - int n2 ///< The order of the y term in the transform. + psS32 n1, ///< The order of the x term in the transform. + psS32 n2 ///< The order of the y term in the transform. ); @@ -193,8 +193,8 @@ psPlaneDistort* psPlaneDistortAlloc( - int n1, ///< The order of the w term in the transform. - int n2, ///< The order of the x term in the transform. - int n3, ///< The order of the y term in the transform. - int n4 ///< The order of the z term in the transform. + psS32 n1, ///< The order of the w term in the transform. + psS32 n2, ///< The order of the x term in the transform. + psS32 n3, ///< The order of the y term in the transform. + psS32 n4 ///< The order of the z term in the transform. ); Index: /trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.c (revision 2203) +++ /trunk/psLib/src/astronomy/psMetadata.c (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-09 03:05:53 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ /*****************************************************************************/ -static int metadataId = 0; +static psS32 metadataId = 0; /*****************************************************************************/ @@ -143,5 +143,5 @@ // Set metadata item unique id - *(int *)(&metadataItem->id) = ++metadataId; + *(psS32 *)(&metadataItem->id) = ++metadataId; // Set metadata item type @@ -154,5 +154,5 @@ break; case PS_META_BOOL: - metadataItem->data.B = (bool)va_arg(argPtr, int); + metadataItem->data.B = (psBool)va_arg(argPtr, psS32); break; case PS_META_S32: @@ -215,5 +215,5 @@ } -bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location ) +psBool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, psS32 location ) { char * key = NULL; @@ -337,6 +337,6 @@ } -bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, - const char *comment, ...) +psBool psMetadataAdd(psMetadata* restrict md, psS32 where, const char *name, psMetadataType type, + const char *comment, ...) { va_list argPtr; @@ -359,7 +359,7 @@ } -bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) -{ - int numChildren = 0; +psBool psMetadataRemove(psMetadata* restrict md, psS32 where, const char *restrict key) +{ + psS32 numChildren = 0; psList* mdList = NULL; psHash* mdTable = NULL; @@ -471,5 +471,5 @@ } -psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +psMetadataItem* psMetadataGet(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -497,5 +497,5 @@ } -bool psMetadataSetIterator(psMetadata* restrict md, int where) +psBool psMetadataSetIterator(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -517,5 +517,5 @@ } -psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; @@ -553,5 +553,5 @@ } -psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; Index: /trunk/psLib/src/astronomy/psMetadata.h =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.h (revision 2203) +++ /trunk/psLib/src/astronomy/psMetadata.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:06:27 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,11 +38,11 @@ PS_META_F32, ///< Single-precision float data. PS_META_F64, ///< Double-precision float data. - PS_META_STR, ///< String data (Stored in as void *). - PS_META_VEC, ///< Vector data (Stored in as void *). - PS_META_IMG, ///< Image data (Stored in as void *). - PS_META_JPEG, ///< JPEG data (Stored in as void *). - PS_META_PNG, ///< PNG data (Stored in as void *). - PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). - PS_META_UNKNOWN, ///< Other data (Stored in as void *). + PS_META_STR, ///< String data (Stored in as psPtr ). + PS_META_VEC, ///< Vector data (Stored in as psPtr ). + PS_META_IMG, ///< Image data (Stored in as psPtr ). + PS_META_JPEG, ///< JPEG data (Stored in as psPtr ). + PS_META_PNG, ///< PNG data (Stored in as psPtr ). + PS_META_ASTROM, ///< Astrometric coefficients (Stored in as psPtr ). + PS_META_UNKNOWN, ///< Other data (Stored in as psPtr ). PS_META_NTYPE ///< Number of types. Must be last. } psMetadataType; @@ -55,13 +55,13 @@ typedef struct psMetadataItem { - const int id; ///< Unique ID for metadata item. + const psS32 id; ///< Unique ID for metadata item. char *restrict name; ///< Name of metadata item. psMetadataType type; ///< Type of metadata item. union { - bool B; ///< boolean data + psBool B; ///< boolean data psS32 S32; ///< Signed 32-bit integer data. psF32 F32; ///< Single-precision float data. psF64 F64; ///< Double-precision float data. - psPTR V; ///< Pointer to other type of data. + psPtr V; ///< Pointer to other type of data. } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). @@ -144,8 +144,8 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem( +psBool psMetadataAddItem( psMetadata* restrict md, ///< Metadata collection to insert metadat item. psMetadataItem* restrict item, ///< Metadata item to be added. - int location ///< Location to be added. + psS32 location ///< Location to be added. ); @@ -156,7 +156,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be added. +psBool psMetadataAdd( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be added. const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. @@ -175,7 +175,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be removed. +psBool psMetadataRemove( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. ); @@ -203,5 +203,5 @@ psMetadataItem* psMetadataGet( psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where ///< Location to be retrieved. + psS32 where ///< Location to be retrieved. ); @@ -213,7 +213,7 @@ * @return void: void. */ -bool psMetadataSetIterator( +psBool psMetadataSetIterator( psMetadata* restrict md, ///< Metadata collection to iterate. - int where ///< Location of iterator. + psS32 where ///< Location of iterator. ); @@ -227,5 +227,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); @@ -239,5 +239,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); Index: /trunk/psLib/src/astronomy/psMetadataIO.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadataIO.c (revision 2203) +++ /trunk/psLib/src/astronomy/psMetadataIO.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 00:43:12 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ /** Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string * must be null terminated. */ -bool ignoreLine(char *inString) +psBool ignoreLine(char *inString) { while(*inString!='\0' && *inString!='#') { @@ -119,5 +119,5 @@ /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null * terminated copy of the original input string. */ -char *cleanString(char *inString, int sLen) +char *cleanString(char *inString, psS32 sLen) { char *ptrB = NULL; @@ -149,7 +149,7 @@ /** Count repeat occurances of a single character within a line. The input string must be null terminated. */ -int repeatedChars(char *inString, char ch) -{ - int count = 0; +psS32 repeatedChars(char *inString, char ch) +{ + psS32 count = 0; @@ -166,8 +166,8 @@ /** Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location * the beginning of the string. Tokens are newly allocated null terminated strings. */ -char* getToken(char **inString, char *delimiter, int *status) +char* getToken(char **inString, char *delimiter, psS32 *status) { char *cleanToken = NULL; - int sLen = 0; + psS32 sLen = 0; @@ -195,5 +195,5 @@ /** Returns single parsed value as a double precision number. The input string must be cleaned and null * terminated. */ -double parseValue(char *inString, int *status) +double parseValue(char *inString, psS32 *status) { char *end = NULL; @@ -212,7 +212,7 @@ /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */ -bool parseBool(char *inString, int *status) -{ - bool value = false; +psBool parseBool(char *inString, psS32 *status) +{ + psBool value = false; @@ -229,10 +229,10 @@ /** Returns parsed vector filled with with data. The input string must be null terminated. */ -psVector* parseVector(char *inString, psElemType elemType, int *status) +psVector* parseVector(char *inString, psElemType elemType, psS32 *status) { char *end = NULL; char *saveValue = NULL; - int i = 0; - int numValues = 0; + psS32 i = 0; + psS32 numValues = 0; double value = 0.0; psVector *vec = NULL; @@ -341,8 +341,8 @@ -psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, int extNum, char *fileName) -{ - bool tempBool; - bool success; +psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, psS32 extNum, char *fileName) +{ + psBool tempBool; + psBool success; char keyType; char keyName[FITS_LINE_SIZE]; @@ -350,9 +350,9 @@ char keyComment[FITS_LINE_SIZE]; char fitsErr[MAX_STRING_LENGTH]; - int i; - int hduType = 0; - int status = 0; - int numKeys = 0; - int keyNum = 0; + psS32 i; + psS32 hduType = 0; + psS32 status = 0; + psS32 numKeys = 0; + psS32 keyNum = 0; psMetadataType metadataItemType; fitsfile *fd = NULL; @@ -449,7 +449,7 @@ -int psMetadataParseConfig(psMetadata** md, char *fileName, bool overwrite) -{ - bool tempBool; +psS32 psMetadataParseConfig(psMetadata** md, char *fileName, psBool overwrite) +{ + psBool tempBool; char *line = NULL; char *strName = NULL; @@ -458,7 +458,7 @@ char *strComment = NULL; char *linePtr = NULL; - int status = 0; - int lineCount = 0; - int failedLines = 0; + psS32 status = 0; + psS32 lineCount = 0; + psS32 failedLines = 0; psF64 tempDbl = 0.0; psS32 tempInt = 0.0; Index: /trunk/psLib/src/astronomy/psMetadataIO.h =================================================================== --- /trunk/psLib/src/astronomy/psMetadataIO.h (revision 2203) +++ /trunk/psLib/src/astronomy/psMetadataIO.h (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:17:39 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. - int extNum, ///< File name extension number. Starts at 1. + psS32 extNum, ///< File name extension number. Starts at 1. char *fileName ///< Name of file to read. ); @@ -58,10 +58,10 @@ * Loads pre-defined settings by parsing a configuration file into a psMetadata structure. * - * @return int : Number of lines that failed to be read. + * @return psS32 : Number of lines that failed to be read. */ -int psMetadataParseConfig( +psS32 psMetadataParseConfig( psMetadata** md, ///< Resulting metadata from read. char *fileName, ///< Name of file to read. - bool overwrite ///< Allow overwrite of duplicate specifications. + psBool overwrite ///< Allow overwrite of duplicate specifications. ); Index: /trunk/psLib/src/astronomy/psPhotometry.h =================================================================== --- /trunk/psLib/src/astronomy/psPhotometry.h (revision 2203) +++ /trunk/psLib/src/astronomy/psPhotometry.h (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 23:40:54 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -43,5 +43,5 @@ typedef struct { - const int ID; ///< ID number for this photometric system + const psS32 ID; ///< ID number for this photometric system const char *name; ///< Name of photometric system const char *camera; ///< Camera for photometric system Index: /trunk/psLib/src/astronomy/psTime.c =================================================================== --- /trunk/psLib/src/astronomy/psTime.c (revision 2203) +++ /trunk/psLib/src/astronomy/psTime.c (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 00:37:44 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -144,5 +144,5 @@ static double lookupSer7Table( const psTime *time, ///< time to lookup. - int col ///< Column to lookup. + psS32 col ///< Column to lookup. ); @@ -150,6 +150,6 @@ { char line[LINESIZE]; - int j = 0; - int maxLines = 100; + psS32 j = 0; + psS32 maxLines = 100; psF64 *ptr = NULL; psImage *table = NULL; @@ -180,5 +180,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; p_psMemSetPersistent(table,true); @@ -191,8 +191,8 @@ static psImage* readSer7File(const char *fileName) { - bool beginRecord = false; + psBool beginRecord = false; char line[LINESIZE]; - int j = 0; - int maxLines = 400; + psS32 j = 0; + psS32 maxLines = 400; psImage *table = NULL; FILE *fd = NULL; @@ -231,5 +231,5 @@ } } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; p_psMemSetPersistent(table,true); @@ -244,7 +244,7 @@ { char line[LINESIZE]; - int i = 0; - int j = 0; - int maxLines = 2500; + psS32 i = 0; + psS32 j = 0; + psS32 maxLines = 2500; psImage *table = NULL; FILE *fd = NULL; @@ -276,5 +276,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; return table; @@ -284,6 +284,6 @@ { char line[LINESIZE]; - int j = 0; - int maxLines = 15000; + psS32 j = 0; + psS32 maxLines = 15000; psImage *table = NULL; FILE *fd = NULL; @@ -346,5 +346,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; return table; @@ -354,7 +354,7 @@ static double lookupTaiUtcTable(const psTime *time) { - int hiIdx = 0; - int loIdx = 0; - int numRows = 0; + psS32 hiIdx = 0; + psS32 loIdx = 0; + psS32 numRows = 0; double jd = 0.0; double mjd = 0.0; @@ -422,9 +422,9 @@ } -static double lookupSer7Table(const psTime *time, int col) -{ - int hiIdx = 0; - int loIdx = 0; - int numRows = 0; +static double lookupSer7Table(const psTime *time, psS32 col) +{ + psS32 hiIdx = 0; + psS32 loIdx = 0; + psS32 numRows = 0; double out = 0.0; double denom = 0.0; @@ -752,7 +752,7 @@ } -long psTimeLeapseconds(const psTime *time1, const psTime *time2) -{ - long diff = 0; +psS64 psTimeLeapseconds(const psTime *time1, const psTime *time2) +{ + psS64 diff = 0; @@ -827,5 +827,5 @@ char* psTimeToISOTime(const psTime *time) { - int ms = 0; + psS32 ms = 0; char *timeString = NULL; char *tempString = NULL; @@ -889,12 +889,12 @@ struct tm* psTimeToTM(const psTime *time) { - long cent = 0; - long year = 0; - long month = 0; - long day = 0; - long hour = 0; - long minute = 0; - long seconds = 0; - long temp = 0; + psS64 cent = 0; + psS64 year = 0; + psS64 month = 0; + psS64 day = 0; + psS64 hour = 0; + psS64 minute = 0; + psS64 seconds = 0; + psS64 temp = 0; struct tm* tmTime = NULL; @@ -975,7 +975,7 @@ seconds = days * SEC_PER_DAY; if(seconds < 0.0) { - outTime->usec = (seconds - (long)seconds) * -1000000.0; // psTime earlier than epoch + outTime->usec = (seconds - (psS64)seconds) * -1000000.0; // psTime earlier than epoch } else { - outTime->usec = (seconds - (long)seconds) * 1000000.0; // psTime greater than epoch + outTime->usec = (seconds - (psS64)seconds) * 1000000.0; // psTime greater than epoch } outTime->sec = seconds; @@ -1003,7 +1003,7 @@ seconds = days * SEC_PER_DAY; if(seconds < 0.0) { - outTime->usec = (seconds - (long)seconds) * -1000000.0; // psTime earlier than epoch + outTime->usec = (seconds - (psS64)seconds) * -1000000.0; // psTime earlier than epoch } else { - outTime->usec = (seconds - (long)seconds) * 1000000.0; // psTime greater than epoch + outTime->usec = (seconds - (psS64)seconds) * 1000000.0; // psTime greater than epoch } outTime->sec = seconds; @@ -1020,11 +1020,11 @@ { char tempString[MAX_TIME_STRING_LENGTH]; - int month; - int day; - int year; - int hour; - int minute; - int second; - int millisecond; + psS32 month; + psS32 day; + psS32 year; + psS32 hour; + psS32 minute; + psS32 second; + psS32 millisecond; struct tm tmTime; psTime *outTime = NULL; @@ -1127,11 +1127,11 @@ psTime* psTimeFromTM(const struct tm* time) { - long year; - long month; - long day; - long hour; - long minute; - long seconds; - long temp; + psS64 year; + psS64 month; + psS64 day; + psS64 hour; + psS64 minute; + psS64 seconds; + psS64 temp; psTime *outTime = NULL; @@ -1194,5 +1194,5 @@ { psF64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1243,5 +1243,5 @@ { psS64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1267,5 +1267,5 @@ outTime = psTimeAlloc(tai1->type); deltaSec = tai1->sec - tai2->sec; - deltaUsec = (long)tai1->usec - (long)tai2->usec; + deltaUsec = (psS64)tai1->usec - (psS64)tai2->usec; // Adjust time in case of microsecond underflow after subtraction @@ -1289,5 +1289,5 @@ { psS64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1313,5 +1313,5 @@ outTime = psTimeAlloc(tai1->type); deltaSec = tai1->sec - tai2->sec; - deltaUsec = (long)tai1->usec - (long)tai2->usec; + deltaUsec = (psS64)tai1->usec - (psS64)tai2->usec; // Adjust time in case of microsecond underflow after subtraction Index: /trunk/psLib/src/astronomy/psTime.h =================================================================== --- /trunk/psLib/src/astronomy/psTime.h (revision 2203) +++ /trunk/psLib/src/astronomy/psTime.h (revision 2204) @@ -54,6 +54,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-20 20:05:58 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -181,5 +181,5 @@ * @return long: leapseconds added between given times */ -long psTimeLeapseconds( +psS64 psTimeLeapseconds( const psTime* time1, ///< First input time. const psTime* time2 ///< Second input time. Index: /trunk/psLib/src/collections/psArray.c =================================================================== --- /trunk/psLib/src/collections/psArray.c (revision 2203) +++ /trunk/psLib/src/collections/psArray.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-28 23:26:48 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,5 @@ /*****************************************************************************/ -psArray* psArrayAlloc(unsigned int nalloc) +psArray* psArrayAlloc(psU32 nalloc) { psArray* psArr = NULL; @@ -54,10 +54,10 @@ // Create vector data array - psArr->data = psAlloc(nalloc * sizeof(psPTR)); + psArr->data = psAlloc(nalloc * sizeof(psPtr)); return psArr; } -psArray* psArrayRealloc(psArray* restrict in, unsigned int nalloc) +psArray* psArrayRealloc(psArray* restrict in, psU32 nalloc) { if (in == NULL) { @@ -65,5 +65,5 @@ } else if (in->nalloc != nalloc) { // No need to realloc to same size if (nalloc < in->n) { - for (int i = nalloc; i < in->n; i++) { // For reduction in vector size + for (psS32 i = nalloc; i < in->n; i++) { // For reduction in vector size psFree(in->data[i]); } @@ -71,5 +71,5 @@ } // Realloc after decrementation to avoid accessing freed array elements - in->data = psRealloc(in->data, nalloc * sizeof(psPTR)); + in->data = psRealloc(in->data, nalloc * sizeof(psPtr)); in->nalloc = nalloc; } @@ -89,8 +89,8 @@ } -bool psArrayRemove(psArray* psArr, - psPTR data) +psBool psArrayRemove(psArray* psArr, + psPtr data) { - bool success = false; + psBool success = false; if (psArr == NULL) { @@ -98,9 +98,9 @@ } - int n = psArr->n; - psPTR* psArrData = psArr->data; - for (int i = n-1; i<0; i--) { + psS32 n = psArr->n; + psPtr* psArrData = psArr->data; + for (psS32 i = n-1; i<0; i--) { if (psArrData[i] == data) { - memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPTR)); + memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPtr)); n--; success = true; @@ -119,5 +119,5 @@ } - for (int i = 0; i < psArr->n; i++) { + for (psS32 i = 0; i < psArr->n; i++) { psFree(psArr->data[i]); psArr->data[i] = NULL; @@ -131,5 +131,5 @@ } - qsort(in->data, in->n, sizeof(psPTR), (int (*)(const void *, const void *))compare); + qsort(in->data, in->n, sizeof(psPtr), (int (*)(const void* , const void*))compare); return in; Index: /trunk/psLib/src/collections/psArray.h =================================================================== --- /trunk/psLib/src/collections/psArray.h (revision 2203) +++ /trunk/psLib/src/collections/psArray.h (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-28 23:26:48 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,6 +20,4 @@ #ifndef PS_ARRAY_H #define PS_ARRAY_H - -#include #include "psType.h" @@ -36,7 +34,7 @@ typedef struct { - unsigned int nalloc; ///< Total number of elements available. - unsigned int n; ///< Number of elements in use. - psPTR* data; ///< An Array of pointer elements + psU32 nalloc; ///< Total number of elements available. + psU32 n; ///< Number of elements in use. + psPtr* data; ///< An Array of pointer elements } psArray; @@ -57,5 +55,5 @@ */ psArray* psArrayAlloc( - unsigned int nalloc ///< Total number of elements to make available. + psU32 nalloc ///< Total number of elements to make available. ); @@ -70,5 +68,5 @@ psArray* psArrayRealloc( psArray* restrict psArr, ///< array to reallocate. - unsigned int nalloc ///< Total number of elements to make available. + psU32 nalloc ///< Total number of elements to make available. ); @@ -81,7 +79,7 @@ * */ -bool psArrayRemove( +psBool psArrayRemove( psArray* psArr, ///< array to operate on - psPTR data ///< the data pointer to remove from psArray + psPtr data ///< the data pointer to remove from psArray ); Index: /trunk/psLib/src/collections/psBitSet.c =================================================================== --- /trunk/psLib/src/collections/psBitSet.c (revision 2203) +++ /trunk/psLib/src/collections/psBitSet.c (revision 2204) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-21 23:17:52 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,4 @@ #include #include -#include #include "psBitSet.h" @@ -48,5 +47,5 @@ * @return char*: Pointer to byte in which bit is contained. */ -static char mask(int bit) +static char mask(psS32 bit) { char mask = (char)0x01; @@ -67,7 +66,7 @@ } -psBitSet* psBitSetAlloc(int n) -{ - int numBytes = 0; +psBitSet* psBitSetAlloc(psS32 n) +{ + psS32 numBytes = 0; psBitSet* newObj = NULL; @@ -95,5 +94,5 @@ psBitSet* psBitSetSet(psBitSet* inBitSet, - int bit) + psS32 bit) { char *byte = NULL; @@ -120,5 +119,5 @@ psBitSet* psBitSetClear(psBitSet* inBitSet, - int bit) + psS32 bit) { char *byte = NULL; @@ -144,6 +143,6 @@ } -bool psBitSetTest(const psBitSet* inBitSet, - int bit) +psBool psBitSetTest(const psBitSet* inBitSet, + psS32 bit) { char *byte = NULL; @@ -173,10 +172,10 @@ const psBitSet* restrict inBitSet2) { - int i = 0; - int n = 0; + psS32 i = 0; + psS32 n = 0; char* outBits = NULL; char* inBits1 = NULL; char* inBits2 = NULL; - int op = UNKNOWN_OP; + psS32 op = UNKNOWN_OP; if (inBitSet1 == NULL) { @@ -198,8 +197,8 @@ // make operator all caps - int tempStrLen = strlen(operator); + psS32 tempStrLen = strlen(operator); char* tempStr = psAlloc(tempStrLen+1); - for (int lcv=0;lcvn * 8; + psS32 i = 0; + psS32 numBits = inBitSet->n * 8; char *outString = psAlloc((size_t) numBits + 1); Index: /trunk/psLib/src/collections/psBitSet.h =================================================================== --- /trunk/psLib/src/collections/psBitSet.h (revision 2203) +++ /trunk/psLib/src/collections/psBitSet.h (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,4 +20,6 @@ #ifndef PSBITSET_H #define PSBITSET_H + +#include "psType.h" /// @addtogroup BitSet @@ -35,5 +37,5 @@ typedef struct { - int n; ///< Number of bytes in the array + psS32 n; ///< Number of bytes in the array char *bits; ///< Aray of bytes holding bits } @@ -54,5 +56,5 @@ /*@null@*/ psBitSet* psBitSetAlloc( - int n ///< Number of bits in psBitSet array + psS32 n ///< Number of bits in psBitSet array ); @@ -68,5 +70,5 @@ /* @returned@ */ psBitSet* restrict inMask, ///< Pointer to psBitSet to be set. - int bit ///< Bit to be set. + psS32 bit ///< Bit to be set. ); @@ -82,5 +84,5 @@ /* @returned@ */ psBitSet* restrict inMask, ///< Pointer to psBitSet to be cleared. - int bit ///< Bit to be cleared. + psS32 bit ///< Bit to be cleared. ); @@ -95,7 +97,7 @@ */ -bool psBitSetTest( +psBool psBitSetTest( const psBitSet* restrict inMask, ///< Pointer psBitSet to be tested. - int bit ///< Bit to be tested. + psS32 bit ///< Bit to be tested. ); Index: /trunk/psLib/src/collections/psCompare.c =================================================================== --- /trunk/psLib/src/collections/psCompare.c (revision 2203) +++ /trunk/psLib/src/collections/psCompare.c (revision 2204) @@ -7,11 +7,10 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ -#include "psType.h" #include "psCompare.h" Index: /trunk/psLib/src/collections/psCompare.h =================================================================== --- /trunk/psLib/src/collections/psCompare.h (revision 2203) +++ /trunk/psLib/src/collections/psCompare.h (revision 2204) @@ -1,17 +1,19 @@ +/** @file psCompare.h + * @brief Comparison functions for sorting routines + * + * @author Robert Daniel DeSonia, MHPCC + * + * @ingroup Compare + * + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + */ + #if !defined(PS_COMPARE_H) #define PS_COMPARE_H -/** @file psCompare.h - * @brief Comparison functions for sorting routines - * - * @author Robert Daniel DeSonia, MHPCC - * - * @ingroup Compare - * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-11 19:58:11 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ +#include "psType.h" /** @addtogroup Compare Index: /trunk/psLib/src/collections/psHash.c =================================================================== --- /trunk/psLib/src/collections/psHash.c (revision 2203) +++ /trunk/psLib/src/collections/psHash.c (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-09-21 23:17:53 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,4 @@ #include #include -#include #include "psHash.h" #include "psMemory.h" @@ -29,7 +28,7 @@ #include "psCollectionsErrors.h" -static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next); +static psHashBucket* hashBucketAlloc(const char *key, psPtr data, psHashBucket* next); static void hashBucketFree(psHashBucket* bucket); -static void *doHashWork(psHash* table, const char *key, void *data, bool remove +static psPtr doHashWork(psHash* table, const char *key, psPtr data, psBool remove ); static void hashFree(psHash* table); @@ -45,5 +44,5 @@ psList* psHashKeyList(psHash* table) { - int i = 0; // Loop index variable + psS32 i = 0; // Loop index variable psList* myLinkList = NULL; // The output data structure psHashBucket* ptr = NULL; // Used to step thru linked list. @@ -85,5 +84,5 @@ *****************************************************************************/ static psHashBucket* hashBucketAlloc(const char *key, - void *data, + psPtr data, psHashBucket* next) { @@ -135,7 +134,7 @@ The new hash table. *****************************************************************************/ -psHash* psHashAlloc(int nbucket) // initial number of buckets -{ - int i = 0; // loop index variable +psHash* psHashAlloc(psS32 nbucket) // initial number of buckets +{ + psS32 i = 0; // loop index variable // Create the new hash table. @@ -172,5 +171,5 @@ static void hashFree(psHash* table) { - int i = 0; // Loop index variable. + psS32 i = 0; // Loop index variable. if (table == NULL) { @@ -212,10 +211,10 @@ there is little common code between those functions. *****************************************************************************/ -static void *doHashWork(psHash* table, +static psPtr doHashWork(psHash* table, const char *key, - void *data, bool remove + psPtr data, psBool remove ) { - long int hash = 1; // This will contain an integer value + psS64 hash = 1; // This will contain an integer value // "hashed" from the key. @@ -236,5 +235,5 @@ } // NOTE: This is the originally supplied hash function. - // for (int i = 0, len = strlen(key); i < len; i++) { + // for (psS32 i = 0, len = strlen(key); i < len; i++) { // hash = (hash << 1) ^ key[i]; // } @@ -273,5 +272,5 @@ // of removing an item from a single-linked list. - void *data = ptr->data; + psPtr data = ptr->data; optr->next = ptr->next; @@ -344,7 +343,7 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashAdd(psHash* table, - const char *key, - void *data) +psBool psHashAdd(psHash* table, + const char *key, + psPtr data) { if (table == NULL) { @@ -380,5 +379,5 @@ The data associated with that key. *****************************************************************************/ -void *psHashLookup(psHash* table, // table to lookup key in +psPtr psHashLookup(psHash* table, // table to lookup key in const char *key) // key to lookup { @@ -409,9 +408,9 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashRemove(psHash* table, - const char *key) -{ - void *data = NULL; - bool retVal = false; +psBool psHashRemove(psHash* table, + const char *key) +{ + psPtr data = NULL; + psBool retVal = false; if (table == NULL) { Index: /trunk/psLib/src/collections/psHash.h =================================================================== --- /trunk/psLib/src/collections/psHash.h (revision 2203) +++ /trunk/psLib/src/collections/psHash.h (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 23:40:55 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,4 @@ * \{ */ -#include #include "psList.h" @@ -30,5 +29,5 @@ { char *key; ///< key for this item of data - void *data; ///< the data itself + psPtr data; ///< the data itself struct psHashBucket* next; ///< list of other possible keys } @@ -40,5 +39,5 @@ typedef struct psHash { - int nbucket; ///< Number of buckets in hash table. + psS32 nbucket; ///< Number of buckets in hash table. psHashBucket* *buckets; ///< The bucket data. } @@ -46,22 +45,22 @@ /// Allocate hash buckets in table. -psHash* psHashAlloc(int nbucket ///< The number of buckets to allocate. +psHash* psHashAlloc(psS32 nbucket ///< The number of buckets to allocate. ); /// Insert entry into table. -bool psHashAdd(psHash* table, ///< table to insert in - const char *key, ///< key to use - void *data ///< data to insert - ); +psBool psHashAdd(psHash* table, ///< table to insert in + const char *key, ///< key to use + psPtr data ///< data to insert + ); /// Lookup key in table. -void *psHashLookup(psHash* table, ///< table to lookup key in +psPtr psHashLookup(psHash* table, ///< table to lookup key in const char *key ///< key to lookup ); /// Remove key from table. -bool psHashRemove(psHash* table, ///< table to lookup key in - const char *key ///< key to lookup - ); +psBool psHashRemove(psHash* table, ///< table to lookup key in + const char *key ///< key to lookup + ); /// List all keys in table. Index: /trunk/psLib/src/collections/psList.c =================================================================== --- /trunk/psLib/src/collections/psList.c (revision 2203) +++ /trunk/psLib/src/collections/psList.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -13,5 +13,4 @@ #include -#include #include #include // we need a mutex to make this stuff thread safe. @@ -26,14 +25,14 @@ #include "psCollectionsErrors.h" -#define ITER_INIT_HEAD ((void *)1) // next iteration should return head -#define ITER_INIT_TAIL ((void *)2) // next iteration should return tail +#define ITER_INIT_HEAD ((psPtr )1) // next iteration should return head +#define ITER_INIT_TAIL ((psPtr )2) // next iteration should return tail // private functions. static psListElem* listGetIterator(psList* list); -static int listGetIteratorIndex(psList* list); -static void listSetIterator(psList* list, int where, bool lockList); +static psS32 listGetIteratorIndex(psList* list); +static void listSetIterator(psList* list, psS32 where, psBool lockList); static void listFree(psList* list); -psList* psListAlloc(void *data) +psList* psListAlloc(psPtr data) { psList* list = psAlloc(sizeof(psList)); @@ -82,9 +81,9 @@ } -bool psListAdd(psList* list, int location, void *data) +psBool psListAdd(psList* list, psS32 location, psPtr data) { psListElem* position; psListElem* elem; - int cursorIndex = 0; + psS32 cursorIndex = 0; if (list == NULL) { @@ -168,8 +167,8 @@ * Remove an element from a list */ -bool psListRemove(psList* list, int location, void *data) +psBool psListRemove(psList* list, psS32 location, psPtr data) { psListElem* elem = NULL; // element to remove - int cursorIndex = 0; + psS32 cursorIndex = 0; if (list == NULL) { @@ -184,5 +183,5 @@ // search list for the data item. - int i = 0; // index + psS32 i = 0; // index for (psListElem* ptr = list->head; ptr != NULL; ptr = ptr->next) { @@ -247,13 +246,13 @@ } -void psListSetIterator(psList* list, int where) +void psListSetIterator(psList* list, psS32 where) { listSetIterator(list, where, true); } -static void listSetIterator(psList* list, int where, bool lockList) +static void listSetIterator(psList* list, psS32 where, psBool lockList) { psListElem* cursor; - int position; + psS32 position; if (list == NULL) { @@ -272,5 +271,5 @@ } - if (where >= (int)list->size) { + if (where >= (psS32)list->size) { list->iter = NULL; if (lockList) { @@ -323,16 +322,16 @@ } - int position = listGetIteratorIndex(list); + psS32 position = listGetIteratorIndex(list); if (where < position) { - int diff = position - where; - - for (int count = 0; count < diff; count++) { + psS32 diff = position - where; + + for (psS32 count = 0; count < diff; count++) { listSetIterator(list, PS_LIST_PREVIOUS, false); } } else { - int diff = where - position; - - for (int count = 0; count < diff; count++) { + psS32 diff = where - position; + + for (psS32 count = 0; count < diff; count++) { listSetIterator(list, PS_LIST_NEXT, false); } @@ -363,5 +362,5 @@ } -int listGetIteratorIndex(psList* list) +psS32 listGetIteratorIndex(psList* list) { if (list->iter == ITER_INIT_HEAD) { @@ -374,5 +373,5 @@ } -void *psListGet(psList* list, int location) +psPtr psListGet(psList* list, psS32 location) { psListElem* element; @@ -391,15 +390,15 @@ * and now return the previous/next element of the list */ -void *psListGetNext(psList* list) +psPtr psListGetNext(psList* list) { return psListGet(list, PS_LIST_NEXT); } -void *psListGetPrevious(psList* list) +psPtr psListGetPrevious(psList* list) { return psListGet(list, PS_LIST_PREVIOUS); } -void *psListGetCurrent(psList* list) +psPtr psListGetCurrent(psList* list) { return psListGet(list, PS_LIST_CURRENT); @@ -412,5 +411,5 @@ { psListElem* ptr; - unsigned int n; + psU32 n; psArray* restrict arr; @@ -429,5 +428,5 @@ ptr = list->head; n = list->size; - for (int i = 0; i < n; i++) { + for (psS32 i = 0; i < n; i++) { arr->data[i] = psMemIncrRefCounter(ptr->data); ptr = ptr->next; @@ -439,5 +438,5 @@ psList* psArrayToList(psArray* arr) { - unsigned int n; + psU32 n; psList* list; // list of elements @@ -448,5 +447,5 @@ list = psListAlloc(NULL); n = arr->n; - for (int i = 0; i < n; i++) { + for (psS32 i = 0; i < n; i++) { psListAdd(list, PS_LIST_TAIL, arr->data[i]); } Index: /trunk/psLib/src/collections/psList.h =================================================================== --- /trunk/psLib/src/collections/psList.h (revision 2203) +++ /trunk/psLib/src/collections/psList.h (revision 2204) @@ -10,6 +10,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-09 02:23:27 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,4 @@ #include // we need a mutex to make this stuff thread safe. -#include // we use the bool type. #include "psCompare.h" @@ -46,5 +45,5 @@ struct psListElem* prev; ///< previous link in list struct psListElem* next; ///< next link in list - void *data; ///< real data item + psPtr data; ///< real data item } psListElem; @@ -57,9 +56,9 @@ typedef struct { - unsigned int size; ///< number of elements on list + psU32 size; ///< number of elements on list psListElem* head; ///< first element on list (may be NULL) psListElem* tail; ///< last element on list (may be NULL) psListElem* iter; ///< iteration cursor - unsigned int iterIndex; ///< the numeric position of the iteration cursor in the list + psU32 iterIndex; ///< the numeric position of the iteration cursor in the list pthread_mutex_t lock; ///< mutex to lock a node during changes } @@ -71,5 +70,5 @@ */ psList* psListAlloc( - void *data + psPtr data ///< initial data item; may be NULL if no an empty psList is desired ) @@ -81,20 +80,20 @@ * NULL, the return value will also be NULL. */ -bool psListAdd( +psBool psListAdd( psList* restrict list, ///< list to add to (if NULL, nothing is done) - int location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. - void *data ///< data item to add. If NULL, list is not modified. + psS32 location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. + psPtr data ///< data item to add. If NULL, list is not modified. ); /** Remove an item from a list. If location parameter is PS_LIST_UNKNOWN, * - * @return bool TRUE if element is successfully removed, otherwise FALSE. + * @return psBool TRUE if element is successfully removed, otherwise FALSE. */ -bool psListRemove( +psBool psListRemove( psList* restrict list, ///< list to remove element from - int location, + psS32 location, ///< index of item, or PS_LIST_UNKNOWN, PS_LIST_NEXT, PS_LIST_PREV, or numbered location. - void *data + psPtr data ///< if location is PS_LIST_UNKNOWN, data item to find and remove, otherwise this is ignored. ); @@ -102,12 +101,12 @@ /** Retrieve an item from a list. * - * @return void* the item corresponding to the location parameter. If + * @return psPtr the item corresponding to the location parameter. If * location is invalid (e.g., a numbered index greater * than the list size or if the list is empty), a * NULL is returned. */ -void *psListGet( +psPtr psListGet( psList* restrict list, ///< list to retrieve element from - int location ///< index number, or PS_LIST_NEXT, PS_LIST_PREV, PS_LIST_UNKNOWN + psS32 location ///< index number, or PS_LIST_NEXT, PS_LIST_PREV, PS_LIST_UNKNOWN ); @@ -118,5 +117,5 @@ void psListSetIterator( psList* restrict list, ///< list to retrieve element from - int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL + psS32 location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -124,9 +123,9 @@ * the next list position. * - * @return void* the data item next on the list or NULL if the iterator + * @return psPtr the data item next on the list or NULL if the iterator * is already pointing to the last element or the list * parameter was NULL. */ -void *psListGetNext( +psPtr psListGetNext( psList* restrict list ///< list to retrieve element from ); @@ -135,9 +134,9 @@ * not move the iterator location. * - * @return void* the data item cooresponding to current iterator + * @return psPtr the data item cooresponding to current iterator * cursor position of the list, or NULL if either the * iterator is not valid or list parameter was NULL. */ -void *psListGetCurrent( +psPtr psListGetCurrent( psList* restrict list ///< list to retrieve element from ); @@ -146,9 +145,9 @@ * iterator to the previous list position. * - * @return void* the data item previous on the list or NULL if the iterator + * @return psPtr the data item previous on the list or NULL if the iterator * is already pointing to the first element or the list * parameter was NULL. */ -void *psListGetPrevious( +psPtr psListGetPrevious( psList* restrict list ///< list to retrieve element from ); Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 2203) +++ /trunk/psLib/src/collections/psMetadata.c (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-09 03:05:53 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ /*****************************************************************************/ -static int metadataId = 0; +static psS32 metadataId = 0; /*****************************************************************************/ @@ -143,5 +143,5 @@ // Set metadata item unique id - *(int *)(&metadataItem->id) = ++metadataId; + *(psS32 *)(&metadataItem->id) = ++metadataId; // Set metadata item type @@ -154,5 +154,5 @@ break; case PS_META_BOOL: - metadataItem->data.B = (bool)va_arg(argPtr, int); + metadataItem->data.B = (psBool)va_arg(argPtr, psS32); break; case PS_META_S32: @@ -215,5 +215,5 @@ } -bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location ) +psBool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, psS32 location ) { char * key = NULL; @@ -337,6 +337,6 @@ } -bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, - const char *comment, ...) +psBool psMetadataAdd(psMetadata* restrict md, psS32 where, const char *name, psMetadataType type, + const char *comment, ...) { va_list argPtr; @@ -359,7 +359,7 @@ } -bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) -{ - int numChildren = 0; +psBool psMetadataRemove(psMetadata* restrict md, psS32 where, const char *restrict key) +{ + psS32 numChildren = 0; psList* mdList = NULL; psHash* mdTable = NULL; @@ -471,5 +471,5 @@ } -psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +psMetadataItem* psMetadataGet(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -497,5 +497,5 @@ } -bool psMetadataSetIterator(psMetadata* restrict md, int where) +psBool psMetadataSetIterator(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -517,5 +517,5 @@ } -psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; @@ -553,5 +553,5 @@ } -psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; Index: /trunk/psLib/src/collections/psMetadata.h =================================================================== --- /trunk/psLib/src/collections/psMetadata.h (revision 2203) +++ /trunk/psLib/src/collections/psMetadata.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:06:27 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,11 +38,11 @@ PS_META_F32, ///< Single-precision float data. PS_META_F64, ///< Double-precision float data. - PS_META_STR, ///< String data (Stored in as void *). - PS_META_VEC, ///< Vector data (Stored in as void *). - PS_META_IMG, ///< Image data (Stored in as void *). - PS_META_JPEG, ///< JPEG data (Stored in as void *). - PS_META_PNG, ///< PNG data (Stored in as void *). - PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). - PS_META_UNKNOWN, ///< Other data (Stored in as void *). + PS_META_STR, ///< String data (Stored in as psPtr ). + PS_META_VEC, ///< Vector data (Stored in as psPtr ). + PS_META_IMG, ///< Image data (Stored in as psPtr ). + PS_META_JPEG, ///< JPEG data (Stored in as psPtr ). + PS_META_PNG, ///< PNG data (Stored in as psPtr ). + PS_META_ASTROM, ///< Astrometric coefficients (Stored in as psPtr ). + PS_META_UNKNOWN, ///< Other data (Stored in as psPtr ). PS_META_NTYPE ///< Number of types. Must be last. } psMetadataType; @@ -55,13 +55,13 @@ typedef struct psMetadataItem { - const int id; ///< Unique ID for metadata item. + const psS32 id; ///< Unique ID for metadata item. char *restrict name; ///< Name of metadata item. psMetadataType type; ///< Type of metadata item. union { - bool B; ///< boolean data + psBool B; ///< boolean data psS32 S32; ///< Signed 32-bit integer data. psF32 F32; ///< Single-precision float data. psF64 F64; ///< Double-precision float data. - psPTR V; ///< Pointer to other type of data. + psPtr V; ///< Pointer to other type of data. } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). @@ -144,8 +144,8 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem( +psBool psMetadataAddItem( psMetadata* restrict md, ///< Metadata collection to insert metadat item. psMetadataItem* restrict item, ///< Metadata item to be added. - int location ///< Location to be added. + psS32 location ///< Location to be added. ); @@ -156,7 +156,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be added. +psBool psMetadataAdd( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be added. const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. @@ -175,7 +175,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be removed. +psBool psMetadataRemove( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. ); @@ -203,5 +203,5 @@ psMetadataItem* psMetadataGet( psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where ///< Location to be retrieved. + psS32 where ///< Location to be retrieved. ); @@ -213,7 +213,7 @@ * @return void: void. */ -bool psMetadataSetIterator( +psBool psMetadataSetIterator( psMetadata* restrict md, ///< Metadata collection to iterate. - int where ///< Location of iterator. + psS32 where ///< Location of iterator. ); @@ -227,5 +227,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); @@ -239,5 +239,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); Index: /trunk/psLib/src/collections/psMetadataIO.c =================================================================== --- /trunk/psLib/src/collections/psMetadataIO.c (revision 2203) +++ /trunk/psLib/src/collections/psMetadataIO.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 00:43:12 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ /** Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string * must be null terminated. */ -bool ignoreLine(char *inString) +psBool ignoreLine(char *inString) { while(*inString!='\0' && *inString!='#') { @@ -119,5 +119,5 @@ /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null * terminated copy of the original input string. */ -char *cleanString(char *inString, int sLen) +char *cleanString(char *inString, psS32 sLen) { char *ptrB = NULL; @@ -149,7 +149,7 @@ /** Count repeat occurances of a single character within a line. The input string must be null terminated. */ -int repeatedChars(char *inString, char ch) -{ - int count = 0; +psS32 repeatedChars(char *inString, char ch) +{ + psS32 count = 0; @@ -166,8 +166,8 @@ /** Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location * the beginning of the string. Tokens are newly allocated null terminated strings. */ -char* getToken(char **inString, char *delimiter, int *status) +char* getToken(char **inString, char *delimiter, psS32 *status) { char *cleanToken = NULL; - int sLen = 0; + psS32 sLen = 0; @@ -195,5 +195,5 @@ /** Returns single parsed value as a double precision number. The input string must be cleaned and null * terminated. */ -double parseValue(char *inString, int *status) +double parseValue(char *inString, psS32 *status) { char *end = NULL; @@ -212,7 +212,7 @@ /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */ -bool parseBool(char *inString, int *status) -{ - bool value = false; +psBool parseBool(char *inString, psS32 *status) +{ + psBool value = false; @@ -229,10 +229,10 @@ /** Returns parsed vector filled with with data. The input string must be null terminated. */ -psVector* parseVector(char *inString, psElemType elemType, int *status) +psVector* parseVector(char *inString, psElemType elemType, psS32 *status) { char *end = NULL; char *saveValue = NULL; - int i = 0; - int numValues = 0; + psS32 i = 0; + psS32 numValues = 0; double value = 0.0; psVector *vec = NULL; @@ -341,8 +341,8 @@ -psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, int extNum, char *fileName) -{ - bool tempBool; - bool success; +psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, psS32 extNum, char *fileName) +{ + psBool tempBool; + psBool success; char keyType; char keyName[FITS_LINE_SIZE]; @@ -350,9 +350,9 @@ char keyComment[FITS_LINE_SIZE]; char fitsErr[MAX_STRING_LENGTH]; - int i; - int hduType = 0; - int status = 0; - int numKeys = 0; - int keyNum = 0; + psS32 i; + psS32 hduType = 0; + psS32 status = 0; + psS32 numKeys = 0; + psS32 keyNum = 0; psMetadataType metadataItemType; fitsfile *fd = NULL; @@ -449,7 +449,7 @@ -int psMetadataParseConfig(psMetadata** md, char *fileName, bool overwrite) -{ - bool tempBool; +psS32 psMetadataParseConfig(psMetadata** md, char *fileName, psBool overwrite) +{ + psBool tempBool; char *line = NULL; char *strName = NULL; @@ -458,7 +458,7 @@ char *strComment = NULL; char *linePtr = NULL; - int status = 0; - int lineCount = 0; - int failedLines = 0; + psS32 status = 0; + psS32 lineCount = 0; + psS32 failedLines = 0; psF64 tempDbl = 0.0; psS32 tempInt = 0.0; Index: /trunk/psLib/src/collections/psMetadataIO.h =================================================================== --- /trunk/psLib/src/collections/psMetadataIO.h (revision 2203) +++ /trunk/psLib/src/collections/psMetadataIO.h (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:17:39 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. - int extNum, ///< File name extension number. Starts at 1. + psS32 extNum, ///< File name extension number. Starts at 1. char *fileName ///< Name of file to read. ); @@ -58,10 +58,10 @@ * Loads pre-defined settings by parsing a configuration file into a psMetadata structure. * - * @return int : Number of lines that failed to be read. + * @return psS32 : Number of lines that failed to be read. */ -int psMetadataParseConfig( +psS32 psMetadataParseConfig( psMetadata** md, ///< Resulting metadata from read. char *fileName, ///< Name of file to read. - bool overwrite ///< Allow overwrite of duplicate specifications. + psBool overwrite ///< Allow overwrite of duplicate specifications. ); Index: /trunk/psLib/src/collections/psVector.c =================================================================== --- /trunk/psLib/src/collections/psVector.c (revision 2203) +++ /trunk/psLib/src/collections/psVector.c (revision 2204) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-07 19:51:30 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,8 +42,8 @@ // FUNCTION IMPLEMENTATION - PUBLIC -psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType) +psVector* psVectorAlloc(psU32 nalloc, psElemType elemType) { psVector* psVec = NULL; - int elementSize = 0; + psS32 elementSize = 0; elementSize = PSELEMTYPE_SIZEOF(elemType); @@ -64,7 +64,7 @@ } -psVector* psVectorRealloc(psVector* restrict in, unsigned int nalloc) -{ - int elementSize = 0; +psVector* psVectorRealloc(psVector* restrict in, psU32 nalloc) +{ + psS32 elementSize = 0; psElemType elemType; @@ -88,7 +88,7 @@ } -psVector* psVectorRecycle(psVector* restrict in, unsigned int n, psElemType type) -{ - int byteSize; +psVector* psVectorRecycle(psVector* restrict in, psU32 n, psElemType type) +{ + psS32 byteSize; if (in == NULL) { @@ -129,5 +129,5 @@ } - int nElements = in->n; + psS32 nElements = in->n; out = psVectorRecycle(out, nElements, type); @@ -136,5 +136,5 @@ ps##INTYPE *inVec = in->data.INTYPE; \ ps##OUTTYPE *outVec = out->data.OUTTYPE; \ - for (int col=0;coldata.TYPE; \ ps##TYPE diff; \ - for(int i=0; idata.V, true); \ -for (int i=0;idata.F32[i] = 1.0; \ } \ @@ -62,5 +62,5 @@ p_psMemSetPersistent(VEC, true); \ p_psMemSetPersistent(VEC->data.V, true); \ -for (int i=0;idata.F64[i] = 1.0; \ } \ @@ -70,5 +70,5 @@ p_psMemSetPersistent(VEC, true); \ p_psMemSetPersistent(VEC->data.V, true); \ -for (int i=0;idata.F32[i] = (float) i; \ } \ @@ -78,5 +78,5 @@ p_psMemSetPersistent(VEC, true); \ p_psMemSetPersistent(VEC->data.V, true); \ -for (int i=0;idata.F64[i] = (float) i; \ } \ @@ -209,5 +209,5 @@ #define PS_PRINT_VECTOR(NAME) \ -for (int my_i=0;my_in;my_i++) { \ +for (psS32 my_i=0;my_in;my_i++) { \ printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \ } \ @@ -216,5 +216,5 @@ #define PS_VECTOR_F64_TO_F32(X64, X32) \ psVector *X32 = psVectorAlloc(X64->n, PS_TYPE_F32); \ -for (int i=0;in;i++) { \ +for (psS32 i=0;in;i++) { \ X32->data.F32[i] = (float) X64->data.F64[i]; \ } \ @@ -222,5 +222,5 @@ #define PS_VECTOR_F32_TO_F64(X32, X64) \ psVector *X64 = psVectorAlloc(X32->n, PS_TYPE_F64); \ -for (int i=0;in;i++) { \ +for (psS32 i=0;in;i++) { \ X64->data.F64[i] = (float) X32->data.F32[i]; \ } \ Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 2203) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 2204) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 21:24:42 $ + * @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ \ if (IN->type.type == PS_TYPE_F64) { \ - for (int i=0;in;i++) { \ + for (psS32 i=0;in;i++) { \ OUT->data.F32[i] = (float) (IN->data.F64[i]); \ } \ @@ -69,5 +69,5 @@ \ if (IN->type.type == PS_TYPE_F32) { \ - for (int i=0;in;i++) { \ + for (psS32 i=0;in;i++) { \ OUT->data.F64[i] = (float) (IN->data.F32[i]); \ } \ @@ -117,9 +117,9 @@ outer coefficients of the Chebyshev polynomials. *****************************************************************************/ -static psPolynomial1D **CreateChebyshevPolys(int maxChebyPoly) +static psPolynomial1D **CreateChebyshevPolys(psS32 maxChebyPoly) { psPolynomial1D **chebPolys = NULL; - int i = 0; - int j = 0; + psS32 i = 0; + psS32 j = 0; chebPolys = (psPolynomial1D **) psAlloc(maxChebyPoly * sizeof(psPolynomial1D *)); @@ -153,5 +153,5 @@ evaluated Gaussian is: \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] *****************************************************************************/ -float psGaussian(float x, float mean, float sigma, bool normal) +float psGaussian(float x, float mean, float sigma, psBool normal) { float tmp = 1.0; @@ -185,10 +185,10 @@ NOTE: XXX: There is no way to seed the random generator. *****************************************************************************/ -psVector* psGaussianDev(float mean, float sigma, int Npts) +psVector* psGaussianDev(float mean, float sigma, psS32 Npts) { psVector* gauss = NULL; const gsl_rng_type *T = NULL; gsl_rng *r = NULL; - int i = 0; + psS32 i = 0; gauss = psVectorAlloc(Npts, PS_TYPE_F32); @@ -209,8 +209,8 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D* psPolynomial1DAlloc(int n, +psPolynomial1D* psPolynomial1DAlloc(psS32 n, psPolynomialType type) { - int i = 0; + psS32 i = 0; psPolynomial1D* newPoly = NULL; @@ -232,9 +232,9 @@ } -psPolynomial2D* psPolynomial2DAlloc(int nX, int nY, +psPolynomial2D* psPolynomial2DAlloc(psS32 nX, psS32 nY, psPolynomialType type) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; psPolynomial2D* newPoly = NULL; @@ -265,10 +265,10 @@ } -psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ, +psPolynomial3D* psPolynomial3DAlloc(psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int x = 0; - int y = 0; - int z = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psPolynomial3D* newPoly = NULL; @@ -307,11 +307,11 @@ } -psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ, +psPolynomial4D* psPolynomial4DAlloc(psS32 nW, psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int w = 0; - int x = 0; - int y = 0; - int z = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psPolynomial4D* newPoly = NULL; @@ -367,5 +367,5 @@ static void polynomial2DFree(psPolynomial2D* myPoly) { - int x = 0; + psS32 x = 0; for (x = 0; x < myPoly->nX; x++) { @@ -381,6 +381,6 @@ static void polynomial3DFree(psPolynomial3D* myPoly) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; for (x = 0; x < myPoly->nX; x++) { @@ -402,7 +402,7 @@ static void polynomial4DFree(psPolynomial4D* myPoly) { - int w = 0; - int x = 0; - int y = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; for (w = 0; w < myPoly->nW; w++) { @@ -434,5 +434,5 @@ float p_psOrdPolynomial1DEval(float x, const psPolynomial1D* myPoly) { - int loop_x = 0; + psS32 loop_x = 0; float polySum = 0.0; float xSum = 1.0; @@ -478,6 +478,6 @@ { psVector *d; - int n; - int i; + psS32 n; + psS32 i; float tmp; @@ -500,6 +500,6 @@ /* - int n; - int i; + psS32 n; + psS32 i; float tmp; psPolynomial1D **chebPolys = NULL; @@ -537,5 +537,5 @@ psVector *tmp; psVector *myX; - int i; + psS32 i; PS_CONVERT_VECTOR_F32(x, myX); @@ -555,6 +555,6 @@ float p_psOrdPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; float polySum = 0.0; float xSum = 1.0; @@ -577,10 +577,10 @@ float p_psChebPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -628,6 +628,6 @@ psVector *myX; psVector *myY; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(x, myX); @@ -658,7 +658,7 @@ float p_psOrdPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; float polySum = 0.0; float xSum = 1.0; @@ -686,11 +686,11 @@ float p_psChebPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -746,6 +746,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(x, myX); @@ -787,8 +787,8 @@ float p_psOrdPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; float polySum = 0.0; float wSum = 1.0; @@ -821,12 +821,12 @@ float p_psChebPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -890,6 +890,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(w, myW); @@ -936,8 +936,8 @@ -psDPolynomial1D* psDPolynomial1DAlloc(int n, +psDPolynomial1D* psDPolynomial1DAlloc(psS32 n, psPolynomialType type) { - int i = 0; + psS32 i = 0; psDPolynomial1D* newPoly = NULL; @@ -959,9 +959,9 @@ } -psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY, +psDPolynomial2D* psDPolynomial2DAlloc(psS32 nX, psS32 nY, psPolynomialType type) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; psDPolynomial2D* newPoly = NULL; @@ -992,10 +992,10 @@ } -psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ, +psDPolynomial3D* psDPolynomial3DAlloc(psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int x = 0; - int y = 0; - int z = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psDPolynomial3D* newPoly = NULL; @@ -1034,11 +1034,11 @@ } -psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ, +psDPolynomial4D* psDPolynomial4DAlloc(psS32 nW, psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int w = 0; - int x = 0; - int y = 0; - int z = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psDPolynomial4D* newPoly = NULL; @@ -1094,5 +1094,5 @@ static void dPolynomial2DFree(psDPolynomial2D* myPoly) { - int x = 0; + psS32 x = 0; for (x = 0; x < myPoly->nX; x++) { @@ -1108,6 +1108,6 @@ static void dPolynomial3DFree(psDPolynomial3D* myPoly) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; for (x = 0; x < myPoly->nX; x++) { @@ -1129,7 +1129,7 @@ static void dPolynomial4DFree(psDPolynomial4D* myPoly) { - int w = 0; - int x = 0; - int y = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; for (w = 0; w < myPoly->nW; w++) { @@ -1159,5 +1159,5 @@ double p_psDOrdPolynomial1DEval(double x, const psDPolynomial1D* myPoly) { - int loop_x = 0; + psS32 loop_x = 0; double polySum = 0.0; double xSum = 1.0; @@ -1183,6 +1183,6 @@ { psVector *d; - int n; - int i; + psS32 n; + psS32 i; double tmp; @@ -1222,5 +1222,5 @@ psVector *tmp; psVector *myX; - int i; + psS32 i; PS_CONVERT_VECTOR_F64(x, myX); @@ -1241,6 +1241,6 @@ double p_psDOrdPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; double polySum = 0.0; double xSum = 1.0; @@ -1263,10 +1263,10 @@ double p_psDChebPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1314,6 +1314,6 @@ psVector *myX; psVector *myY; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(x, myX); @@ -1344,7 +1344,7 @@ double p_psDOrdPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; double polySum = 0.0; double xSum = 1.0; @@ -1372,11 +1372,11 @@ double p_psDChebPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1432,6 +1432,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(x, myX); @@ -1475,8 +1475,8 @@ double p_psDOrdPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; double polySum = 0.0; double wSum = 1.0; @@ -1509,12 +1509,12 @@ double p_psDChebPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1578,6 +1578,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(w, myW); @@ -1624,5 +1624,5 @@ //typedef struct { -// int n; +// psS32 n; // psPolynomial1D **spline; // float *p_psDeriv2; @@ -1636,11 +1636,11 @@ XXX: Ensure that domain[i+1] != domain[i] *****************************************************************************/ -psSpline1D *psSpline1DAlloc(int numSplines, - int order, +psSpline1D *psSpline1DAlloc(psS32 numSplines, + psS32 order, float min, float max) { psSpline1D *tmp = NULL; - int i; + psS32 i; float tmpDomain; float width; @@ -1677,7 +1677,7 @@ // XXX: Have Robert put the dealocator in the memory file. -int p_psSpline1DFree(psSpline1D *tmpSpline) -{ - int i; +psS32 p_psSpline1DFree(psSpline1D *tmpSpline) +{ + psS32 i; if (tmpSpline == NULL) { @@ -1704,9 +1704,9 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order) + psS32 order) { psSpline1D *tmp = NULL; - int i; - int numSplines; + psS32 i; + psS32 numSplines; tmp = (psSpline1D *) psAlloc(sizeof(psSpline1D)); @@ -1746,11 +1746,11 @@ XXX: name since we don't take psVectors as input. *****************************************************************************/ -int p_psVectorBinDisectF32(float *bins, - int numBins, - float x) -{ - int min; - int max; - int mid; +psS32 p_psVectorBinDisectF32(float *bins, + psS32 numBins, + float x) +{ + psS32 min; + psS32 max; + psS32 mid; psTrace(".psLib.dataManip.psFunctions.p_psVectorBinDisectF32", 4, @@ -1800,11 +1800,11 @@ p_psVectorBinDisectS32(): integer version of above. *****************************************************************************/ -int p_psVectorBinDisectS32(int *bins, - int numBins, - int x) -{ - int min; - int max; - int mid; +psS32 p_psVectorBinDisectS32(psS32 *bins, + psS32 numBins, + psS32 x) +{ + psS32 min; + psS32 max; + psS32 mid; psTrace(".psLib.dataManip.psFunctions.p_psVectorBinDisectS32", 4, @@ -1848,6 +1848,6 @@ p_psVectorBinDisect(): A wrapper to the above p_psVectorBinDisect(). *****************************************************************************/ -int p_psVectorBinDisect(psVector *bins, - psScalar *x) +psS32 p_psVectorBinDisect(psVector *bins, + psScalar *x) { if (x->type.type != bins->type.type) { @@ -1877,9 +1877,9 @@ float p_ps1DFullInterpolateF32(float *domain, float *range, - int n, + psS32 n, float x) { - int i; - int m; + psS32 i; + psS32 m; static psVector *p = NULL; p = psVectorRecycle(p, n, PS_TYPE_F32); @@ -1937,11 +1937,11 @@ float p_ps1DInterpolateF32(float *domain, float *range, - int n, - int order, + psS32 n, + psS32 order, float x) { - int binNum; - int numIntPoints = order+1; - int origin; + psS32 binNum; + psS32 numIntPoints = order+1; + psS32 origin; psTrace(".psLib.dataManip.psFunctions.p_ps1DInterpolateF32", 4, @@ -1987,5 +1987,5 @@ psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - int order, + psS32 order, psScalar *x) { @@ -2065,6 +2065,6 @@ float x) { - int binNum; - int n; + psS32 binNum; + psS32 n; n = spline->n; @@ -2091,5 +2091,5 @@ const psSpline1D *spline) { - int i; + psS32 i; psVector *tmpVector; Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 2203) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 2204) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 00:48:15 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -45,5 +45,5 @@ float mean, ///< Mean for the Gaussian float stddev, ///< Standard deviation for the Gaussian - bool normal ///< Indicates whether result should be normalized + psBool normal ///< Indicates whether result should be normalized ); @@ -57,5 +57,5 @@ float mean, ///< The mean of the Gaussian float sigma, ///< The sigma of the Gaussian - int Npts ///< The size of the vector + psS32 Npts ///< The size of the vector ); @@ -69,5 +69,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms float *coeff; ///< Coefficients float *coeffErr; ///< Error in coefficients @@ -80,6 +80,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y float **coeff; ///< Coefficients float **coeffErr; ///< Error in coefficients @@ -92,7 +92,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ***coeff; ///< Coefficients float ***coeffErr; ///< Error in coefficients @@ -105,8 +105,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ****coeff; ///< Coefficients float ****coeffErr; ///< Error in coefficients @@ -121,5 +121,5 @@ */ psPolynomial1D* psPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -130,6 +130,6 @@ */ psPolynomial2D* psPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -140,7 +140,7 @@ */ psPolynomial3D* psPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -151,8 +151,8 @@ */ psPolynomial4D* psPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -230,5 +230,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms double *coeff; ///< Coefficients double *coeffErr; ///< Error in coefficients @@ -241,6 +241,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y double **coeff; ///< Coefficients double **coeffErr; ///< Error in coefficients @@ -253,7 +253,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ***coeff; ///< Coefficients double ***coeffErr; ///< Error in coefficients @@ -266,8 +266,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ****coeff; ///< Coefficients double ****coeffErr; ///< Error in coefficients @@ -281,5 +281,5 @@ */ psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -290,6 +290,6 @@ */ psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -300,7 +300,7 @@ */ psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -311,8 +311,8 @@ */ psDPolynomial4D* psDPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -386,5 +386,5 @@ typedef struct { - int n; ///< The number of spline polynomials + psS32 n; ///< The number of spline polynomials psPolynomial1D **spline; ///< An array of n pointers to the spline polynomials float *p_psDeriv2; ///< For cubic splines, the second derivative at each domain point. Size is n+1. @@ -393,13 +393,13 @@ psSpline1D; -psSpline1D *psSpline1DAlloc(int n, - int order, +psSpline1D *psSpline1DAlloc(psS32 n, + psS32 order, float min, float max); -int p_psSpline1DFree(psSpline1D *tmpSpline); +psS32 p_psSpline1DFree(psSpline1D *tmpSpline); psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order); + psS32 order); float psSpline1DEval(const psSpline1D *spline, @@ -409,18 +409,18 @@ const psSpline1D *spline); -int p_psVectorBinDisectF32(float *bins, - int numBins, - float x); - -int p_psVectorBinDisectS32(int *bins, - int numBins, - int x); - -int p_psVectorBinDisect(psVector *bins, - psScalar *x); +psS32 p_psVectorBinDisectF32(float *bins, + psS32 numBins, + float x); + +psS32 p_psVectorBinDisectS32(psS32 *bins, + psS32 numBins, + psS32 x); + +psS32 p_psVectorBinDisect(psVector *bins, + psScalar *x); psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - int order, + psS32 order, psScalar *x); Index: /trunk/psLib/src/dataManip/psMatrix.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrix.c (revision 2203) +++ /trunk/psLib/src/dataManip/psMatrix.c (revision 2204) @@ -20,6 +20,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-08 02:48:01 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -119,8 +119,8 @@ psImage* psMatrixLUD(psImage* outImage, psVector* outPerm, psImage* inImage) { - int signum = 0; - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 signum = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix lu; gsl_permutation perm; @@ -165,7 +165,7 @@ const psVector* inVector, const psVector* inPerm) { - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix lu; gsl_permutation perm; @@ -217,8 +217,8 @@ psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *restrict det) { - int signum = 0; - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 signum = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix inv; gsl_matrix *lu; @@ -271,8 +271,8 @@ float *psMatrixDeterminant(const psImage* restrict inImage) { - int signum = 0; - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 signum = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; float *det = NULL; gsl_matrix *lu = NULL; @@ -313,7 +313,7 @@ psImage* psMatrixMultiply(psImage* outImage, psImage* inImage1, psImage* inImage2) { - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix m1; gsl_matrix m2; @@ -355,7 +355,7 @@ psImage* psMatrixTranspose(psImage* outImage, const psImage* inImage) { - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix trans; @@ -392,6 +392,6 @@ psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage) { - int numRows = 0; - int numCols = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_vector *eVals = NULL; gsl_eigen_symmv_workspace *w = NULL; @@ -436,5 +436,5 @@ psVector* psMatrixToVector(psVector* outVector, const psImage* inImage) { - int size = 0; + psS32 size = 0; // Error checks @@ -495,5 +495,5 @@ psImage* psVectorToMatrix(psImage* outImage, const psVector* inVector) { - int size = 0; + psS32 size = 0; // Error checks Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 2203) +++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 2204) @@ -29,6 +29,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-08 02:48:01 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -88,6 +88,6 @@ #define SCALAR_VECTOR(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int npt = 0; \ + psS32 i = 0; \ + psS32 npt = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -104,8 +104,8 @@ #define SCALAR_IMAGE(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int j = 0; \ - int numRows = 0; \ - int numCols = 0; \ + psS32 i = 0; \ + psS32 j = 0; \ + psS32 numRows = 0; \ + psS32 numCols = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -126,6 +126,6 @@ #define VECTOR_SCALAR(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int n1 = 0; \ + psS32 i = 0; \ + psS32 n1 = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -142,7 +142,7 @@ #define VECTOR_VECTOR(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int n1 = 0; \ - int n2 = 0; \ + psS32 i = 0; \ + psS32 n1 = 0; \ + psS32 n2 = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -167,9 +167,9 @@ #define VECTOR_IMAGE(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int j = 0; \ - int n1 = 0; \ - int numRows2 = 0; \ - int numCols2 = 0; \ + psS32 i = 0; \ + psS32 j = 0; \ + psS32 n1 = 0; \ + psS32 numRows2 = 0; \ + psS32 numCols2 = 0; \ psDimen dim1 = 0; \ ps##TYPE *o = NULL; \ @@ -221,8 +221,8 @@ #define IMAGE_SCALAR(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int j = 0; \ - int numRows = 0; \ - int numCols = 0; \ + psS32 i = 0; \ + psS32 j = 0; \ + psS32 numRows = 0; \ + psS32 numCols = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -242,9 +242,9 @@ #define IMAGE_VECTOR(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int j = 0; \ - int n2 = 0; \ - int numRows1 = 0; \ - int numCols1 = 0; \ + psS32 i = 0; \ + psS32 j = 0; \ + psS32 n2 = 0; \ + psS32 numRows1 = 0; \ + psS32 numCols1 = 0; \ psDimen dim2 = 0; \ ps##TYPE *o = NULL; \ @@ -295,10 +295,10 @@ #define IMAGE_IMAGE(OUT,IN1,OP,IN2,TYPE) \ { \ - int i = 0; \ - int j = 0; \ - int numRows1 = 0; \ - int numCols1 = 0; \ - int numRows2 = 0; \ - int numCols2 = 0; \ + psS32 i = 0; \ + psS32 j = 0; \ + psS32 numRows1 = 0; \ + psS32 numCols1 = 0; \ + psS32 numRows2 = 0; \ + psS32 numCols2 = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -417,5 +417,5 @@ } -void *psBinaryOp(void *out, void *in1, char *op, void *in2) +psPtr psBinaryOp(psPtr out, psPtr in1, char *op, psPtr in2) { psDimen dim1 = 0; @@ -605,7 +605,7 @@ #define VECTOR(OUT,IN,OP,TYPE) \ { \ - int i = 0; \ - int nIn = 0; \ - int nOut = 0; \ + psS32 i = 0; \ + psS32 nIn = 0; \ + psS32 nOut = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -629,10 +629,10 @@ #define IMAGE(OUT,IN,OP,TYPE) \ { \ - int i = 0; \ - int j = 0; \ - int numRowsIn = 0; \ - int numColsIn = 0; \ - int numRowsOut = 0; \ - int numColsOut = 0; \ + psS32 i = 0; \ + psS32 j = 0; \ + psS32 numRowsIn = 0; \ + psS32 numColsIn = 0; \ + psS32 numRowsOut = 0; \ + psS32 numColsOut = 0; \ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ @@ -818,5 +818,5 @@ } -void *psUnaryOp(void *out, void *in, char *op) +psPtr psUnaryOp(psPtr out, psPtr in, char *op) { psDimen dimIn = 0; Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.h =================================================================== --- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.h (revision 2203) +++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.h (revision 2204) @@ -30,6 +30,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-11 02:37:55 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,8 +56,8 @@ */ psType* psBinaryOp( - void *out, ///< Output type, either psImage or psVector. - void *in1, ///< First input, either psImage or psVector. + psPtr out, ///< Output type, either psImage or psVector. + psPtr in1, ///< First input, either psImage or psVector. char *op, ///< Operator. - void *in2 ///< Second input, either psImage or psVector. + psPtr in2 ///< Second input, either psImage or psVector. ); @@ -79,6 +79,6 @@ */ psType* psUnaryOp( - void *out, ///< Output type, either psImage or psVector. - void *in, ///< Input, either psImage or psVector. + psPtr out, ///< Output type, either psImage or psVector. + psPtr in, ///< Input, either psImage or psVector. char *op ///< Operator. ); Index: /trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.c (revision 2203) +++ /trunk/psLib/src/dataManip/psMinimize.c (revision 2204) @@ -9,6 +9,6 @@ * @author GLF, MHPCC * - * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 23:14:04 $ + * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,8 +59,8 @@ *****************************************************************************/ void p_psBuildSums1D(double x, - int polyOrder, + psS32 polyOrder, psVector* sums) { - int i = 0; + psS32 i = 0; double xSum = 0.0; @@ -101,10 +101,10 @@ "---- CalculateSecondDerivs() begin ----\n"); - int i; - int k; - bool mustFreeX = false; + psS32 i; + psS32 k; + psBool mustFreeX = false; float sig; float p; - int n = y->n; + psS32 n = y->n; float *u = (float *) psAlloc(n * sizeof(float)); float *derivs2 = (float *) psAlloc(n * sizeof(float)); @@ -173,7 +173,7 @@ float X) { - int n; - int klo; - int khi; + psS32 n; + psS32 klo; + psS32 khi; float H; float A; @@ -240,8 +240,8 @@ psTrace(".psLib.dataManip.psVectorFitSpline1D", 4, "---- psVectorFitSpline1D() begin ----\n"); - int numSplines = (y->n)-1; + psS32 numSplines = (y->n)-1; float tmp; float H; - int i; + psS32 i; float slope; psVector *x32 = NULL; @@ -416,12 +416,12 @@ the F64 port might be. *****************************************************************************/ -bool psMinimizeLMChi2(psMinimization *min, - psImage *covar, - psVector *params, - const psVector *paramMask, - const psArray *x, - const psVector *y, - const psVector *yErr, - psMinimizeLMChi2Func func) +psBool psMinimizeLMChi2(psMinimization *min, + psImage *covar, + psVector *params, + const psVector *paramMask, + const psArray *x, + const psVector *y, + const psVector *yErr, + psMinimizeLMChi2Func func) { PS_CHECK_NULL_PTR_RETURN_NULL(min); @@ -441,12 +441,12 @@ psTrace(".psLib.dataManip.psMinimizeLMChi2", 4, "---- psMinimizeLMChi2() begin ----\n"); - int numData = y->n; - int numParams = params->n; - int i; - int j; - int k; - int l; - int n; - int p; + psS32 numData = y->n; + psS32 numParams = params->n; + psS32 i; + psS32 j; + psS32 k; + psS32 l; + psS32 n; + psS32 p; psVector *beta = psVectorAlloc(numParams, PS_TYPE_F64); psVector *perm = psVectorAlloc(numParams, PS_TYPE_F64); @@ -663,7 +663,7 @@ const psVector* restrict yErr) { - int j; - int k; - int n = x->n; + psS32 j; + psS32 k; + psS32 n = x->n; double fac; double sum; @@ -689,5 +689,5 @@ // are fitting this ChebyShev polynomial to. - for (int i=0;in; + psS32 polyOrder = myPoly->n; psImage* A = NULL; psImage* ALUD = NULL; @@ -748,7 +748,7 @@ psVector* X = NULL; // NOTE: do we need this? psVector* coeffs = NULL; - int i = 0; - int j = 0; - int k = 0; + psS32 i = 0; + psS32 j = 0; + psS32 k = 0; psVector* xSums = NULL; @@ -853,5 +853,5 @@ const psVector* restrict yErr) { - int i; + psS32 i; psPolynomial1D *tmpPoly; PS_CHECK_NULL_1DPOLY_RETURN_NULL(myPoly); @@ -908,5 +908,5 @@ /****************************************************************************** *****************************************************************************/ -psMinimization *psMinimizationAlloc(int maxIter, +psMinimization *psMinimizationAlloc(psS32 maxIter, float tol) { @@ -952,5 +952,5 @@ float fb = 0.0; float fc = 0.0; - int iter = 100; + psS32 iter = 100; float aDir = 0.0; float cDir = 0.0; @@ -960,6 +960,6 @@ float stepSize = DETERMINE_BRACKET_STEP_SIZE; psVector *tmp = NULL; - int i = 0; - int null = 0; + psS32 i = 0; + psS32 null = 0; psTrace(".psLib.dataManip.p_psDetermineBracket", 4, @@ -1141,6 +1141,6 @@ psVector *tmpc = NULL; psVector *tmpn = NULL; - int i = 0; - int null = 0; + psS32 i = 0; + psS32 null = 0; psTrace(".psLib.dataManip.p_psLineMin", 4, @@ -1313,9 +1313,9 @@ XXX: Check for F32 types? *****************************************************************************/ -bool psMinimizePowell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - psMinimizePowellFunc func) +psBool psMinimizePowell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + psMinimizePowellFunc func) { PS_CHECK_NULL_VECTOR_RETURN_NULL(params); @@ -1325,7 +1325,7 @@ PS_CHECK_NULL_PTR_RETURN_NULL(func); - int numDims = params->n; - int i = 0; - int j = 0; + psS32 numDims = params->n; + psS32 i = 0; + psS32 j = 0; psVector **v = NULL; psVector *pQP = NULL; @@ -1337,5 +1337,5 @@ float baseFuncVal = 0.0; float currFuncVal = 0.0; - int biggestIter = 0; + psS32 biggestIter = 0; float biggestDiff = 0.0; float term1 = 0.0; @@ -1529,5 +1529,5 @@ float chi2 = 0.0; float d; - int i; + psS32 i; psVector *tmp; @@ -1552,11 +1552,11 @@ psMinimizePowell(). *****************************************************************************/ -bool psMinimizeChi2Powell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - const psVector *value, - const psVector *error, - psMinimizeChi2PowellFunc func) +psBool psMinimizeChi2Powell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + const psVector *value, + const psVector *error, + psMinimizeChi2PowellFunc func) { myValue = (psVector *) value; Index: /trunk/psLib/src/dataManip/psMinimize.h =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.h (revision 2203) +++ /trunk/psLib/src/dataManip/psMinimize.h (revision 2204) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 23:14:04 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,13 +46,13 @@ typedef struct { - int maxIter; ///< Convergence limit + psS32 maxIter; ///< Convergence limit float tol; ///< Error Tolerance float value; ///< Value of function at minimum - int iter; ///< Number of iterations required + psS32 iter; ///< Number of iterations required float lastDelta; ///< The last difference for the fit } psMinimization; -psMinimization *psMinimizationAlloc(int maxIter, +psMinimization *psMinimizationAlloc(psS32 maxIter, float tol); @@ -88,12 +88,12 @@ const psArray *x); -bool psMinimizeLMChi2(psMinimization *min, - psImage *covar, - psVector *params, - const psVector *paramMask, - const psArray *x, - const psVector *y, - const psVector *yErr, - psMinimizeLMChi2Func func); +psBool psMinimizeLMChi2(psMinimization *min, + psImage *covar, + psVector *params, + const psVector *paramMask, + const psArray *x, + const psVector *y, + const psVector *yErr, + psMinimizeLMChi2Func func); typedef @@ -101,9 +101,9 @@ const psArray *coords); -bool psMinimizePowell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - psMinimizePowellFunc func); +psBool psMinimizePowell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + psMinimizePowellFunc func); typedef @@ -111,11 +111,11 @@ const psArray *coords); -bool psMinimizeChi2Powell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - const psVector *value, - const psVector *error, - psMinimizeChi2PowellFunc func); +psBool psMinimizeChi2Powell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + const psVector *value, + const psVector *error, + psMinimizeChi2PowellFunc func); Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 2203) +++ /trunk/psLib/src/dataManip/psStats.c (revision 2204) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 21:24:43 $ + * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ void p_psVectorRobustStats(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats); + const psVector* restrict maskVector, psU32 maskVal, psStats* stats); @@ -75,5 +75,5 @@ /*****************************************************************************/ -bool p_psGetStatValue(const psStats* stats, double *value) +psBool p_psGetStatValue(const psStats* stats, double *value) { @@ -134,7 +134,7 @@ *****************************************************************************/ -void p_psVectorPrint(psVector* myVector, psVector* maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable. +void p_psVectorPrint(psVector* myVector, psVector* maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable. for (i = 0; i < myVector->n; i++) { @@ -178,9 +178,9 @@ void p_psVectorSampleMean(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable float mean = 0.0; // The mean - int count = 0; // # of points in this mean? + psS32 count = 0; // # of points in this mean? float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -242,7 +242,7 @@ *****************************************************************************/ void p_psVectorMax(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable float max = -MY_MAX_FLOAT; // The calculated maximum float rangeMin = 0.0; // Exclude data below this @@ -303,7 +303,7 @@ *****************************************************************************/ void p_psVectorMin(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable float min = MY_MAX_FLOAT; // The calculated maximum float rangeMin = 0.0; // Exclude data below this @@ -363,9 +363,9 @@ NULL *****************************************************************************/ -int p_psVectorNValues(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable - int numData = 0; // The number of data points +psS32 p_psVectorNValues(const psVector* restrict myVector, + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable + psS32 numData = 0; // The number of data points float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -414,11 +414,11 @@ *****************************************************************************/ void p_psVectorSampleMedian(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) { psVector* unsortedVector = NULL; // Temporary vector psVector* sortedVector = NULL; // Temporary vector - int i = 0; // Loop index variable - int count = 0; // # of points in this mean? - int nValues = 0; // # of points in vector + psS32 i = 0; // Loop index variable + psS32 count = 0; // # of points in this mean? + psS32 nValues = 0; // # of points in vector float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -497,13 +497,13 @@ float sigma) { - int i = 0; // Loop index variable - int j = 0; // Loop index variable + psS32 i = 0; // Loop index variable + psS32 j = 0; // Loop index variable float iMid; float jMid; - int numBins = robustHistogram->nums->n; - int numBounds = robustHistogram->bounds->n; + psS32 numBins = robustHistogram->nums->n; + psS32 numBounds = robustHistogram->bounds->n; psVector* smooth = psVectorAlloc(numBins, PS_TYPE_F32); - int jMin = 0; - int jMax = 0; + psS32 jMin = 0; + psS32 jMax = 0; float firstBound = robustHistogram->bounds->data.F32[0]; float lastBound = robustHistogram->bounds->data.F32[numBounds-1]; @@ -566,11 +566,11 @@ *****************************************************************************/ void p_psVectorSampleQuartiles(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) { psVector* unsortedVector = NULL; // Temporary vector psVector* sortedVector = NULL; // Temporary vector - int i = 0; // Loop index variable - int count = 0; // # of points in this mean? - int nValues = 0; // # data points + psS32 i = 0; // Loop index variable + psS32 count = 0; // # of points in this mean? + psS32 nValues = 0; // # data points float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -648,8 +648,8 @@ *****************************************************************************/ void p_psVectorSampleStdev(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable - int countInt = 0; // # of data points being used + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable + psS32 countInt = 0; // # of data points being used float countFloat = 0.0; // # of data points being used float mean = 0.0; // The mean @@ -733,8 +733,8 @@ *****************************************************************************/ void p_psVectorClippedStats(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable - int j = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable + psS32 j = 0; // Loop index variable float clippedMean = 0.0; // self-explanatory float clippedStdev = 0.0; // self-explanatory @@ -825,5 +825,5 @@ float min = (float)HUGE; float max = (float)-HUGE; - int i = 0; + psS32 i = 0; for (i = 0; i < myData->n; i++) { @@ -856,5 +856,5 @@ float max = (double)-HUGE; double range = 0.0; - int i = 0; + psS32 i = 0; for (i = 0; i < myData->n; i++) { @@ -914,5 +914,5 @@ *****************************************************************************/ float p_psGaussianDeriv(const psVector* restrict myData, - const psVector* restrict myParams, int whichParam) + const psVector* restrict myParams, psS32 whichParam) { float x = myData->data.F32[0]; @@ -957,5 +957,5 @@ *****************************************************************************/ float p_psQuadraticDeriv(const psVector* restrict myParams, - const psVector* restrict myCoords, int whichParamDeriv) + const psVector* restrict myCoords, psS32 whichParamDeriv) { float x = myCoords->data.F32[0]; @@ -989,5 +989,5 @@ float getThisValue) { - int numIterations = 0; + psS32 numIterations = 0; float midpoint = 0.0; float oldMidpoint = 1.0; @@ -1030,5 +1030,5 @@ float fitQuadraticSearchForYThenReturnX(psVector *xVec, psVector *yVec, - int binNum, + psS32 binNum, float yVal) { @@ -1129,5 +1129,5 @@ void p_psVectorRobustStats(const psVector* restrict myVector, const psVector* restrict maskVector, - unsigned int maskVal, + psU32 maskVal, psStats* stats) { @@ -1135,12 +1135,12 @@ psVector* robustHistogramVector = NULL; float binSize = 0.0; // Size of the histogram bins - int LQBinNum = -1; // Bin num for lower quartile - int UQBinNum = -1; // Bin num for upper quartile - int medianBinNum = -1; - int i = 0; // Loop index variable - int modeBinNum = 0; + psS32 LQBinNum = -1; // Bin num for lower quartile + psS32 UQBinNum = -1; // Bin num for upper quartile + psS32 medianBinNum = -1; + psS32 i = 0; // Loop index variable + psS32 modeBinNum = 0; float modeBinCount = 0.0; float dL = 0.0; - int numBins = 0; + psS32 numBins = 0; float myMean = 0.0; float myStdev = 0.0; @@ -1200,5 +1200,5 @@ // bins, not the binSize. Also, if we get here, we know that // binSize != 0.0. - numBins = (int)((stats->max - stats->min) / binSize); + numBins = (psS32)((stats->max - stats->min) / binSize); robustHistogram = psHistogramAlloc(stats->min, stats->max, numBins); @@ -1440,7 +1440,7 @@ The histogram structure *****************************************************************************/ -psHistogram* psHistogramAlloc(float lower, float upper, int n) -{ - int i = 0; // Loop index variable +psHistogram* psHistogramAlloc(float lower, float upper, psS32 n) +{ + psS32 i = 0; // Loop index variable psHistogram* newHist = NULL; // The new histogram structure float binSize = 0.0; // The histogram bin size @@ -1500,5 +1500,5 @@ { psHistogram* newHist = NULL; // The new histogram structure - int i; // Loop index variable + psS32 i; // Loop index variable // NOTE: Verify that this is the correct action. @@ -1565,15 +1565,15 @@ const psVector* restrict in, const psVector* restrict mask, - unsigned int maskVal) -{ - int i = 0; // Loop index variable + psU32 maskVal) +{ + psS32 i = 0; // Loop index variable float binSize = 0.0; // Histogram bin size - int binNum = 0; // A temporary bin number - int numBins = 0; // The total number of bins - int tmp = 0; + psS32 binNum = 0; // A temporary bin number + psS32 numBins = 0; // The total number of bins + psS32 tmp = 0; psScalar tmpScalar; tmpScalar.type.type = PS_TYPE_F32; psVector* inF32; - int mustFreeTmp = 1; + psS32 mustFreeTmp = 1; // NOTE: Verify that this is the correct action. @@ -1629,5 +1629,5 @@ if (out->uniform == true) { binSize = out->bounds->data.F32[1] - out->bounds->data.F32[0]; - binNum = (int)((inF32->data.F32[i] - out->bounds->data.F32[0]) / binSize); + binNum = (psS32)((inF32->data.F32[i] - out->bounds->data.F32[0]) / binSize); // NOTE: This next if-statement really shouldn't be necessary. @@ -1673,5 +1673,5 @@ psVector* p_psConvertToF32(psVector* in) { - int i = 0; + psS32 i = 0; psVector* tmp = NULL; @@ -1724,8 +1724,8 @@ psVector* in, psVector* mask, - unsigned int maskVal) + psU32 maskVal) { psVector* inF32; - int mustFreeTmp = 1; + psS32 mustFreeTmp = 1; if (in == NULL) { Index: /trunk/psLib/src/dataManip/psStats.h =================================================================== --- /trunk/psLib/src/dataManip/psStats.h (revision 2203) +++ /trunk/psLib/src/dataManip/psStats.h (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 20:07:04 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,11 +67,11 @@ double robustUQ; ///< robust upper quartile double robustLQ; ///< robust lower quartile - int robustN50; ///< - int robustNfit; ///< + psS32 robustN50; ///< + psS32 robustNfit; ///< double clippedMean; ///< Nsigma clipped mean double clippedStdev; ///< standard deviation after clipping - int clippedNvalues; ///< ??? + psS32 clippedNvalues; ///< ??? double clipSigma; ///< Nsigma used for clipping; user input - int clipIter; ///< Number of clipping iterations; user input + psS32 clipIter; ///< Number of clipping iterations; user input double min; ///< minimum data value in array double max; ///< maximum data value in array @@ -89,5 +89,5 @@ psVector* in, ///< Vector to be analysed: must be F32 psVector* mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL - unsigned int maskVal ///< Only mask elements with one of these bits set in maskVector + psU32 maskVal ///< Only mask elements with one of these bits set in maskVector ); @@ -118,7 +118,7 @@ psVector* bounds; ///< Bounds for the bins (type F32) psVector* nums; ///< Number in each of the bins (INT) - int minNum; ///< Number below the minimum - int maxNum; ///< Number above the maximum - bool uniform; ///< Is it a uniform distribution? + psS32 minNum; ///< Number below the minimum + psS32 maxNum; ///< Number above the maximum + psBool uniform; ///< Is it a uniform distribution? } psHistogram; @@ -133,5 +133,5 @@ float lower, ///< Lower limit for the bins float upper, ///< Upper limit for the bins - int n ///< Number of bins + psS32 n ///< Number of bins ); @@ -157,14 +157,14 @@ const psVector* restrict in, ///< Vector to analyse const psVector* restrict mask, ///< Mask dat for input vector - unsigned int maskVal ///< Mask value + psU32 maskVal ///< Mask value ); /** Extracts the statistic value specified by stats->options. * - * @return bool If more than one statistic result is set in stats->options, + * @return psBool If more than one statistic result is set in stats->options, * false is returned and the value parameter is not set, * otherwise true is returned. */ -bool p_psGetStatValue( +psBool p_psGetStatValue( const psStats* stats, ///< the statistic struct to operate on Index: /trunk/psLib/src/dataManip/psVectorFFT.c =================================================================== --- /trunk/psLib/src/dataManip/psVectorFFT.c (revision 2203) +++ /trunk/psLib/src/dataManip/psVectorFFT.c (revision 2204) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-13 20:46:57 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -27,9 +27,9 @@ #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE -static bool p_fftwWisdomImported = false; +static psBool p_fftwWisdomImported = false; psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction) { - unsigned int numElements; + psU32 numElements; psElemType type; fftwf_plan plan; @@ -85,5 +85,5 @@ if ((direction & PS_FFT_REAL_RESULT) != 0) { - for (int i = 0; i < numElements; i++) { + for (psS32 i = 0; i < numElements; i++) { out->data.F32[i] = out->data.C32[i]; } @@ -98,5 +98,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (in == NULL) { @@ -127,5 +127,5 @@ outVec = out->data.F32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = crealf(inVec[i]); } @@ -138,5 +138,5 @@ outVec = out->data.F64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = creal(inVec[i]); } @@ -158,5 +158,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (in == NULL) { @@ -187,5 +187,5 @@ outVec = out->data.F32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = cimagf(inVec[i]); } @@ -198,5 +198,5 @@ outVec = out->data.F64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = cimag(inVec[i]); } @@ -218,5 +218,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (real == NULL || imag == NULL) { @@ -254,5 +254,5 @@ outVec = out->data.C32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = realVec[i] + I * imagVec[i]; } @@ -266,5 +266,5 @@ outVec = out->data.C64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = realVec[i] + I * imagVec[i]; } @@ -286,5 +286,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (in == NULL) { @@ -316,5 +316,5 @@ outVec = out->data.C32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = crealf(inVec[i]) - I * cimagf(inVec[i]); } @@ -327,5 +327,5 @@ outVec = out->data.C64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = creal(inVec[i]) - I * cimag(inVec[i]); } @@ -347,8 +347,8 @@ { psElemType type; - unsigned int outNumElements; - unsigned int inNumElements; - unsigned int inHalfNumElements; - unsigned int inNumElementsSquared; + psU32 outNumElements; + psU32 inNumElements; + psU32 inHalfNumElements; + psU32 inNumElementsSquared; if (in == NULL) { @@ -378,5 +378,5 @@ // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1) - for (unsigned int i = 1; i < inHalfNumElements; i++) { + for (psU32 i = 1; i < inHalfNumElements; i++) { inAbs1 = cabsf(inVec[i]); inAbs2 = cabsf(inVec[inNumElements - i]); @@ -402,5 +402,5 @@ // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1) - for (unsigned int i = 1; i < inHalfNumElements; i++) { + for (psU32 i = 1; i < inHalfNumElements; i++) { inAbs1 = cabs(inVec[i]); inAbs2 = cabs(inVec[inNumElements - i]); Index: /trunk/psLib/src/fft/psImageFFT.c =================================================================== --- /trunk/psLib/src/fft/psImageFFT.c (revision 2203) +++ /trunk/psLib/src/fft/psImageFFT.c (revision 2204) @@ -5,11 +5,10 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 21:31:30 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ #include -#include #include #include @@ -27,10 +26,10 @@ #define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE -static bool p_fftwWisdomImported = false; +static psBool p_fftwWisdomImported = false; psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction) { - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; psElemType type; fftwf_plan plan; @@ -77,5 +76,5 @@ // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place. - int sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD; + psS32 sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD; out = psImageCopy(out, in, PS_TYPE_C32); plan = fftwf_plan_dft_2d(numCols, numRows, @@ -118,6 +117,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (in == NULL) { @@ -140,9 +139,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = crealf(inRow[col]); } @@ -153,9 +152,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = creal(inRow[col]); } @@ -179,6 +178,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (in == NULL) { @@ -203,9 +202,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = cimagf(inRow[col]); } @@ -216,9 +215,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = cimag(inRow[col]); } @@ -241,6 +240,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (real == NULL || imag == NULL) { @@ -282,10 +281,10 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C32[row]; realRow = real->data.F32[row]; imagRow = imag->data.F32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = realRow[col] + I * imagRow[col]; } @@ -297,10 +296,10 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C64[row]; realRow = real->data.F64[row]; imagRow = imag->data.F64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = realRow[col] + I * imagRow[col]; } @@ -324,6 +323,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (in == NULL) { @@ -346,9 +345,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = crealf(inRow[col]) - I * cimagf(inRow[col]); } @@ -359,9 +358,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = creal(inRow[col]) - I * cimag(inRow[col]); } @@ -384,7 +383,7 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; - int numElementsSquared; + psU32 numCols; + psU32 numRows; + psS32 numElementsSquared; if (in == NULL) { @@ -405,9 +404,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { real = crealf(inRow[col]); imag = cimagf(inRow[col]); @@ -422,9 +421,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { real = creal(inRow[col]); imag = cimag(inRow[col]); Index: /trunk/psLib/src/fft/psVectorFFT.c =================================================================== --- /trunk/psLib/src/fft/psVectorFFT.c (revision 2203) +++ /trunk/psLib/src/fft/psVectorFFT.c (revision 2204) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-13 20:46:57 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -27,9 +27,9 @@ #define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE -static bool p_fftwWisdomImported = false; +static psBool p_fftwWisdomImported = false; psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction) { - unsigned int numElements; + psU32 numElements; psElemType type; fftwf_plan plan; @@ -85,5 +85,5 @@ if ((direction & PS_FFT_REAL_RESULT) != 0) { - for (int i = 0; i < numElements; i++) { + for (psS32 i = 0; i < numElements; i++) { out->data.F32[i] = out->data.C32[i]; } @@ -98,5 +98,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (in == NULL) { @@ -127,5 +127,5 @@ outVec = out->data.F32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = crealf(inVec[i]); } @@ -138,5 +138,5 @@ outVec = out->data.F64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = creal(inVec[i]); } @@ -158,5 +158,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (in == NULL) { @@ -187,5 +187,5 @@ outVec = out->data.F32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = cimagf(inVec[i]); } @@ -198,5 +198,5 @@ outVec = out->data.F64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = cimag(inVec[i]); } @@ -218,5 +218,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (real == NULL || imag == NULL) { @@ -254,5 +254,5 @@ outVec = out->data.C32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = realVec[i] + I * imagVec[i]; } @@ -266,5 +266,5 @@ outVec = out->data.C64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = realVec[i] + I * imagVec[i]; } @@ -286,5 +286,5 @@ { psElemType type; - unsigned int numElements; + psU32 numElements; if (in == NULL) { @@ -316,5 +316,5 @@ outVec = out->data.C32; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = crealf(inVec[i]) - I * cimagf(inVec[i]); } @@ -327,5 +327,5 @@ outVec = out->data.C64; - for (unsigned int i = 0; i < numElements; i++) { + for (psU32 i = 0; i < numElements; i++) { outVec[i] = creal(inVec[i]) - I * cimag(inVec[i]); } @@ -347,8 +347,8 @@ { psElemType type; - unsigned int outNumElements; - unsigned int inNumElements; - unsigned int inHalfNumElements; - unsigned int inNumElementsSquared; + psU32 outNumElements; + psU32 inNumElements; + psU32 inHalfNumElements; + psU32 inNumElementsSquared; if (in == NULL) { @@ -378,5 +378,5 @@ // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1) - for (unsigned int i = 1; i < inHalfNumElements; i++) { + for (psU32 i = 1; i < inHalfNumElements; i++) { inAbs1 = cabsf(inVec[i]); inAbs2 = cabsf(inVec[inNumElements - i]); @@ -402,5 +402,5 @@ // from ADD: P_j = (|C_j|^2+|C_N-j|^2)/N^2, where j = 1,2,...,(N/2-1) - for (unsigned int i = 1; i < inHalfNumElements; i++) { + for (psU32 i = 1; i < inHalfNumElements; i++) { inAbs1 = cabs(inVec[i]); inAbs2 = cabs(inVec[inNumElements - i]); Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 2203) +++ /trunk/psLib/src/image/psImage.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 01:22:59 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,11 +29,11 @@ static void imageFree(psImage* image); -psImage* psImageAlloc(unsigned int numCols, - unsigned int numRows, +psImage* psImageAlloc(psU32 numCols, + psU32 numRows, const psElemType type) { - int area = 0; - int elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes - int rowSize = numCols * elementSize; // row size in bytes. + psS32 area = 0; + psS32 elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes + psS32 rowSize = numCols * elementSize; // row size in bytes. area = numCols * numRows; @@ -51,5 +51,5 @@ p_psMemSetDeallocator(image, (psFreeFcn) imageFree); - image->data.V = psAlloc(sizeof(void *) * numRows); + image->data.V = psAlloc(sizeof(psPtr ) * numRows); image->rawDataBuffer = psAlloc(area * elementSize); @@ -57,12 +57,12 @@ // set the row pointers. image->data.V[0] = image->rawDataBuffer; - for (int i = 1; i < numRows; i++) { - image->data.V[i] = (void *)((int8_t *) image->data.V[i - 1] + rowSize); - } - - *(int *)&image->col0 = 0; - *(int *)&image->row0 = 0; - *(unsigned int *)&image->numCols = numCols; - *(unsigned int *)&image->numRows = numRows; + for (psS32 i = 1; i < numRows; i++) { + image->data.V[i] = (psPtr )((int8_t *) image->data.V[i - 1] + rowSize); + } + + *(psS32 *)&image->col0 = 0; + *(psS32 *)&image->row0 = 0; + *(psU32 *)&image->numCols = numCols; + *(psU32 *)&image->numRows = numRows; *(psDimen* ) & image->type.dimen = PS_DIMEN_IMAGE; *(psElemType* ) & image->type.type = type; @@ -81,11 +81,11 @@ if (image->type.type == PS_TYPE_PTR) { // 2-D array of pointers -- must dereference elements - unsigned int oldNumRows = image->numRows; - unsigned int oldNumCols = image->numCols; - psPTR* rowPtr; - - for (unsigned int row = 0; row < oldNumRows; row++) { + psU32 oldNumRows = image->numRows; + psU32 oldNumCols = image->numCols; + psPtr* rowPtr; + + for (psU32 row = 0; row < oldNumRows; row++) { rowPtr = image->data.PTR[row]; - for (unsigned int col = 0; col < oldNumCols; col++) { + for (psU32 col = 0; col < oldNumCols; col++) { psMemDecrRefCounter(rowPtr[col]); } @@ -105,10 +105,10 @@ psImage* psImageRecycle(psImage* old, - unsigned int numCols, - unsigned int numRows, + psU32 numCols, + psU32 numRows, const psElemType type) { - int elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes - int rowSize = numCols * elementSize; // row size in bytes. + psS32 elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes + psS32 rowSize = numCols * elementSize; // row size in bytes. if (old == NULL) { @@ -128,11 +128,11 @@ // 2-D array of pointers -- must // dereference - unsigned int oldNumRows = old->numRows; - unsigned int oldNumCols = old->numCols; - psPTR* rowPtr; - - for (unsigned int row = 0; row < oldNumRows; row++) { + psU32 oldNumRows = old->numRows; + psU32 oldNumCols = old->numCols; + psPtr* rowPtr; + + for (psU32 row = 0; row < oldNumRows; row++) { rowPtr = old->data.PTR[row]; - for (unsigned int col = 0; col < oldNumCols; col++) { + for (psU32 col = 0; col < oldNumCols; col++) { psMemDecrRefCounter(rowPtr[col]); rowPtr[col] = NULL; @@ -149,14 +149,14 @@ old->rawDataBuffer = psRealloc(old->data.V[0], numCols * numRows * elementSize); - old->data.V = (void **)psRealloc(old->data.V, numRows * sizeof(void *)); + old->data.V = (psPtr *)psRealloc(old->data.V, numRows * sizeof(psPtr )); // recreate the row pointers old->data.V[0] = old->rawDataBuffer; - for (int i = 1; i < numRows; i++) { - old->data.V[i] = (void *)((int8_t *) old->data.V[i - 1] + rowSize); - } - - *(unsigned int *)&old->numCols = numCols; - *(unsigned int *)&old->numRows = numRows; + for (psS32 i = 1; i < numRows; i++) { + old->data.V[i] = (psPtr )((int8_t *) old->data.V[i - 1] + rowSize); + } + + *(psU32 *)&old->numCols = numCols; + *(psU32 *)&old->numRows = numRows; *(psElemType* ) & old->type.type = type; @@ -169,8 +169,8 @@ { psElemType inDatatype; - int elementSize; - int elements; - int numRows; - int numCols; + psS32 elementSize; + psS32 elements; + psS32 numRows; + psS32 numCols; if (input == NULL || input->data.V == NULL) { @@ -218,5 +218,5 @@ // datatype. if (type == inDatatype) { - for (int row=0;rowdata.V[row], input->data.V[row], elementSize * numCols); } @@ -227,8 +227,8 @@ ps##INTYPE *in; \ ps##OUTTYPE *out; \ - for(int row=0;rowdata.INTYPE[row]; \ out = OUT->data.OUTTYPE[row]; \ - for (int col=0;colparent = NULL; } @@ -366,5 +366,5 @@ float y, const psImage* mask, - unsigned int maskVal, + psU32 maskVal, psC64 unexposedValue, psImageInterpolateMode mode) @@ -438,11 +438,11 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psF64 unexposedValue) \ { \ - int intX = (int) round((psF64)(x) - 0.5 + FLT_EPSILON); \ - int intY = (int) round((psF64)(y) - 0.5 + FLT_EPSILON); \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intX = (psS32) round((psF64)(x) - 0.5 + FLT_EPSILON); \ + psS32 intY = (psS32) round((psF64)(y) - 0.5 + FLT_EPSILON); \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ \ if ((intX < 0) || \ @@ -463,11 +463,11 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psC64 unexposedValue) \ { \ - int intX = (int) round((psF64)(x) - 0.5); \ - int intY = (int) round((psF64)(y) - 0.5); \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intX = (psS32) round((psF64)(x) - 0.5); \ + psS32 intY = (psS32) round((psF64)(y) - 0.5); \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ \ if ((intX < 0) || \ @@ -501,5 +501,5 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psF64 unexposedValue) \ { \ @@ -508,16 +508,16 @@ psF64 fracX = x - 0.5 - floorX; \ psF64 fracY = y - 0.5 - floorY; \ - int intFloorX = (int) floorX; \ - int intFloorY = (int) floorY; \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intFloorX = (psS32) floorX; \ + psS32 intFloorY = (psS32) floorY; \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ ps##TYPE V00; \ ps##TYPE V01; \ ps##TYPE V10; \ ps##TYPE V11; \ - bool valid00 = false; \ - bool valid01 = false; \ - bool valid10 = false; \ - bool valid11 = false; \ + psBool valid00 = false; \ + psBool valid01 = false; \ + psBool valid10 = false; \ + psBool valid11 = false; \ \ if (intFloorY >= 0 && intFloorY <= lastY) { \ @@ -556,5 +556,5 @@ \ psF64 V0; \ - bool valid0 = true; \ + psBool valid0 = true; \ if (valid00 && valid10) { \ V0 = V00*(1-fracX)+V10*fracX; \ @@ -568,5 +568,5 @@ \ psF64 V1; \ - bool valid1 = true; \ + psBool valid1 = true; \ if (valid01 && valid11) { \ V1 = V01*(1-fracX)+V11*fracX; \ @@ -595,5 +595,5 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psC64 unexposedValue) \ { \ @@ -602,16 +602,16 @@ psF64 fracX = x - 0.5 - floorX; \ psF64 fracY = y - 0.5 - floorY; \ - int intFloorX = (int) floorX; \ - int intFloorY = (int) floorY; \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intFloorX = (psS32) floorX; \ + psS32 intFloorY = (psS32) floorY; \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ ps##TYPE V00; \ ps##TYPE V01; \ ps##TYPE V10; \ ps##TYPE V11; \ - bool valid00 = false; \ - bool valid01 = false; \ - bool valid10 = false; \ - bool valid11 = false; \ + psBool valid00 = false; \ + psBool valid01 = false; \ + psBool valid10 = false; \ + psBool valid11 = false; \ \ if (intFloorY >= 0 && intFloorY <= lastY) { \ @@ -650,5 +650,5 @@ \ psC64 V0; \ - bool valid0 = true; \ + psBool valid0 = true; \ if (valid00 && valid10) { \ V0 = V00*(1-fracX)+V10*fracX; \ @@ -662,5 +662,5 @@ \ psC64 V1; \ - bool valid1 = true; \ + psBool valid1 = true; \ if (valid01 && valid11) { \ V0 = V01*(1-fracX)+V11*fracX; \ Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 2203) +++ /trunk/psLib/src/image/psImage.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 01:22:59 $ + * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -47,8 +47,8 @@ { const psType type; ///< Image data type and dimension. - const unsigned int numCols; ///< Number of columns in image - const unsigned int numRows; ///< Number of rows in image. - const int col0; ///< Column position relative to parent. - const int row0; ///< Row position relative to parent. + const psU32 numCols; ///< Number of columns in image + const psU32 numRows; ///< Number of rows in image. + const psS32 col0; ///< Column position relative to parent. + const psS32 row0; ///< Row position relative to parent. union { @@ -65,11 +65,11 @@ psC32** C32; ///< Single-precision complex data. psC64** C64; ///< Double-precision complex data. - psPTR** PTR; ///< Void pointers. - psPTR* V; ///< Pointer to data. + psPtr** PTR; ///< Void pointers. + psPtr* V; ///< Pointer to data. } data; ///< Union for data types. const struct psImage* parent; ///< Parent, if a subimage. psArray* children; ///< Children of this region. - void* rawDataBuffer; + psPtr rawDataBuffer; } psImage; @@ -84,6 +84,6 @@ */ psImage* psImageAlloc( - unsigned int numCols, ///< Number of rows in image. - unsigned int numRows, ///< Number of columns in image. + psU32 numCols, ///< Number of rows in image. + psU32 numRows, ///< Number of columns in image. const psElemType type ///< Type of data for image. ); @@ -96,6 +96,6 @@ psImage* psImageRecycle( psImage* old, ///< the psImage to recycle by resizing image buffer - unsigned int numCols, ///< the desired number of columns in image - unsigned int numRows, ///< the desired number of rows in image + psU32 numCols, ///< the desired number of columns in image + psU32 numRows, ///< the desired number of rows in image const psElemType type ///< the desired datatype of the image ); @@ -115,8 +115,8 @@ /** Frees all children of a psImage. * - * @return int Number of children freed. + * @return psS32 Number of children freed. * */ -int psImageFreeChildren( +psS32 psImageFreeChildren( psImage* image ///< psImage in which all children shall be deallocated ); @@ -132,5 +132,5 @@ float y, ///< row location ot derive value of const psImage* mask, ///< if not NULL, the mask of the input image - unsigned int maskVal, ///< the mask value + psU32 maskVal, ///< the mask value psC64 unexposedValue, ///< return value if x,y location is not in image. psImageInterpolateMode mode ///< interpolation mode @@ -143,5 +143,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psF64 unexposedValue /**< return value if x,y location is not in image. */ \ ); \ @@ -151,5 +151,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psF64 unexposedValue /**< return value if x,y location is not in image. */ \ ); @@ -161,5 +161,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psC64 unexposedValue /**< return value if x,y location is not in image. */ \ ); \ @@ -169,5 +169,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psC64 unexposedValue /**< return value if x,y location is not in image. */ \ ); Index: /trunk/psLib/src/image/psImageConvolve.c =================================================================== --- /trunk/psLib/src/image/psImageConvolve.c (revision 2203) +++ /trunk/psLib/src/image/psImageConvolve.c (revision 2204) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 21:31:30 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,9 +28,9 @@ static void freeKernel(psKernel* ptr); -psKernel* psKernelAlloc(int xMin, int xMax, int yMin, int yMax) +psKernel* psKernelAlloc(psS32 xMin, psS32 xMax, psS32 yMin, psS32 yMax) { psKernel* result; - int numRows; - int numCols; + psS32 numRows; + psS32 numCols; // following is explicitly spelled out in the SDRS as a requirement @@ -40,5 +40,5 @@ yMin, yMax); - int temp = yMin; + psS32 temp = yMin; yMin = yMax; yMax = temp; @@ -51,5 +51,5 @@ xMin, xMax); - int temp = xMin; + psS32 temp = xMin; xMin = xMax; xMax = temp; @@ -70,5 +70,5 @@ psKernelType** kernelRows = result->p_kernelRows; psKernelType** imageRows = result->image->data.PS_TYPE_KERNEL_DATA; - for (int i = 0; i < numRows; i++) { + for (psS32 i = 0; i < numRows; i++) { kernelRows[i] = imageRows[i] - xMin; } @@ -91,17 +91,17 @@ const psVector* xShifts, const psVector* yShifts, - bool relative) + psBool relative) { - int x = 0; - int y = 0; - int t = 0; - int deltaT; - int oldX; - int oldY; - int xMin = 0; - int xMax = 0; - int yMin = 0; - int yMax = 0; - int length = 0; + psS32 x = 0; + psS32 y = 0; + psS32 t = 0; + psS32 deltaT; + psS32 oldX; + psS32 oldY; + psS32 xMin = 0; + psS32 xMax = 0; + psS32 yMin = 0; + psS32 yMax = 0; + psS32 length = 0; psKernelType normalizeTime = 1.0; // fraction of total time for each shift clock psKernel* result = NULL; @@ -153,5 +153,5 @@ y = 0; \ t = 0; \ - for (int lcv = 0; lcv < length; lcv++) { \ + for (psS32 lcv = 0; lcv < length; lcv++) { \ if (relative) { \ x += xShiftData[lcv]; \ @@ -181,5 +181,5 @@ y = 0; \ t = 0; \ - for (int i = 0; i < length; i++) { \ + for (psS32 i = 0; i < length; i++) { \ deltaT = t; \ oldX = x; \ @@ -228,5 +228,5 @@ } -psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, bool direct) +psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, psBool direct) { if (in == NULL) { @@ -242,13 +242,13 @@ return NULL; } - int xMin = kernel->xMin; - int xMax = kernel->xMax; - int yMin = kernel->yMin; - int yMax = kernel->yMax; + psS32 xMin = kernel->xMin; + psS32 xMax = kernel->xMax; + psS32 yMin = kernel->yMin; + psS32 yMax = kernel->yMax; psKernelType** kData = kernel->kernel; // make the output image to the proper size and type - int numRows = in->numRows; - int numCols = in->numCols; + psS32 numRows = in->numRows; + psS32 numCols = in->numCols; @@ -261,11 +261,11 @@ ps##TYPE** inData = in->data.TYPE; \ out = psImageRecycle(out, numCols, numRows, PS_TYPE_##TYPE); \ - for (int row=0;rowdata.TYPE[row]; \ - for (int col=0;col= 0 && row-kRow < numRows) { \ - for (int kCol = xMin; kCol < xMax; kCol++) { \ + for (psS32 kCol = xMin; kCol < xMax; kCol++) { \ if (col-kCol >= 0 && col-kCol < numCols) { \ pixel += kData[kRow][kCol] * inData[row-kRow][col-kCol]; \ @@ -310,10 +310,10 @@ } else { // fourier convolution - int paddedCols = numCols+2*FOURIER_PADDING; - int paddedRows = numRows+2*FOURIER_PADDING; + psS32 paddedCols = numCols+2*FOURIER_PADDING; + psS32 paddedRows = numRows+2*FOURIER_PADDING; // check to see if kernel is smaller, otherwise padding it up will fail. - int kRows = kernel->image->numRows; - int kCols = kernel->image->numCols; + psS32 kRows = kernel->image->numRows; + psS32 kCols = kernel->image->numCols; if (kRows >= numRows || kCols >= numCols) { psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", @@ -328,5 +328,5 @@ // pad the image psImage* paddedImage = psImageAlloc(paddedCols,paddedRows,in->type.type); - int elementSize = PSELEMTYPE_SIZEOF(in->type.type); + psS32 elementSize = PSELEMTYPE_SIZEOF(in->type.type); // zero out padded area on top and bottom @@ -335,8 +335,8 @@ // fill in the image-containing rows. - int sidePaddingSize = FOURIER_PADDING*elementSize; - int imageRowSize = numCols*elementSize; + psS32 sidePaddingSize = FOURIER_PADDING*elementSize; + psS32 imageRowSize = numCols*elementSize; psU8* paddedData = paddedImage->data.U8[FOURIER_PADDING]; - for (int row=0;rowdata.U8[0],0,sizeof(psKernelType)*numCols*numRows); // zero-out image - int yMax = kernel->yMax; - int xMax = kernel->xMax; - for (int row = kernel->yMin; row <= yMax;row++) { - int padRow = row; + psS32 yMax = kernel->yMax; + psS32 xMax = kernel->xMax; + for (psS32 row = kernel->yMin; row <= yMax;row++) { + psS32 padRow = row; if (padRow < 0) { padRow += paddedRows; @@ -363,5 +363,5 @@ psKernelType* padData = paddedKernel->data.PS_TYPE_KERNEL_DATA[padRow]; psKernelType* kernelRow = kernel->kernel[row]; - for (int col = kernel->xMin; col <= xMax; col++) { + for (psS32 col = kernel->xMin; col <= xMax; col++) { if (col < 0) { padData[col+paddedCols] = kernelRow[col]; @@ -418,8 +418,8 @@ out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32); float factor = 1.0f/numCols/numRows; - for (int row = 0; row < numRows; row++) { + for (psS32 row = 0; row < numRows; row++) { psF32* outRow = out->data.F32[row]; psC32* resultRow = complexOutSansPad->data.C32[row]; - for (int col = 0; col < numCols; col++) { + for (psS32 col = 0; col < numCols; col++) { outRow[col] = crealf(resultRow[col])*factor; } Index: /trunk/psLib/src/image/psImageConvolve.h =================================================================== --- /trunk/psLib/src/image/psImageConvolve.h (revision 2203) +++ /trunk/psLib/src/image/psImageConvolve.h (revision 2204) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-23 18:30:57 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -15,6 +15,4 @@ #ifndef PS_IMAGE_CONVOLVE_H #define PS_IMAGE_CONVOLVE_H - -#include #include "psImage.h" @@ -32,8 +30,8 @@ { psImage* image; ///< Kernel data, in the form of an image - int xMin; ///< Most negative x index - int yMin; ///< Most negative y index - int xMax; ///< Most positive x index - int yMax; ///< Most positive y index + psS32 xMin; ///< Most negative x index + psS32 yMin; ///< Most negative y index + psS32 xMax; ///< Most positive x index + psS32 yMax; ///< Most positive y index psKernelType** kernel; ///< Pointer to the kernel data psKernelType** p_kernelRows; ///< Pointer to the rows of the kernel data; not intended for user use. @@ -68,8 +66,8 @@ */ psKernel* psKernelAlloc( - int xMin, ///< Most negative x index - int xMax, ///< Most positive x index - int yMin, ///< Most negative y index - int yMax ///< Most positive y index + psS32 xMin, ///< Most negative x index + psS32 xMax, ///< Most positive x index + psS32 yMin, ///< Most negative y index + psS32 yMax ///< Most positive y index ); @@ -94,5 +92,5 @@ const psVector* xShifts, ///< list of x-axis shifts const psVector* yShifts, ///< list of y-axis shifts - bool relative + psBool relative ); @@ -118,5 +116,5 @@ const psImage* in, ///< the psImage to convolve const psKernel* kernel, ///< kernel to colvolve with - bool direct ///< specifies method, true=direct convolution, false=fourier + psBool direct ///< specifies method, true=direct convolution, false=fourier ); Index: /trunk/psLib/src/image/psImageExtraction.c =================================================================== --- /trunk/psLib/src/image/psImageExtraction.c (revision 2203) +++ /trunk/psLib/src/image/psImageExtraction.c (revision 2204) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 01:22:59 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,11 +26,11 @@ psImage* imageSubset(psImage* out, psImage* image, - int col0, - int row0, - int col1, - int row1) + psS32 col0, + psS32 row0, + psS32 col1, + psS32 row1) { - unsigned int elementSize; // size of image element in bytes - unsigned int inputColOffset; // offset in bytes to first subset pixel in input row + psU32 elementSize; // size of image element in bytes + psU32 inputColOffset; // offset in bytes to first subset pixel in input row if (image == NULL || image->data.V == NULL) { @@ -68,6 +68,6 @@ return NULL; } - int numRows = row1-row0; - int numCols = col1-col0; + psS32 numRows = row1-row0; + psS32 numCols = col1-col0; elementSize = PSELEMTYPE_SIZEOF(image->type.type); @@ -82,5 +82,5 @@ // increment the raw data buffer before freeing anything in the 'out' - void* rawData = psMemIncrRefCounter(image->rawDataBuffer); + psPtr rawData = psMemIncrRefCounter(image->rawDataBuffer); if (out != NULL) { @@ -97,10 +97,10 @@ } - out->data.V = psRealloc(out->data.V,sizeof(void*)*numRows); // resize row pointer array + out->data.V = psRealloc(out->data.V,sizeof(psPtr)*numRows); // resize row pointer array *(psType*)&out->type = image->type; - *(unsigned int*)&out->numCols = numCols; - *(unsigned int*)&out->numRows = numRows; - *(int*)&out->row0 = row0; - *(int*)&out->col0 = col0; + *(psU32*)&out->numCols = numCols; + *(psU32*)&out->numRows = numRows; + *(psS32*)&out->row0 = row0; + *(psS32*)&out->col0 = col0; out->parent = image; out->children = NULL; @@ -111,10 +111,10 @@ inputColOffset = elementSize * col0; - for (int row = 0; row < numRows; row++) { + for (psS32 row = 0; row < numRows; row++) { out->data.V[row] = image->data.U8[row0 + row] + inputColOffset; } // add output image as a child of the input image. - int n = 0; + psS32 n = 0; psArray* children = image->children; if (children == NULL) { @@ -134,8 +134,8 @@ psImage* psImageSubset(psImage* image, - int col0, - int row0, - int col1, - int row1) + psS32 col0, + psS32 row0, + psS32 col1, + psS32 row1) { return imageSubset(NULL,image,col0,row0,col1,row1); @@ -145,8 +145,8 @@ const char* section) { - int col0; - int col1; - int row0; - int row1; + psS32 col0; + psS32 col1; + psS32 row0; + psS32 row1; // section should be of the form '[col0:col1,row0:row1]' @@ -177,5 +177,5 @@ } -psImage* psImageTrim(psImage* image, int col0, int row0, int col1, int row1) +psImage* psImageTrim(psImage* image, psS32 col0, psS32 row0, psS32 col1, psS32 row1) { if (image == NULL || image->data.V == NULL) { @@ -220,24 +220,24 @@ psImageFreeChildren(image); - unsigned int elementSize = PSELEMTYPE_SIZEOF(image->type.type); - unsigned int numCols = col1-col0; - unsigned int numRows = row1-row0; - unsigned int rowSize = elementSize*numCols; - unsigned int colOffset = elementSize * col0; + psU32 elementSize = PSELEMTYPE_SIZEOF(image->type.type); + psU32 numCols = col1-col0; + psU32 numRows = row1-row0; + psU32 rowSize = elementSize*numCols; + psU32 colOffset = elementSize * col0; psU8* imageData = image->rawDataBuffer; - for (int row = row0; row < row1; row++) { + for (psS32 row = row0; row < row1; row++) { memmove(imageData,image->data.U8[row] + colOffset,rowSize); imageData += rowSize; } - *(unsigned int*)&image->numRows = numRows; - *(unsigned int*)&image->numCols = numCols; + *(psU32*)&image->numRows = numRows; + *(psU32*)&image->numCols = numCols; // XXX: should I really resize the buffers? - image->data.V = psRealloc(image->data.V,sizeof(void*)*numRows); + image->data.V = psRealloc(image->data.V,sizeof(psPtr)*numRows); image->rawDataBuffer = psRealloc(image->rawDataBuffer,rowSize*numRows); image->data.V[0] = image->rawDataBuffer; - for (int r = 1; r < numRows; r++) { + for (psS32 r = 1; r < numRows; r++) { image->data.U8[r] = image->data.U8[r-1] + rowSize; } @@ -250,9 +250,9 @@ const psImage* restrict in, const psImage* restrict mask, - unsigned int maskVal, - int col0, - int row0, - int col1, - int row1, + psU32 maskVal, + psS32 col0, + psS32 row0, + psS32 col1, + psS32 row1, psImageCutDirection direction, const psStats* stats) @@ -261,7 +261,7 @@ psStats* myStats; psElemType type; - int inRows; - int inCols; - int delta = 1; + psS32 inRows; + psS32 inCols; + psS32 delta = 1; psF64* outData; @@ -349,6 +349,6 @@ *myStats = *stats; - int numCols = col1-col0; - int numRows = row1-row0; + psS32 numCols = col1-col0; + psS32 numRows = row1-row0; if (direction == PS_CUT_X_POS || direction == PS_CUT_X_NEG) { @@ -380,5 +380,5 @@ case PS_TYPE_##TYPE: { \ psMaskType* maskVecData = NULL; \ - for (int c=col0;cdata.TYPE[row0] + c; \ ps##TYPE *imgVecData = imgVec->data.TYPE; \ @@ -387,5 +387,5 @@ maskData = (psMaskType* )(mask->data.V[row0]) + c; \ } \ - for (int r=row0;rdata.V = (void *)(in->data.U8[r] + col0 * elementSize); + imgVec->data.V = (psPtr )(in->data.U8[r] + col0 * elementSize); if (maskVec != NULL) { - maskVec->data.V = (void *)(mask->data.U8[r] + col0 * sizeof(psMaskType)); + maskVec->data.V = (psPtr )(mask->data.U8[r] + col0 * sizeof(psMaskType)); } myStats = psVectorStats(myStats, imgVec, maskVec, maskVal); @@ -503,10 +503,10 @@ const psImage* in, const psImage* restrict mask, - unsigned int maskVal, + psU32 maskVal, float startCol, float startRow, float endCol, float endRow, - unsigned int nSamples, + psU32 nSamples, psImageInterpolateMode mode) { @@ -518,6 +518,6 @@ return NULL; } - int numCols = in->numCols; - int numRows = in->numRows; + psS32 numCols = in->numCols; + psS32 numRows = in->numRows; if (nSamples < 2) { @@ -594,5 +594,5 @@ case PS_TYPE_##TYPE: { \ ps##TYPE* outData = out->data.TYPE; \ - for (int i = 0; i < nSamples; i++) { \ + for (psS32 i = 0; i < nSamples; i++) { \ float x = startCol + (float)i*dX; \ float y = startRow + (float)i*dY; \ @@ -642,5 +642,5 @@ const psImage* in, const psImage* restrict mask, - unsigned int maskVal, + psU32 maskVal, float centerCol, float centerRow, @@ -659,6 +659,6 @@ return NULL; } - int numCols = in->numCols; - int numRows = in->numRows; + psS32 numCols = in->numCols; + psS32 numRows = in->numRows; if (mask != NULL) { @@ -734,5 +734,5 @@ // size the output vector to proper size. - int numOut = radii->n - 1; + psS32 numOut = radii->n - 1; out = psVectorRecycle(out, numOut, PS_TYPE_F64); psF64* outData = out->data.F64; @@ -741,8 +741,8 @@ psF32* rSq = rSqVec->data.F32; - int startRow = centerRow - rSq[numOut]; - int endRow = centerRow + rSq[numOut]; - int startCol = centerCol - rSq[numOut]; - int endCol = centerCol + rSq[numOut]; + psS32 startRow = centerRow - rSq[numOut]; + psS32 endRow = centerRow + rSq[numOut]; + psS32 startCol = centerCol - rSq[numOut]; + psS32 endCol = centerCol + rSq[numOut]; if (startRow < 0) { @@ -763,5 +763,5 @@ // Square the radii data - for (int d = 0; d <= numOut; d++) { + for (psS32 d = 0; d <= numOut; d++) { rSq[d] *= rSq[d]; } @@ -770,5 +770,5 @@ psVector** buffer = psAlloc(sizeof(psVector*)*numOut); psVector** bufferMask = psAlloc(sizeof(psVector*)*numOut); - for (int lcv = 0; lcv < numOut; lcv++) { + for (psS32 lcv = 0; lcv < numOut; lcv++) { // n.b. alloc enough for the data by making the vectors slightly larger // than the area of the region of interest. @@ -788,5 +788,5 @@ float dY; float dist; - for (int row=startRow; row <= endRow; row++) { + for (psS32 row=startRow; row <= endRow; row++) { psF32* inRow = in->data.F32[row]; psMaskType* maskRow = NULL; @@ -794,11 +794,11 @@ maskRow = mask->data.PS_TYPE_MASK_DATA[row]; } - for (int col=startCol; col <= endCol; col++) { + for (psS32 col=startCol; col <= endCol; col++) { dX = centerCol - (float)col - 0.5f; dY = centerRow - (float)row - 0.5f; dist = dX*dX+dY*dY; - for (int r = 0; r < numOut; r++) { + for (psS32 r = 0; r < numOut; r++) { if (rSq[r] < dist && dist < rSq[r+1]) { - int n = buffer[r]->n; + psS32 n = buffer[r]->n; if (n == buffer[r]->nalloc) { // in case buffers already full, expand buffer[r] = psVectorRealloc(buffer[r], n*2); @@ -825,5 +825,5 @@ *myStats = *stats; - for (int r = 0; r < numOut; r++) { + for (psS32 r = 0; r < numOut; r++) { myStats = psVectorStats(myStats,buffer[r], bufferMask[r],maskVal); (void)p_psGetStatValue(myStats,&statVal); @@ -833,5 +833,5 @@ psFree(myStats); - for (int lcv = 0; lcv < numOut; lcv++) { + for (psS32 lcv = 0; lcv < numOut; lcv++) { psFree(buffer[lcv]); psFree(bufferMask[lcv]); Index: /trunk/psLib/src/image/psImageExtraction.h =================================================================== --- /trunk/psLib/src/image/psImageExtraction.h (revision 2203) +++ /trunk/psLib/src/image/psImageExtraction.h (revision 2204) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-13 22:05:03 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -54,8 +54,8 @@ psImage* psImageSubset( psImage* image, ///< Parent image. - int col0, ///< starting column of subimage - int row0, ///< starting row of subimage - int col1, ///< exclusive end column of subimage. - int row1 ///< exclusive end row of subimage + psS32 col0, ///< starting column of subimage + psS32 row0, ///< starting row of subimage + psS32 col1, ///< exclusive end column of subimage. + psS32 row1 ///< exclusive end row of subimage ); @@ -93,8 +93,8 @@ psImage* psImageTrim( psImage* image, ///< image to trim - int col0, ///< column of trim region's left boundary - int row0, ///< row of trim region's lower boundary - int col1, ///< column of trim region's right boundary - int row1 ///< row of trim region's upper boundary + psS32 col0, ///< column of trim region's left boundary + psS32 row0, ///< row of trim region's lower boundary + psS32 col1, ///< column of trim region's right boundary + psS32 row1 ///< row of trim region's upper boundary ); @@ -130,9 +130,9 @@ const psImage* restrict input, ///< the input image in which to perform the slice const psImage* restrict mask, ///< the mask for the input image. - unsigned int maskVal, ///< the mask value to apply to the mask - int col0, ///< the leftmost column of the slice region - int row0, ///< the bottommost row of the slice region - int col1, ///< exclusive end column of the slice region - int row1, ///< exclusive end row of the slice region + psU32 maskVal, ///< the mask value to apply to the mask + psS32 col0, ///< the leftmost column of the slice region + psS32 row0, ///< the bottommost row of the slice region + psS32 col1, ///< exclusive end column of the slice region + psS32 row1, ///< exclusive end row of the slice region psImageCutDirection direction, ///< the slice dimension and direction const psStats* stats ///< the statistic to perform in slice operation @@ -161,10 +161,10 @@ const psImage* input, ///< the input image in which to perform the cut const psImage* restrict mask, ///< the mask for the input image. - unsigned int maskVal, ///< the mask value to apply to the mask + psU32 maskVal, ///< the mask value to apply to the mask float startCol, ///< the column of the start of the cut line float startRow, ///< the row of the start of the cut line float endCol, ///< the column of the end of the cut line float endRow, ///< the row of the end of the cut line - unsigned int nSamples, ///< the number of samples along the cut + psU32 nSamples, ///< the number of samples along the cut psImageInterpolateMode mode ///< the interpolation method to use ); @@ -187,5 +187,5 @@ const psImage* input, ///< the input image in which to perform the cut const psImage* restrict mask, ///< the mask for the input image. - unsigned int maskVal, ///< the mask value to apply to the mask + psU32 maskVal, ///< the mask value to apply to the mask float centerCol, ///< the column of the center of the cut circle float centerRow, ///< the row of the center of the cut circle Index: /trunk/psLib/src/image/psImageFFT.c =================================================================== --- /trunk/psLib/src/image/psImageFFT.c (revision 2203) +++ /trunk/psLib/src/image/psImageFFT.c (revision 2204) @@ -5,11 +5,10 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 21:31:30 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ #include -#include #include #include @@ -27,10 +26,10 @@ #define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE -static bool p_fftwWisdomImported = false; +static psBool p_fftwWisdomImported = false; psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction) { - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; psElemType type; fftwf_plan plan; @@ -77,5 +76,5 @@ // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place. - int sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD; + psS32 sign = ((direction & PS_FFT_FORWARD) != 0) ? FFTW_FORWARD : FFTW_BACKWARD; out = psImageCopy(out, in, PS_TYPE_C32); plan = fftwf_plan_dft_2d(numCols, numRows, @@ -118,6 +117,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (in == NULL) { @@ -140,9 +139,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = crealf(inRow[col]); } @@ -153,9 +152,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = creal(inRow[col]); } @@ -179,6 +178,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (in == NULL) { @@ -203,9 +202,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = cimagf(inRow[col]); } @@ -216,9 +215,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = cimag(inRow[col]); } @@ -241,6 +240,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (real == NULL || imag == NULL) { @@ -282,10 +281,10 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C32[row]; realRow = real->data.F32[row]; imagRow = imag->data.F32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = realRow[col] + I * imagRow[col]; } @@ -297,10 +296,10 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C64[row]; realRow = real->data.F64[row]; imagRow = imag->data.F64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = realRow[col] + I * imagRow[col]; } @@ -324,6 +323,6 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; + psU32 numCols; + psU32 numRows; if (in == NULL) { @@ -346,9 +345,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = crealf(inRow[col]) - I * cimagf(inRow[col]); } @@ -359,9 +358,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.C64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { outRow[col] = creal(inRow[col]) - I * cimag(inRow[col]); } @@ -384,7 +383,7 @@ { psElemType type; - unsigned int numCols; - unsigned int numRows; - int numElementsSquared; + psU32 numCols; + psU32 numRows; + psS32 numElementsSquared; if (in == NULL) { @@ -405,9 +404,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F32[row]; inRow = in->data.C32[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { real = crealf(inRow[col]); imag = cimagf(inRow[col]); @@ -422,9 +421,9 @@ out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); - for (unsigned int row = 0; row < numRows; row++) { + for (psU32 row = 0; row < numRows; row++) { outRow = out->data.F64[row]; inRow = in->data.C64[row]; - for (unsigned int col = 0; col < numCols; col++) { + for (psU32 col = 0; col < numCols; col++) { real = creal(inRow[col]); imag = cimag(inRow[col]); Index: /trunk/psLib/src/image/psImageIO.c =================================================================== --- /trunk/psLib/src/image/psImageIO.c (revision 2203) +++ /trunk/psLib/src/image/psImageIO.c (revision 2204) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-02 02:08:00 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -15,5 +15,4 @@ #include #include -#include #include "psImageIO.h" @@ -24,26 +23,26 @@ psImage* psImageReadSection(psImage* output, - int col, - int row, - int numCols, - int numRows, - int z, + psS32 col, + psS32 row, + psS32 numCols, + psS32 numRows, + psS32 z, char *extname, - int extnum, + psS32 extnum, char *filename) { fitsfile *fptr = NULL; /* Pointer to the FITS file */ - int status = 0; /* CFITSIO file vars */ - int nAxis = 0; - int anynull = 0; - int bitPix = 0; /* Pixel type */ - long nAxes[3]; - long firstPixel[3]; /* lower-left corner of image subset */ - long lastPixel[3]; /* upper-right corner of image subset */ - long increment[3]; /* increment for image subset */ + psS32 status = 0; /* CFITSIO file vars */ + psS32 nAxis = 0; + psS32 anynull = 0; + psS32 bitPix = 0; /* Pixel type */ + psS64 nAxes[3]; + psS64 firstPixel[3]; /* lower-left corner of image subset */ + psS64 lastPixel[3]; /* upper-right corner of image subset */ + psS64 increment[3]; /* increment for image subset */ char fitsErr[80] = ""; /* CFITSIO error message string */ - int hduType = IMAGE_HDU; - int fitsDatatype = 0; - int datatype = 0; + psS32 hduType = IMAGE_HDU; + psS32 fitsDatatype = 0; + psS32 datatype = 0; if (filename == NULL) { @@ -228,27 +227,27 @@ } -bool psImageWriteSection(psImage* input, - int col0, - int row0, - int z, - char *extname, - int extnum, - char *filename) +psBool psImageWriteSection(psImage* input, + psS32 col0, + psS32 row0, + psS32 z, + char *extname, + psS32 extnum, + char *filename) { - int numCols = 0; - int numRows = 0; - - int status = 0; /* CFITSIO status */ + psS32 numCols = 0; + psS32 numRows = 0; + + psS32 status = 0; /* CFITSIO status */ fitsfile *fptr = NULL; /* pointer to the FITS file */ - long nAxes[3]; /* Image axis vars */ - long firstPixel[3]; /* First Pixel to read */ - long lastPixel[3]; /* Last Pixel to read */ + psS64 nAxes[3]; /* Image axis vars */ + psS64 firstPixel[3]; /* First Pixel to read */ + psS64 lastPixel[3]; /* Last Pixel to read */ char fitsErr[80]; /* FITSIO message string */ - int datatype = 0; /* the datatype of the image */ - int bitPix = 0; /* FITS bitPix value */ - int hduType = IMAGE_HDU; /* the HDU type (image,table, etc.) */ + psS32 datatype = 0; /* the datatype of the image */ + psS32 bitPix = 0; /* FITS bitPix value */ + psS32 hduType = IMAGE_HDU; /* the HDU type (image,table, etc.) */ double bscale = 1.0; double bzero = 0.0; - bool createNewHDU = false; + psBool createNewHDU = false; /* need a valid image to write */ @@ -336,5 +335,5 @@ } } else { - int numHDUs = 0; + psS32 numHDUs = 0; fits_get_num_hdus(fptr, &numHDUs, &status); Index: /trunk/psLib/src/image/psImageIO.h =================================================================== --- /trunk/psLib/src/image/psImageIO.h (revision 2203) +++ /trunk/psLib/src/image/psImageIO.h (revision 2204) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-10 01:05:53 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -17,6 +17,4 @@ #ifndef PS_IMAGEIO_H #define PS_IMAGEIO_H - -#include #include "psImage.h" @@ -34,17 +32,17 @@ /**< the output psImage to recycle, or NULL if new psImage desired */ - int col0, + psS32 col0, /**< the column index of the origin to start reading */ - int row0, + psS32 row0, /**< the row index of the origin to start reading */ - int numCols, + psS32 numCols, /**< the number of desired columns to read */ - int numRows, + psS32 numRows, /**< the number of desired rows to read */ - int z, + psS32 z, /**< the z index to read if file is organized as a 3D image cube. */ @@ -54,5 +52,5 @@ */ - int extnum, + psS32 extnum, /**< the image extension to read (0=PHU, 1=first extension, etc.) This is * only used if extname is NULL @@ -65,17 +63,17 @@ /** Read an image or subimage from a FITS file specified by a filename. * - * return bool TRUE is successful, otherwise FALSE. + * return psBool TRUE is successful, otherwise FALSE. */ -bool psImageWriteSection( +psBool psImageWriteSection( psImage* input, /**< the psImage to write */ - int col0, + psS32 col0, /**< the column index of the origin to start writing */ - int row0, + psS32 row0, /**< the row index of the origin to start writing */ - int z, + psS32 z, /**< the z index to start writing */ @@ -85,5 +83,5 @@ */ - int extnum, + psS32 extnum, /**< the image extension to write (0=PHU, 1=first extension, etc.) This is * only used if extname is NULL. Index: /trunk/psLib/src/image/psImageManip.c =================================================================== --- /trunk/psLib/src/image/psImageManip.c (revision 2203) +++ /trunk/psLib/src/image/psImageManip.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 01:22:59 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,4 @@ #include // for isfinite(), etc. #include -#include #include // for memcpy, etc. @@ -29,13 +28,13 @@ #include "psImageErrors.h" -int psImageClip(psImage* input, - psF64 min, - psF64 vmin, - psF64 max, - psF64 vmax) +psS32 psImageClip(psImage* input, + psF64 min, + psF64 vmin, + psF64 max, + psF64 vmax) { - int numClipped = 0; - unsigned int numRows; - unsigned int numCols; + psS32 numClipped = 0; + psU32 numRows; + psU32 numCols; if (input == NULL) { @@ -72,7 +71,7 @@ (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ } \ - for (unsigned int row = 0;rowdata.type[row]; \ - for (unsigned int col = 0; col < numCols; col++) { \ + for (psU32 col = 0; col < numCols; col++) { \ if ((psF64)inputRow[col] < min) { \ inputRow[col] = (ps##type)vmin; \ @@ -103,7 +102,7 @@ (psF64)PS_MIN_##type,(psF64)PS_MAX_##type); \ } \ - for (unsigned int row = 0;rowdata.type[row]; \ - for (unsigned int col = 0; col < numCols; col++) { \ + for (psU32 col = 0; col < numCols; col++) { \ if (absfcn(inputRow[col]) < min) { \ inputRow[col] = (ps##type)vmin; \ @@ -144,10 +143,10 @@ } -int psImageClipNaN(psImage* input, - psF64 value) +psS32 psImageClipNaN(psImage* input, + psF64 value) { - int numClipped = 0; - unsigned int numRows; - unsigned int numCols; + psS32 numClipped = 0; + psU32 numRows; + psU32 numCols; if (input == NULL) { @@ -161,7 +160,7 @@ #define psImageClipNaNCase(type) \ case PS_TYPE_##type: \ - for (unsigned int row = 0;rowdata.type[row]; \ - for (unsigned int col = 0; col < numCols; col++) { \ + for (psU32 col = 0; col < numCols; col++) { \ if (! isfinite(inputRow[col])) { \ inputRow[col] = (ps##type)value; \ @@ -190,16 +189,16 @@ } -int psImageOverlaySection(psImage* image, - const psImage* overlay, - int col0, - int row0, - const char *op) +psS32 psImageOverlaySection(psImage* image, + const psImage* overlay, + psS32 col0, + psS32 row0, + const char *op) { - unsigned int imageNumRows; - unsigned int imageNumCols; - unsigned int overlayNumRows; - unsigned int overlayNumCols; - unsigned int imageRowLimit; - unsigned int imageColLimit; + psU32 imageNumRows; + psU32 imageNumCols; + psU32 overlayNumRows; + psU32 overlayNumCols; + psU32 imageRowLimit; + psU32 imageColLimit; psElemType type; @@ -257,8 +256,8 @@ #define psImageOverlayCase(DATATYPE) \ case PS_TYPE_##DATATYPE: \ - for (unsigned int row=row0;rowdata.DATATYPE[row]; \ ps##DATATYPE* overlayRow = overlay->data.DATATYPE[row-row0]; \ - for (unsigned int col=col0;coldata.type[row]; \ - for (unsigned int col = 0; col < numCols; col++) { \ + for (psU32 col = 0; col < numCols; col++) { \ if ( (realfcn(inputRow[col]) > realMax) || (imagfcn(inputRow[col]) > imagMax) ) { \ inputRow[col] = (ps##type)vmax; \ @@ -411,11 +410,11 @@ const psImage* restrict mask, psMaskType maskVal, - unsigned int scale, + psU32 scale, const psStats* stats) { - int inRows; - int inCols; - int outRows; - int outCols; + psS32 inRows; + psS32 inCols; + psS32 outRows; + psS32 outCols; psVector* vec; // vector to hold the values of a single bin. psVector* maskVec = NULL; // vector to hold the mask of a single bin. @@ -491,18 +490,18 @@ ps##type* vecData = vec->data.type; \ psMaskType* inRowMask = NULL; \ - for (int row = 0; row < outRows; row++) { \ + for (psS32 row = 0; row < outRows; row++) { \ outRowData = out->data.type[row]; \ - int inCurrentRow = row*scale; \ - int inNextRow = (row+1)*scale; \ - for (int col = 0; col < outCols; col++) { \ - int inCurrentCol = col*scale; \ - int inNextCol = (col+1)*scale; \ - int n = 0; \ - for (int inRow = inCurrentRow; inRow < inNextRow && inRow < inRows; inRow++) { \ + psS32 inCurrentRow = row*scale; \ + psS32 inNextRow = (row+1)*scale; \ + for (psS32 col = 0; col < outCols; col++) { \ + psS32 inCurrentCol = col*scale; \ + psS32 inNextCol = (col+1)*scale; \ + psS32 n = 0; \ + for (psS32 inRow = inCurrentRow; inRow < inNextRow && inRow < inRows; inRow++) { \ ps##type* inRowData = in->data.type[inRow]; \ if (mask != NULL) { \ inRowMask = mask->data.PS_TYPE_MASK_DATA[inRow]; \ } \ - for (int inCol = inCurrentCol; inCol < inNextCol && inCol < inCols; inCol++) { \ + for (psS32 inCol = inCurrentCol; inCol < inNextCol && inCol < inCols; inCol++) { \ if (maskData != NULL) { \ maskData[n] = inRowMask[inCol]; \ @@ -555,9 +554,9 @@ psImage* psImageResample(psImage* out, const psImage* in, - int scale, + psS32 scale, psImageInterpolateMode mode) { - int outRows; - int outCols; + psS32 outRows; + psS32 outCols; float invScale; @@ -597,8 +596,8 @@ case PS_TYPE_##TYPE: { \ out = psImageRecycle(out,outCols, outRows, PS_TYPE_##TYPE); \ - for (int row=0;rowdata.TYPE[row]; \ float inRow = (float)row * invScale; \ - for (int col=0;col= outRows) { @@ -706,7 +705,7 @@ if (fabsf(angle - 90.0f) < FLT_EPSILON) { // perform 1/4 rotate counter-clockwise - int numRows = in->numCols; - int numCols = in->numRows; - int lastCol = numCols - 1; + psS32 numRows = in->numCols; + psS32 numCols = in->numRows; + psS32 lastCol = numCols - 1; psElemType type = in->type.type; @@ -716,7 +715,7 @@ case PS_TYPE_##TYPE: { \ ps##TYPE** inData = in->data.TYPE; \ - for (int row=0;rowdata.TYPE[row]; \ - for (int col=0;colnumRows; - int lastRow = numRows - 1; - int numCols = in->numCols; - int lastCol = numCols - 1; + psS32 numRows = in->numRows; + psS32 lastRow = numRows - 1; + psS32 numCols = in->numCols; + psS32 lastCol = numCols - 1; psElemType type = in->type.type; @@ -762,8 +761,8 @@ #define PSIMAGE_ROTATE_180_CASE(TYPE) \ case PS_TYPE_##TYPE: { \ - for (int row=0;rowdata.TYPE[row]; \ ps##TYPE* inRow = in->data.TYPE[lastRow-row]; \ - for (int col=0;colnumCols; - int lastRow = numRows - 1; - int numCols = in->numRows; + psS32 numRows = in->numCols; + psS32 lastRow = numRows - 1; + psS32 numCols = in->numRows; psElemType type = in->type.type; @@ -809,7 +808,7 @@ case PS_TYPE_##TYPE: { \ ps##TYPE** inData = in->data.TYPE; \ - for (int row=0;rowdata.TYPE[row]; \ - for (int col=0;coltype.type; - int numRows = in->numRows; - int numCols = in->numCols; + psS32 numRows = in->numRows; + psS32 numCols = in->numCols; float centerX = (float)(numCols) / 2.0f; float centerY = (float)(numRows) / 2.0f; @@ -859,8 +858,8 @@ // y' = y cos(t) - x sin(t); i.e. y' = (y-centerY)*cosT - (x-centerX)*sinT; - int outCols = ceil(abs(numCols * cosT) + abs(numRows * sinT)) + 1; - int outRows = ceil(abs(numCols * sinT) + abs(numRows * cosT)) + 1; + psS32 outCols = ceil(abs(numCols * cosT) + abs(numRows * sinT)) + 1; + psS32 outRows = ceil(abs(numCols * sinT) + abs(numRows * cosT)) + 1; float minX = (float)outCols / -2.0f; - int intMinY = outRows / -2; + psS32 intMinY = outRows / -2; out = psImageRecycle(out, outCols, outRows, type); @@ -906,9 +905,9 @@ float inY; \ ps##TYPE* outRow; \ - for (int y = 0; y < outRows; y++) { \ + for (psS32 y = 0; y < outRows; y++) { \ inX = minXTimesCosTPlusCenterX + (y+intMinY) * sinT; \ inY = CenterYMinusminXTimesSinT + (y+intMinY) * cosT; \ outRow = out->data.TYPE[y]; \ - for (int x = 0; x < outCols; x++) { \ + for (psS32 x = 0; x < outCols; x++) { \ outRow[x] = p_psImagePixelInterpolate##MODE##_##TYPE(in,inX,inY,NULL,0,unexposedValue); \ inX += cosT; \ @@ -993,7 +992,7 @@ psImageInterpolateMode mode) { - int outRows; - int outCols; - int elementSize; + psS32 outRows; + psS32 outCols; + psS32 elementSize; psElemType type; @@ -1030,8 +1029,8 @@ break; \ } \ - for (int row=0;rowdata.TYPE[row]; \ float y = dy+(float)row; \ - for (int col=0;colp_kernelRows; psKernelType** imageRows = result->image->data.PS_TYPE_KERNEL_DATA; - for (int i = 0; i < numRows; i++) { + for (psS32 i = 0; i < numRows; i++) { kernelRows[i] = imageRows[i] - xMin; } @@ -91,17 +91,17 @@ const psVector* xShifts, const psVector* yShifts, - bool relative) + psBool relative) { - int x = 0; - int y = 0; - int t = 0; - int deltaT; - int oldX; - int oldY; - int xMin = 0; - int xMax = 0; - int yMin = 0; - int yMax = 0; - int length = 0; + psS32 x = 0; + psS32 y = 0; + psS32 t = 0; + psS32 deltaT; + psS32 oldX; + psS32 oldY; + psS32 xMin = 0; + psS32 xMax = 0; + psS32 yMin = 0; + psS32 yMax = 0; + psS32 length = 0; psKernelType normalizeTime = 1.0; // fraction of total time for each shift clock psKernel* result = NULL; @@ -153,5 +153,5 @@ y = 0; \ t = 0; \ - for (int lcv = 0; lcv < length; lcv++) { \ + for (psS32 lcv = 0; lcv < length; lcv++) { \ if (relative) { \ x += xShiftData[lcv]; \ @@ -181,5 +181,5 @@ y = 0; \ t = 0; \ - for (int i = 0; i < length; i++) { \ + for (psS32 i = 0; i < length; i++) { \ deltaT = t; \ oldX = x; \ @@ -228,5 +228,5 @@ } -psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, bool direct) +psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, psBool direct) { if (in == NULL) { @@ -242,13 +242,13 @@ return NULL; } - int xMin = kernel->xMin; - int xMax = kernel->xMax; - int yMin = kernel->yMin; - int yMax = kernel->yMax; + psS32 xMin = kernel->xMin; + psS32 xMax = kernel->xMax; + psS32 yMin = kernel->yMin; + psS32 yMax = kernel->yMax; psKernelType** kData = kernel->kernel; // make the output image to the proper size and type - int numRows = in->numRows; - int numCols = in->numCols; + psS32 numRows = in->numRows; + psS32 numCols = in->numCols; @@ -261,11 +261,11 @@ ps##TYPE** inData = in->data.TYPE; \ out = psImageRecycle(out, numCols, numRows, PS_TYPE_##TYPE); \ - for (int row=0;rowdata.TYPE[row]; \ - for (int col=0;col= 0 && row-kRow < numRows) { \ - for (int kCol = xMin; kCol < xMax; kCol++) { \ + for (psS32 kCol = xMin; kCol < xMax; kCol++) { \ if (col-kCol >= 0 && col-kCol < numCols) { \ pixel += kData[kRow][kCol] * inData[row-kRow][col-kCol]; \ @@ -310,10 +310,10 @@ } else { // fourier convolution - int paddedCols = numCols+2*FOURIER_PADDING; - int paddedRows = numRows+2*FOURIER_PADDING; + psS32 paddedCols = numCols+2*FOURIER_PADDING; + psS32 paddedRows = numRows+2*FOURIER_PADDING; // check to see if kernel is smaller, otherwise padding it up will fail. - int kRows = kernel->image->numRows; - int kCols = kernel->image->numCols; + psS32 kRows = kernel->image->numRows; + psS32 kCols = kernel->image->numCols; if (kRows >= numRows || kCols >= numCols) { psErrorMsg(PS_ERRORNAME_DOMAIN "psImageConvolve", @@ -328,5 +328,5 @@ // pad the image psImage* paddedImage = psImageAlloc(paddedCols,paddedRows,in->type.type); - int elementSize = PSELEMTYPE_SIZEOF(in->type.type); + psS32 elementSize = PSELEMTYPE_SIZEOF(in->type.type); // zero out padded area on top and bottom @@ -335,8 +335,8 @@ // fill in the image-containing rows. - int sidePaddingSize = FOURIER_PADDING*elementSize; - int imageRowSize = numCols*elementSize; + psS32 sidePaddingSize = FOURIER_PADDING*elementSize; + psS32 imageRowSize = numCols*elementSize; psU8* paddedData = paddedImage->data.U8[FOURIER_PADDING]; - for (int row=0;rowdata.U8[0],0,sizeof(psKernelType)*numCols*numRows); // zero-out image - int yMax = kernel->yMax; - int xMax = kernel->xMax; - for (int row = kernel->yMin; row <= yMax;row++) { - int padRow = row; + psS32 yMax = kernel->yMax; + psS32 xMax = kernel->xMax; + for (psS32 row = kernel->yMin; row <= yMax;row++) { + psS32 padRow = row; if (padRow < 0) { padRow += paddedRows; @@ -363,5 +363,5 @@ psKernelType* padData = paddedKernel->data.PS_TYPE_KERNEL_DATA[padRow]; psKernelType* kernelRow = kernel->kernel[row]; - for (int col = kernel->xMin; col <= xMax; col++) { + for (psS32 col = kernel->xMin; col <= xMax; col++) { if (col < 0) { padData[col+paddedCols] = kernelRow[col]; @@ -418,8 +418,8 @@ out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32); float factor = 1.0f/numCols/numRows; - for (int row = 0; row < numRows; row++) { + for (psS32 row = 0; row < numRows; row++) { psF32* outRow = out->data.F32[row]; psC32* resultRow = complexOutSansPad->data.C32[row]; - for (int col = 0; col < numCols; col++) { + for (psS32 col = 0; col < numCols; col++) { outRow[col] = crealf(resultRow[col])*factor; } Index: /trunk/psLib/src/imageops/psImageConvolve.h =================================================================== --- /trunk/psLib/src/imageops/psImageConvolve.h (revision 2203) +++ /trunk/psLib/src/imageops/psImageConvolve.h (revision 2204) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-23 18:30:57 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -15,6 +15,4 @@ #ifndef PS_IMAGE_CONVOLVE_H #define PS_IMAGE_CONVOLVE_H - -#include #include "psImage.h" @@ -32,8 +30,8 @@ { psImage* image; ///< Kernel data, in the form of an image - int xMin; ///< Most negative x index - int yMin; ///< Most negative y index - int xMax; ///< Most positive x index - int yMax; ///< Most positive y index + psS32 xMin; ///< Most negative x index + psS32 yMin; ///< Most negative y index + psS32 xMax; ///< Most positive x index + psS32 yMax; ///< Most positive y index psKernelType** kernel; ///< Pointer to the kernel data psKernelType** p_kernelRows; ///< Pointer to the rows of the kernel data; not intended for user use. @@ -68,8 +66,8 @@ */ psKernel* psKernelAlloc( - int xMin, ///< Most negative x index - int xMax, ///< Most positive x index - int yMin, ///< Most negative y index - int yMax ///< Most positive y index + psS32 xMin, ///< Most negative x index + psS32 xMax, ///< Most positive x index + psS32 yMin, ///< Most negative y index + psS32 yMax ///< Most positive y index ); @@ -94,5 +92,5 @@ const psVector* xShifts, ///< list of x-axis shifts const psVector* yShifts, ///< list of y-axis shifts - bool relative + psBool relative ); @@ -118,5 +116,5 @@ const psImage* in, ///< the psImage to convolve const psKernel* kernel, ///< kernel to colvolve with - bool direct ///< specifies method, true=direct convolution, false=fourier + psBool direct ///< specifies method, true=direct convolution, false=fourier ); Index: /trunk/psLib/src/imageops/psImageStats.c =================================================================== --- /trunk/psLib/src/imageops/psImageStats.c (revision 2203) +++ /trunk/psLib/src/imageops/psImageStats.c (revision 2204) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-14 01:06:44 $ +* @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -40,5 +40,5 @@ psImage* in, psImage* mask, - int maskVal) + psS32 maskVal) { psVector* junkData = NULL; @@ -106,5 +106,5 @@ psImage* in, psImage* mask, - unsigned int maskVal) + psU32 maskVal) { psVector* junkData = NULL; @@ -150,7 +150,7 @@ // XXX: Why do we have this function? -float *p_psCalcScaleFactorsFit(int n) -{ - int i = 0; +float *p_psCalcScaleFactorsFit(psS32 n) +{ + psS32 i = 0; float tmp = 0.0; float *scalingFactors = (float *)psAlloc(n * sizeof(float)); @@ -175,7 +175,7 @@ output a vector of evenly spaced floating point values between -1.0:1.0. *****************************************************************************/ -float *p_psCalcScaleFactorsEval(int n) -{ - int i = 0; +float *p_psCalcScaleFactorsEval(psS32 n) +{ + psS32 i = 0; float tmp = 0.0; @@ -196,5 +196,5 @@ // XXX: Use a static array of CHebyshev polynomials. -psPolynomial1D **p_psCreateChebyshevPolys(int maxChebyPoly) +psPolynomial1D **p_psCreateChebyshevPolys(psS32 maxChebyPoly) { if (maxChebyPoly < 1) { @@ -202,6 +202,6 @@ } psPolynomial1D **chebPolys = NULL; - int i = 0; - int j = 0; + psS32 i = 0; + psS32 j = 0; chebPolys = (psPolynomial1D **) psAlloc(maxChebyPoly * sizeof(psPolynomial1D *)); @@ -245,11 +245,11 @@ const psImage* input) { - int x = 0; - int y = 0; - int i = 0; - int j = 0; + psS32 x = 0; + psS32 y = 0; + psS32 i = 0; + psS32 j = 0; float **sums = NULL; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; float *cScalingFactors = NULL; float *rScalingFactors = NULL; @@ -365,11 +365,11 @@ psImage* psImageEvalPolynomial(psImage* input, const psPolynomial2D* coeffs) { - int x = 0; - int y = 0; - int i = 0; - int j = 0; + psS32 x = 0; + psS32 y = 0; + psS32 i = 0; + psS32 j = 0; // float **sums = NULL; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; float *cScalingFactors = NULL; float *rScalingFactors = NULL; Index: /trunk/psLib/src/imageops/psImageStats.h =================================================================== --- /trunk/psLib/src/imageops/psImageStats.h (revision 2203) +++ /trunk/psLib/src/imageops/psImageStats.h (revision 2204) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-05 01:03:11 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -40,5 +40,5 @@ psImage* in, ///< image (or subimage) to calculate stats psImage* mask, ///< mask data for image (NULL ok) - int maskVal ///< mask Mask for mask + psS32 maskVal ///< mask Mask for mask ); @@ -55,5 +55,5 @@ psImage* in, ///< Image data to be histogramed. psImage* mask, ///< mask data for image (NULL ok) - unsigned int maskVal ///< mask Mask for mask + psU32 maskVal ///< mask Mask for mask ); Index: /trunk/psLib/src/math/psCompare.c =================================================================== --- /trunk/psLib/src/math/psCompare.c (revision 2203) +++ /trunk/psLib/src/math/psCompare.c (revision 2204) @@ -7,11 +7,10 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ -#include "psType.h" #include "psCompare.h" Index: /trunk/psLib/src/math/psCompare.h =================================================================== --- /trunk/psLib/src/math/psCompare.h (revision 2203) +++ /trunk/psLib/src/math/psCompare.h (revision 2204) @@ -1,17 +1,19 @@ +/** @file psCompare.h + * @brief Comparison functions for sorting routines + * + * @author Robert Daniel DeSonia, MHPCC + * + * @ingroup Compare + * + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + */ + #if !defined(PS_COMPARE_H) #define PS_COMPARE_H -/** @file psCompare.h - * @brief Comparison functions for sorting routines - * - * @author Robert Daniel DeSonia, MHPCC - * - * @ingroup Compare - * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-11 19:58:11 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ +#include "psType.h" /** @addtogroup Compare Index: /trunk/psLib/src/math/psConstants.h =================================================================== --- /trunk/psLib/src/math/psConstants.h (revision 2203) +++ /trunk/psLib/src/math/psConstants.h (revision 2204) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 21:24:42 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -54,5 +54,5 @@ p_psMemSetPersistent(VEC, true); \ p_psMemSetPersistent(VEC->data.V, true); \ -for (int i=0;idata.F32[i] = 1.0; \ } \ @@ -62,5 +62,5 @@ p_psMemSetPersistent(VEC, true); \ p_psMemSetPersistent(VEC->data.V, true); \ -for (int i=0;idata.F64[i] = 1.0; \ } \ @@ -70,5 +70,5 @@ p_psMemSetPersistent(VEC, true); \ p_psMemSetPersistent(VEC->data.V, true); \ -for (int i=0;idata.F32[i] = (float) i; \ } \ @@ -78,5 +78,5 @@ p_psMemSetPersistent(VEC, true); \ p_psMemSetPersistent(VEC->data.V, true); \ -for (int i=0;idata.F64[i] = (float) i; \ } \ @@ -209,5 +209,5 @@ #define PS_PRINT_VECTOR(NAME) \ -for (int my_i=0;my_in;my_i++) { \ +for (psS32 my_i=0;my_in;my_i++) { \ printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \ } \ @@ -216,5 +216,5 @@ #define PS_VECTOR_F64_TO_F32(X64, X32) \ psVector *X32 = psVectorAlloc(X64->n, PS_TYPE_F32); \ -for (int i=0;in;i++) { \ +for (psS32 i=0;in;i++) { \ X32->data.F32[i] = (float) X64->data.F64[i]; \ } \ @@ -222,5 +222,5 @@ #define PS_VECTOR_F32_TO_F64(X32, X64) \ psVector *X64 = psVectorAlloc(X32->n, PS_TYPE_F64); \ -for (int i=0;in;i++) { \ +for (psS32 i=0;in;i++) { \ X64->data.F64[i] = (float) X32->data.F32[i]; \ } \ Index: /trunk/psLib/src/math/psMatrix.c =================================================================== --- /trunk/psLib/src/math/psMatrix.c (revision 2203) +++ /trunk/psLib/src/math/psMatrix.c (revision 2204) @@ -20,6 +20,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-08 02:48:01 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -119,8 +119,8 @@ psImage* psMatrixLUD(psImage* outImage, psVector* outPerm, psImage* inImage) { - int signum = 0; - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 signum = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix lu; gsl_permutation perm; @@ -165,7 +165,7 @@ const psVector* inVector, const psVector* inPerm) { - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix lu; gsl_permutation perm; @@ -217,8 +217,8 @@ psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *restrict det) { - int signum = 0; - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 signum = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix inv; gsl_matrix *lu; @@ -271,8 +271,8 @@ float *psMatrixDeterminant(const psImage* restrict inImage) { - int signum = 0; - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 signum = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; float *det = NULL; gsl_matrix *lu = NULL; @@ -313,7 +313,7 @@ psImage* psMatrixMultiply(psImage* outImage, psImage* inImage1, psImage* inImage2) { - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix m1; gsl_matrix m2; @@ -355,7 +355,7 @@ psImage* psMatrixTranspose(psImage* outImage, const psImage* inImage) { - int arraySize = 0; - int numRows = 0; - int numCols = 0; + psS32 arraySize = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_matrix trans; @@ -392,6 +392,6 @@ psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage) { - int numRows = 0; - int numCols = 0; + psS32 numRows = 0; + psS32 numCols = 0; gsl_vector *eVals = NULL; gsl_eigen_symmv_workspace *w = NULL; @@ -436,5 +436,5 @@ psVector* psMatrixToVector(psVector* outVector, const psImage* inImage) { - int size = 0; + psS32 size = 0; // Error checks @@ -495,5 +495,5 @@ psImage* psVectorToMatrix(psImage* outImage, const psVector* inVector) { - int size = 0; + psS32 size = 0; // Error checks Index: /trunk/psLib/src/math/psMinimize.c =================================================================== --- /trunk/psLib/src/math/psMinimize.c (revision 2203) +++ /trunk/psLib/src/math/psMinimize.c (revision 2204) @@ -9,6 +9,6 @@ * @author GLF, MHPCC * - * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 23:14:04 $ + * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,8 +59,8 @@ *****************************************************************************/ void p_psBuildSums1D(double x, - int polyOrder, + psS32 polyOrder, psVector* sums) { - int i = 0; + psS32 i = 0; double xSum = 0.0; @@ -101,10 +101,10 @@ "---- CalculateSecondDerivs() begin ----\n"); - int i; - int k; - bool mustFreeX = false; + psS32 i; + psS32 k; + psBool mustFreeX = false; float sig; float p; - int n = y->n; + psS32 n = y->n; float *u = (float *) psAlloc(n * sizeof(float)); float *derivs2 = (float *) psAlloc(n * sizeof(float)); @@ -173,7 +173,7 @@ float X) { - int n; - int klo; - int khi; + psS32 n; + psS32 klo; + psS32 khi; float H; float A; @@ -240,8 +240,8 @@ psTrace(".psLib.dataManip.psVectorFitSpline1D", 4, "---- psVectorFitSpline1D() begin ----\n"); - int numSplines = (y->n)-1; + psS32 numSplines = (y->n)-1; float tmp; float H; - int i; + psS32 i; float slope; psVector *x32 = NULL; @@ -416,12 +416,12 @@ the F64 port might be. *****************************************************************************/ -bool psMinimizeLMChi2(psMinimization *min, - psImage *covar, - psVector *params, - const psVector *paramMask, - const psArray *x, - const psVector *y, - const psVector *yErr, - psMinimizeLMChi2Func func) +psBool psMinimizeLMChi2(psMinimization *min, + psImage *covar, + psVector *params, + const psVector *paramMask, + const psArray *x, + const psVector *y, + const psVector *yErr, + psMinimizeLMChi2Func func) { PS_CHECK_NULL_PTR_RETURN_NULL(min); @@ -441,12 +441,12 @@ psTrace(".psLib.dataManip.psMinimizeLMChi2", 4, "---- psMinimizeLMChi2() begin ----\n"); - int numData = y->n; - int numParams = params->n; - int i; - int j; - int k; - int l; - int n; - int p; + psS32 numData = y->n; + psS32 numParams = params->n; + psS32 i; + psS32 j; + psS32 k; + psS32 l; + psS32 n; + psS32 p; psVector *beta = psVectorAlloc(numParams, PS_TYPE_F64); psVector *perm = psVectorAlloc(numParams, PS_TYPE_F64); @@ -663,7 +663,7 @@ const psVector* restrict yErr) { - int j; - int k; - int n = x->n; + psS32 j; + psS32 k; + psS32 n = x->n; double fac; double sum; @@ -689,5 +689,5 @@ // are fitting this ChebyShev polynomial to. - for (int i=0;in; + psS32 polyOrder = myPoly->n; psImage* A = NULL; psImage* ALUD = NULL; @@ -748,7 +748,7 @@ psVector* X = NULL; // NOTE: do we need this? psVector* coeffs = NULL; - int i = 0; - int j = 0; - int k = 0; + psS32 i = 0; + psS32 j = 0; + psS32 k = 0; psVector* xSums = NULL; @@ -853,5 +853,5 @@ const psVector* restrict yErr) { - int i; + psS32 i; psPolynomial1D *tmpPoly; PS_CHECK_NULL_1DPOLY_RETURN_NULL(myPoly); @@ -908,5 +908,5 @@ /****************************************************************************** *****************************************************************************/ -psMinimization *psMinimizationAlloc(int maxIter, +psMinimization *psMinimizationAlloc(psS32 maxIter, float tol) { @@ -952,5 +952,5 @@ float fb = 0.0; float fc = 0.0; - int iter = 100; + psS32 iter = 100; float aDir = 0.0; float cDir = 0.0; @@ -960,6 +960,6 @@ float stepSize = DETERMINE_BRACKET_STEP_SIZE; psVector *tmp = NULL; - int i = 0; - int null = 0; + psS32 i = 0; + psS32 null = 0; psTrace(".psLib.dataManip.p_psDetermineBracket", 4, @@ -1141,6 +1141,6 @@ psVector *tmpc = NULL; psVector *tmpn = NULL; - int i = 0; - int null = 0; + psS32 i = 0; + psS32 null = 0; psTrace(".psLib.dataManip.p_psLineMin", 4, @@ -1313,9 +1313,9 @@ XXX: Check for F32 types? *****************************************************************************/ -bool psMinimizePowell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - psMinimizePowellFunc func) +psBool psMinimizePowell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + psMinimizePowellFunc func) { PS_CHECK_NULL_VECTOR_RETURN_NULL(params); @@ -1325,7 +1325,7 @@ PS_CHECK_NULL_PTR_RETURN_NULL(func); - int numDims = params->n; - int i = 0; - int j = 0; + psS32 numDims = params->n; + psS32 i = 0; + psS32 j = 0; psVector **v = NULL; psVector *pQP = NULL; @@ -1337,5 +1337,5 @@ float baseFuncVal = 0.0; float currFuncVal = 0.0; - int biggestIter = 0; + psS32 biggestIter = 0; float biggestDiff = 0.0; float term1 = 0.0; @@ -1529,5 +1529,5 @@ float chi2 = 0.0; float d; - int i; + psS32 i; psVector *tmp; @@ -1552,11 +1552,11 @@ psMinimizePowell(). *****************************************************************************/ -bool psMinimizeChi2Powell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - const psVector *value, - const psVector *error, - psMinimizeChi2PowellFunc func) +psBool psMinimizeChi2Powell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + const psVector *value, + const psVector *error, + psMinimizeChi2PowellFunc func) { myValue = (psVector *) value; Index: /trunk/psLib/src/math/psMinimize.h =================================================================== --- /trunk/psLib/src/math/psMinimize.h (revision 2203) +++ /trunk/psLib/src/math/psMinimize.h (revision 2204) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 23:14:04 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,13 +46,13 @@ typedef struct { - int maxIter; ///< Convergence limit + psS32 maxIter; ///< Convergence limit float tol; ///< Error Tolerance float value; ///< Value of function at minimum - int iter; ///< Number of iterations required + psS32 iter; ///< Number of iterations required float lastDelta; ///< The last difference for the fit } psMinimization; -psMinimization *psMinimizationAlloc(int maxIter, +psMinimization *psMinimizationAlloc(psS32 maxIter, float tol); @@ -88,12 +88,12 @@ const psArray *x); -bool psMinimizeLMChi2(psMinimization *min, - psImage *covar, - psVector *params, - const psVector *paramMask, - const psArray *x, - const psVector *y, - const psVector *yErr, - psMinimizeLMChi2Func func); +psBool psMinimizeLMChi2(psMinimization *min, + psImage *covar, + psVector *params, + const psVector *paramMask, + const psArray *x, + const psVector *y, + const psVector *yErr, + psMinimizeLMChi2Func func); typedef @@ -101,9 +101,9 @@ const psArray *coords); -bool psMinimizePowell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - psMinimizePowellFunc func); +psBool psMinimizePowell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + psMinimizePowellFunc func); typedef @@ -111,11 +111,11 @@ const psArray *coords); -bool psMinimizeChi2Powell(psMinimization *min, - psVector *params, - const psVector *paramMask, - const psArray *coords, - const psVector *value, - const psVector *error, - psMinimizeChi2PowellFunc func); +psBool psMinimizeChi2Powell(psMinimization *min, + psVector *params, + const psVector *paramMask, + const psArray *coords, + const psVector *value, + const psVector *error, + psMinimizeChi2PowellFunc func); Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 2203) +++ /trunk/psLib/src/math/psPolynomial.c (revision 2204) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 21:24:42 $ + * @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ \ if (IN->type.type == PS_TYPE_F64) { \ - for (int i=0;in;i++) { \ + for (psS32 i=0;in;i++) { \ OUT->data.F32[i] = (float) (IN->data.F64[i]); \ } \ @@ -69,5 +69,5 @@ \ if (IN->type.type == PS_TYPE_F32) { \ - for (int i=0;in;i++) { \ + for (psS32 i=0;in;i++) { \ OUT->data.F64[i] = (float) (IN->data.F32[i]); \ } \ @@ -117,9 +117,9 @@ outer coefficients of the Chebyshev polynomials. *****************************************************************************/ -static psPolynomial1D **CreateChebyshevPolys(int maxChebyPoly) +static psPolynomial1D **CreateChebyshevPolys(psS32 maxChebyPoly) { psPolynomial1D **chebPolys = NULL; - int i = 0; - int j = 0; + psS32 i = 0; + psS32 j = 0; chebPolys = (psPolynomial1D **) psAlloc(maxChebyPoly * sizeof(psPolynomial1D *)); @@ -153,5 +153,5 @@ evaluated Gaussian is: \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] *****************************************************************************/ -float psGaussian(float x, float mean, float sigma, bool normal) +float psGaussian(float x, float mean, float sigma, psBool normal) { float tmp = 1.0; @@ -185,10 +185,10 @@ NOTE: XXX: There is no way to seed the random generator. *****************************************************************************/ -psVector* psGaussianDev(float mean, float sigma, int Npts) +psVector* psGaussianDev(float mean, float sigma, psS32 Npts) { psVector* gauss = NULL; const gsl_rng_type *T = NULL; gsl_rng *r = NULL; - int i = 0; + psS32 i = 0; gauss = psVectorAlloc(Npts, PS_TYPE_F32); @@ -209,8 +209,8 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D* psPolynomial1DAlloc(int n, +psPolynomial1D* psPolynomial1DAlloc(psS32 n, psPolynomialType type) { - int i = 0; + psS32 i = 0; psPolynomial1D* newPoly = NULL; @@ -232,9 +232,9 @@ } -psPolynomial2D* psPolynomial2DAlloc(int nX, int nY, +psPolynomial2D* psPolynomial2DAlloc(psS32 nX, psS32 nY, psPolynomialType type) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; psPolynomial2D* newPoly = NULL; @@ -265,10 +265,10 @@ } -psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ, +psPolynomial3D* psPolynomial3DAlloc(psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int x = 0; - int y = 0; - int z = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psPolynomial3D* newPoly = NULL; @@ -307,11 +307,11 @@ } -psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ, +psPolynomial4D* psPolynomial4DAlloc(psS32 nW, psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int w = 0; - int x = 0; - int y = 0; - int z = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psPolynomial4D* newPoly = NULL; @@ -367,5 +367,5 @@ static void polynomial2DFree(psPolynomial2D* myPoly) { - int x = 0; + psS32 x = 0; for (x = 0; x < myPoly->nX; x++) { @@ -381,6 +381,6 @@ static void polynomial3DFree(psPolynomial3D* myPoly) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; for (x = 0; x < myPoly->nX; x++) { @@ -402,7 +402,7 @@ static void polynomial4DFree(psPolynomial4D* myPoly) { - int w = 0; - int x = 0; - int y = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; for (w = 0; w < myPoly->nW; w++) { @@ -434,5 +434,5 @@ float p_psOrdPolynomial1DEval(float x, const psPolynomial1D* myPoly) { - int loop_x = 0; + psS32 loop_x = 0; float polySum = 0.0; float xSum = 1.0; @@ -478,6 +478,6 @@ { psVector *d; - int n; - int i; + psS32 n; + psS32 i; float tmp; @@ -500,6 +500,6 @@ /* - int n; - int i; + psS32 n; + psS32 i; float tmp; psPolynomial1D **chebPolys = NULL; @@ -537,5 +537,5 @@ psVector *tmp; psVector *myX; - int i; + psS32 i; PS_CONVERT_VECTOR_F32(x, myX); @@ -555,6 +555,6 @@ float p_psOrdPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; float polySum = 0.0; float xSum = 1.0; @@ -577,10 +577,10 @@ float p_psChebPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -628,6 +628,6 @@ psVector *myX; psVector *myY; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(x, myX); @@ -658,7 +658,7 @@ float p_psOrdPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; float polySum = 0.0; float xSum = 1.0; @@ -686,11 +686,11 @@ float p_psChebPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -746,6 +746,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(x, myX); @@ -787,8 +787,8 @@ float p_psOrdPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; float polySum = 0.0; float wSum = 1.0; @@ -821,12 +821,12 @@ float p_psChebPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -890,6 +890,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(w, myW); @@ -936,8 +936,8 @@ -psDPolynomial1D* psDPolynomial1DAlloc(int n, +psDPolynomial1D* psDPolynomial1DAlloc(psS32 n, psPolynomialType type) { - int i = 0; + psS32 i = 0; psDPolynomial1D* newPoly = NULL; @@ -959,9 +959,9 @@ } -psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY, +psDPolynomial2D* psDPolynomial2DAlloc(psS32 nX, psS32 nY, psPolynomialType type) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; psDPolynomial2D* newPoly = NULL; @@ -992,10 +992,10 @@ } -psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ, +psDPolynomial3D* psDPolynomial3DAlloc(psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int x = 0; - int y = 0; - int z = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psDPolynomial3D* newPoly = NULL; @@ -1034,11 +1034,11 @@ } -psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ, +psDPolynomial4D* psDPolynomial4DAlloc(psS32 nW, psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int w = 0; - int x = 0; - int y = 0; - int z = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psDPolynomial4D* newPoly = NULL; @@ -1094,5 +1094,5 @@ static void dPolynomial2DFree(psDPolynomial2D* myPoly) { - int x = 0; + psS32 x = 0; for (x = 0; x < myPoly->nX; x++) { @@ -1108,6 +1108,6 @@ static void dPolynomial3DFree(psDPolynomial3D* myPoly) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; for (x = 0; x < myPoly->nX; x++) { @@ -1129,7 +1129,7 @@ static void dPolynomial4DFree(psDPolynomial4D* myPoly) { - int w = 0; - int x = 0; - int y = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; for (w = 0; w < myPoly->nW; w++) { @@ -1159,5 +1159,5 @@ double p_psDOrdPolynomial1DEval(double x, const psDPolynomial1D* myPoly) { - int loop_x = 0; + psS32 loop_x = 0; double polySum = 0.0; double xSum = 1.0; @@ -1183,6 +1183,6 @@ { psVector *d; - int n; - int i; + psS32 n; + psS32 i; double tmp; @@ -1222,5 +1222,5 @@ psVector *tmp; psVector *myX; - int i; + psS32 i; PS_CONVERT_VECTOR_F64(x, myX); @@ -1241,6 +1241,6 @@ double p_psDOrdPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; double polySum = 0.0; double xSum = 1.0; @@ -1263,10 +1263,10 @@ double p_psDChebPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1314,6 +1314,6 @@ psVector *myX; psVector *myY; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(x, myX); @@ -1344,7 +1344,7 @@ double p_psDOrdPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; double polySum = 0.0; double xSum = 1.0; @@ -1372,11 +1372,11 @@ double p_psDChebPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1432,6 +1432,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(x, myX); @@ -1475,8 +1475,8 @@ double p_psDOrdPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; double polySum = 0.0; double wSum = 1.0; @@ -1509,12 +1509,12 @@ double p_psDChebPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1578,6 +1578,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(w, myW); @@ -1624,5 +1624,5 @@ //typedef struct { -// int n; +// psS32 n; // psPolynomial1D **spline; // float *p_psDeriv2; @@ -1636,11 +1636,11 @@ XXX: Ensure that domain[i+1] != domain[i] *****************************************************************************/ -psSpline1D *psSpline1DAlloc(int numSplines, - int order, +psSpline1D *psSpline1DAlloc(psS32 numSplines, + psS32 order, float min, float max) { psSpline1D *tmp = NULL; - int i; + psS32 i; float tmpDomain; float width; @@ -1677,7 +1677,7 @@ // XXX: Have Robert put the dealocator in the memory file. -int p_psSpline1DFree(psSpline1D *tmpSpline) -{ - int i; +psS32 p_psSpline1DFree(psSpline1D *tmpSpline) +{ + psS32 i; if (tmpSpline == NULL) { @@ -1704,9 +1704,9 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order) + psS32 order) { psSpline1D *tmp = NULL; - int i; - int numSplines; + psS32 i; + psS32 numSplines; tmp = (psSpline1D *) psAlloc(sizeof(psSpline1D)); @@ -1746,11 +1746,11 @@ XXX: name since we don't take psVectors as input. *****************************************************************************/ -int p_psVectorBinDisectF32(float *bins, - int numBins, - float x) -{ - int min; - int max; - int mid; +psS32 p_psVectorBinDisectF32(float *bins, + psS32 numBins, + float x) +{ + psS32 min; + psS32 max; + psS32 mid; psTrace(".psLib.dataManip.psFunctions.p_psVectorBinDisectF32", 4, @@ -1800,11 +1800,11 @@ p_psVectorBinDisectS32(): integer version of above. *****************************************************************************/ -int p_psVectorBinDisectS32(int *bins, - int numBins, - int x) -{ - int min; - int max; - int mid; +psS32 p_psVectorBinDisectS32(psS32 *bins, + psS32 numBins, + psS32 x) +{ + psS32 min; + psS32 max; + psS32 mid; psTrace(".psLib.dataManip.psFunctions.p_psVectorBinDisectS32", 4, @@ -1848,6 +1848,6 @@ p_psVectorBinDisect(): A wrapper to the above p_psVectorBinDisect(). *****************************************************************************/ -int p_psVectorBinDisect(psVector *bins, - psScalar *x) +psS32 p_psVectorBinDisect(psVector *bins, + psScalar *x) { if (x->type.type != bins->type.type) { @@ -1877,9 +1877,9 @@ float p_ps1DFullInterpolateF32(float *domain, float *range, - int n, + psS32 n, float x) { - int i; - int m; + psS32 i; + psS32 m; static psVector *p = NULL; p = psVectorRecycle(p, n, PS_TYPE_F32); @@ -1937,11 +1937,11 @@ float p_ps1DInterpolateF32(float *domain, float *range, - int n, - int order, + psS32 n, + psS32 order, float x) { - int binNum; - int numIntPoints = order+1; - int origin; + psS32 binNum; + psS32 numIntPoints = order+1; + psS32 origin; psTrace(".psLib.dataManip.psFunctions.p_ps1DInterpolateF32", 4, @@ -1987,5 +1987,5 @@ psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - int order, + psS32 order, psScalar *x) { @@ -2065,6 +2065,6 @@ float x) { - int binNum; - int n; + psS32 binNum; + psS32 n; n = spline->n; @@ -2091,5 +2091,5 @@ const psSpline1D *spline) { - int i; + psS32 i; psVector *tmpVector; Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 2203) +++ /trunk/psLib/src/math/psPolynomial.h (revision 2204) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 00:48:15 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -45,5 +45,5 @@ float mean, ///< Mean for the Gaussian float stddev, ///< Standard deviation for the Gaussian - bool normal ///< Indicates whether result should be normalized + psBool normal ///< Indicates whether result should be normalized ); @@ -57,5 +57,5 @@ float mean, ///< The mean of the Gaussian float sigma, ///< The sigma of the Gaussian - int Npts ///< The size of the vector + psS32 Npts ///< The size of the vector ); @@ -69,5 +69,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms float *coeff; ///< Coefficients float *coeffErr; ///< Error in coefficients @@ -80,6 +80,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y float **coeff; ///< Coefficients float **coeffErr; ///< Error in coefficients @@ -92,7 +92,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ***coeff; ///< Coefficients float ***coeffErr; ///< Error in coefficients @@ -105,8 +105,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ****coeff; ///< Coefficients float ****coeffErr; ///< Error in coefficients @@ -121,5 +121,5 @@ */ psPolynomial1D* psPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -130,6 +130,6 @@ */ psPolynomial2D* psPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -140,7 +140,7 @@ */ psPolynomial3D* psPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -151,8 +151,8 @@ */ psPolynomial4D* psPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -230,5 +230,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms double *coeff; ///< Coefficients double *coeffErr; ///< Error in coefficients @@ -241,6 +241,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y double **coeff; ///< Coefficients double **coeffErr; ///< Error in coefficients @@ -253,7 +253,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ***coeff; ///< Coefficients double ***coeffErr; ///< Error in coefficients @@ -266,8 +266,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ****coeff; ///< Coefficients double ****coeffErr; ///< Error in coefficients @@ -281,5 +281,5 @@ */ psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -290,6 +290,6 @@ */ psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -300,7 +300,7 @@ */ psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -311,8 +311,8 @@ */ psDPolynomial4D* psDPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -386,5 +386,5 @@ typedef struct { - int n; ///< The number of spline polynomials + psS32 n; ///< The number of spline polynomials psPolynomial1D **spline; ///< An array of n pointers to the spline polynomials float *p_psDeriv2; ///< For cubic splines, the second derivative at each domain point. Size is n+1. @@ -393,13 +393,13 @@ psSpline1D; -psSpline1D *psSpline1DAlloc(int n, - int order, +psSpline1D *psSpline1DAlloc(psS32 n, + psS32 order, float min, float max); -int p_psSpline1DFree(psSpline1D *tmpSpline); +psS32 p_psSpline1DFree(psSpline1D *tmpSpline); psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order); + psS32 order); float psSpline1DEval(const psSpline1D *spline, @@ -409,18 +409,18 @@ const psSpline1D *spline); -int p_psVectorBinDisectF32(float *bins, - int numBins, - float x); - -int p_psVectorBinDisectS32(int *bins, - int numBins, - int x); - -int p_psVectorBinDisect(psVector *bins, - psScalar *x); +psS32 p_psVectorBinDisectF32(float *bins, + psS32 numBins, + float x); + +psS32 p_psVectorBinDisectS32(psS32 *bins, + psS32 numBins, + psS32 x); + +psS32 p_psVectorBinDisect(psVector *bins, + psScalar *x); psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - int order, + psS32 order, psScalar *x); Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 2203) +++ /trunk/psLib/src/math/psSpline.c (revision 2204) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 21:24:42 $ + * @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ \ if (IN->type.type == PS_TYPE_F64) { \ - for (int i=0;in;i++) { \ + for (psS32 i=0;in;i++) { \ OUT->data.F32[i] = (float) (IN->data.F64[i]); \ } \ @@ -69,5 +69,5 @@ \ if (IN->type.type == PS_TYPE_F32) { \ - for (int i=0;in;i++) { \ + for (psS32 i=0;in;i++) { \ OUT->data.F64[i] = (float) (IN->data.F32[i]); \ } \ @@ -117,9 +117,9 @@ outer coefficients of the Chebyshev polynomials. *****************************************************************************/ -static psPolynomial1D **CreateChebyshevPolys(int maxChebyPoly) +static psPolynomial1D **CreateChebyshevPolys(psS32 maxChebyPoly) { psPolynomial1D **chebPolys = NULL; - int i = 0; - int j = 0; + psS32 i = 0; + psS32 j = 0; chebPolys = (psPolynomial1D **) psAlloc(maxChebyPoly * sizeof(psPolynomial1D *)); @@ -153,5 +153,5 @@ evaluated Gaussian is: \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] *****************************************************************************/ -float psGaussian(float x, float mean, float sigma, bool normal) +float psGaussian(float x, float mean, float sigma, psBool normal) { float tmp = 1.0; @@ -185,10 +185,10 @@ NOTE: XXX: There is no way to seed the random generator. *****************************************************************************/ -psVector* psGaussianDev(float mean, float sigma, int Npts) +psVector* psGaussianDev(float mean, float sigma, psS32 Npts) { psVector* gauss = NULL; const gsl_rng_type *T = NULL; gsl_rng *r = NULL; - int i = 0; + psS32 i = 0; gauss = psVectorAlloc(Npts, PS_TYPE_F32); @@ -209,8 +209,8 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D* psPolynomial1DAlloc(int n, +psPolynomial1D* psPolynomial1DAlloc(psS32 n, psPolynomialType type) { - int i = 0; + psS32 i = 0; psPolynomial1D* newPoly = NULL; @@ -232,9 +232,9 @@ } -psPolynomial2D* psPolynomial2DAlloc(int nX, int nY, +psPolynomial2D* psPolynomial2DAlloc(psS32 nX, psS32 nY, psPolynomialType type) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; psPolynomial2D* newPoly = NULL; @@ -265,10 +265,10 @@ } -psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ, +psPolynomial3D* psPolynomial3DAlloc(psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int x = 0; - int y = 0; - int z = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psPolynomial3D* newPoly = NULL; @@ -307,11 +307,11 @@ } -psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ, +psPolynomial4D* psPolynomial4DAlloc(psS32 nW, psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int w = 0; - int x = 0; - int y = 0; - int z = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psPolynomial4D* newPoly = NULL; @@ -367,5 +367,5 @@ static void polynomial2DFree(psPolynomial2D* myPoly) { - int x = 0; + psS32 x = 0; for (x = 0; x < myPoly->nX; x++) { @@ -381,6 +381,6 @@ static void polynomial3DFree(psPolynomial3D* myPoly) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; for (x = 0; x < myPoly->nX; x++) { @@ -402,7 +402,7 @@ static void polynomial4DFree(psPolynomial4D* myPoly) { - int w = 0; - int x = 0; - int y = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; for (w = 0; w < myPoly->nW; w++) { @@ -434,5 +434,5 @@ float p_psOrdPolynomial1DEval(float x, const psPolynomial1D* myPoly) { - int loop_x = 0; + psS32 loop_x = 0; float polySum = 0.0; float xSum = 1.0; @@ -478,6 +478,6 @@ { psVector *d; - int n; - int i; + psS32 n; + psS32 i; float tmp; @@ -500,6 +500,6 @@ /* - int n; - int i; + psS32 n; + psS32 i; float tmp; psPolynomial1D **chebPolys = NULL; @@ -537,5 +537,5 @@ psVector *tmp; psVector *myX; - int i; + psS32 i; PS_CONVERT_VECTOR_F32(x, myX); @@ -555,6 +555,6 @@ float p_psOrdPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; float polySum = 0.0; float xSum = 1.0; @@ -577,10 +577,10 @@ float p_psChebPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -628,6 +628,6 @@ psVector *myX; psVector *myY; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(x, myX); @@ -658,7 +658,7 @@ float p_psOrdPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; float polySum = 0.0; float xSum = 1.0; @@ -686,11 +686,11 @@ float p_psChebPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -746,6 +746,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(x, myX); @@ -787,8 +787,8 @@ float p_psOrdPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; float polySum = 0.0; float wSum = 1.0; @@ -821,12 +821,12 @@ float p_psChebPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; float polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -890,6 +890,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F32(w, myW); @@ -936,8 +936,8 @@ -psDPolynomial1D* psDPolynomial1DAlloc(int n, +psDPolynomial1D* psDPolynomial1DAlloc(psS32 n, psPolynomialType type) { - int i = 0; + psS32 i = 0; psDPolynomial1D* newPoly = NULL; @@ -959,9 +959,9 @@ } -psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY, +psDPolynomial2D* psDPolynomial2DAlloc(psS32 nX, psS32 nY, psPolynomialType type) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; psDPolynomial2D* newPoly = NULL; @@ -992,10 +992,10 @@ } -psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ, +psDPolynomial3D* psDPolynomial3DAlloc(psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int x = 0; - int y = 0; - int z = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psDPolynomial3D* newPoly = NULL; @@ -1034,11 +1034,11 @@ } -psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ, +psDPolynomial4D* psDPolynomial4DAlloc(psS32 nW, psS32 nX, psS32 nY, psS32 nZ, psPolynomialType type) { - int w = 0; - int x = 0; - int y = 0; - int z = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; + psS32 z = 0; psDPolynomial4D* newPoly = NULL; @@ -1094,5 +1094,5 @@ static void dPolynomial2DFree(psDPolynomial2D* myPoly) { - int x = 0; + psS32 x = 0; for (x = 0; x < myPoly->nX; x++) { @@ -1108,6 +1108,6 @@ static void dPolynomial3DFree(psDPolynomial3D* myPoly) { - int x = 0; - int y = 0; + psS32 x = 0; + psS32 y = 0; for (x = 0; x < myPoly->nX; x++) { @@ -1129,7 +1129,7 @@ static void dPolynomial4DFree(psDPolynomial4D* myPoly) { - int w = 0; - int x = 0; - int y = 0; + psS32 w = 0; + psS32 x = 0; + psS32 y = 0; for (w = 0; w < myPoly->nW; w++) { @@ -1159,5 +1159,5 @@ double p_psDOrdPolynomial1DEval(double x, const psDPolynomial1D* myPoly) { - int loop_x = 0; + psS32 loop_x = 0; double polySum = 0.0; double xSum = 1.0; @@ -1183,6 +1183,6 @@ { psVector *d; - int n; - int i; + psS32 n; + psS32 i; double tmp; @@ -1222,5 +1222,5 @@ psVector *tmp; psVector *myX; - int i; + psS32 i; PS_CONVERT_VECTOR_F64(x, myX); @@ -1241,6 +1241,6 @@ double p_psDOrdPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; double polySum = 0.0; double xSum = 1.0; @@ -1263,10 +1263,10 @@ double p_psDChebPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1314,6 +1314,6 @@ psVector *myX; psVector *myY; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(x, myX); @@ -1344,7 +1344,7 @@ double p_psDOrdPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; double polySum = 0.0; double xSum = 1.0; @@ -1372,11 +1372,11 @@ double p_psDChebPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1432,6 +1432,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(x, myX); @@ -1475,8 +1475,8 @@ double p_psDOrdPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; double polySum = 0.0; double wSum = 1.0; @@ -1509,12 +1509,12 @@ double p_psDChebPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { - int loop_w = 0; - int loop_x = 0; - int loop_y = 0; - int loop_z = 0; - int i = 0; + psS32 loop_w = 0; + psS32 loop_x = 0; + psS32 loop_y = 0; + psS32 loop_z = 0; + psS32 i = 0; double polySum = 0.0; psPolynomial1D* *chebPolys = NULL; - int maxChebyPoly = 0; + psS32 maxChebyPoly = 0; // Determine how many Chebyshev polynomials @@ -1578,6 +1578,6 @@ psVector *myY; psVector *myZ; - int i; - int vecLen=x->n; + psS32 i; + psS32 vecLen=x->n; PS_CONVERT_VECTOR_F64(w, myW); @@ -1624,5 +1624,5 @@ //typedef struct { -// int n; +// psS32 n; // psPolynomial1D **spline; // float *p_psDeriv2; @@ -1636,11 +1636,11 @@ XXX: Ensure that domain[i+1] != domain[i] *****************************************************************************/ -psSpline1D *psSpline1DAlloc(int numSplines, - int order, +psSpline1D *psSpline1DAlloc(psS32 numSplines, + psS32 order, float min, float max) { psSpline1D *tmp = NULL; - int i; + psS32 i; float tmpDomain; float width; @@ -1677,7 +1677,7 @@ // XXX: Have Robert put the dealocator in the memory file. -int p_psSpline1DFree(psSpline1D *tmpSpline) -{ - int i; +psS32 p_psSpline1DFree(psSpline1D *tmpSpline) +{ + psS32 i; if (tmpSpline == NULL) { @@ -1704,9 +1704,9 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order) + psS32 order) { psSpline1D *tmp = NULL; - int i; - int numSplines; + psS32 i; + psS32 numSplines; tmp = (psSpline1D *) psAlloc(sizeof(psSpline1D)); @@ -1746,11 +1746,11 @@ XXX: name since we don't take psVectors as input. *****************************************************************************/ -int p_psVectorBinDisectF32(float *bins, - int numBins, - float x) -{ - int min; - int max; - int mid; +psS32 p_psVectorBinDisectF32(float *bins, + psS32 numBins, + float x) +{ + psS32 min; + psS32 max; + psS32 mid; psTrace(".psLib.dataManip.psFunctions.p_psVectorBinDisectF32", 4, @@ -1800,11 +1800,11 @@ p_psVectorBinDisectS32(): integer version of above. *****************************************************************************/ -int p_psVectorBinDisectS32(int *bins, - int numBins, - int x) -{ - int min; - int max; - int mid; +psS32 p_psVectorBinDisectS32(psS32 *bins, + psS32 numBins, + psS32 x) +{ + psS32 min; + psS32 max; + psS32 mid; psTrace(".psLib.dataManip.psFunctions.p_psVectorBinDisectS32", 4, @@ -1848,6 +1848,6 @@ p_psVectorBinDisect(): A wrapper to the above p_psVectorBinDisect(). *****************************************************************************/ -int p_psVectorBinDisect(psVector *bins, - psScalar *x) +psS32 p_psVectorBinDisect(psVector *bins, + psScalar *x) { if (x->type.type != bins->type.type) { @@ -1877,9 +1877,9 @@ float p_ps1DFullInterpolateF32(float *domain, float *range, - int n, + psS32 n, float x) { - int i; - int m; + psS32 i; + psS32 m; static psVector *p = NULL; p = psVectorRecycle(p, n, PS_TYPE_F32); @@ -1937,11 +1937,11 @@ float p_ps1DInterpolateF32(float *domain, float *range, - int n, - int order, + psS32 n, + psS32 order, float x) { - int binNum; - int numIntPoints = order+1; - int origin; + psS32 binNum; + psS32 numIntPoints = order+1; + psS32 origin; psTrace(".psLib.dataManip.psFunctions.p_ps1DInterpolateF32", 4, @@ -1987,5 +1987,5 @@ psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - int order, + psS32 order, psScalar *x) { @@ -2065,6 +2065,6 @@ float x) { - int binNum; - int n; + psS32 binNum; + psS32 n; n = spline->n; @@ -2091,5 +2091,5 @@ const psSpline1D *spline) { - int i; + psS32 i; psVector *tmpVector; Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 2203) +++ /trunk/psLib/src/math/psSpline.h (revision 2204) @@ -12,6 +12,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 00:48:15 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -45,5 +45,5 @@ float mean, ///< Mean for the Gaussian float stddev, ///< Standard deviation for the Gaussian - bool normal ///< Indicates whether result should be normalized + psBool normal ///< Indicates whether result should be normalized ); @@ -57,5 +57,5 @@ float mean, ///< The mean of the Gaussian float sigma, ///< The sigma of the Gaussian - int Npts ///< The size of the vector + psS32 Npts ///< The size of the vector ); @@ -69,5 +69,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms float *coeff; ///< Coefficients float *coeffErr; ///< Error in coefficients @@ -80,6 +80,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y float **coeff; ///< Coefficients float **coeffErr; ///< Error in coefficients @@ -92,7 +92,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ***coeff; ///< Coefficients float ***coeffErr; ///< Error in coefficients @@ -105,8 +105,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z float ****coeff; ///< Coefficients float ****coeffErr; ///< Error in coefficients @@ -121,5 +121,5 @@ */ psPolynomial1D* psPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -130,6 +130,6 @@ */ psPolynomial2D* psPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -140,7 +140,7 @@ */ psPolynomial3D* psPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -151,8 +151,8 @@ */ psPolynomial4D* psPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -230,5 +230,5 @@ { psPolynomialType type; ///< Polynomial type - int n; ///< Number of terms + psS32 n; ///< Number of terms double *coeff; ///< Coefficients double *coeffErr; ///< Error in coefficients @@ -241,6 +241,6 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y double **coeff; ///< Coefficients double **coeffErr; ///< Error in coefficients @@ -253,7 +253,7 @@ { psPolynomialType type; ///< Polynomial type - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ***coeff; ///< Coefficients double ***coeffErr; ///< Error in coefficients @@ -266,8 +266,8 @@ { psPolynomialType type; ///< Polynomial type - int nW; ///< Number of terms in w - int nX; ///< Number of terms in x - int nY; ///< Number of terms in y - int nZ; ///< Number of terms in z + psS32 nW; ///< Number of terms in w + psS32 nX; ///< Number of terms in x + psS32 nY; ///< Number of terms in y + psS32 nZ; ///< Number of terms in z double ****coeff; ///< Coefficients double ****coeffErr; ///< Error in coefficients @@ -281,5 +281,5 @@ */ psDPolynomial1D* psDPolynomial1DAlloc( - int n, ///< Number of terms + psS32 n, ///< Number of terms psPolynomialType type ///< Polynomial Type ); @@ -290,6 +290,6 @@ */ psDPolynomial2D* psDPolynomial2DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y psPolynomialType type ///< Polynomial Type ); @@ -300,7 +300,7 @@ */ psDPolynomial3D* psDPolynomial3DAlloc( - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -311,8 +311,8 @@ */ psDPolynomial4D* psDPolynomial4DAlloc( - int nW, ///< Number of terms in w - int nX, ///< Number of terms in x - int nY, ///< Number of terms in y - int nZ, ///< Number of terms in z + psS32 nW, ///< Number of terms in w + psS32 nX, ///< Number of terms in x + psS32 nY, ///< Number of terms in y + psS32 nZ, ///< Number of terms in z psPolynomialType type ///< Polynomial Type ); @@ -386,5 +386,5 @@ typedef struct { - int n; ///< The number of spline polynomials + psS32 n; ///< The number of spline polynomials psPolynomial1D **spline; ///< An array of n pointers to the spline polynomials float *p_psDeriv2; ///< For cubic splines, the second derivative at each domain point. Size is n+1. @@ -393,13 +393,13 @@ psSpline1D; -psSpline1D *psSpline1DAlloc(int n, - int order, +psSpline1D *psSpline1DAlloc(psS32 n, + psS32 order, float min, float max); -int p_psSpline1DFree(psSpline1D *tmpSpline); +psS32 p_psSpline1DFree(psSpline1D *tmpSpline); psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - int order); + psS32 order); float psSpline1DEval(const psSpline1D *spline, @@ -409,18 +409,18 @@ const psSpline1D *spline); -int p_psVectorBinDisectF32(float *bins, - int numBins, - float x); - -int p_psVectorBinDisectS32(int *bins, - int numBins, - int x); - -int p_psVectorBinDisect(psVector *bins, - psScalar *x); +psS32 p_psVectorBinDisectF32(float *bins, + psS32 numBins, + float x); + +psS32 p_psVectorBinDisectS32(psS32 *bins, + psS32 numBins, + psS32 x); + +psS32 p_psVectorBinDisect(psVector *bins, + psScalar *x); psScalar *p_psVectorInterpolate(psVector *domain, psVector *range, - int order, + psS32 order, psScalar *x); Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 2203) +++ /trunk/psLib/src/math/psStats.c (revision 2204) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 21:24:43 $ + * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ void p_psVectorRobustStats(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats); + const psVector* restrict maskVector, psU32 maskVal, psStats* stats); @@ -75,5 +75,5 @@ /*****************************************************************************/ -bool p_psGetStatValue(const psStats* stats, double *value) +psBool p_psGetStatValue(const psStats* stats, double *value) { @@ -134,7 +134,7 @@ *****************************************************************************/ -void p_psVectorPrint(psVector* myVector, psVector* maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable. +void p_psVectorPrint(psVector* myVector, psVector* maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable. for (i = 0; i < myVector->n; i++) { @@ -178,9 +178,9 @@ void p_psVectorSampleMean(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable float mean = 0.0; // The mean - int count = 0; // # of points in this mean? + psS32 count = 0; // # of points in this mean? float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -242,7 +242,7 @@ *****************************************************************************/ void p_psVectorMax(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable float max = -MY_MAX_FLOAT; // The calculated maximum float rangeMin = 0.0; // Exclude data below this @@ -303,7 +303,7 @@ *****************************************************************************/ void p_psVectorMin(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable float min = MY_MAX_FLOAT; // The calculated maximum float rangeMin = 0.0; // Exclude data below this @@ -363,9 +363,9 @@ NULL *****************************************************************************/ -int p_psVectorNValues(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable - int numData = 0; // The number of data points +psS32 p_psVectorNValues(const psVector* restrict myVector, + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable + psS32 numData = 0; // The number of data points float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -414,11 +414,11 @@ *****************************************************************************/ void p_psVectorSampleMedian(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) { psVector* unsortedVector = NULL; // Temporary vector psVector* sortedVector = NULL; // Temporary vector - int i = 0; // Loop index variable - int count = 0; // # of points in this mean? - int nValues = 0; // # of points in vector + psS32 i = 0; // Loop index variable + psS32 count = 0; // # of points in this mean? + psS32 nValues = 0; // # of points in vector float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -497,13 +497,13 @@ float sigma) { - int i = 0; // Loop index variable - int j = 0; // Loop index variable + psS32 i = 0; // Loop index variable + psS32 j = 0; // Loop index variable float iMid; float jMid; - int numBins = robustHistogram->nums->n; - int numBounds = robustHistogram->bounds->n; + psS32 numBins = robustHistogram->nums->n; + psS32 numBounds = robustHistogram->bounds->n; psVector* smooth = psVectorAlloc(numBins, PS_TYPE_F32); - int jMin = 0; - int jMax = 0; + psS32 jMin = 0; + psS32 jMax = 0; float firstBound = robustHistogram->bounds->data.F32[0]; float lastBound = robustHistogram->bounds->data.F32[numBounds-1]; @@ -566,11 +566,11 @@ *****************************************************************************/ void p_psVectorSampleQuartiles(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) { psVector* unsortedVector = NULL; // Temporary vector psVector* sortedVector = NULL; // Temporary vector - int i = 0; // Loop index variable - int count = 0; // # of points in this mean? - int nValues = 0; // # data points + psS32 i = 0; // Loop index variable + psS32 count = 0; // # of points in this mean? + psS32 nValues = 0; // # data points float rangeMin = 0.0; // Exclude data below this float rangeMax = 0.0; // Exclude date above this @@ -648,8 +648,8 @@ *****************************************************************************/ void p_psVectorSampleStdev(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable - int countInt = 0; // # of data points being used + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable + psS32 countInt = 0; // # of data points being used float countFloat = 0.0; // # of data points being used float mean = 0.0; // The mean @@ -733,8 +733,8 @@ *****************************************************************************/ void p_psVectorClippedStats(const psVector* restrict myVector, - const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) -{ - int i = 0; // Loop index variable - int j = 0; // Loop index variable + const psVector* restrict maskVector, psU32 maskVal, psStats* stats) +{ + psS32 i = 0; // Loop index variable + psS32 j = 0; // Loop index variable float clippedMean = 0.0; // self-explanatory float clippedStdev = 0.0; // self-explanatory @@ -825,5 +825,5 @@ float min = (float)HUGE; float max = (float)-HUGE; - int i = 0; + psS32 i = 0; for (i = 0; i < myData->n; i++) { @@ -856,5 +856,5 @@ float max = (double)-HUGE; double range = 0.0; - int i = 0; + psS32 i = 0; for (i = 0; i < myData->n; i++) { @@ -914,5 +914,5 @@ *****************************************************************************/ float p_psGaussianDeriv(const psVector* restrict myData, - const psVector* restrict myParams, int whichParam) + const psVector* restrict myParams, psS32 whichParam) { float x = myData->data.F32[0]; @@ -957,5 +957,5 @@ *****************************************************************************/ float p_psQuadraticDeriv(const psVector* restrict myParams, - const psVector* restrict myCoords, int whichParamDeriv) + const psVector* restrict myCoords, psS32 whichParamDeriv) { float x = myCoords->data.F32[0]; @@ -989,5 +989,5 @@ float getThisValue) { - int numIterations = 0; + psS32 numIterations = 0; float midpoint = 0.0; float oldMidpoint = 1.0; @@ -1030,5 +1030,5 @@ float fitQuadraticSearchForYThenReturnX(psVector *xVec, psVector *yVec, - int binNum, + psS32 binNum, float yVal) { @@ -1129,5 +1129,5 @@ void p_psVectorRobustStats(const psVector* restrict myVector, const psVector* restrict maskVector, - unsigned int maskVal, + psU32 maskVal, psStats* stats) { @@ -1135,12 +1135,12 @@ psVector* robustHistogramVector = NULL; float binSize = 0.0; // Size of the histogram bins - int LQBinNum = -1; // Bin num for lower quartile - int UQBinNum = -1; // Bin num for upper quartile - int medianBinNum = -1; - int i = 0; // Loop index variable - int modeBinNum = 0; + psS32 LQBinNum = -1; // Bin num for lower quartile + psS32 UQBinNum = -1; // Bin num for upper quartile + psS32 medianBinNum = -1; + psS32 i = 0; // Loop index variable + psS32 modeBinNum = 0; float modeBinCount = 0.0; float dL = 0.0; - int numBins = 0; + psS32 numBins = 0; float myMean = 0.0; float myStdev = 0.0; @@ -1200,5 +1200,5 @@ // bins, not the binSize. Also, if we get here, we know that // binSize != 0.0. - numBins = (int)((stats->max - stats->min) / binSize); + numBins = (psS32)((stats->max - stats->min) / binSize); robustHistogram = psHistogramAlloc(stats->min, stats->max, numBins); @@ -1440,7 +1440,7 @@ The histogram structure *****************************************************************************/ -psHistogram* psHistogramAlloc(float lower, float upper, int n) -{ - int i = 0; // Loop index variable +psHistogram* psHistogramAlloc(float lower, float upper, psS32 n) +{ + psS32 i = 0; // Loop index variable psHistogram* newHist = NULL; // The new histogram structure float binSize = 0.0; // The histogram bin size @@ -1500,5 +1500,5 @@ { psHistogram* newHist = NULL; // The new histogram structure - int i; // Loop index variable + psS32 i; // Loop index variable // NOTE: Verify that this is the correct action. @@ -1565,15 +1565,15 @@ const psVector* restrict in, const psVector* restrict mask, - unsigned int maskVal) -{ - int i = 0; // Loop index variable + psU32 maskVal) +{ + psS32 i = 0; // Loop index variable float binSize = 0.0; // Histogram bin size - int binNum = 0; // A temporary bin number - int numBins = 0; // The total number of bins - int tmp = 0; + psS32 binNum = 0; // A temporary bin number + psS32 numBins = 0; // The total number of bins + psS32 tmp = 0; psScalar tmpScalar; tmpScalar.type.type = PS_TYPE_F32; psVector* inF32; - int mustFreeTmp = 1; + psS32 mustFreeTmp = 1; // NOTE: Verify that this is the correct action. @@ -1629,5 +1629,5 @@ if (out->uniform == true) { binSize = out->bounds->data.F32[1] - out->bounds->data.F32[0]; - binNum = (int)((inF32->data.F32[i] - out->bounds->data.F32[0]) / binSize); + binNum = (psS32)((inF32->data.F32[i] - out->bounds->data.F32[0]) / binSize); // NOTE: This next if-statement really shouldn't be necessary. @@ -1673,5 +1673,5 @@ psVector* p_psConvertToF32(psVector* in) { - int i = 0; + psS32 i = 0; psVector* tmp = NULL; @@ -1724,8 +1724,8 @@ psVector* in, psVector* mask, - unsigned int maskVal) + psU32 maskVal) { psVector* inF32; - int mustFreeTmp = 1; + psS32 mustFreeTmp = 1; if (in == NULL) { Index: /trunk/psLib/src/math/psStats.h =================================================================== --- /trunk/psLib/src/math/psStats.h (revision 2203) +++ /trunk/psLib/src/math/psStats.h (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 20:07:04 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,11 +67,11 @@ double robustUQ; ///< robust upper quartile double robustLQ; ///< robust lower quartile - int robustN50; ///< - int robustNfit; ///< + psS32 robustN50; ///< + psS32 robustNfit; ///< double clippedMean; ///< Nsigma clipped mean double clippedStdev; ///< standard deviation after clipping - int clippedNvalues; ///< ??? + psS32 clippedNvalues; ///< ??? double clipSigma; ///< Nsigma used for clipping; user input - int clipIter; ///< Number of clipping iterations; user input + psS32 clipIter; ///< Number of clipping iterations; user input double min; ///< minimum data value in array double max; ///< maximum data value in array @@ -89,5 +89,5 @@ psVector* in, ///< Vector to be analysed: must be F32 psVector* mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL - unsigned int maskVal ///< Only mask elements with one of these bits set in maskVector + psU32 maskVal ///< Only mask elements with one of these bits set in maskVector ); @@ -118,7 +118,7 @@ psVector* bounds; ///< Bounds for the bins (type F32) psVector* nums; ///< Number in each of the bins (INT) - int minNum; ///< Number below the minimum - int maxNum; ///< Number above the maximum - bool uniform; ///< Is it a uniform distribution? + psS32 minNum; ///< Number below the minimum + psS32 maxNum; ///< Number above the maximum + psBool uniform; ///< Is it a uniform distribution? } psHistogram; @@ -133,5 +133,5 @@ float lower, ///< Lower limit for the bins float upper, ///< Upper limit for the bins - int n ///< Number of bins + psS32 n ///< Number of bins ); @@ -157,14 +157,14 @@ const psVector* restrict in, ///< Vector to analyse const psVector* restrict mask, ///< Mask dat for input vector - unsigned int maskVal ///< Mask value + psU32 maskVal ///< Mask value ); /** Extracts the statistic value specified by stats->options. * - * @return bool If more than one statistic result is set in stats->options, + * @return psBool If more than one statistic result is set in stats->options, * false is returned and the value parameter is not set, * otherwise true is returned. */ -bool p_psGetStatValue( +psBool p_psGetStatValue( const psStats* stats, ///< the statistic struct to operate on Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 2203) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 01:22:59 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,11 +29,11 @@ static void imageFree(psImage* image); -psImage* psImageAlloc(unsigned int numCols, - unsigned int numRows, +psImage* psImageAlloc(psU32 numCols, + psU32 numRows, const psElemType type) { - int area = 0; - int elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes - int rowSize = numCols * elementSize; // row size in bytes. + psS32 area = 0; + psS32 elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes + psS32 rowSize = numCols * elementSize; // row size in bytes. area = numCols * numRows; @@ -51,5 +51,5 @@ p_psMemSetDeallocator(image, (psFreeFcn) imageFree); - image->data.V = psAlloc(sizeof(void *) * numRows); + image->data.V = psAlloc(sizeof(psPtr ) * numRows); image->rawDataBuffer = psAlloc(area * elementSize); @@ -57,12 +57,12 @@ // set the row pointers. image->data.V[0] = image->rawDataBuffer; - for (int i = 1; i < numRows; i++) { - image->data.V[i] = (void *)((int8_t *) image->data.V[i - 1] + rowSize); - } - - *(int *)&image->col0 = 0; - *(int *)&image->row0 = 0; - *(unsigned int *)&image->numCols = numCols; - *(unsigned int *)&image->numRows = numRows; + for (psS32 i = 1; i < numRows; i++) { + image->data.V[i] = (psPtr )((int8_t *) image->data.V[i - 1] + rowSize); + } + + *(psS32 *)&image->col0 = 0; + *(psS32 *)&image->row0 = 0; + *(psU32 *)&image->numCols = numCols; + *(psU32 *)&image->numRows = numRows; *(psDimen* ) & image->type.dimen = PS_DIMEN_IMAGE; *(psElemType* ) & image->type.type = type; @@ -81,11 +81,11 @@ if (image->type.type == PS_TYPE_PTR) { // 2-D array of pointers -- must dereference elements - unsigned int oldNumRows = image->numRows; - unsigned int oldNumCols = image->numCols; - psPTR* rowPtr; - - for (unsigned int row = 0; row < oldNumRows; row++) { + psU32 oldNumRows = image->numRows; + psU32 oldNumCols = image->numCols; + psPtr* rowPtr; + + for (psU32 row = 0; row < oldNumRows; row++) { rowPtr = image->data.PTR[row]; - for (unsigned int col = 0; col < oldNumCols; col++) { + for (psU32 col = 0; col < oldNumCols; col++) { psMemDecrRefCounter(rowPtr[col]); } @@ -105,10 +105,10 @@ psImage* psImageRecycle(psImage* old, - unsigned int numCols, - unsigned int numRows, + psU32 numCols, + psU32 numRows, const psElemType type) { - int elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes - int rowSize = numCols * elementSize; // row size in bytes. + psS32 elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes + psS32 rowSize = numCols * elementSize; // row size in bytes. if (old == NULL) { @@ -128,11 +128,11 @@ // 2-D array of pointers -- must // dereference - unsigned int oldNumRows = old->numRows; - unsigned int oldNumCols = old->numCols; - psPTR* rowPtr; - - for (unsigned int row = 0; row < oldNumRows; row++) { + psU32 oldNumRows = old->numRows; + psU32 oldNumCols = old->numCols; + psPtr* rowPtr; + + for (psU32 row = 0; row < oldNumRows; row++) { rowPtr = old->data.PTR[row]; - for (unsigned int col = 0; col < oldNumCols; col++) { + for (psU32 col = 0; col < oldNumCols; col++) { psMemDecrRefCounter(rowPtr[col]); rowPtr[col] = NULL; @@ -149,14 +149,14 @@ old->rawDataBuffer = psRealloc(old->data.V[0], numCols * numRows * elementSize); - old->data.V = (void **)psRealloc(old->data.V, numRows * sizeof(void *)); + old->data.V = (psPtr *)psRealloc(old->data.V, numRows * sizeof(psPtr )); // recreate the row pointers old->data.V[0] = old->rawDataBuffer; - for (int i = 1; i < numRows; i++) { - old->data.V[i] = (void *)((int8_t *) old->data.V[i - 1] + rowSize); - } - - *(unsigned int *)&old->numCols = numCols; - *(unsigned int *)&old->numRows = numRows; + for (psS32 i = 1; i < numRows; i++) { + old->data.V[i] = (psPtr )((int8_t *) old->data.V[i - 1] + rowSize); + } + + *(psU32 *)&old->numCols = numCols; + *(psU32 *)&old->numRows = numRows; *(psElemType* ) & old->type.type = type; @@ -169,8 +169,8 @@ { psElemType inDatatype; - int elementSize; - int elements; - int numRows; - int numCols; + psS32 elementSize; + psS32 elements; + psS32 numRows; + psS32 numCols; if (input == NULL || input->data.V == NULL) { @@ -218,5 +218,5 @@ // datatype. if (type == inDatatype) { - for (int row=0;rowdata.V[row], input->data.V[row], elementSize * numCols); } @@ -227,8 +227,8 @@ ps##INTYPE *in; \ ps##OUTTYPE *out; \ - for(int row=0;rowdata.INTYPE[row]; \ out = OUT->data.OUTTYPE[row]; \ - for (int col=0;colparent = NULL; } @@ -366,5 +366,5 @@ float y, const psImage* mask, - unsigned int maskVal, + psU32 maskVal, psC64 unexposedValue, psImageInterpolateMode mode) @@ -438,11 +438,11 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psF64 unexposedValue) \ { \ - int intX = (int) round((psF64)(x) - 0.5 + FLT_EPSILON); \ - int intY = (int) round((psF64)(y) - 0.5 + FLT_EPSILON); \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intX = (psS32) round((psF64)(x) - 0.5 + FLT_EPSILON); \ + psS32 intY = (psS32) round((psF64)(y) - 0.5 + FLT_EPSILON); \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ \ if ((intX < 0) || \ @@ -463,11 +463,11 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psC64 unexposedValue) \ { \ - int intX = (int) round((psF64)(x) - 0.5); \ - int intY = (int) round((psF64)(y) - 0.5); \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intX = (psS32) round((psF64)(x) - 0.5); \ + psS32 intY = (psS32) round((psF64)(y) - 0.5); \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ \ if ((intX < 0) || \ @@ -501,5 +501,5 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psF64 unexposedValue) \ { \ @@ -508,16 +508,16 @@ psF64 fracX = x - 0.5 - floorX; \ psF64 fracY = y - 0.5 - floorY; \ - int intFloorX = (int) floorX; \ - int intFloorY = (int) floorY; \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intFloorX = (psS32) floorX; \ + psS32 intFloorY = (psS32) floorY; \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ ps##TYPE V00; \ ps##TYPE V01; \ ps##TYPE V10; \ ps##TYPE V11; \ - bool valid00 = false; \ - bool valid01 = false; \ - bool valid10 = false; \ - bool valid11 = false; \ + psBool valid00 = false; \ + psBool valid01 = false; \ + psBool valid10 = false; \ + psBool valid11 = false; \ \ if (intFloorY >= 0 && intFloorY <= lastY) { \ @@ -556,5 +556,5 @@ \ psF64 V0; \ - bool valid0 = true; \ + psBool valid0 = true; \ if (valid00 && valid10) { \ V0 = V00*(1-fracX)+V10*fracX; \ @@ -568,5 +568,5 @@ \ psF64 V1; \ - bool valid1 = true; \ + psBool valid1 = true; \ if (valid01 && valid11) { \ V1 = V01*(1-fracX)+V11*fracX; \ @@ -595,5 +595,5 @@ float y, \ const psImage* mask, \ - unsigned int maskVal, \ + psU32 maskVal, \ psC64 unexposedValue) \ { \ @@ -602,16 +602,16 @@ psF64 fracX = x - 0.5 - floorX; \ psF64 fracY = y - 0.5 - floorY; \ - int intFloorX = (int) floorX; \ - int intFloorY = (int) floorY; \ - int lastX = input->numCols - 1; \ - int lastY = input->numRows - 1; \ + psS32 intFloorX = (psS32) floorX; \ + psS32 intFloorY = (psS32) floorY; \ + psS32 lastX = input->numCols - 1; \ + psS32 lastY = input->numRows - 1; \ ps##TYPE V00; \ ps##TYPE V01; \ ps##TYPE V10; \ ps##TYPE V11; \ - bool valid00 = false; \ - bool valid01 = false; \ - bool valid10 = false; \ - bool valid11 = false; \ + psBool valid00 = false; \ + psBool valid01 = false; \ + psBool valid10 = false; \ + psBool valid11 = false; \ \ if (intFloorY >= 0 && intFloorY <= lastY) { \ @@ -650,5 +650,5 @@ \ psC64 V0; \ - bool valid0 = true; \ + psBool valid0 = true; \ if (valid00 && valid10) { \ V0 = V00*(1-fracX)+V10*fracX; \ @@ -662,5 +662,5 @@ \ psC64 V1; \ - bool valid1 = true; \ + psBool valid1 = true; \ if (valid01 && valid11) { \ V0 = V01*(1-fracX)+V11*fracX; \ Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 2203) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 01:22:59 $ + * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -47,8 +47,8 @@ { const psType type; ///< Image data type and dimension. - const unsigned int numCols; ///< Number of columns in image - const unsigned int numRows; ///< Number of rows in image. - const int col0; ///< Column position relative to parent. - const int row0; ///< Row position relative to parent. + const psU32 numCols; ///< Number of columns in image + const psU32 numRows; ///< Number of rows in image. + const psS32 col0; ///< Column position relative to parent. + const psS32 row0; ///< Row position relative to parent. union { @@ -65,11 +65,11 @@ psC32** C32; ///< Single-precision complex data. psC64** C64; ///< Double-precision complex data. - psPTR** PTR; ///< Void pointers. - psPTR* V; ///< Pointer to data. + psPtr** PTR; ///< Void pointers. + psPtr* V; ///< Pointer to data. } data; ///< Union for data types. const struct psImage* parent; ///< Parent, if a subimage. psArray* children; ///< Children of this region. - void* rawDataBuffer; + psPtr rawDataBuffer; } psImage; @@ -84,6 +84,6 @@ */ psImage* psImageAlloc( - unsigned int numCols, ///< Number of rows in image. - unsigned int numRows, ///< Number of columns in image. + psU32 numCols, ///< Number of rows in image. + psU32 numRows, ///< Number of columns in image. const psElemType type ///< Type of data for image. ); @@ -96,6 +96,6 @@ psImage* psImageRecycle( psImage* old, ///< the psImage to recycle by resizing image buffer - unsigned int numCols, ///< the desired number of columns in image - unsigned int numRows, ///< the desired number of rows in image + psU32 numCols, ///< the desired number of columns in image + psU32 numRows, ///< the desired number of rows in image const psElemType type ///< the desired datatype of the image ); @@ -115,8 +115,8 @@ /** Frees all children of a psImage. * - * @return int Number of children freed. + * @return psS32 Number of children freed. * */ -int psImageFreeChildren( +psS32 psImageFreeChildren( psImage* image ///< psImage in which all children shall be deallocated ); @@ -132,5 +132,5 @@ float y, ///< row location ot derive value of const psImage* mask, ///< if not NULL, the mask of the input image - unsigned int maskVal, ///< the mask value + psU32 maskVal, ///< the mask value psC64 unexposedValue, ///< return value if x,y location is not in image. psImageInterpolateMode mode ///< interpolation mode @@ -143,5 +143,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psF64 unexposedValue /**< return value if x,y location is not in image. */ \ ); \ @@ -151,5 +151,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psF64 unexposedValue /**< return value if x,y location is not in image. */ \ ); @@ -161,5 +161,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psC64 unexposedValue /**< return value if x,y location is not in image. */ \ ); \ @@ -169,5 +169,5 @@ float y, /**< row location ot derive value of */ \ const psImage* mask, /**< if not NULL, the mask of the input image */ \ - unsigned int maskVal, /**< the mask value */ \ + psU32 maskVal, /**< the mask value */ \ psC64 unexposedValue /**< return value if x,y location is not in image. */ \ ); Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 2203) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 2204) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-07 19:51:30 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,8 +42,8 @@ // FUNCTION IMPLEMENTATION - PUBLIC -psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType) +psVector* psVectorAlloc(psU32 nalloc, psElemType elemType) { psVector* psVec = NULL; - int elementSize = 0; + psS32 elementSize = 0; elementSize = PSELEMTYPE_SIZEOF(elemType); @@ -64,7 +64,7 @@ } -psVector* psVectorRealloc(psVector* restrict in, unsigned int nalloc) -{ - int elementSize = 0; +psVector* psVectorRealloc(psVector* restrict in, psU32 nalloc) +{ + psS32 elementSize = 0; psElemType elemType; @@ -88,7 +88,7 @@ } -psVector* psVectorRecycle(psVector* restrict in, unsigned int n, psElemType type) -{ - int byteSize; +psVector* psVectorRecycle(psVector* restrict in, psU32 n, psElemType type) +{ + psS32 byteSize; if (in == NULL) { @@ -129,5 +129,5 @@ } - int nElements = in->n; + psS32 nElements = in->n; out = psVectorRecycle(out, nElements, type); @@ -136,5 +136,5 @@ ps##INTYPE *inVec = in->data.INTYPE; \ ps##OUTTYPE *outVec = out->data.OUTTYPE; \ - for (int col=0;coldata.TYPE; \ ps##TYPE diff; \ - for(int i=0; imsg,false); p_psMemSetPersistent(errorStack[lcv]->name,false); @@ -94,5 +94,5 @@ } -psErrorCode psErrorMsg(const char *name, psErrorCode code, bool new, const char* fmt, ...) +psErrorCode psErrorMsg(const char *name, psErrorCode code, psBool new, const char* fmt, ...) { char errMsg[1024]; @@ -131,5 +131,5 @@ } -psErr* psErrorGet(int which) +psErr* psErrorGet(psS32 which) { psErr* result; @@ -180,5 +180,5 @@ vfprintf(fd,fmt,va); - for (int lcv=0;lcvcode >= PS_ERR_BASE) { fprintf(fd," -> %s: %s\n %s\n", Index: /trunk/psLib/src/sys/psError.h =================================================================== --- /trunk/psLib/src/sys/psError.h (revision 2203) +++ /trunk/psLib/src/sys/psError.h (revision 2204) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-23 22:18:13 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ */ psErr* psErrorGet( - int which ///< position in the error stack. 0 is last error on stack. + psS32 which ///< position in the error stack. 0 is last error on stack. ); @@ -121,5 +121,5 @@ const char *name, ///< Name of error in the form aaa.bbb.ccc psErrorCode code, ///< Error class code - bool new, ///< true if error originates at this location + psBool new, ///< true if error originates at this location const char* fmt, ///< printf style formatting statement defining error message ... Index: /trunk/psLib/src/sys/psErrorCodes.c =================================================================== --- /trunk/psLib/src/sys/psErrorCodes.c (revision 2203) +++ /trunk/psLib/src/sys/psErrorCodes.c (revision 2204) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 21:14:58 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ // first, search the static error codes - int n = 0; + psS32 n = 0; while(staticErrorCodes[n].code != PS_ERR_N_ERR_CLASSES && staticErrorCodes[n].code != code) { @@ -88,5 +88,5 @@ static void freeErrorDescription(psErrorDescription* err) { - psFree((void*)err->description); + psFree((psPtr)err->description); } @@ -125,5 +125,5 @@ void psErrorRegister(const psErrorDescription* errors, - int nerror) + psS32 nerror) { if (nerror < 1) { @@ -143,9 +143,9 @@ } - for (int i=0;idescription,true); + p_psMemSetPersistent((psPtr)err->description,true); if (! psListAdd(dynamicErrorCodes, PS_LIST_HEAD, @@ -162,5 +162,5 @@ } -bool p_psErrorUnregister(psErrorCode code) +psBool p_psErrorUnregister(psErrorCode code) { // Check input argument is non-negative @@ -179,4 +179,4 @@ } - return psListRemove(dynamicErrorCodes,PS_LIST_UNKNOWN,(void*)desc); + return psListRemove(dynamicErrorCodes,PS_LIST_UNKNOWN,(psPtr)desc); } Index: /trunk/psLib/src/sys/psErrorCodes.h =================================================================== --- /trunk/psLib/src/sys/psErrorCodes.h (revision 2203) +++ /trunk/psLib/src/sys/psErrorCodes.h (revision 2204) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 21:14:58 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -15,4 +15,6 @@ #ifndef PS_ERROR_CODES_H #define PS_ERROR_CODES_H + +#include "psType.h" /* N.B., lines between '//~Start' and '//~End' are automatic generated from @@ -93,12 +95,12 @@ void psErrorRegister( const psErrorDescription* errors, ///< Array of error codes to register - int nerror ///< number of errors in input array + psS32 nerror ///< number of errors in input array ); /** Clears error codes registered via psErrorRegister. * - * @return bool TRUE if given errorcode was removed, otherwise FALSE. + * @return psBool TRUE if given errorcode was removed, otherwise FALSE. */ -bool p_psErrorUnregister( +psBool p_psErrorUnregister( psErrorCode code ///< the error code to find and remove ); Index: /trunk/psLib/src/sys/psLogMsg.c =================================================================== --- /trunk/psLib/src/sys/psLogMsg.c (revision 2203) +++ /trunk/psLib/src/sys/psLogMsg.c (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,11 +19,11 @@ /***************************************************************************** NOTES: currently, the prototype code has the following global variables: - static int p_psGlobalLogDest; - static int p_psGlobalLogLevel; - static int p_psLogTime; - static int p_psLogHost; - static int p_psLogLevel; - static int p_psLogName; - static int p_psLogMsg; + static psS32 p_psGlobalLogDest; + static psS32 p_psGlobalLogLevel; + static psS32 p_psLogTime; + static psS32 p_psLogHost; + static psS32 p_psLogLevel; + static psS32 p_psLogName; + static psS32 p_psLogMsg; *****************************************************************************/ #include @@ -34,5 +34,4 @@ #include #include -#include #include "psLogMsg.h" @@ -49,15 +48,15 @@ static FILE *logDest = (FILE *) 1; // flag to initialize to stderr before using. -static int globalLogLevel = PS_LOG_INFO; // log all messages at this or above -static bool logTime = true; // Flag to include time info -static bool logHost = true; // Flag to include host info -static bool logLevel = true; // Flag to include level info -static bool logName = true; // Flag to include name info -static bool logMsg = true; // Flag to include message info +static psS32 globalLogLevel = PS_LOG_INFO; // log all messages at this or above +static psBool logTime = true; // Flag to include time info +static psBool logHost = true; // Flag to include host info +static psBool logLevel = true; // Flag to include level info +static psBool logName = true; // Flag to include name info +static psBool logMsg = true; // Flag to include message info /***************************************************************************** psLogSetLevel(): Set the current log level and return old level. Input: - level (int): the new log level. + level (psS32): the new log level. Output: none @@ -65,8 +64,8 @@ The old log level. *****************************************************************************/ -int psLogSetLevel(int level) +psS32 psLogSetLevel(psS32 level) { // Save old global log level for changing it. - int oldLevel = globalLogLevel; + psS32 oldLevel = globalLogLevel; if ((level < MIN_LOG_LEVEL) || (level > MAX_LOG_LEVEL)) { @@ -86,5 +85,5 @@ Input: - dest (int): the new log destination + dest (psS32): the new log destination Output: None. @@ -92,5 +91,5 @@ An integer specifying the old log destination. *****************************************************************************/ -bool psLogSetDestination(const char *dest) +psBool psLogSetDestination(const char *dest) { char protocol[5]; @@ -245,7 +244,7 @@ NULL. *****************************************************************************/ -void psLogMsgV(const char *name, int level, const char *fmt, va_list ap) -{ - static int first = 1; // Flag for calling gethostname() +void psLogMsgV(const char *name, psS32 level, const char *fmt, va_list ap) +{ + static psS32 first = 1; // Flag for calling gethostname() static char hostname[HOST_NAME_MAX + 1]; @@ -254,5 +253,5 @@ char head[MAX_LOG_LINE_LENGTH + 2]; // the added two are for the ending | and \0 char *head_ptr = head; // where we've got to in head - int maxLength = MAX_LOG_LINE_LENGTH; + psS32 maxLength = MAX_LOG_LINE_LENGTH; time_t clock = time(NULL); // The current time. struct tm *utc = gmtime(&clock); // The current gm time. @@ -375,5 +374,5 @@ NULL *****************************************************************************/ -void psLogMsg(const char *name, int level, const char *fmt, ...) +void psLogMsg(const char *name, psS32 level, const char *fmt, ...) { va_list ap; Index: /trunk/psLib/src/sys/psLogMsg.h =================================================================== --- /trunk/psLib/src/sys/psLogMsg.h (revision 2203) +++ /trunk/psLib/src/sys/psLogMsg.h (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,6 @@ #define PS_LOG_MSG_H #include -#include + +#include "psType.h" /** @addtogroup LogTrace @@ -31,7 +32,7 @@ * argument which can specify more general log destinations. * - * @return int true if set successfully, otherwise false. + * @return psS32 true if set successfully, otherwise false. */ -bool psLogSetDestination( +psBool psLogSetDestination( const char *dest ///< Specifies where to send messages. ); @@ -43,8 +44,8 @@ * be displayed. * - * @return int old logging level + * @return psS32 old logging level */ -int psLogSetLevel( - int level ///< Specifies the system log level +psS32 psLogSetLevel( + psS32 level ///< Specifies the system log level ); @@ -68,5 +69,5 @@ void psLogMsg( const char *name, ///< name of the log source - int myLevel, ///< severity level of this log message + psS32 myLevel, ///< severity level of this log message const char *fmt, ///< printf-style format command ... @@ -79,5 +80,5 @@ void psLogMsgV( const char *name, ///< name of the log source - int myLevel, ///< severity level of this log message + psS32 myLevel, ///< severity level of this log message const char *fmt, ///< printf-style format command va_list ap ///< varargs argument list Index: /trunk/psLib/src/sys/psMemory.c =================================================================== --- /trunk/psLib/src/sys/psMemory.c (revision 2203) +++ /trunk/psLib/src/sys/psMemory.c (revision 2204) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-09-21 22:30:19 $ +* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,4 @@ #include #include -#include #include @@ -28,9 +27,9 @@ #include "psSysUtilsErrors.h" -#define P_PS_MEMMAGIC (void *)0xdeadbeef // Magic number in psMemBlock header +#define P_PS_MEMMAGIC (psPtr )0xdeadbeef // Magic number in psMemBlock header #define P_PS_LARGE_BLOCK_SIZE 65536 // size where under, we try to recycle -static int checkMemBlock(const psMemBlock* m, const char *funcName); +static psS32 checkMemBlock(const psMemBlock* m, const char *funcName); static psMemBlock* lastMemBlockAllocated = NULL; static pthread_mutex_t memBlockListMutex = PTHREAD_MUTEX_INITIALIZER; @@ -39,8 +38,8 @@ static pthread_mutex_t recycleMemBlockListMutex = PTHREAD_MUTEX_INITIALIZER; -static int recycleBins = 13; -static int recycleBinSize[14] = { - 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, P_PS_LARGE_BLOCK_SIZE - }; +static psS32 recycleBins = 13; +static psS32 recycleBinSize[14] = { + 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, P_PS_LARGE_BLOCK_SIZE + }; // N.B. recycleBinSize should be terminated by P_PS_LARGE_BLOCK_SIZE (simplifies search loops) @@ -61,10 +60,10 @@ * Default memExhausted callback. */ -static void *memExhaustedCallbackDefault(size_t size) -{ - void *ptr = NULL; +static psPtr memExhaustedCallbackDefault(size_t size) +{ + psPtr ptr = NULL; pthread_mutex_lock(&recycleMemBlockListMutex); - int level = recycleBins - 1; + psS32 level = recycleBins - 1; while (level >= 0 && ptr == NULL) { @@ -98,5 +97,5 @@ } -static void memProblemCallbackDefault(const psMemBlock* ptr, const char *file, int lineno) +static void memProblemCallbackDefault(const psMemBlock* ptr, const char *file, psS32 lineno) { if (ptr->refCounter < 1) { @@ -223,5 +222,5 @@ */ -static int checkMemBlock(const psMemBlock* m, const char *funcName) +static psS32 checkMemBlock(const psMemBlock* m, const char *funcName) { // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked, @@ -248,5 +247,5 @@ return 1; } - if (*(void **)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) { + if (*(psPtr *)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) { psErrorMsg(PS_ERRORNAME_DOMAIN "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, PS_ERRORTEXT_psMemory_OVERFLOW, @@ -258,8 +257,8 @@ } -int psMemCheckCorruption(bool abort_on_error) -{ - int nbad = 0; // number of bad blocks - bool failure = false; +psS32 psMemCheckCorruption(psBool abort_on_error) +{ + psS32 nbad = 0; // number of bad blocks + psBool failure = false; // get exclusive access to the memBlock list to avoid it changing on us while we use it. @@ -289,5 +288,5 @@ } -void *p_psAlloc(size_t size, const char *file, int lineno) +psPtr p_psAlloc(size_t size, const char *file, psS32 lineno) { @@ -297,5 +296,5 @@ if (size < P_PS_LARGE_BLOCK_SIZE) { // find the bin we need. - int level = 0; + psS32 level = 0; while (size > recycleBinSize[level]) { @@ -323,5 +322,5 @@ if (ptr == NULL) { - ptr = malloc(sizeof(psMemBlock) + size + sizeof(void *)); + ptr = malloc(sizeof(psMemBlock) + size + sizeof(psPtr )); if (ptr == NULL) { @@ -332,6 +331,6 @@ } - ptr->startblock = P_PS_MEMMAGIC; - ptr->endblock = P_PS_MEMMAGIC; + *(psPtr*)&ptr->startblock = P_PS_MEMMAGIC; + *(psPtr*)&ptr->endblock = P_PS_MEMMAGIC; ptr->userMemorySize = size; pthread_mutex_init(&ptr->refCounterMutex, NULL); @@ -345,6 +344,6 @@ ptr->freeFcn = NULL; ptr->persistent = false; - *(unsigned int *)&ptr->lineno = lineno; - *(void **)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; + *(psU32 *)&ptr->lineno = lineno; + *(psPtr *)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; ptr->previousBlock = NULL; @@ -371,5 +370,5 @@ } -void *p_psRealloc(void *vptr, size_t size, const char *file, int lineno) +psPtr p_psRealloc(psPtr vptr, size_t size, const char *file, psS32 lineno) { if (vptr == NULL) { @@ -377,5 +376,5 @@ } else { psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - bool isBlockLast = false; + psBool isBlockLast = false; if (checkMemBlock(ptr, __func__) != 0) { @@ -389,5 +388,5 @@ isBlockLast = (ptr == lastMemBlockAllocated); - ptr = (psMemBlock* ) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); + ptr = (psMemBlock* ) realloc(ptr, sizeof(psMemBlock) + size + sizeof(psPtr )); if (ptr == NULL) { @@ -399,5 +398,5 @@ ptr->userMemorySize = size; - *(void **)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; + *(psPtr *)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; if (isBlockLast) { @@ -423,5 +422,5 @@ } -void p_psFree(void *vptr, const char *file, int lineno) +void p_psFree(psPtr vptr, const char *file, psS32 lineno) { if (vptr == NULL) { @@ -444,8 +443,8 @@ * Check for memory leaks. */ -int psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd) -{ - int nleak = 0; - int j = 0; +psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd) +{ + psS32 nleak = 0; + psS32 j = 0; psMemBlock* topBlock = lastMemBlockAllocated; @@ -499,8 +498,8 @@ */ // return refCounter -psReferenceCount psMemGetRefCounter(void *vptr) +psReferenceCount psMemGetRefCounter(psPtr vptr) { psMemBlock* ptr; - unsigned int refCount; + psU32 refCount; if (vptr == NULL) { @@ -522,5 +521,5 @@ // increment and return refCounter -void *p_psMemIncrRefCounter(void *vptr, const char *file, int lineno) +psPtr p_psMemIncrRefCounter(psPtr vptr, const char *file, psS32 lineno) { psMemBlock* ptr; @@ -544,5 +543,5 @@ // decrement and return refCounter -void *p_psMemDecrRefCounter(void *vptr, const char *file, int lineno) +psPtr p_psMemDecrRefCounter(psPtr vptr, const char *file, psS32 lineno) { if (vptr == NULL) { @@ -593,5 +592,5 @@ if (ptr->userMemorySize < P_PS_LARGE_BLOCK_SIZE) { - int level = 1; + psS32 level = 1; while (ptr->userMemorySize >= recycleBinSize[level]) { @@ -635,5 +634,5 @@ } -void p_psMemSetDeallocator(void *vptr, psFreeFcn freeFcn) +void p_psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) { if (vptr == NULL) { @@ -650,5 +649,5 @@ } -psFreeFcn p_psMemGetDeallocator(void *vptr) +psFreeFcn p_psMemGetDeallocator(psPtr vptr) { if (vptr == NULL) { @@ -665,5 +664,5 @@ } -bool p_psMemGetPersistent(void *vptr) +psBool p_psMemGetPersistent(psPtr vptr) { if (vptr == NULL) { @@ -680,5 +679,5 @@ } -void p_psMemSetPersistent(void *vptr,bool value) +void p_psMemSetPersistent(psPtr vptr,psBool value) { if (vptr == NULL) { Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 2203) +++ /trunk/psLib/src/sys/psMemory.h (revision 2204) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 23:48:25 $ + * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,6 +22,7 @@ #include // needed for FILE -#include #include // we need a mutex to make this stuff thread safe. + +#include "psType.h" /** @addtogroup MemoryManagement @@ -48,11 +49,11 @@ /// typedef for memory identification numbers. Guaranteed to be some variety of integer. -typedef unsigned long psMemoryId; +typedef psU64 psMemoryId; /// typedef for a memory block's reference count. Guaranteed to be some variety of integer. -typedef unsigned long psReferenceCount; +typedef psU64 psReferenceCount; /// typedef for deallocator. -typedef void (*psFreeFcn) (void *ptr); +typedef void (*psFreeFcn) (psPtr ptr); /** Book-keeping data for storage allocator. @@ -63,5 +64,5 @@ typedef struct psMemBlock { - const void *startblock; ///< initialised to p_psMEMMAGIC + const psPtr startblock; ///< initialised to p_psMEMMAGIC struct psMemBlock* previousBlock; ///< previous block in allocation list struct psMemBlock* nextBlock; ///< next block allocation list @@ -70,9 +71,9 @@ const psMemoryId id; ///< a unique ID for this allocation const char *file; ///< set from __FILE__ in e.g. p_psAlloc - const int lineno; ///< set from __LINE__ in e.g. p_psAlloc + const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc pthread_mutex_t refCounterMutex; ///< mutex to ensure exclusive access to reference counter psReferenceCount refCounter; ///< how many times pointer is referenced - bool persistent; ///< marks if this non-user persistent data like error stack, etc. - const void *endblock; ///< initialised to p_psMEMMAGIC + psBool persistent; ///< marks if this non-user persistent data like error stack, etc. + const psPtr endblock; ///< initialised to p_psMEMMAGIC } psMemBlock; @@ -106,10 +107,10 @@ const psMemBlock* ptr, ///< the pointer to the problematic memory block. const char *file, ///< the file in which the problem originated - int lineno ///< the line number in which the problem originated + psS32 lineno ///< the line number in which the problem originated ); /** prototype of a callback function used when memory runs out * - * @return void* pointer to requested buffer of the size size_t, or NULL if memory could not + * @return psPtr pointer to requested buffer of the size size_t, or NULL if memory could not * be found. * @@ -117,5 +118,5 @@ * @ingroup memCallback */ -typedef void *(*psMemExhaustedCallback) ( +typedef psPtr (*psMemExhaustedCallback) ( size_t size ///< the size of buffer required ); @@ -123,15 +124,15 @@ /** Memory allocation. This operates much like malloc(), but is guaranteed to return a non-NULL value. * - * @return void* pointer to the allocated buffer. This will not be NULL. + * @return psPtr pointer to the allocated buffer. This will not be NULL. * @see psFree */ #ifdef DOXYGEN -void *psAlloc(size_t size ///< Size required +psPtr psAlloc(size_t size ///< Size required ); #else -void *p_psAlloc(size_t size, ///< Size required +psPtr p_psAlloc(size_t size, ///< Size required const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -148,5 +149,5 @@ */ void p_psMemSetDeallocator( - void *ptr, ///< the memory block to operate on + psPtr ptr, ///< the memory block to operate on psFreeFcn freeFcn ///< the function to be executed at deallocation ); @@ -162,5 +163,5 @@ */ psFreeFcn p_psMemGetDeallocator( - void *ptr ///< the memory block + psPtr ptr ///< the memory block ); @@ -176,6 +177,6 @@ */ void p_psMemSetPersistent( - void *ptr, ///< the memory block to operate on - bool value ///< true if memory is persistent, otherwise false + psPtr ptr, ///< the memory block to operate on + psBool value ///< true if memory is persistent, otherwise false ); @@ -187,8 +188,8 @@ * Memory marked as persistent is excluded from memory leak checks. * - * @return bool true if memory is marked persistent, otherwise false. - */ -bool p_psMemGetPersistent( - void *ptr ///< the memory block to check. + * @return psBool true if memory is marked persistent, otherwise false. + */ +psBool p_psMemGetPersistent( + psPtr ptr ///< the memory block to check. ); @@ -196,19 +197,19 @@ /** Memory re-allocation. This operates much like realloc(), but is guaranteed to return a non-NULL value. * - * @return void* pointer to resized buffer. This will not be NULL. + * @return psPtr pointer to resized buffer. This will not be NULL. * @see psAlloc, psFree */ #ifdef DOXYGEN -void *psRealloc( - void *ptr ///< Pointer to re-allocate +psPtr psRealloc( + psPtr ptr ///< Pointer to re-allocate size_t size, ///< Size required ); #else -void *p_psRealloc( - void *ptr, ///< Pointer to re-allocate +psPtr p_psRealloc( + psPtr ptr, ///< Pointer to re-allocate size_t size, ///< Size required const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -224,12 +225,12 @@ #ifdef DOXYGEN void psFree( - void *ptr, ///< Pointer to free, if NULL, function returns immediately. + psPtr ptr, ///< Pointer to free, if NULL, function returns immediately. ); #else void p_psFree( - void *ptr, ///< Pointer to free + psPtr ptr, ///< Pointer to free const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -248,10 +249,10 @@ * If memory leaks are found, the Memory Problem callback will be called as well. * - * return int number of memory blocks found as 'leaks', i.e., the number of currently allocated memory + * return psS32 number of memory blocks found as 'leaks', i.e., the number of currently allocated memory * blocks above id0 that have not been freed. * @see psAlloc, psFree, psgetMemId, psMemProblemCallbackSet * @ingroup memTracing */ -int psMemCheckLeaks( +psS32 psMemCheckLeaks( psMemoryId id0, ///< don't list blocks with id < id0 psMemBlock* ** arr, ///< pointer to array of pointers to leaked blocks, or NULL @@ -264,6 +265,6 @@ * @ingroup memTracing */ -int psMemCheckCorruption( - bool abort_on_error ///< Abort on detecting corruption? +psS32 psMemCheckCorruption( + psBool abort_on_error ///< Abort on detecting corruption? ); @@ -273,5 +274,5 @@ */ psReferenceCount psMemGetRefCounter( - void *vptr ///< Pointer to get refCounter for + psPtr vptr ///< Pointer to get refCounter for ); @@ -281,13 +282,13 @@ */ #ifdef DOXYGEN -void *psMemIncrRefCounter( - void *vptr ///< Pointer to increment refCounter, and return -); -#else - -void *p_psMemIncrRefCounter( - void *vptr, ///< Pointer to increment refCounter, and return +psPtr psMemIncrRefCounter( + psPtr vptr ///< Pointer to increment refCounter, and return +); +#else + +psPtr p_psMemIncrRefCounter( + psPtr vptr, ///< Pointer to increment refCounter, and return const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -299,17 +300,17 @@ * @ingroup memRefCount * - * @return void* the pointer deremented in refCount, or NULL if pointer is + * @return psPtr the pointer deremented in refCount, or NULL if pointer is * fully dereferenced. */ #ifdef DOXYGEN -void* psMemDecrRefCounter( - void* vptr ///< Pointer to decrement refCounter, and return -); -#else - -void *p_psMemDecrRefCounter( - void *vptr, ///< Pointer to decrement refCounter, and return +psPtr psMemDecrRefCounter( + psPtr vptr ///< Pointer to decrement refCounter, and return +); +#else + +psPtr p_psMemDecrRefCounter( + psPtr vptr, ///< Pointer to decrement refCounter, and return const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); Index: /trunk/psLib/src/sys/psString.c =================================================================== --- /trunk/psLib/src/sys/psString.c (revision 2203) +++ /trunk/psLib/src/sys/psString.c (revision 2204) @@ -9,6 +9,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 01:05:41 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ } -char *psStringNCopy(const char *str, int nChar) +char *psStringNCopy(const char *str, psS32 nChar) { char *returnValue = NULL; Index: /trunk/psLib/src/sys/psString.h =================================================================== --- /trunk/psLib/src/sys/psString.h (revision 2203) +++ /trunk/psLib/src/sys/psString.h (revision 2204) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-10 01:55:34 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,4 +19,5 @@ #define PS_STRING_H +#include "psType.h" /** This macro will convert the argument to a quoted string */ @@ -62,5 +63,5 @@ /**< Input string of characters to copy */ - int nChar + psS32 nChar /**< Number of bytes to allocate for string copy */ ); Index: /trunk/psLib/src/sys/psTrace.c =================================================================== --- /trunk/psLib/src/sys/psTrace.c (revision 2203) +++ /trunk/psLib/src/sys/psTrace.c (revision 2204) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-20 22:03:35 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -34,5 +34,5 @@ PS_DEFAULT_TRACE_LEVEL: This should only be used when adding the - intermediate components of a long name. Ie. the "B" in .A.B.C + intermediate components of a psS64 name. Ie. the "B" in .A.B.C *****************************************************************************/ @@ -56,10 +56,10 @@ static void componentFree(p_psComponent* comp); -static p_psComponent* componentAlloc(const char *name, int level); +static p_psComponent* componentAlloc(const char *name, psS32 level); /***************************************************************************** componentAlloc(): allocate memory for a new node, and initialize members. *****************************************************************************/ -static p_psComponent* componentAlloc(const char *name, int level) +static p_psComponent* componentAlloc(const char *name, psS32 level) { p_psComponent* comp = psAlloc(sizeof(p_psComponent)); @@ -68,5 +68,5 @@ p_psMemSetDeallocator(comp, (psFreeFcn) componentFree); comp->name = psStringCopy(name); - p_psMemSetPersistent((void*)comp->name,true); + p_psMemSetPersistent((psPtr)comp->name,true); comp->level = level; comp->n = 0; @@ -86,5 +86,5 @@ if (comp->subcomp != NULL) { - for (int i = 0; i < comp->n; i++) { + for (psS32 i = 0; i < comp->n; i++) { p_psMemSetPersistent(comp->subcomp[i],false); psFree(comp->subcomp[i]); @@ -94,6 +94,6 @@ } - p_psMemSetPersistent((void*)comp->name,false); - psFree((void*)comp->name); + p_psMemSetPersistent((psPtr)comp->name,false); + psFree((psPtr)comp->name); } @@ -115,5 +115,5 @@ void p_psTraceReset(p_psComponent* currentNode) { - int i = 0; + psS32 i = 0; if (NULL == currentNode) { @@ -149,12 +149,12 @@ to ANSI-C. *****************************************************************************/ -static bool componentAdd(const char *addNodeName, int level) -{ - int i = 0; // Loop index variable. +static psBool componentAdd(const char *addNodeName, psS32 level) +{ + psS32 i = 0; // Loop index variable. char name[strlen(addNodeName) + 1]; // buffer for writeable copy. char *pname = name; char *firstComponent = NULL; // first component of name p_psComponent* currentNode = cRoot; - int nodeExists = 0; + psS32 nodeExists = 0; // XXX: Verify that this is the correct behavior. @@ -240,6 +240,6 @@ zero *****************************************************************************/ -bool psTraceSetLevel(const char *comp, // component of interest - int level) // desired trace level +psBool psTraceSetLevel(const char *comp, // component of interest + psS32 level) // desired trace level { char *compName = NULL; @@ -299,5 +299,5 @@ The trace level of the "name" component. *****************************************************************************/ -static int doGetTraceLevel(const char *aname) +static psS32 doGetTraceLevel(const char *aname) { char name[strlen(aname) + 1]; // need a writeable copy: for strsep() @@ -305,6 +305,6 @@ char *firstComponent = NULL; // first component of name p_psComponent* currentNode = cRoot; - int i = 0; - int defaultLevel = 0; + psS32 i = 0; + psS32 defaultLevel = 0; if (NULL == currentNode) { @@ -365,8 +365,8 @@ The level of "name" in the root component tree. *****************************************************************************/ -int psTraceGetLevel(const char *name) +psS32 psTraceGetLevel(const char *name) { char *compName = NULL; - int traceLevel; + psS32 traceLevel; if (cRoot == NULL) { @@ -401,8 +401,8 @@ *****************************************************************************/ static void doPrintTraceLevels(const p_psComponent* comp, - int depth, - int defLevel) -{ - int i = 0; + psS32 depth, + psS32 defLevel) +{ + psS32 i = 0; if (comp->name[0] == '\0') { @@ -472,10 +472,10 @@ *****************************************************************************/ void p_psTrace(const char *comp, // component being traced - int level, // desired trace level + psS32 level, // desired trace level ...) // arguments { char *fmt = NULL; va_list ap; - int i = 0; + psS32 i = 0; if (NULL == comp) { Index: /trunk/psLib/src/sys/psTrace.h =================================================================== --- /trunk/psLib/src/sys/psTrace.h (revision 2203) +++ /trunk/psLib/src/sys/psTrace.h (revision 2204) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 23:14:04 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,6 +50,6 @@ { const char *name; // last part of name of component - int level; // trace level for this component - int n; // number of subcomponents + psS32 level; // trace level for this component + psS32 n; // number of subcomponents struct p_psComponent* *subcomp; // next level of subcomponents } @@ -59,5 +59,5 @@ /// Send a trace message void p_psTrace(const char *facil, ///< facilty of interest - int myLevel, ///< desired trace level + psS32 myLevel, ///< desired trace level ...) ///< trace message arguments ; @@ -65,10 +65,10 @@ /// Set trace level -bool psTraceSetLevel(const char *facil, ///< facilty of interest - int level) ///< desired trace level +psBool psTraceSetLevel(const char *facil, ///< facilty of interest + psS32 level) ///< desired trace level ; /// Get the trace level -int psTraceGetLevel(const char *facil) ///< facilty of interest +psS32 psTraceGetLevel(const char *facil) ///< facilty of interest ; Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 2203) +++ /trunk/psLib/src/sys/psType.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 21:40:13 $ +* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -23,4 +23,5 @@ #include #include +#include /// @addtogroup DataContainer @@ -52,5 +53,6 @@ typedef float _Complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers typedef double _Complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers -typedef void *psPTR; ///< void pointer +typedef void* psPtr; ///< void pointer +typedef bool psBool; ///< boolean value typedef enum { @@ -60,7 +62,7 @@ PS_TYPE_S64 = 0x0108, ///< Long integer. PS_TYPE_U8 = 0x0301, ///< Unsigned character. - PS_TYPE_U16 = 0x0302, ///< Unsigned short integer. + PS_TYPE_U16 = 0x0302, ///< Unsigned psS16 integer. PS_TYPE_U32 = 0x0304, ///< Unsigned integer. - PS_TYPE_U64 = 0x0308, ///< Unsigned long integer. + PS_TYPE_U64 = 0x0308, ///< Unsigned psS64 integer. PS_TYPE_F32 = 0x0404, ///< Single-precision Floating point. PS_TYPE_F64 = 0x0408, ///< Double-precision floating point. @@ -115,5 +117,5 @@ #define PS_TYPE_C32_NAME "psC32" #define PS_TYPE_C64_NAME "psC64" -#define PS_TYPE_PTR_NAME "psPTR" +#define PS_TYPE_PTR_NAME "psPtr" #define PS_TYPE_NAME(value,type) \ @@ -183,5 +185,5 @@ #define PS_IS_PSELEMTYPE_COMPLEX(x) ((x & 0x800) == 0x800) /// Macro to determine the storage size, in bytes, of the psElemType. -#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) ) +#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(psPtr) :(x & 0xFF) ) /** Dimensions of a data type. Index: /trunk/psLib/src/sysUtils/psError.c =================================================================== --- /trunk/psLib/src/sysUtils/psError.c (revision 2203) +++ /trunk/psLib/src/sysUtils/psError.c (revision 2204) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-27 20:38:02 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #define MAX_ERROR_STACK_SIZE 64 static psErr* errorStack[MAX_ERROR_STACK_SIZE]; -static unsigned int errorStackSize = 0; +static psU32 errorStackSize = 0; pthread_mutex_t lockErrorStack = PTHREAD_MUTEX_INITIALIZER; @@ -84,5 +84,5 @@ { pthread_mutex_lock(&lockErrorStack); - for (int lcv=0;lcvmsg,false); p_psMemSetPersistent(errorStack[lcv]->name,false); @@ -94,5 +94,5 @@ } -psErrorCode psErrorMsg(const char *name, psErrorCode code, bool new, const char* fmt, ...) +psErrorCode psErrorMsg(const char *name, psErrorCode code, psBool new, const char* fmt, ...) { char errMsg[1024]; @@ -131,5 +131,5 @@ } -psErr* psErrorGet(int which) +psErr* psErrorGet(psS32 which) { psErr* result; @@ -180,5 +180,5 @@ vfprintf(fd,fmt,va); - for (int lcv=0;lcvcode >= PS_ERR_BASE) { fprintf(fd," -> %s: %s\n %s\n", Index: /trunk/psLib/src/sysUtils/psError.h =================================================================== --- /trunk/psLib/src/sysUtils/psError.h (revision 2203) +++ /trunk/psLib/src/sysUtils/psError.h (revision 2204) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-23 22:18:13 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ */ psErr* psErrorGet( - int which ///< position in the error stack. 0 is last error on stack. + psS32 which ///< position in the error stack. 0 is last error on stack. ); @@ -121,5 +121,5 @@ const char *name, ///< Name of error in the form aaa.bbb.ccc psErrorCode code, ///< Error class code - bool new, ///< true if error originates at this location + psBool new, ///< true if error originates at this location const char* fmt, ///< printf style formatting statement defining error message ... Index: /trunk/psLib/src/sysUtils/psErrorCodes.c =================================================================== --- /trunk/psLib/src/sysUtils/psErrorCodes.c (revision 2203) +++ /trunk/psLib/src/sysUtils/psErrorCodes.c (revision 2204) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 21:14:58 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ // first, search the static error codes - int n = 0; + psS32 n = 0; while(staticErrorCodes[n].code != PS_ERR_N_ERR_CLASSES && staticErrorCodes[n].code != code) { @@ -88,5 +88,5 @@ static void freeErrorDescription(psErrorDescription* err) { - psFree((void*)err->description); + psFree((psPtr)err->description); } @@ -125,5 +125,5 @@ void psErrorRegister(const psErrorDescription* errors, - int nerror) + psS32 nerror) { if (nerror < 1) { @@ -143,9 +143,9 @@ } - for (int i=0;idescription,true); + p_psMemSetPersistent((psPtr)err->description,true); if (! psListAdd(dynamicErrorCodes, PS_LIST_HEAD, @@ -162,5 +162,5 @@ } -bool p_psErrorUnregister(psErrorCode code) +psBool p_psErrorUnregister(psErrorCode code) { // Check input argument is non-negative @@ -179,4 +179,4 @@ } - return psListRemove(dynamicErrorCodes,PS_LIST_UNKNOWN,(void*)desc); + return psListRemove(dynamicErrorCodes,PS_LIST_UNKNOWN,(psPtr)desc); } Index: /trunk/psLib/src/sysUtils/psErrorCodes.h =================================================================== --- /trunk/psLib/src/sysUtils/psErrorCodes.h (revision 2203) +++ /trunk/psLib/src/sysUtils/psErrorCodes.h (revision 2204) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 21:14:58 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -15,4 +15,6 @@ #ifndef PS_ERROR_CODES_H #define PS_ERROR_CODES_H + +#include "psType.h" /* N.B., lines between '//~Start' and '//~End' are automatic generated from @@ -93,12 +95,12 @@ void psErrorRegister( const psErrorDescription* errors, ///< Array of error codes to register - int nerror ///< number of errors in input array + psS32 nerror ///< number of errors in input array ); /** Clears error codes registered via psErrorRegister. * - * @return bool TRUE if given errorcode was removed, otherwise FALSE. + * @return psBool TRUE if given errorcode was removed, otherwise FALSE. */ -bool p_psErrorUnregister( +psBool p_psErrorUnregister( psErrorCode code ///< the error code to find and remove ); Index: /trunk/psLib/src/sysUtils/psLogMsg.c =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.c (revision 2203) +++ /trunk/psLib/src/sysUtils/psLogMsg.c (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,11 +19,11 @@ /***************************************************************************** NOTES: currently, the prototype code has the following global variables: - static int p_psGlobalLogDest; - static int p_psGlobalLogLevel; - static int p_psLogTime; - static int p_psLogHost; - static int p_psLogLevel; - static int p_psLogName; - static int p_psLogMsg; + static psS32 p_psGlobalLogDest; + static psS32 p_psGlobalLogLevel; + static psS32 p_psLogTime; + static psS32 p_psLogHost; + static psS32 p_psLogLevel; + static psS32 p_psLogName; + static psS32 p_psLogMsg; *****************************************************************************/ #include @@ -34,5 +34,4 @@ #include #include -#include #include "psLogMsg.h" @@ -49,15 +48,15 @@ static FILE *logDest = (FILE *) 1; // flag to initialize to stderr before using. -static int globalLogLevel = PS_LOG_INFO; // log all messages at this or above -static bool logTime = true; // Flag to include time info -static bool logHost = true; // Flag to include host info -static bool logLevel = true; // Flag to include level info -static bool logName = true; // Flag to include name info -static bool logMsg = true; // Flag to include message info +static psS32 globalLogLevel = PS_LOG_INFO; // log all messages at this or above +static psBool logTime = true; // Flag to include time info +static psBool logHost = true; // Flag to include host info +static psBool logLevel = true; // Flag to include level info +static psBool logName = true; // Flag to include name info +static psBool logMsg = true; // Flag to include message info /***************************************************************************** psLogSetLevel(): Set the current log level and return old level. Input: - level (int): the new log level. + level (psS32): the new log level. Output: none @@ -65,8 +64,8 @@ The old log level. *****************************************************************************/ -int psLogSetLevel(int level) +psS32 psLogSetLevel(psS32 level) { // Save old global log level for changing it. - int oldLevel = globalLogLevel; + psS32 oldLevel = globalLogLevel; if ((level < MIN_LOG_LEVEL) || (level > MAX_LOG_LEVEL)) { @@ -86,5 +85,5 @@ Input: - dest (int): the new log destination + dest (psS32): the new log destination Output: None. @@ -92,5 +91,5 @@ An integer specifying the old log destination. *****************************************************************************/ -bool psLogSetDestination(const char *dest) +psBool psLogSetDestination(const char *dest) { char protocol[5]; @@ -245,7 +244,7 @@ NULL. *****************************************************************************/ -void psLogMsgV(const char *name, int level, const char *fmt, va_list ap) -{ - static int first = 1; // Flag for calling gethostname() +void psLogMsgV(const char *name, psS32 level, const char *fmt, va_list ap) +{ + static psS32 first = 1; // Flag for calling gethostname() static char hostname[HOST_NAME_MAX + 1]; @@ -254,5 +253,5 @@ char head[MAX_LOG_LINE_LENGTH + 2]; // the added two are for the ending | and \0 char *head_ptr = head; // where we've got to in head - int maxLength = MAX_LOG_LINE_LENGTH; + psS32 maxLength = MAX_LOG_LINE_LENGTH; time_t clock = time(NULL); // The current time. struct tm *utc = gmtime(&clock); // The current gm time. @@ -375,5 +374,5 @@ NULL *****************************************************************************/ -void psLogMsg(const char *name, int level, const char *fmt, ...) +void psLogMsg(const char *name, psS32 level, const char *fmt, ...) { va_list ap; Index: /trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.h (revision 2203) +++ /trunk/psLib/src/sysUtils/psLogMsg.h (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,6 @@ #define PS_LOG_MSG_H #include -#include + +#include "psType.h" /** @addtogroup LogTrace @@ -31,7 +32,7 @@ * argument which can specify more general log destinations. * - * @return int true if set successfully, otherwise false. + * @return psS32 true if set successfully, otherwise false. */ -bool psLogSetDestination( +psBool psLogSetDestination( const char *dest ///< Specifies where to send messages. ); @@ -43,8 +44,8 @@ * be displayed. * - * @return int old logging level + * @return psS32 old logging level */ -int psLogSetLevel( - int level ///< Specifies the system log level +psS32 psLogSetLevel( + psS32 level ///< Specifies the system log level ); @@ -68,5 +69,5 @@ void psLogMsg( const char *name, ///< name of the log source - int myLevel, ///< severity level of this log message + psS32 myLevel, ///< severity level of this log message const char *fmt, ///< printf-style format command ... @@ -79,5 +80,5 @@ void psLogMsgV( const char *name, ///< name of the log source - int myLevel, ///< severity level of this log message + psS32 myLevel, ///< severity level of this log message const char *fmt, ///< printf-style format command va_list ap ///< varargs argument list Index: /trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.c (revision 2203) +++ /trunk/psLib/src/sysUtils/psMemory.c (revision 2204) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-09-21 22:30:19 $ +* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,4 @@ #include #include -#include #include @@ -28,9 +27,9 @@ #include "psSysUtilsErrors.h" -#define P_PS_MEMMAGIC (void *)0xdeadbeef // Magic number in psMemBlock header +#define P_PS_MEMMAGIC (psPtr )0xdeadbeef // Magic number in psMemBlock header #define P_PS_LARGE_BLOCK_SIZE 65536 // size where under, we try to recycle -static int checkMemBlock(const psMemBlock* m, const char *funcName); +static psS32 checkMemBlock(const psMemBlock* m, const char *funcName); static psMemBlock* lastMemBlockAllocated = NULL; static pthread_mutex_t memBlockListMutex = PTHREAD_MUTEX_INITIALIZER; @@ -39,8 +38,8 @@ static pthread_mutex_t recycleMemBlockListMutex = PTHREAD_MUTEX_INITIALIZER; -static int recycleBins = 13; -static int recycleBinSize[14] = { - 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, P_PS_LARGE_BLOCK_SIZE - }; +static psS32 recycleBins = 13; +static psS32 recycleBinSize[14] = { + 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, P_PS_LARGE_BLOCK_SIZE + }; // N.B. recycleBinSize should be terminated by P_PS_LARGE_BLOCK_SIZE (simplifies search loops) @@ -61,10 +60,10 @@ * Default memExhausted callback. */ -static void *memExhaustedCallbackDefault(size_t size) -{ - void *ptr = NULL; +static psPtr memExhaustedCallbackDefault(size_t size) +{ + psPtr ptr = NULL; pthread_mutex_lock(&recycleMemBlockListMutex); - int level = recycleBins - 1; + psS32 level = recycleBins - 1; while (level >= 0 && ptr == NULL) { @@ -98,5 +97,5 @@ } -static void memProblemCallbackDefault(const psMemBlock* ptr, const char *file, int lineno) +static void memProblemCallbackDefault(const psMemBlock* ptr, const char *file, psS32 lineno) { if (ptr->refCounter < 1) { @@ -223,5 +222,5 @@ */ -static int checkMemBlock(const psMemBlock* m, const char *funcName) +static psS32 checkMemBlock(const psMemBlock* m, const char *funcName) { // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked, @@ -248,5 +247,5 @@ return 1; } - if (*(void **)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) { + if (*(psPtr *)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) { psErrorMsg(PS_ERRORNAME_DOMAIN "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, PS_ERRORTEXT_psMemory_OVERFLOW, @@ -258,8 +257,8 @@ } -int psMemCheckCorruption(bool abort_on_error) -{ - int nbad = 0; // number of bad blocks - bool failure = false; +psS32 psMemCheckCorruption(psBool abort_on_error) +{ + psS32 nbad = 0; // number of bad blocks + psBool failure = false; // get exclusive access to the memBlock list to avoid it changing on us while we use it. @@ -289,5 +288,5 @@ } -void *p_psAlloc(size_t size, const char *file, int lineno) +psPtr p_psAlloc(size_t size, const char *file, psS32 lineno) { @@ -297,5 +296,5 @@ if (size < P_PS_LARGE_BLOCK_SIZE) { // find the bin we need. - int level = 0; + psS32 level = 0; while (size > recycleBinSize[level]) { @@ -323,5 +322,5 @@ if (ptr == NULL) { - ptr = malloc(sizeof(psMemBlock) + size + sizeof(void *)); + ptr = malloc(sizeof(psMemBlock) + size + sizeof(psPtr )); if (ptr == NULL) { @@ -332,6 +331,6 @@ } - ptr->startblock = P_PS_MEMMAGIC; - ptr->endblock = P_PS_MEMMAGIC; + *(psPtr*)&ptr->startblock = P_PS_MEMMAGIC; + *(psPtr*)&ptr->endblock = P_PS_MEMMAGIC; ptr->userMemorySize = size; pthread_mutex_init(&ptr->refCounterMutex, NULL); @@ -345,6 +344,6 @@ ptr->freeFcn = NULL; ptr->persistent = false; - *(unsigned int *)&ptr->lineno = lineno; - *(void **)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; + *(psU32 *)&ptr->lineno = lineno; + *(psPtr *)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; ptr->previousBlock = NULL; @@ -371,5 +370,5 @@ } -void *p_psRealloc(void *vptr, size_t size, const char *file, int lineno) +psPtr p_psRealloc(psPtr vptr, size_t size, const char *file, psS32 lineno) { if (vptr == NULL) { @@ -377,5 +376,5 @@ } else { psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - bool isBlockLast = false; + psBool isBlockLast = false; if (checkMemBlock(ptr, __func__) != 0) { @@ -389,5 +388,5 @@ isBlockLast = (ptr == lastMemBlockAllocated); - ptr = (psMemBlock* ) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); + ptr = (psMemBlock* ) realloc(ptr, sizeof(psMemBlock) + size + sizeof(psPtr )); if (ptr == NULL) { @@ -399,5 +398,5 @@ ptr->userMemorySize = size; - *(void **)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; + *(psPtr *)((int8_t *) (ptr + 1) + size) = P_PS_MEMMAGIC; if (isBlockLast) { @@ -423,5 +422,5 @@ } -void p_psFree(void *vptr, const char *file, int lineno) +void p_psFree(psPtr vptr, const char *file, psS32 lineno) { if (vptr == NULL) { @@ -444,8 +443,8 @@ * Check for memory leaks. */ -int psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd) -{ - int nleak = 0; - int j = 0; +psS32 psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd) +{ + psS32 nleak = 0; + psS32 j = 0; psMemBlock* topBlock = lastMemBlockAllocated; @@ -499,8 +498,8 @@ */ // return refCounter -psReferenceCount psMemGetRefCounter(void *vptr) +psReferenceCount psMemGetRefCounter(psPtr vptr) { psMemBlock* ptr; - unsigned int refCount; + psU32 refCount; if (vptr == NULL) { @@ -522,5 +521,5 @@ // increment and return refCounter -void *p_psMemIncrRefCounter(void *vptr, const char *file, int lineno) +psPtr p_psMemIncrRefCounter(psPtr vptr, const char *file, psS32 lineno) { psMemBlock* ptr; @@ -544,5 +543,5 @@ // decrement and return refCounter -void *p_psMemDecrRefCounter(void *vptr, const char *file, int lineno) +psPtr p_psMemDecrRefCounter(psPtr vptr, const char *file, psS32 lineno) { if (vptr == NULL) { @@ -593,5 +592,5 @@ if (ptr->userMemorySize < P_PS_LARGE_BLOCK_SIZE) { - int level = 1; + psS32 level = 1; while (ptr->userMemorySize >= recycleBinSize[level]) { @@ -635,5 +634,5 @@ } -void p_psMemSetDeallocator(void *vptr, psFreeFcn freeFcn) +void p_psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) { if (vptr == NULL) { @@ -650,5 +649,5 @@ } -psFreeFcn p_psMemGetDeallocator(void *vptr) +psFreeFcn p_psMemGetDeallocator(psPtr vptr) { if (vptr == NULL) { @@ -665,5 +664,5 @@ } -bool p_psMemGetPersistent(void *vptr) +psBool p_psMemGetPersistent(psPtr vptr) { if (vptr == NULL) { @@ -680,5 +679,5 @@ } -void p_psMemSetPersistent(void *vptr,bool value) +void p_psMemSetPersistent(psPtr vptr,psBool value) { if (vptr == NULL) { Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 2203) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 2204) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 23:48:25 $ + * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,6 +22,7 @@ #include // needed for FILE -#include #include // we need a mutex to make this stuff thread safe. + +#include "psType.h" /** @addtogroup MemoryManagement @@ -48,11 +49,11 @@ /// typedef for memory identification numbers. Guaranteed to be some variety of integer. -typedef unsigned long psMemoryId; +typedef psU64 psMemoryId; /// typedef for a memory block's reference count. Guaranteed to be some variety of integer. -typedef unsigned long psReferenceCount; +typedef psU64 psReferenceCount; /// typedef for deallocator. -typedef void (*psFreeFcn) (void *ptr); +typedef void (*psFreeFcn) (psPtr ptr); /** Book-keeping data for storage allocator. @@ -63,5 +64,5 @@ typedef struct psMemBlock { - const void *startblock; ///< initialised to p_psMEMMAGIC + const psPtr startblock; ///< initialised to p_psMEMMAGIC struct psMemBlock* previousBlock; ///< previous block in allocation list struct psMemBlock* nextBlock; ///< next block allocation list @@ -70,9 +71,9 @@ const psMemoryId id; ///< a unique ID for this allocation const char *file; ///< set from __FILE__ in e.g. p_psAlloc - const int lineno; ///< set from __LINE__ in e.g. p_psAlloc + const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc pthread_mutex_t refCounterMutex; ///< mutex to ensure exclusive access to reference counter psReferenceCount refCounter; ///< how many times pointer is referenced - bool persistent; ///< marks if this non-user persistent data like error stack, etc. - const void *endblock; ///< initialised to p_psMEMMAGIC + psBool persistent; ///< marks if this non-user persistent data like error stack, etc. + const psPtr endblock; ///< initialised to p_psMEMMAGIC } psMemBlock; @@ -106,10 +107,10 @@ const psMemBlock* ptr, ///< the pointer to the problematic memory block. const char *file, ///< the file in which the problem originated - int lineno ///< the line number in which the problem originated + psS32 lineno ///< the line number in which the problem originated ); /** prototype of a callback function used when memory runs out * - * @return void* pointer to requested buffer of the size size_t, or NULL if memory could not + * @return psPtr pointer to requested buffer of the size size_t, or NULL if memory could not * be found. * @@ -117,5 +118,5 @@ * @ingroup memCallback */ -typedef void *(*psMemExhaustedCallback) ( +typedef psPtr (*psMemExhaustedCallback) ( size_t size ///< the size of buffer required ); @@ -123,15 +124,15 @@ /** Memory allocation. This operates much like malloc(), but is guaranteed to return a non-NULL value. * - * @return void* pointer to the allocated buffer. This will not be NULL. + * @return psPtr pointer to the allocated buffer. This will not be NULL. * @see psFree */ #ifdef DOXYGEN -void *psAlloc(size_t size ///< Size required +psPtr psAlloc(size_t size ///< Size required ); #else -void *p_psAlloc(size_t size, ///< Size required +psPtr p_psAlloc(size_t size, ///< Size required const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -148,5 +149,5 @@ */ void p_psMemSetDeallocator( - void *ptr, ///< the memory block to operate on + psPtr ptr, ///< the memory block to operate on psFreeFcn freeFcn ///< the function to be executed at deallocation ); @@ -162,5 +163,5 @@ */ psFreeFcn p_psMemGetDeallocator( - void *ptr ///< the memory block + psPtr ptr ///< the memory block ); @@ -176,6 +177,6 @@ */ void p_psMemSetPersistent( - void *ptr, ///< the memory block to operate on - bool value ///< true if memory is persistent, otherwise false + psPtr ptr, ///< the memory block to operate on + psBool value ///< true if memory is persistent, otherwise false ); @@ -187,8 +188,8 @@ * Memory marked as persistent is excluded from memory leak checks. * - * @return bool true if memory is marked persistent, otherwise false. - */ -bool p_psMemGetPersistent( - void *ptr ///< the memory block to check. + * @return psBool true if memory is marked persistent, otherwise false. + */ +psBool p_psMemGetPersistent( + psPtr ptr ///< the memory block to check. ); @@ -196,19 +197,19 @@ /** Memory re-allocation. This operates much like realloc(), but is guaranteed to return a non-NULL value. * - * @return void* pointer to resized buffer. This will not be NULL. + * @return psPtr pointer to resized buffer. This will not be NULL. * @see psAlloc, psFree */ #ifdef DOXYGEN -void *psRealloc( - void *ptr ///< Pointer to re-allocate +psPtr psRealloc( + psPtr ptr ///< Pointer to re-allocate size_t size, ///< Size required ); #else -void *p_psRealloc( - void *ptr, ///< Pointer to re-allocate +psPtr p_psRealloc( + psPtr ptr, ///< Pointer to re-allocate size_t size, ///< Size required const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -224,12 +225,12 @@ #ifdef DOXYGEN void psFree( - void *ptr, ///< Pointer to free, if NULL, function returns immediately. + psPtr ptr, ///< Pointer to free, if NULL, function returns immediately. ); #else void p_psFree( - void *ptr, ///< Pointer to free + psPtr ptr, ///< Pointer to free const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -248,10 +249,10 @@ * If memory leaks are found, the Memory Problem callback will be called as well. * - * return int number of memory blocks found as 'leaks', i.e., the number of currently allocated memory + * return psS32 number of memory blocks found as 'leaks', i.e., the number of currently allocated memory * blocks above id0 that have not been freed. * @see psAlloc, psFree, psgetMemId, psMemProblemCallbackSet * @ingroup memTracing */ -int psMemCheckLeaks( +psS32 psMemCheckLeaks( psMemoryId id0, ///< don't list blocks with id < id0 psMemBlock* ** arr, ///< pointer to array of pointers to leaked blocks, or NULL @@ -264,6 +265,6 @@ * @ingroup memTracing */ -int psMemCheckCorruption( - bool abort_on_error ///< Abort on detecting corruption? +psS32 psMemCheckCorruption( + psBool abort_on_error ///< Abort on detecting corruption? ); @@ -273,5 +274,5 @@ */ psReferenceCount psMemGetRefCounter( - void *vptr ///< Pointer to get refCounter for + psPtr vptr ///< Pointer to get refCounter for ); @@ -281,13 +282,13 @@ */ #ifdef DOXYGEN -void *psMemIncrRefCounter( - void *vptr ///< Pointer to increment refCounter, and return -); -#else - -void *p_psMemIncrRefCounter( - void *vptr, ///< Pointer to increment refCounter, and return +psPtr psMemIncrRefCounter( + psPtr vptr ///< Pointer to increment refCounter, and return +); +#else + +psPtr p_psMemIncrRefCounter( + psPtr vptr, ///< Pointer to increment refCounter, and return const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); @@ -299,17 +300,17 @@ * @ingroup memRefCount * - * @return void* the pointer deremented in refCount, or NULL if pointer is + * @return psPtr the pointer deremented in refCount, or NULL if pointer is * fully dereferenced. */ #ifdef DOXYGEN -void* psMemDecrRefCounter( - void* vptr ///< Pointer to decrement refCounter, and return -); -#else - -void *p_psMemDecrRefCounter( - void *vptr, ///< Pointer to decrement refCounter, and return +psPtr psMemDecrRefCounter( + psPtr vptr ///< Pointer to decrement refCounter, and return +); +#else + +psPtr p_psMemDecrRefCounter( + psPtr vptr, ///< Pointer to decrement refCounter, and return const char *file, ///< File of call - int lineno ///< Line number of call + psS32 lineno ///< Line number of call ); Index: /trunk/psLib/src/sysUtils/psString.c =================================================================== --- /trunk/psLib/src/sysUtils/psString.c (revision 2203) +++ /trunk/psLib/src/sysUtils/psString.c (revision 2204) @@ -9,6 +9,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 01:05:41 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ } -char *psStringNCopy(const char *str, int nChar) +char *psStringNCopy(const char *str, psS32 nChar) { char *returnValue = NULL; Index: /trunk/psLib/src/sysUtils/psString.h =================================================================== --- /trunk/psLib/src/sysUtils/psString.h (revision 2203) +++ /trunk/psLib/src/sysUtils/psString.h (revision 2204) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-10 01:55:34 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,4 +19,5 @@ #define PS_STRING_H +#include "psType.h" /** This macro will convert the argument to a quoted string */ @@ -62,5 +63,5 @@ /**< Input string of characters to copy */ - int nChar + psS32 nChar /**< Number of bytes to allocate for string copy */ ); Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat =================================================================== --- /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat (revision 2203) +++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat (revision 2204) Index: /trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.c (revision 2203) +++ /trunk/psLib/src/sysUtils/psTrace.c (revision 2204) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-20 22:03:35 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -34,5 +34,5 @@ PS_DEFAULT_TRACE_LEVEL: This should only be used when adding the - intermediate components of a long name. Ie. the "B" in .A.B.C + intermediate components of a psS64 name. Ie. the "B" in .A.B.C *****************************************************************************/ @@ -56,10 +56,10 @@ static void componentFree(p_psComponent* comp); -static p_psComponent* componentAlloc(const char *name, int level); +static p_psComponent* componentAlloc(const char *name, psS32 level); /***************************************************************************** componentAlloc(): allocate memory for a new node, and initialize members. *****************************************************************************/ -static p_psComponent* componentAlloc(const char *name, int level) +static p_psComponent* componentAlloc(const char *name, psS32 level) { p_psComponent* comp = psAlloc(sizeof(p_psComponent)); @@ -68,5 +68,5 @@ p_psMemSetDeallocator(comp, (psFreeFcn) componentFree); comp->name = psStringCopy(name); - p_psMemSetPersistent((void*)comp->name,true); + p_psMemSetPersistent((psPtr)comp->name,true); comp->level = level; comp->n = 0; @@ -86,5 +86,5 @@ if (comp->subcomp != NULL) { - for (int i = 0; i < comp->n; i++) { + for (psS32 i = 0; i < comp->n; i++) { p_psMemSetPersistent(comp->subcomp[i],false); psFree(comp->subcomp[i]); @@ -94,6 +94,6 @@ } - p_psMemSetPersistent((void*)comp->name,false); - psFree((void*)comp->name); + p_psMemSetPersistent((psPtr)comp->name,false); + psFree((psPtr)comp->name); } @@ -115,5 +115,5 @@ void p_psTraceReset(p_psComponent* currentNode) { - int i = 0; + psS32 i = 0; if (NULL == currentNode) { @@ -149,12 +149,12 @@ to ANSI-C. *****************************************************************************/ -static bool componentAdd(const char *addNodeName, int level) -{ - int i = 0; // Loop index variable. +static psBool componentAdd(const char *addNodeName, psS32 level) +{ + psS32 i = 0; // Loop index variable. char name[strlen(addNodeName) + 1]; // buffer for writeable copy. char *pname = name; char *firstComponent = NULL; // first component of name p_psComponent* currentNode = cRoot; - int nodeExists = 0; + psS32 nodeExists = 0; // XXX: Verify that this is the correct behavior. @@ -240,6 +240,6 @@ zero *****************************************************************************/ -bool psTraceSetLevel(const char *comp, // component of interest - int level) // desired trace level +psBool psTraceSetLevel(const char *comp, // component of interest + psS32 level) // desired trace level { char *compName = NULL; @@ -299,5 +299,5 @@ The trace level of the "name" component. *****************************************************************************/ -static int doGetTraceLevel(const char *aname) +static psS32 doGetTraceLevel(const char *aname) { char name[strlen(aname) + 1]; // need a writeable copy: for strsep() @@ -305,6 +305,6 @@ char *firstComponent = NULL; // first component of name p_psComponent* currentNode = cRoot; - int i = 0; - int defaultLevel = 0; + psS32 i = 0; + psS32 defaultLevel = 0; if (NULL == currentNode) { @@ -365,8 +365,8 @@ The level of "name" in the root component tree. *****************************************************************************/ -int psTraceGetLevel(const char *name) +psS32 psTraceGetLevel(const char *name) { char *compName = NULL; - int traceLevel; + psS32 traceLevel; if (cRoot == NULL) { @@ -401,8 +401,8 @@ *****************************************************************************/ static void doPrintTraceLevels(const p_psComponent* comp, - int depth, - int defLevel) -{ - int i = 0; + psS32 depth, + psS32 defLevel) +{ + psS32 i = 0; if (comp->name[0] == '\0') { @@ -472,10 +472,10 @@ *****************************************************************************/ void p_psTrace(const char *comp, // component being traced - int level, // desired trace level + psS32 level, // desired trace level ...) // arguments { char *fmt = NULL; va_list ap; - int i = 0; + psS32 i = 0; if (NULL == comp) { Index: /trunk/psLib/src/sysUtils/psTrace.h =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.h (revision 2203) +++ /trunk/psLib/src/sysUtils/psTrace.h (revision 2204) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 23:14:04 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,6 +50,6 @@ { const char *name; // last part of name of component - int level; // trace level for this component - int n; // number of subcomponents + psS32 level; // trace level for this component + psS32 n; // number of subcomponents struct p_psComponent* *subcomp; // next level of subcomponents } @@ -59,5 +59,5 @@ /// Send a trace message void p_psTrace(const char *facil, ///< facilty of interest - int myLevel, ///< desired trace level + psS32 myLevel, ///< desired trace level ...) ///< trace message arguments ; @@ -65,10 +65,10 @@ /// Set trace level -bool psTraceSetLevel(const char *facil, ///< facilty of interest - int level) ///< desired trace level +psBool psTraceSetLevel(const char *facil, ///< facilty of interest + psS32 level) ///< desired trace level ; /// Get the trace level -int psTraceGetLevel(const char *facil) ///< facilty of interest +psS32 psTraceGetLevel(const char *facil) ///< facilty of interest ; Index: /trunk/psLib/src/sysUtils/psType.h =================================================================== --- /trunk/psLib/src/sysUtils/psType.h (revision 2203) +++ /trunk/psLib/src/sysUtils/psType.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 21:40:13 $ +* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -23,4 +23,5 @@ #include #include +#include /// @addtogroup DataContainer @@ -52,5 +53,6 @@ typedef float _Complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers typedef double _Complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers -typedef void *psPTR; ///< void pointer +typedef void* psPtr; ///< void pointer +typedef bool psBool; ///< boolean value typedef enum { @@ -60,7 +62,7 @@ PS_TYPE_S64 = 0x0108, ///< Long integer. PS_TYPE_U8 = 0x0301, ///< Unsigned character. - PS_TYPE_U16 = 0x0302, ///< Unsigned short integer. + PS_TYPE_U16 = 0x0302, ///< Unsigned psS16 integer. PS_TYPE_U32 = 0x0304, ///< Unsigned integer. - PS_TYPE_U64 = 0x0308, ///< Unsigned long integer. + PS_TYPE_U64 = 0x0308, ///< Unsigned psS64 integer. PS_TYPE_F32 = 0x0404, ///< Single-precision Floating point. PS_TYPE_F64 = 0x0408, ///< Double-precision floating point. @@ -115,5 +117,5 @@ #define PS_TYPE_C32_NAME "psC32" #define PS_TYPE_C64_NAME "psC64" -#define PS_TYPE_PTR_NAME "psPTR" +#define PS_TYPE_PTR_NAME "psPtr" #define PS_TYPE_NAME(value,type) \ @@ -183,5 +185,5 @@ #define PS_IS_PSELEMTYPE_COMPLEX(x) ((x & 0x800) == 0x800) /// Macro to determine the storage size, in bytes, of the psElemType. -#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) ) +#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(psPtr) :(x & 0xFF) ) /** Dimensions of a data type. Index: /trunk/psLib/src/types/psArray.c =================================================================== --- /trunk/psLib/src/types/psArray.c (revision 2203) +++ /trunk/psLib/src/types/psArray.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-28 23:26:48 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,5 @@ /*****************************************************************************/ -psArray* psArrayAlloc(unsigned int nalloc) +psArray* psArrayAlloc(psU32 nalloc) { psArray* psArr = NULL; @@ -54,10 +54,10 @@ // Create vector data array - psArr->data = psAlloc(nalloc * sizeof(psPTR)); + psArr->data = psAlloc(nalloc * sizeof(psPtr)); return psArr; } -psArray* psArrayRealloc(psArray* restrict in, unsigned int nalloc) +psArray* psArrayRealloc(psArray* restrict in, psU32 nalloc) { if (in == NULL) { @@ -65,5 +65,5 @@ } else if (in->nalloc != nalloc) { // No need to realloc to same size if (nalloc < in->n) { - for (int i = nalloc; i < in->n; i++) { // For reduction in vector size + for (psS32 i = nalloc; i < in->n; i++) { // For reduction in vector size psFree(in->data[i]); } @@ -71,5 +71,5 @@ } // Realloc after decrementation to avoid accessing freed array elements - in->data = psRealloc(in->data, nalloc * sizeof(psPTR)); + in->data = psRealloc(in->data, nalloc * sizeof(psPtr)); in->nalloc = nalloc; } @@ -89,8 +89,8 @@ } -bool psArrayRemove(psArray* psArr, - psPTR data) +psBool psArrayRemove(psArray* psArr, + psPtr data) { - bool success = false; + psBool success = false; if (psArr == NULL) { @@ -98,9 +98,9 @@ } - int n = psArr->n; - psPTR* psArrData = psArr->data; - for (int i = n-1; i<0; i--) { + psS32 n = psArr->n; + psPtr* psArrData = psArr->data; + for (psS32 i = n-1; i<0; i--) { if (psArrData[i] == data) { - memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPTR)); + memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPtr)); n--; success = true; @@ -119,5 +119,5 @@ } - for (int i = 0; i < psArr->n; i++) { + for (psS32 i = 0; i < psArr->n; i++) { psFree(psArr->data[i]); psArr->data[i] = NULL; @@ -131,5 +131,5 @@ } - qsort(in->data, in->n, sizeof(psPTR), (int (*)(const void *, const void *))compare); + qsort(in->data, in->n, sizeof(psPtr), (int (*)(const void* , const void*))compare); return in; Index: /trunk/psLib/src/types/psArray.h =================================================================== --- /trunk/psLib/src/types/psArray.h (revision 2203) +++ /trunk/psLib/src/types/psArray.h (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-28 23:26:48 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,6 +20,4 @@ #ifndef PS_ARRAY_H #define PS_ARRAY_H - -#include #include "psType.h" @@ -36,7 +34,7 @@ typedef struct { - unsigned int nalloc; ///< Total number of elements available. - unsigned int n; ///< Number of elements in use. - psPTR* data; ///< An Array of pointer elements + psU32 nalloc; ///< Total number of elements available. + psU32 n; ///< Number of elements in use. + psPtr* data; ///< An Array of pointer elements } psArray; @@ -57,5 +55,5 @@ */ psArray* psArrayAlloc( - unsigned int nalloc ///< Total number of elements to make available. + psU32 nalloc ///< Total number of elements to make available. ); @@ -70,5 +68,5 @@ psArray* psArrayRealloc( psArray* restrict psArr, ///< array to reallocate. - unsigned int nalloc ///< Total number of elements to make available. + psU32 nalloc ///< Total number of elements to make available. ); @@ -81,7 +79,7 @@ * */ -bool psArrayRemove( +psBool psArrayRemove( psArray* psArr, ///< array to operate on - psPTR data ///< the data pointer to remove from psArray + psPtr data ///< the data pointer to remove from psArray ); Index: /trunk/psLib/src/types/psBitSet.c =================================================================== --- /trunk/psLib/src/types/psBitSet.c (revision 2203) +++ /trunk/psLib/src/types/psBitSet.c (revision 2204) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-21 23:17:52 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,4 @@ #include #include -#include #include "psBitSet.h" @@ -48,5 +47,5 @@ * @return char*: Pointer to byte in which bit is contained. */ -static char mask(int bit) +static char mask(psS32 bit) { char mask = (char)0x01; @@ -67,7 +66,7 @@ } -psBitSet* psBitSetAlloc(int n) -{ - int numBytes = 0; +psBitSet* psBitSetAlloc(psS32 n) +{ + psS32 numBytes = 0; psBitSet* newObj = NULL; @@ -95,5 +94,5 @@ psBitSet* psBitSetSet(psBitSet* inBitSet, - int bit) + psS32 bit) { char *byte = NULL; @@ -120,5 +119,5 @@ psBitSet* psBitSetClear(psBitSet* inBitSet, - int bit) + psS32 bit) { char *byte = NULL; @@ -144,6 +143,6 @@ } -bool psBitSetTest(const psBitSet* inBitSet, - int bit) +psBool psBitSetTest(const psBitSet* inBitSet, + psS32 bit) { char *byte = NULL; @@ -173,10 +172,10 @@ const psBitSet* restrict inBitSet2) { - int i = 0; - int n = 0; + psS32 i = 0; + psS32 n = 0; char* outBits = NULL; char* inBits1 = NULL; char* inBits2 = NULL; - int op = UNKNOWN_OP; + psS32 op = UNKNOWN_OP; if (inBitSet1 == NULL) { @@ -198,8 +197,8 @@ // make operator all caps - int tempStrLen = strlen(operator); + psS32 tempStrLen = strlen(operator); char* tempStr = psAlloc(tempStrLen+1); - for (int lcv=0;lcvn * 8; + psS32 i = 0; + psS32 numBits = inBitSet->n * 8; char *outString = psAlloc((size_t) numBits + 1); Index: /trunk/psLib/src/types/psBitSet.h =================================================================== --- /trunk/psLib/src/types/psBitSet.h (revision 2203) +++ /trunk/psLib/src/types/psBitSet.h (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,4 +20,6 @@ #ifndef PSBITSET_H #define PSBITSET_H + +#include "psType.h" /// @addtogroup BitSet @@ -35,5 +37,5 @@ typedef struct { - int n; ///< Number of bytes in the array + psS32 n; ///< Number of bytes in the array char *bits; ///< Aray of bytes holding bits } @@ -54,5 +56,5 @@ /*@null@*/ psBitSet* psBitSetAlloc( - int n ///< Number of bits in psBitSet array + psS32 n ///< Number of bits in psBitSet array ); @@ -68,5 +70,5 @@ /* @returned@ */ psBitSet* restrict inMask, ///< Pointer to psBitSet to be set. - int bit ///< Bit to be set. + psS32 bit ///< Bit to be set. ); @@ -82,5 +84,5 @@ /* @returned@ */ psBitSet* restrict inMask, ///< Pointer to psBitSet to be cleared. - int bit ///< Bit to be cleared. + psS32 bit ///< Bit to be cleared. ); @@ -95,7 +97,7 @@ */ -bool psBitSetTest( +psBool psBitSetTest( const psBitSet* restrict inMask, ///< Pointer psBitSet to be tested. - int bit ///< Bit to be tested. + psS32 bit ///< Bit to be tested. ); Index: /trunk/psLib/src/types/psHash.c =================================================================== --- /trunk/psLib/src/types/psHash.c (revision 2203) +++ /trunk/psLib/src/types/psHash.c (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-09-21 23:17:53 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,4 @@ #include #include -#include #include "psHash.h" #include "psMemory.h" @@ -29,7 +28,7 @@ #include "psCollectionsErrors.h" -static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next); +static psHashBucket* hashBucketAlloc(const char *key, psPtr data, psHashBucket* next); static void hashBucketFree(psHashBucket* bucket); -static void *doHashWork(psHash* table, const char *key, void *data, bool remove +static psPtr doHashWork(psHash* table, const char *key, psPtr data, psBool remove ); static void hashFree(psHash* table); @@ -45,5 +44,5 @@ psList* psHashKeyList(psHash* table) { - int i = 0; // Loop index variable + psS32 i = 0; // Loop index variable psList* myLinkList = NULL; // The output data structure psHashBucket* ptr = NULL; // Used to step thru linked list. @@ -85,5 +84,5 @@ *****************************************************************************/ static psHashBucket* hashBucketAlloc(const char *key, - void *data, + psPtr data, psHashBucket* next) { @@ -135,7 +134,7 @@ The new hash table. *****************************************************************************/ -psHash* psHashAlloc(int nbucket) // initial number of buckets -{ - int i = 0; // loop index variable +psHash* psHashAlloc(psS32 nbucket) // initial number of buckets +{ + psS32 i = 0; // loop index variable // Create the new hash table. @@ -172,5 +171,5 @@ static void hashFree(psHash* table) { - int i = 0; // Loop index variable. + psS32 i = 0; // Loop index variable. if (table == NULL) { @@ -212,10 +211,10 @@ there is little common code between those functions. *****************************************************************************/ -static void *doHashWork(psHash* table, +static psPtr doHashWork(psHash* table, const char *key, - void *data, bool remove + psPtr data, psBool remove ) { - long int hash = 1; // This will contain an integer value + psS64 hash = 1; // This will contain an integer value // "hashed" from the key. @@ -236,5 +235,5 @@ } // NOTE: This is the originally supplied hash function. - // for (int i = 0, len = strlen(key); i < len; i++) { + // for (psS32 i = 0, len = strlen(key); i < len; i++) { // hash = (hash << 1) ^ key[i]; // } @@ -273,5 +272,5 @@ // of removing an item from a single-linked list. - void *data = ptr->data; + psPtr data = ptr->data; optr->next = ptr->next; @@ -344,7 +343,7 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashAdd(psHash* table, - const char *key, - void *data) +psBool psHashAdd(psHash* table, + const char *key, + psPtr data) { if (table == NULL) { @@ -380,5 +379,5 @@ The data associated with that key. *****************************************************************************/ -void *psHashLookup(psHash* table, // table to lookup key in +psPtr psHashLookup(psHash* table, // table to lookup key in const char *key) // key to lookup { @@ -409,9 +408,9 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashRemove(psHash* table, - const char *key) -{ - void *data = NULL; - bool retVal = false; +psBool psHashRemove(psHash* table, + const char *key) +{ + psPtr data = NULL; + psBool retVal = false; if (table == NULL) { Index: /trunk/psLib/src/types/psHash.h =================================================================== --- /trunk/psLib/src/types/psHash.h (revision 2203) +++ /trunk/psLib/src/types/psHash.h (revision 2204) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 23:40:55 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,4 @@ * \{ */ -#include #include "psList.h" @@ -30,5 +29,5 @@ { char *key; ///< key for this item of data - void *data; ///< the data itself + psPtr data; ///< the data itself struct psHashBucket* next; ///< list of other possible keys } @@ -40,5 +39,5 @@ typedef struct psHash { - int nbucket; ///< Number of buckets in hash table. + psS32 nbucket; ///< Number of buckets in hash table. psHashBucket* *buckets; ///< The bucket data. } @@ -46,22 +45,22 @@ /// Allocate hash buckets in table. -psHash* psHashAlloc(int nbucket ///< The number of buckets to allocate. +psHash* psHashAlloc(psS32 nbucket ///< The number of buckets to allocate. ); /// Insert entry into table. -bool psHashAdd(psHash* table, ///< table to insert in - const char *key, ///< key to use - void *data ///< data to insert - ); +psBool psHashAdd(psHash* table, ///< table to insert in + const char *key, ///< key to use + psPtr data ///< data to insert + ); /// Lookup key in table. -void *psHashLookup(psHash* table, ///< table to lookup key in +psPtr psHashLookup(psHash* table, ///< table to lookup key in const char *key ///< key to lookup ); /// Remove key from table. -bool psHashRemove(psHash* table, ///< table to lookup key in - const char *key ///< key to lookup - ); +psBool psHashRemove(psHash* table, ///< table to lookup key in + const char *key ///< key to lookup + ); /// List all keys in table. Index: /trunk/psLib/src/types/psList.c =================================================================== --- /trunk/psLib/src/types/psList.c (revision 2203) +++ /trunk/psLib/src/types/psList.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -13,5 +13,4 @@ #include -#include #include #include // we need a mutex to make this stuff thread safe. @@ -26,14 +25,14 @@ #include "psCollectionsErrors.h" -#define ITER_INIT_HEAD ((void *)1) // next iteration should return head -#define ITER_INIT_TAIL ((void *)2) // next iteration should return tail +#define ITER_INIT_HEAD ((psPtr )1) // next iteration should return head +#define ITER_INIT_TAIL ((psPtr )2) // next iteration should return tail // private functions. static psListElem* listGetIterator(psList* list); -static int listGetIteratorIndex(psList* list); -static void listSetIterator(psList* list, int where, bool lockList); +static psS32 listGetIteratorIndex(psList* list); +static void listSetIterator(psList* list, psS32 where, psBool lockList); static void listFree(psList* list); -psList* psListAlloc(void *data) +psList* psListAlloc(psPtr data) { psList* list = psAlloc(sizeof(psList)); @@ -82,9 +81,9 @@ } -bool psListAdd(psList* list, int location, void *data) +psBool psListAdd(psList* list, psS32 location, psPtr data) { psListElem* position; psListElem* elem; - int cursorIndex = 0; + psS32 cursorIndex = 0; if (list == NULL) { @@ -168,8 +167,8 @@ * Remove an element from a list */ -bool psListRemove(psList* list, int location, void *data) +psBool psListRemove(psList* list, psS32 location, psPtr data) { psListElem* elem = NULL; // element to remove - int cursorIndex = 0; + psS32 cursorIndex = 0; if (list == NULL) { @@ -184,5 +183,5 @@ // search list for the data item. - int i = 0; // index + psS32 i = 0; // index for (psListElem* ptr = list->head; ptr != NULL; ptr = ptr->next) { @@ -247,13 +246,13 @@ } -void psListSetIterator(psList* list, int where) +void psListSetIterator(psList* list, psS32 where) { listSetIterator(list, where, true); } -static void listSetIterator(psList* list, int where, bool lockList) +static void listSetIterator(psList* list, psS32 where, psBool lockList) { psListElem* cursor; - int position; + psS32 position; if (list == NULL) { @@ -272,5 +271,5 @@ } - if (where >= (int)list->size) { + if (where >= (psS32)list->size) { list->iter = NULL; if (lockList) { @@ -323,16 +322,16 @@ } - int position = listGetIteratorIndex(list); + psS32 position = listGetIteratorIndex(list); if (where < position) { - int diff = position - where; - - for (int count = 0; count < diff; count++) { + psS32 diff = position - where; + + for (psS32 count = 0; count < diff; count++) { listSetIterator(list, PS_LIST_PREVIOUS, false); } } else { - int diff = where - position; - - for (int count = 0; count < diff; count++) { + psS32 diff = where - position; + + for (psS32 count = 0; count < diff; count++) { listSetIterator(list, PS_LIST_NEXT, false); } @@ -363,5 +362,5 @@ } -int listGetIteratorIndex(psList* list) +psS32 listGetIteratorIndex(psList* list) { if (list->iter == ITER_INIT_HEAD) { @@ -374,5 +373,5 @@ } -void *psListGet(psList* list, int location) +psPtr psListGet(psList* list, psS32 location) { psListElem* element; @@ -391,15 +390,15 @@ * and now return the previous/next element of the list */ -void *psListGetNext(psList* list) +psPtr psListGetNext(psList* list) { return psListGet(list, PS_LIST_NEXT); } -void *psListGetPrevious(psList* list) +psPtr psListGetPrevious(psList* list) { return psListGet(list, PS_LIST_PREVIOUS); } -void *psListGetCurrent(psList* list) +psPtr psListGetCurrent(psList* list) { return psListGet(list, PS_LIST_CURRENT); @@ -412,5 +411,5 @@ { psListElem* ptr; - unsigned int n; + psU32 n; psArray* restrict arr; @@ -429,5 +428,5 @@ ptr = list->head; n = list->size; - for (int i = 0; i < n; i++) { + for (psS32 i = 0; i < n; i++) { arr->data[i] = psMemIncrRefCounter(ptr->data); ptr = ptr->next; @@ -439,5 +438,5 @@ psList* psArrayToList(psArray* arr) { - unsigned int n; + psU32 n; psList* list; // list of elements @@ -448,5 +447,5 @@ list = psListAlloc(NULL); n = arr->n; - for (int i = 0; i < n; i++) { + for (psS32 i = 0; i < n; i++) { psListAdd(list, PS_LIST_TAIL, arr->data[i]); } Index: /trunk/psLib/src/types/psList.h =================================================================== --- /trunk/psLib/src/types/psList.h (revision 2203) +++ /trunk/psLib/src/types/psList.h (revision 2204) @@ -10,6 +10,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-09 02:23:27 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,4 @@ #include // we need a mutex to make this stuff thread safe. -#include // we use the bool type. #include "psCompare.h" @@ -46,5 +45,5 @@ struct psListElem* prev; ///< previous link in list struct psListElem* next; ///< next link in list - void *data; ///< real data item + psPtr data; ///< real data item } psListElem; @@ -57,9 +56,9 @@ typedef struct { - unsigned int size; ///< number of elements on list + psU32 size; ///< number of elements on list psListElem* head; ///< first element on list (may be NULL) psListElem* tail; ///< last element on list (may be NULL) psListElem* iter; ///< iteration cursor - unsigned int iterIndex; ///< the numeric position of the iteration cursor in the list + psU32 iterIndex; ///< the numeric position of the iteration cursor in the list pthread_mutex_t lock; ///< mutex to lock a node during changes } @@ -71,5 +70,5 @@ */ psList* psListAlloc( - void *data + psPtr data ///< initial data item; may be NULL if no an empty psList is desired ) @@ -81,20 +80,20 @@ * NULL, the return value will also be NULL. */ -bool psListAdd( +psBool psListAdd( psList* restrict list, ///< list to add to (if NULL, nothing is done) - int location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. - void *data ///< data item to add. If NULL, list is not modified. + psS32 location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. + psPtr data ///< data item to add. If NULL, list is not modified. ); /** Remove an item from a list. If location parameter is PS_LIST_UNKNOWN, * - * @return bool TRUE if element is successfully removed, otherwise FALSE. + * @return psBool TRUE if element is successfully removed, otherwise FALSE. */ -bool psListRemove( +psBool psListRemove( psList* restrict list, ///< list to remove element from - int location, + psS32 location, ///< index of item, or PS_LIST_UNKNOWN, PS_LIST_NEXT, PS_LIST_PREV, or numbered location. - void *data + psPtr data ///< if location is PS_LIST_UNKNOWN, data item to find and remove, otherwise this is ignored. ); @@ -102,12 +101,12 @@ /** Retrieve an item from a list. * - * @return void* the item corresponding to the location parameter. If + * @return psPtr the item corresponding to the location parameter. If * location is invalid (e.g., a numbered index greater * than the list size or if the list is empty), a * NULL is returned. */ -void *psListGet( +psPtr psListGet( psList* restrict list, ///< list to retrieve element from - int location ///< index number, or PS_LIST_NEXT, PS_LIST_PREV, PS_LIST_UNKNOWN + psS32 location ///< index number, or PS_LIST_NEXT, PS_LIST_PREV, PS_LIST_UNKNOWN ); @@ -118,5 +117,5 @@ void psListSetIterator( psList* restrict list, ///< list to retrieve element from - int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL + psS32 location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -124,9 +123,9 @@ * the next list position. * - * @return void* the data item next on the list or NULL if the iterator + * @return psPtr the data item next on the list or NULL if the iterator * is already pointing to the last element or the list * parameter was NULL. */ -void *psListGetNext( +psPtr psListGetNext( psList* restrict list ///< list to retrieve element from ); @@ -135,9 +134,9 @@ * not move the iterator location. * - * @return void* the data item cooresponding to current iterator + * @return psPtr the data item cooresponding to current iterator * cursor position of the list, or NULL if either the * iterator is not valid or list parameter was NULL. */ -void *psListGetCurrent( +psPtr psListGetCurrent( psList* restrict list ///< list to retrieve element from ); @@ -146,9 +145,9 @@ * iterator to the previous list position. * - * @return void* the data item previous on the list or NULL if the iterator + * @return psPtr the data item previous on the list or NULL if the iterator * is already pointing to the first element or the list * parameter was NULL. */ -void *psListGetPrevious( +psPtr psListGetPrevious( psList* restrict list ///< list to retrieve element from ); Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 2203) +++ /trunk/psLib/src/types/psMetadata.c (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-09 03:05:53 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ /*****************************************************************************/ -static int metadataId = 0; +static psS32 metadataId = 0; /*****************************************************************************/ @@ -143,5 +143,5 @@ // Set metadata item unique id - *(int *)(&metadataItem->id) = ++metadataId; + *(psS32 *)(&metadataItem->id) = ++metadataId; // Set metadata item type @@ -154,5 +154,5 @@ break; case PS_META_BOOL: - metadataItem->data.B = (bool)va_arg(argPtr, int); + metadataItem->data.B = (psBool)va_arg(argPtr, psS32); break; case PS_META_S32: @@ -215,5 +215,5 @@ } -bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location ) +psBool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, psS32 location ) { char * key = NULL; @@ -337,6 +337,6 @@ } -bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, - const char *comment, ...) +psBool psMetadataAdd(psMetadata* restrict md, psS32 where, const char *name, psMetadataType type, + const char *comment, ...) { va_list argPtr; @@ -359,7 +359,7 @@ } -bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) -{ - int numChildren = 0; +psBool psMetadataRemove(psMetadata* restrict md, psS32 where, const char *restrict key) +{ + psS32 numChildren = 0; psList* mdList = NULL; psHash* mdTable = NULL; @@ -471,5 +471,5 @@ } -psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +psMetadataItem* psMetadataGet(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -497,5 +497,5 @@ } -bool psMetadataSetIterator(psMetadata* restrict md, int where) +psBool psMetadataSetIterator(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -517,5 +517,5 @@ } -psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; @@ -553,5 +553,5 @@ } -psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 2203) +++ /trunk/psLib/src/types/psMetadata.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:06:27 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,11 +38,11 @@ PS_META_F32, ///< Single-precision float data. PS_META_F64, ///< Double-precision float data. - PS_META_STR, ///< String data (Stored in as void *). - PS_META_VEC, ///< Vector data (Stored in as void *). - PS_META_IMG, ///< Image data (Stored in as void *). - PS_META_JPEG, ///< JPEG data (Stored in as void *). - PS_META_PNG, ///< PNG data (Stored in as void *). - PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). - PS_META_UNKNOWN, ///< Other data (Stored in as void *). + PS_META_STR, ///< String data (Stored in as psPtr ). + PS_META_VEC, ///< Vector data (Stored in as psPtr ). + PS_META_IMG, ///< Image data (Stored in as psPtr ). + PS_META_JPEG, ///< JPEG data (Stored in as psPtr ). + PS_META_PNG, ///< PNG data (Stored in as psPtr ). + PS_META_ASTROM, ///< Astrometric coefficients (Stored in as psPtr ). + PS_META_UNKNOWN, ///< Other data (Stored in as psPtr ). PS_META_NTYPE ///< Number of types. Must be last. } psMetadataType; @@ -55,13 +55,13 @@ typedef struct psMetadataItem { - const int id; ///< Unique ID for metadata item. + const psS32 id; ///< Unique ID for metadata item. char *restrict name; ///< Name of metadata item. psMetadataType type; ///< Type of metadata item. union { - bool B; ///< boolean data + psBool B; ///< boolean data psS32 S32; ///< Signed 32-bit integer data. psF32 F32; ///< Single-precision float data. psF64 F64; ///< Double-precision float data. - psPTR V; ///< Pointer to other type of data. + psPtr V; ///< Pointer to other type of data. } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). @@ -144,8 +144,8 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem( +psBool psMetadataAddItem( psMetadata* restrict md, ///< Metadata collection to insert metadat item. psMetadataItem* restrict item, ///< Metadata item to be added. - int location ///< Location to be added. + psS32 location ///< Location to be added. ); @@ -156,7 +156,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be added. +psBool psMetadataAdd( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be added. const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. @@ -175,7 +175,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be removed. +psBool psMetadataRemove( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. ); @@ -203,5 +203,5 @@ psMetadataItem* psMetadataGet( psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where ///< Location to be retrieved. + psS32 where ///< Location to be retrieved. ); @@ -213,7 +213,7 @@ * @return void: void. */ -bool psMetadataSetIterator( +psBool psMetadataSetIterator( psMetadata* restrict md, ///< Metadata collection to iterate. - int where ///< Location of iterator. + psS32 where ///< Location of iterator. ); @@ -227,5 +227,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); @@ -239,5 +239,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); Index: /trunk/psLib/src/types/psMetadataConfig.c =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.c (revision 2203) +++ /trunk/psLib/src/types/psMetadataConfig.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 00:43:12 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ /** Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string * must be null terminated. */ -bool ignoreLine(char *inString) +psBool ignoreLine(char *inString) { while(*inString!='\0' && *inString!='#') { @@ -119,5 +119,5 @@ /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null * terminated copy of the original input string. */ -char *cleanString(char *inString, int sLen) +char *cleanString(char *inString, psS32 sLen) { char *ptrB = NULL; @@ -149,7 +149,7 @@ /** Count repeat occurances of a single character within a line. The input string must be null terminated. */ -int repeatedChars(char *inString, char ch) -{ - int count = 0; +psS32 repeatedChars(char *inString, char ch) +{ + psS32 count = 0; @@ -166,8 +166,8 @@ /** Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location * the beginning of the string. Tokens are newly allocated null terminated strings. */ -char* getToken(char **inString, char *delimiter, int *status) +char* getToken(char **inString, char *delimiter, psS32 *status) { char *cleanToken = NULL; - int sLen = 0; + psS32 sLen = 0; @@ -195,5 +195,5 @@ /** Returns single parsed value as a double precision number. The input string must be cleaned and null * terminated. */ -double parseValue(char *inString, int *status) +double parseValue(char *inString, psS32 *status) { char *end = NULL; @@ -212,7 +212,7 @@ /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */ -bool parseBool(char *inString, int *status) -{ - bool value = false; +psBool parseBool(char *inString, psS32 *status) +{ + psBool value = false; @@ -229,10 +229,10 @@ /** Returns parsed vector filled with with data. The input string must be null terminated. */ -psVector* parseVector(char *inString, psElemType elemType, int *status) +psVector* parseVector(char *inString, psElemType elemType, psS32 *status) { char *end = NULL; char *saveValue = NULL; - int i = 0; - int numValues = 0; + psS32 i = 0; + psS32 numValues = 0; double value = 0.0; psVector *vec = NULL; @@ -341,8 +341,8 @@ -psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, int extNum, char *fileName) -{ - bool tempBool; - bool success; +psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, psS32 extNum, char *fileName) +{ + psBool tempBool; + psBool success; char keyType; char keyName[FITS_LINE_SIZE]; @@ -350,9 +350,9 @@ char keyComment[FITS_LINE_SIZE]; char fitsErr[MAX_STRING_LENGTH]; - int i; - int hduType = 0; - int status = 0; - int numKeys = 0; - int keyNum = 0; + psS32 i; + psS32 hduType = 0; + psS32 status = 0; + psS32 numKeys = 0; + psS32 keyNum = 0; psMetadataType metadataItemType; fitsfile *fd = NULL; @@ -449,7 +449,7 @@ -int psMetadataParseConfig(psMetadata** md, char *fileName, bool overwrite) -{ - bool tempBool; +psS32 psMetadataParseConfig(psMetadata** md, char *fileName, psBool overwrite) +{ + psBool tempBool; char *line = NULL; char *strName = NULL; @@ -458,7 +458,7 @@ char *strComment = NULL; char *linePtr = NULL; - int status = 0; - int lineCount = 0; - int failedLines = 0; + psS32 status = 0; + psS32 lineCount = 0; + psS32 failedLines = 0; psF64 tempDbl = 0.0; psS32 tempInt = 0.0; Index: /trunk/psLib/src/types/psMetadataConfig.h =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.h (revision 2203) +++ /trunk/psLib/src/types/psMetadataConfig.h (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:17:39 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. - int extNum, ///< File name extension number. Starts at 1. + psS32 extNum, ///< File name extension number. Starts at 1. char *fileName ///< Name of file to read. ); @@ -58,10 +58,10 @@ * Loads pre-defined settings by parsing a configuration file into a psMetadata structure. * - * @return int : Number of lines that failed to be read. + * @return psS32 : Number of lines that failed to be read. */ -int psMetadataParseConfig( +psS32 psMetadataParseConfig( psMetadata** md, ///< Resulting metadata from read. char *fileName, ///< Name of file to read. - bool overwrite ///< Allow overwrite of duplicate specifications. + psBool overwrite ///< Allow overwrite of duplicate specifications. ); Index: /trunk/psLib/src/xml/psXML.c =================================================================== --- /trunk/psLib/src/xml/psXML.c (revision 2203) +++ /trunk/psLib/src/xml/psXML.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 00:43:12 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ /** Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string * must be null terminated. */ -bool ignoreLine(char *inString) +psBool ignoreLine(char *inString) { while(*inString!='\0' && *inString!='#') { @@ -119,5 +119,5 @@ /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null * terminated copy of the original input string. */ -char *cleanString(char *inString, int sLen) +char *cleanString(char *inString, psS32 sLen) { char *ptrB = NULL; @@ -149,7 +149,7 @@ /** Count repeat occurances of a single character within a line. The input string must be null terminated. */ -int repeatedChars(char *inString, char ch) -{ - int count = 0; +psS32 repeatedChars(char *inString, char ch) +{ + psS32 count = 0; @@ -166,8 +166,8 @@ /** Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location * the beginning of the string. Tokens are newly allocated null terminated strings. */ -char* getToken(char **inString, char *delimiter, int *status) +char* getToken(char **inString, char *delimiter, psS32 *status) { char *cleanToken = NULL; - int sLen = 0; + psS32 sLen = 0; @@ -195,5 +195,5 @@ /** Returns single parsed value as a double precision number. The input string must be cleaned and null * terminated. */ -double parseValue(char *inString, int *status) +double parseValue(char *inString, psS32 *status) { char *end = NULL; @@ -212,7 +212,7 @@ /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */ -bool parseBool(char *inString, int *status) -{ - bool value = false; +psBool parseBool(char *inString, psS32 *status) +{ + psBool value = false; @@ -229,10 +229,10 @@ /** Returns parsed vector filled with with data. The input string must be null terminated. */ -psVector* parseVector(char *inString, psElemType elemType, int *status) +psVector* parseVector(char *inString, psElemType elemType, psS32 *status) { char *end = NULL; char *saveValue = NULL; - int i = 0; - int numValues = 0; + psS32 i = 0; + psS32 numValues = 0; double value = 0.0; psVector *vec = NULL; @@ -341,8 +341,8 @@ -psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, int extNum, char *fileName) -{ - bool tempBool; - bool success; +psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, psS32 extNum, char *fileName) +{ + psBool tempBool; + psBool success; char keyType; char keyName[FITS_LINE_SIZE]; @@ -350,9 +350,9 @@ char keyComment[FITS_LINE_SIZE]; char fitsErr[MAX_STRING_LENGTH]; - int i; - int hduType = 0; - int status = 0; - int numKeys = 0; - int keyNum = 0; + psS32 i; + psS32 hduType = 0; + psS32 status = 0; + psS32 numKeys = 0; + psS32 keyNum = 0; psMetadataType metadataItemType; fitsfile *fd = NULL; @@ -449,7 +449,7 @@ -int psMetadataParseConfig(psMetadata** md, char *fileName, bool overwrite) -{ - bool tempBool; +psS32 psMetadataParseConfig(psMetadata** md, char *fileName, psBool overwrite) +{ + psBool tempBool; char *line = NULL; char *strName = NULL; @@ -458,7 +458,7 @@ char *strComment = NULL; char *linePtr = NULL; - int status = 0; - int lineCount = 0; - int failedLines = 0; + psS32 status = 0; + psS32 lineCount = 0; + psS32 failedLines = 0; psF64 tempDbl = 0.0; psS32 tempInt = 0.0; Index: /trunk/psLib/src/xml/psXML.h =================================================================== --- /trunk/psLib/src/xml/psXML.h (revision 2203) +++ /trunk/psLib/src/xml/psXML.h (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:17:39 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. - int extNum, ///< File name extension number. Starts at 1. + psS32 extNum, ///< File name extension number. Starts at 1. char *fileName ///< Name of file to read. ); @@ -58,10 +58,10 @@ * Loads pre-defined settings by parsing a configuration file into a psMetadata structure. * - * @return int : Number of lines that failed to be read. + * @return psS32 : Number of lines that failed to be read. */ -int psMetadataParseConfig( +psS32 psMetadataParseConfig( psMetadata** md, ///< Resulting metadata from read. char *fileName, ///< Name of file to read. - bool overwrite ///< Allow overwrite of duplicate specifications. + psBool overwrite ///< Allow overwrite of duplicate specifications. ); Index: /trunk/psLib/test/FullUnitTest =================================================================== --- /trunk/psLib/test/FullUnitTest (revision 2203) +++ /trunk/psLib/test/FullUnitTest (revision 2204) @@ -19,6 +19,6 @@ # RETURN : integer number of tests which failed # -# $Revision: 1.14 $ $Name: not supported by cvs2svn $ -# $Date: 2004-08-20 00:51:22 $ +# $Revision: 1.15 $ $Name: not supported by cvs2svn $ +# $Date: 2004-10-27 00:57:31 $ # # Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,5 +29,5 @@ use Cwd; -# Provides functions for handling long command line options +# Provides functions for handling psS64 command line options use Getopt::Long; Index: /trunk/psLib/test/astronomy/header_1.fits =================================================================== --- /trunk/psLib/test/astronomy/header_1.fits (revision 2203) +++ /trunk/psLib/test/astronomy/header_1.fits (revision 2204) Index: /trunk/psLib/test/astronomy/header_2.fits =================================================================== --- /trunk/psLib/test/astronomy/header_2.fits (revision 2203) +++ /trunk/psLib/test/astronomy/header_2.fits (revision 2204) Index: /trunk/psLib/test/astronomy/tst_psAstrometry.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psAstrometry.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psAstrometry.c (revision 2204) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-13 23:58:20 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -17,10 +17,10 @@ #include "pslib.h" -static int testExposureAlloc(void); -static int testObservatoryAlloc(void); -static int testFPAAlloc(void); -static int testChipAlloc(void); -static int testCellAlloc(void); -static int testReadoutAlloc(void); +static psS32 testExposureAlloc(void); +static psS32 testObservatoryAlloc(void); +static psS32 testFPAAlloc(void); +static psS32 testChipAlloc(void); +static psS32 testCellAlloc(void); +static psS32 testReadoutAlloc(void); testDescription tests[] = { @@ -34,5 +34,5 @@ }; -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psLogSetLevel(PS_LOG_INFO); @@ -41,5 +41,5 @@ } -static int testExposureAlloc(void) +static psS32 testExposureAlloc(void) { psTime* now = psTimeGetTime(PS_TIME_UTC); @@ -123,5 +123,5 @@ } -static int testObservatoryAlloc(void) +static psS32 testObservatoryAlloc(void) { char* name = "The Kaiser Royal Observatory"; @@ -173,5 +173,5 @@ } -static int testFPAAlloc(void) +static psS32 testFPAAlloc(void) { @@ -220,5 +220,5 @@ } - for (int lcv=0; lcv < 8; lcv++) { + for (psS32 lcv=0; lcv < 8; lcv++) { if (fpa->chips->data[lcv] != NULL) { psLogMsg(__func__,PS_LOG_ERROR, @@ -307,5 +307,5 @@ */ - for (int lcv=0; lcv < 8; lcv++) { + for (psS32 lcv=0; lcv < 8; lcv++) { fpa->chips->data[lcv] = psAlloc(4); } @@ -329,5 +329,5 @@ } -static int testChipAlloc(void) +static psS32 testChipAlloc(void) { char* name = "The Kaiser Royal Observatory"; @@ -372,5 +372,5 @@ } - for (int lcv=0; lcv < 8; lcv++) { + for (psS32 lcv=0; lcv < 8; lcv++) { if (chip->cells->data[lcv] != NULL) { psLogMsg(__func__,PS_LOG_ERROR, @@ -477,5 +477,5 @@ } -static int testCellAlloc(void) +static psS32 testCellAlloc(void) { char* name = "The Kaiser Royal Observatory"; @@ -522,5 +522,5 @@ } - for (int lcv=0; lcv < 8; lcv++) { + for (psS32 lcv=0; lcv < 8; lcv++) { if (cell1->readouts->data[lcv] != NULL) { psLogMsg(__func__,PS_LOG_ERROR, @@ -641,5 +641,5 @@ } -static int testReadoutAlloc(void) +static psS32 testReadoutAlloc(void) { psImage* image = psImageAlloc(64,64,PS_TYPE_S8); Index: /trunk/psLib/test/astronomy/tst_psAstrometry01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 2204) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-14 02:05:00 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -14,7 +14,7 @@ #include "pslib.h" -static int test1( void ); -static int test2( void ); -static int test3( void ); +static psS32 test1( void ); +static psS32 test2( void ); +static psS32 test3( void ); testDescription tests[] = { @@ -115,7 +115,7 @@ psFPA *genSystem() { - int i; - int j; - int k; + psS32 i; + psS32 j; + psS32 k; psImage *tmpImage; // psTime* now = psTimeGetTime(PS_TIME_UTC); @@ -170,6 +170,6 @@ for (k=0;kdata.F32[row][col] = (float) ((i * (CHIP_WIDTH + CHIP_GAP)) + (j * (CELL_WIDTH + CELL_GAP))); @@ -185,5 +185,5 @@ } -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -201,8 +201,8 @@ #define Y0 60.0 -int test1( void ) -{ - int i; - int j; +psS32 test1( void ) +{ + psS32 i; + psS32 j; psFixedPattern *tmp = NULL; float x0 = X0; @@ -212,6 +212,6 @@ psImage *x = psImageAlloc(X_NUM_COLS, X_NUM_ROWS, PS_TYPE_F64); psImage *y = psImageAlloc(Y_NUM_COLS, Y_NUM_ROWS, PS_TYPE_F64); - int testStatus = 0; - int numPixels = 0; + psS32 testStatus = 0; + psS32 numPixels = 0; for (i=0;ireadouts->data; @@ -377,6 +377,6 @@ printf("-------------------------------\n"); - for (int i = 0; i < readout->image->numRows ; i++) { - for (int j = 0; j < readout->image->numCols ; j++) { + for (psS32 i = 0; i < readout->image->numRows ; i++) { + for (psS32 j = 0; j < readout->image->numCols ; j++) { printf("(%.1f) ", readout->image->data.F32[i][j]); } @@ -415,8 +415,8 @@ *****************************************************************************/ -int test3( void ) -{ - int x; - int y; +psS32 test3( void ) +{ + psS32 x; + psS32 y; psPlane fpaCoord; psFPA *myFPA = genSystem(); @@ -426,8 +426,8 @@ psPlane testCoord; - int xReadout = 0; - int xFPA = 0; - for (int chip=0;chipdata.V; printf("Key Value: "); - for(int i=0; inalloc;i++) { + for(psS32 i=0; inalloc;i++) { printf("%d ", vec->data.S32[i]); } @@ -103,5 +103,5 @@ static void printMetadataTable(psHash *mdTable) { - int i; + psS32 i; psHashBucket* ptr = NULL; for(i=0; inbucket; i++) { @@ -123,10 +123,10 @@ -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { // Test A - Read config file with overwrite set true printPositiveTestHeader(stdout, "psMetadata", "Test A - Read config file with overwrite set true"); psMetadata *metadata1 = NULL; - int failedLines1 = 0; + psS32 failedLines1 = 0; failedLines1 = psMetadataParseConfig(&metadata1, "test.config", true); printf("Failed lines: %d Expected: 6\n", failedLines1); @@ -138,5 +138,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test B - Read config file with overwrite set false"); psMetadata *metadata2 = NULL; - int failedLines2 = 0; + psS32 failedLines2 = 0; failedLines2 = psMetadataParseConfig(&metadata2, "test.config", false); printf("Failed lines: %d Expected: 7", failedLines2); @@ -148,5 +148,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata"); psMetadata *metadata3 = psMetadataAlloc(); - int failedLines3 = 0; + psS32 failedLines3 = 0; failedLines3 = psMetadataParseConfig(&metadata3, "test.config", false); printf("Failed lines: %d Expected: 7", failedLines3); @@ -176,5 +176,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 2204) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-15 19:26:31 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -96,5 +96,5 @@ static void printMetadataTable(psHash *mdTable) { - int i; + psS32 i; psHashBucket* ptr = NULL; for(i=0; inbucket; i++) { @@ -116,5 +116,5 @@ -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psMetadata *metadata1 = NULL; @@ -262,5 +262,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 2204) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-07 22:31:31 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -60,5 +60,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1 = NULL; @@ -136,5 +136,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 2204) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 01:33:14 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -60,5 +60,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1 = NULL; @@ -231,5 +231,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 2204) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 20:53:21 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -64,5 +64,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1 = NULL; @@ -201,5 +201,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 2204) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-12 01:40:32 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -68,7 +68,7 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { - long data; + psS64 data; psF32 fpdata; psMetadataItem *item1 = NULL; @@ -271,5 +271,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 2204) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-12 01:54:00 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1a = NULL; @@ -134,5 +134,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psTime_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 2204) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-12 01:34:09 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -34,5 +34,5 @@ #include -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psTime *testTime; @@ -55,5 +55,5 @@ // Test B - Print test time printPositiveTestHeader(stdout,"psTime", "Print test time"); - printf("Test time: Seconds = %ld Microseconds = %ld\n", (long)testTime->sec, (long)testTime->usec); + printf("Test time: Seconds = %ld Microseconds = %ld\n", (psS64)testTime->sec, (psS64)testTime->usec); printFooter(stdout, "psTime", "Print test time", true); @@ -75,5 +75,5 @@ psTime *timeD = NULL; timeD = psTimeFromISOTime(isoString); - printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeD->sec, (psU32)timeD->usec); + printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeD->sec, (psU32)timeD->usec); psFree(isoString); psFree(timeD); @@ -90,5 +90,5 @@ timeE = psTimeConvert(timeE, PS_TIME_UTC); psFree(timeE); - printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeE->sec, (psU32)timeE->usec); + printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeE->sec, (psU32)timeE->usec); printFooter(stdout, "psTime", "Convert psTime time to UTC time", true); @@ -103,5 +103,5 @@ timeF = psTimeConvert(timeF, PS_TIME_TAI); psFree(timeF); - printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeF->sec, (psU32)timeF->usec); + printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeF->sec, (psU32)timeF->usec); printFooter(stdout, "psTime", "Convert UTC time to psTime", true); @@ -119,5 +119,5 @@ psTime *timeH = NULL; timeH = psTimeFromMJD(mjdTime); - printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeH->sec, (psU32)timeH->usec); + printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeH->sec, (psU32)timeH->usec); psFree(timeH); printFooter(stdout, "psTime", "Convert MJD time to psTime", true); @@ -136,5 +136,5 @@ psTime *timeJ = NULL; timeJ = psTimeFromJD(jdTime); - printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeJ->sec, (psU32)timeJ->usec); + printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeJ->sec, (psU32)timeJ->usec); psFree(timeJ); printFooter(stdout, "psTime", "Convert JD time to psTime", true); @@ -145,5 +145,5 @@ struct timeval timevalTime; timevalTime = psTimeToTimeval(testTime); - printf("timevalTime: Seconds = %ld Microseconds = %ld\n", (long)timevalTime.tv_sec, (long)timevalTime.tv_usec); + printf("timevalTime: Seconds = %ld Microseconds = %ld\n", (psS64)timevalTime.tv_sec, (psS64)timevalTime.tv_usec); printFooter(stdout, "psTime", "Convert psTime to timeval time", true); @@ -153,5 +153,5 @@ psTime *timeL = NULL; timeL = psTimeFromTimeval(&timevalTime); - printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeL->sec, (psU32)timeL->usec); + printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeL->sec, (psU32)timeL->usec); psFree(timeL); printFooter(stdout, "psTime", "Convert timeval time to psTime", true); @@ -176,5 +176,5 @@ psTime *timeN = NULL; timeN = psTimeFromTM(tmTime); - printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeN->sec, (psU32)timeN->usec); + printf("psTime: Seconds = %ld Microseconds = %d\n", (psS64)timeN->sec, (psU32)timeN->usec); psFree(timeN); psFree(tmTime); @@ -198,5 +198,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psTime_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-20 20:02:46 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ #include "psTest.h" -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { @@ -44,5 +44,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/astronomy/tst_psTime_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 2203) +++ /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-20 20:03:10 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -23,7 +23,7 @@ #define PRINT_TIME(TEXT,TIME) \ -printf("%s Seconds = %ld Microseconds = %u\n", TEXT, (long int)TIME->sec, TIME->usec); +printf("%s Seconds = %ld Microseconds = %u\n", TEXT, (psS64)TIME->sec, TIME->usec); -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { @@ -135,5 +135,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psArray.c =================================================================== --- /trunk/psLib/test/collections/tst_psArray.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psArray.c (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-28 23:26:49 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ typedef struct { - int x; + psS32 x; float y; } @@ -32,6 +32,6 @@ -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { // Create array of pointers @@ -51,5 +51,5 @@ // Test B - Add data to void pointer array printPositiveTestHeader(stdout, "psArray", "Add data to void pointer array"); - for(int i = 0; i < 5; i++) { + for(psS32 i = 0; i < 5; i++) { testStruct *ts = psAlloc(sizeof(testStruct)); ts->x = 10*i; @@ -60,5 +60,5 @@ } - for(int i = 0; i < 5; i++) { + for(psS32 i = 0; i < 5; i++) { testStruct *ts = (testStruct*)psArr->data[i]; printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); @@ -85,5 +85,5 @@ psArr = psArrayRealloc(psArr,10); printf("Adding more elements to void pointer array...\n"); - for(int i = 5; i < 10; i++) { + for(psS32 i = 5; i < 10; i++) { testStruct *ts = psAlloc(sizeof(testStruct)); ts->x = 10*i; @@ -94,5 +94,5 @@ psMemIncrRefCounter(ts); } - for(int i = 0; i < 10; i++) { + for(psS32 i = 0; i < 10; i++) { testStruct *ts = (testStruct*)psArr->data[i]; printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); @@ -118,5 +118,5 @@ printPositiveTestHeader(stdout,"psArray","Reallocate void pointer array smaller"); psArr = psArrayRealloc(psArr,3); - for(int i = 0; i < 3; i++) { + for(psS32 i = 0; i < 3; i++) { testStruct *ts = (testStruct*)psArr->data[i]; printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y); @@ -142,9 +142,9 @@ printPositiveTestHeader(stdout, "psArray", "Free void pointer array"); psFree(psArr); - for(int i = 0; i < 10; i++) { + for(psS32 i = 0; i < 10; i++) { psFree(mySt[i]); } psMemCheckLeaks(0, NULL, stdout); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psBitSet.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psBitSet.c (revision 2204) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-14 20:01:52 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -27,12 +27,12 @@ #include "psTest.h" -static int testBitSet01a(void); -static int testBitSet01b(void); -static int testBitSet01c(void); -static int testBitSet02(void); -static int testBitSet03(void); -static int testBitSet04(void); -static int testBitSet05(void); -static int testBitSet06(void); +static psS32 testBitSet01a(void); +static psS32 testBitSet01b(void); +static psS32 testBitSet01c(void); +static psS32 testBitSet02(void); +static psS32 testBitSet03(void); +static psS32 testBitSet04(void); +static psS32 testBitSet05(void); +static psS32 testBitSet06(void); testDescription tests[] = { @@ -50,5 +50,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -57,5 +57,5 @@ } -int testBitSet01a(void) +psS32 testBitSet01a(void) { psErr* err; @@ -109,5 +109,5 @@ } -int testBitSet01b(void) +psS32 testBitSet01b(void) { char *binOut = NULL; @@ -212,5 +212,5 @@ } -static int testBitSet01c(void) +static psS32 testBitSet01c(void) { psBitSet* bs = psBitSetAlloc(24); @@ -275,5 +275,5 @@ } -int testBitSet02() +psS32 testBitSet02() { char *binOut1 = NULL; @@ -284,5 +284,5 @@ psBitSet* bs2 = psBitSetAlloc(24); psBitSet* and = psBitSetAlloc(24); - for(int i=0; i<24; i++) { + for(psS32 i=0; i<24; i++) { if ((i & 2) == 0) { bs1 = psBitSetSet(bs1, i); @@ -312,7 +312,7 @@ } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(and,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(and,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -331,7 +331,7 @@ psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result"); } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(and,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(and,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -351,5 +351,5 @@ } -static int testBitSet03(void) +static psS32 testBitSet03(void) { char *binOut1 = NULL; @@ -360,5 +360,5 @@ psBitSet* bs2 = psBitSetAlloc(24); psBitSet* or = psBitSetAlloc(24); - for(int i=0; i<24; i++) { + for(psS32 i=0; i<24; i++) { if ((i/2) % 2) { bs1 = psBitSetSet(bs1, i); @@ -389,7 +389,7 @@ } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(or,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(or,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -408,7 +408,7 @@ psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result"); } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(or,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(or,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -429,5 +429,5 @@ } -static int testBitSet04(void) +static psS32 testBitSet04(void) { char *binOut1 = NULL; @@ -438,5 +438,5 @@ psBitSet* bs2 = psBitSetAlloc(24); psBitSet* xor = psBitSetAlloc(24); - for(int i=0; i<24; i++) { + for(psS32 i=0; i<24; i++) { if ((i/2) % 2) { bs1 = psBitSetSet(bs1, i); @@ -467,7 +467,7 @@ } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(xor,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(xor,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -486,7 +486,7 @@ psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result"); } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(xor,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(xor,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -507,5 +507,5 @@ } -static int testBitSet05(void) +static psS32 testBitSet05(void) { char *binOut1 = NULL; @@ -514,5 +514,5 @@ psBitSet* bs1 = psBitSetAlloc(24); psBitSet* not = psBitSetAlloc(24); - for(int i=0; i<24; i++) { + for(psS32 i=0; i<24; i++) { if (i % 2) { bs1 = psBitSetSet(bs1, i); @@ -538,7 +538,7 @@ } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(not,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(not,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -556,7 +556,7 @@ psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result"); } - for(int i=0; i<24; i++) { - bool truth = psBitSetTest(not,i); - bool res = psBitSetTest(outbs,i); + for(psS32 i=0; i<24; i++) { + psBool truth = psBitSetTest(not,i); + psBool res = psBitSetTest(outbs,i); if ( res != truth) { binOut1 = psBitSetToString(bs1); @@ -575,5 +575,5 @@ } -static int testBitSet06(void) +static psS32 testBitSet06(void) { psErr* err; Index: /trunk/psLib/test/collections/tst_psHash00.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash00.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psHash00.c (revision 2204) @@ -8,11 +8,11 @@ #include "psHash.h" #define NUM_HASH_TABLE_BUCKETS 10 -int main() +psS32 main() { psHash *myHashTable = NULL; - int testStatus = true; - int i = 0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 testStatus = true; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; printPositiveTestHeader(stdout, "psHash functions", Index: /trunk/psLib/test/collections/tst_psHash01.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash01.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psHash01.c (revision 2204) @@ -7,5 +7,5 @@ #include "psHash.h" #define NUM_HASH_TABLE_BUCKETS 100 -int imGlobal = 0; +psS32 imGlobal = 0; typedef struct @@ -32,11 +32,11 @@ } -int main() +psS32 main() { psHash *myHashTable = NULL; - int testStatus = true; - int currentId = psMemGetId(); + psS32 testStatus = true; + psS32 currentId = psMemGetId(); ID* id = NULL; - int memLeaks = 0; + psS32 memLeaks = 0; printPositiveTestHeader(stdout, Index: /trunk/psLib/test/collections/tst_psHash02.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash02.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psHash02.c (revision 2204) @@ -12,5 +12,5 @@ #include "psHash.h" #define NUM_HASH_TABLE_BUCKETS 100 -int imGlobal = 0; +psS32 imGlobal = 0; typedef struct @@ -36,9 +36,9 @@ } -int main() +psS32 main() { psHash *myHashTable = NULL; - int testStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 i = 0; ID *id = NULL; char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL @@ -46,6 +46,6 @@ char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL }; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; printPositiveTestHeader(stdout, Index: /trunk/psLib/test/collections/tst_psHash03.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash03.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psHash03.c (revision 2204) @@ -11,6 +11,6 @@ #include "psMemory.h" #define NUM_HASH_TABLE_BUCKETS 100 -int imGlobal = 0; -int currentId = 0; +psS32 imGlobal = 0; +psS32 currentId = 0; typedef struct @@ -27,5 +27,5 @@ psMemBlock **memBlocks = NULL; psMemBlock *tmp = NULL; - int numBlocks = 0; + psS32 numBlocks = 0; numBlocks = psMemCheckLeaks(currentId, &memBlocks, NULL); @@ -36,5 +36,5 @@ if (memBlocks != NULL) { for (tmp = *memBlocks; tmp != NULL; tmp = tmp->nextBlock) { - printf("%d ", (int) tmp->id); + printf("%d ", (psS32) tmp->id); } } @@ -62,11 +62,11 @@ } -int main() +psS32 main() { psHash *myHashTable = NULL; - int testStatus = true; - int i = 0; - int TotalKeys = 0; - bool retVal = false; + psS32 testStatus = true; + psS32 i = 0; + psS32 TotalKeys = 0; + psBool retVal = false; ID *id = NULL; ID *ids[4]; @@ -75,5 +75,5 @@ char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL }; - int memLeaks = 0; + psS32 memLeaks = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/collections/tst_psHash04.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash04.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psHash04.c (revision 2204) @@ -7,5 +7,5 @@ #include "psHash.h" #define NUM_HASH_TABLE_BUCKETS 100 -int imGlobal = 0; +psS32 imGlobal = 0; typedef struct @@ -32,15 +32,15 @@ } -int main() +psS32 main() { psHash *myHashTable = NULL; - int testStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 i = 0; char *myKeys[] = {"ENTRY00", "ENTRY01", "ENTRY02", "ENTRY03", NULL }; char *myData[] = {"IDA", "IDB", "IDC", "IDD", NULL }; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; psList *myLinkList = NULL; psListElem *tmp = NULL; Index: /trunk/psLib/test/collections/tst_psList.c =================================================================== --- /trunk/psLib/test/collections/tst_psList.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psList.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-09 02:24:59 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,12 +18,12 @@ -static int testListAlloc(void); -static int testListAdd(void); -static int testListGet(void); -static int testListRemove(void); -static int testListConvert(void); -static int testListIterator(void); -static int testListFree(void); -static int testListSort(void); +static psS32 testListAlloc(void); +static psS32 testListAdd(void); +static psS32 testListGet(void); +static psS32 testListRemove(void); +static psS32 testListConvert(void); +static psS32 testListIterator(void); +static psS32 testListFree(void); +static psS32 testListSort(void); testDescription tests[] = { @@ -39,5 +39,5 @@ }; -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psLogSetLevel(PS_LOG_INFO); @@ -50,8 +50,8 @@ } -int testListAlloc(void) +psS32 testListAlloc(void) { psList* list; - int ref; + psS32 ref; float* data; @@ -117,8 +117,8 @@ } -int testListAdd(void) +psS32 testListAdd(void) { psList* list = NULL; - int* data = NULL; + psS32* data = NULL; psLogMsg(__func__,PS_LOG_INFO,"psListAdd shall add an element to list"); @@ -134,5 +134,5 @@ */ - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 1; @@ -161,5 +161,5 @@ // 3. where is PS_LIST_HEAD or PS_LIST_TAIL - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 2; if ( ! psListAdd(list,PS_LIST_HEAD,data) ) { @@ -181,10 +181,10 @@ // verify that the head is the inserted data item - if (*(int*)list->head->data != 2) { + if (*(psS32*)list->head->data != 2) { psError(__func__,"psListAdd with PS_LIST_HEAD didn't insert at the head."); return 5; } - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 3; if ( ! psListAdd(list,PS_LIST_TAIL,data) ) { @@ -205,5 +205,5 @@ // verify that the head is still the same - if (*(int*)list->head->data != 2) { + if (*(psS32*)list->head->data != 2) { psError(__func__,"psListAdd with PS_LIST_TAIL modified the head."); return 7; @@ -211,5 +211,5 @@ // verify that the tail is the data item inserted - if (*(int*)list->tail->data != 3) { + if (*(psS32*)list->tail->data != 3) { psError(__func__,"psListAdd with PS_LIST_TAIL didn't insert at the tail."); return 8; @@ -218,5 +218,5 @@ // 4. where is not PS_LIST_* but <0 - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 4; psLogMsg(__func__,PS_LOG_INFO,"Following should error with invalid insert location"); @@ -239,5 +239,5 @@ // 5. where is >0 - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 5; @@ -253,5 +253,5 @@ psFree(data); // verify that the size incremented - if (list->size != 4 || *(int*)list->head->next->data != 5) { + if (list->size != 4 || *(psS32*)list->head->next->data != 5) { printListInt(list); psError(__func__,"psListAdd didn't insert to position #1."); @@ -259,5 +259,5 @@ } - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 6; if ( ! psListAdd(list,3,data) ) { @@ -271,5 +271,5 @@ psFree(data); // verify that the size incremented - if (list->size != 5 || *(int *)list->head->next->next->next->data != 6) { + if (list->size != 5 || *(psS32 *)list->head->next->next->next->data != 6) { printListInt(list); psError(__func__,"psListAdd didn't insert to position #4."); @@ -277,5 +277,5 @@ } - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 7; if ( ! psListAdd(list,2,data) ) { @@ -289,5 +289,5 @@ psFree(data); // verify that the size incremented - if (list->size != 6 || *(int *)list->head->next->next->data != 7) { + if (list->size != 6 || *(psS32 *)list->head->next->next->data != 7) { printListInt(list); psError(__func__,"psListAdd didn't insert to position #2."); @@ -295,5 +295,5 @@ } - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 7; psLogMsg(__func__,PS_LOG_INFO,"Following should be a warning."); @@ -325,6 +325,6 @@ void printListInt(psList* list) { - int* data = NULL; - bool first = true; + psS32* data = NULL; + psBool first = true; psListSetIterator(list,PS_LIST_HEAD); @@ -333,7 +333,7 @@ while ( data != NULL ) { if (!first) { - printf(", %d",*(int*)data); + printf(", %d",*(psS32*)data); } else { - printf("%d",*(int*)data); + printf("%d",*(psS32*)data); first = false; } @@ -345,8 +345,8 @@ -int testListGet(void) +psS32 testListGet(void) { psList* list = NULL; - int* data; + psS32* data; /* @@ -371,20 +371,20 @@ // create a list - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 0; list = psListAlloc(data); psFree(data); - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 1; psListAdd(list,PS_LIST_TAIL,data); psFree(data); - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 2; psListAdd(list,PS_LIST_TAIL,data); psFree(data); - data = psAlloc(sizeof(int)); + data = psAlloc(sizeof(psS32)); *data = 3; psListAdd(list,PS_LIST_TAIL,data); @@ -392,10 +392,10 @@ // 2. which>0 and which=list.n. - data = (int*)psListGet(list,5); + data = (psS32*)psListGet(list,5); if (data != NULL) { psError(__func__,"psListGet failed with which=5"); return 4; } - data = (int*)psListGet(list,4); + data = (psS32*)psListGet(list,4); if (data != NULL) { psError(__func__,"psListGet failed with which=4"); @@ -416,5 +416,5 @@ // 4. which=PS_LIST_HEAD - data = (int*)psListGet(list,PS_LIST_HEAD); + data = (psS32*)psListGet(list,PS_LIST_HEAD); if (data == NULL || *data != 0) { psError(__func__,"psListGet failed with which=PS_LIST_HEAD"); @@ -423,5 +423,5 @@ // 5. which=PS_LIST_NEXT - data = (int*)psListGet(list,PS_LIST_NEXT); + data = (psS32*)psListGet(list,PS_LIST_NEXT); if (data == NULL || *data != 1) { psError(__func__,"psListGet failed with which=PS_LIST_NEXT"); @@ -430,5 +430,5 @@ // 6. which=PS_LIST_TAIL - data = (int*)psListGet(list,PS_LIST_TAIL); + data = (psS32*)psListGet(list,PS_LIST_TAIL); if (data == NULL || *data != 3) { psError(__func__,"psListGet failed with which=PS_LIST_TAIL"); @@ -437,5 +437,5 @@ // 7. which=PS_LIST_PREV - data = (int*)psListGet(list,PS_LIST_PREVIOUS); + data = (psS32*)psListGet(list,PS_LIST_PREVIOUS); if (data == NULL || *data != 2) { psError(__func__,"psListGet failed with which=PS_LIST_PREV"); @@ -448,8 +448,8 @@ } -int testListRemove(void) +psS32 testListRemove(void) { psList* list = NULL; - int* data; + psS32* data; /* @@ -480,6 +480,6 @@ list = psListAlloc(NULL); - for (int lcv=0;lcv<15;lcv++) { - data = psAlloc(sizeof(int)); + for (psS32 lcv=0;lcv<15;lcv++) { + data = psAlloc(sizeof(psS32)); *data = lcv; psListAdd(list,PS_LIST_TAIL,data); @@ -682,14 +682,14 @@ } -int testListConvert(void) +psS32 testListConvert(void) { psList* list = NULL; psArray* arr = NULL; - int* data; + psS32* data; /* array=psListToArray(list) shall take each element of the list, increment - their reference, and insert them into the returned fresh void* array. + their reference, and insert them into the returned fresh psPtr array. The list shall not be changed, except for the element reference increment. */ @@ -699,6 +699,6 @@ // create a list list = psListAlloc(NULL); - for (int lcv=0;lcv<15;lcv++) { - data = psAlloc(sizeof(int)); + for (psS32 lcv=0;lcv<15;lcv++) { + data = psAlloc(sizeof(psS32)); *data = lcv; psListAdd(list,PS_LIST_TAIL,data); @@ -712,13 +712,13 @@ return 1; } - for (int i=0;in;i++) { - if (i != *(int*)arr->data[i]) { + for (psS32 i=0;in;i++) { + if (i != *(psS32*)arr->data[i]) { psError(__func__,"Element %d of array is incorrect (%d).", - i,*(int*)arr->data[i]); + i,*(psS32*)arr->data[i]); return 1; } - if (i != *(int*)psListGet(list,i)) { + if (i != *(psS32*)psListGet(list,i)) { psError(__func__,"Element %d of list is incorrect (%d).", - i,*(int*)arr->data[i]); + i,*(psS32*)arr->data[i]); return 1; } @@ -738,6 +738,6 @@ arr = psArrayAlloc(15); arr->n = arr->nalloc; - for (int lcv=0;lcv<15;lcv++) { - data = psAlloc(sizeof(int)); + for (psS32 lcv=0;lcv<15;lcv++) { + data = psAlloc(sizeof(psS32)); *data = lcv; arr->data[lcv] = data; @@ -750,13 +750,13 @@ return 1; } - for (int i=0;in;i++) { - if (i != *(int*)arr->data[i]) { + for (psS32 i=0;in;i++) { + if (i != *(psS32*)arr->data[i]) { psError(__func__,"Element %d of array is incorrect (%d).", - i,*(int*)arr->data[i]); + i,*(psS32*)arr->data[i]); return 1; } - if (i != *(int*)psListGet(list,i)) { + if (i != *(psS32*)psListGet(list,i)) { psError(__func__,"Element %d of list is incorrect (%d).", - i,*(int*)arr->data[i]); + i,*(psS32*)arr->data[i]); return 1; } @@ -810,8 +810,8 @@ } -int testListIterator(void) +psS32 testListIterator(void) { psList* list = NULL; - int* data; + psS32* data; psLogMsg(__func__,PS_LOG_INFO," psListSetIterator/psListGetNext/psListGetPrev" @@ -837,6 +837,6 @@ // create a list list = psListAlloc(NULL); - for (int lcv=0;lcv<15;lcv++) { - data = psAlloc(sizeof(int)); + for (psS32 lcv=0;lcv<15;lcv++) { + data = psAlloc(sizeof(psS32)); *data = lcv; psListAdd(list,PS_LIST_TAIL,data); @@ -852,5 +852,5 @@ // 3. set list.cursor to list.tail if where=PS_LIST_TAIL psListSetIterator(list,PS_LIST_TAIL); - if (*(int*)psListGetCurrent(list) != 14) { + if (*(psS32*)psListGetCurrent(list) != 14) { psError(__func__,"Didn't successfully move cursor to tail."); return 1; @@ -859,5 +859,5 @@ // 2. set list.cursor to list.head if where=PS_LIST_HEAD psListSetIterator(list,PS_LIST_HEAD); - if (*(int*)psListGetCurrent(list) != 0) { + if (*(psS32*)psListGetCurrent(list) != 0) { psError(__func__,"Didn't successfully move cursor to head."); return 2; @@ -866,10 +866,10 @@ // 4. set list.cursor to list.cursor->next if where=PS_LIST_NEXT psListSetIterator(list,PS_LIST_NEXT); - if (*(int*)psListGetCurrent(list) != 1) { + if (*(psS32*)psListGetCurrent(list) != 1) { psError(__func__,"Didn't successfully move cursor to next."); return 3; } psListSetIterator(list,PS_LIST_NEXT); - if (*(int*)psListGetCurrent(list) != 2) { + if (*(psS32*)psListGetCurrent(list) != 2) { psError(__func__,"Didn't successfully move cursor to next twice."); return 4; @@ -878,10 +878,10 @@ // 5. set list.cursor to list.cursor->prev if where=PS_LIST_PREV psListSetIterator(list,PS_LIST_PREVIOUS); - if (*(int*)psListGetCurrent(list) != 1) { + if (*(psS32*)psListGetCurrent(list) != 1) { psError(__func__,"Didn't successfully move cursor to previous."); return 5; } psListSetIterator(list,PS_LIST_PREVIOUS); - if (*(int*)psListGetCurrent(list) != 0) { + if (*(psS32*)psListGetCurrent(list) != 0) { psError(__func__,"Didn't successfully move cursor to previous twice."); return 6; @@ -892,10 +892,10 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should error with 'Can't move to an unknown position.'"); psListSetIterator(list,PS_LIST_UNKNOWN); - if (*(int*)psListGetCurrent(list) != 1) { + if (*(psS32*)psListGetCurrent(list) != 1) { psError(__func__,"PS_LIST_UNKNOWN moved cursor."); return 7; } psListSetIterator(list,PS_LIST_CURRENT); - if (*(int*)psListGetCurrent(list) != 1) { + if (*(psS32*)psListGetCurrent(list) != 1) { psError(__func__,"PS_LIST_CURRENT moved cursor."); return 8; @@ -903,21 +903,21 @@ // test psListGetPrevious/Next - if (*(int*)psListGetNext(list) != 2) { + if (*(psS32*)psListGetNext(list) != 2) { psError(__func__,"psListGetNext didn't move cursor to next."); return 9; } - if (*(int*)psListGetNext(list) != 3) { + if (*(psS32*)psListGetNext(list) != 3) { psError(__func__,"psListGetNext didn't move cursor to next."); return 10; } - if (*(int*)psListGetPrevious(list) != 2) { + if (*(psS32*)psListGetPrevious(list) != 2) { psError(__func__,"psListGetPrevious didn't move cursor to previous."); return 11; } - if (*(int*)psListGetPrevious(list) != 1) { + if (*(psS32*)psListGetPrevious(list) != 1) { psError(__func__,"psListGetPrevious didn't move cursor to previous."); return 12; } - if (*(int*)psListGetPrevious(list) != 0) { + if (*(psS32*)psListGetPrevious(list) != 0) { psError(__func__,"psListGetPrevious didn't move cursor to previous.."); return 13; @@ -939,5 +939,5 @@ } -int testListFree(void) +psS32 testListFree(void) { float* data[15]; @@ -954,6 +954,6 @@ list = psListAlloc(NULL); - for (int lcv=0;lcv<15;lcv++) { - data[lcv] = psAlloc(sizeof(int)); + for (psS32 lcv=0;lcv<15;lcv++) { + data[lcv] = psAlloc(sizeof(psS32)); *data[lcv] = lcv; psListAdd(list,PS_LIST_TAIL,data[lcv]); @@ -987,5 +987,5 @@ */ - for (int i=0;i<15;i++) { + for (psS32 i=0;i<15;i++) { if (psMemGetRefCounter(data[i]) != 1) { psError(__func__,"pslistFree didn't decrement the data item's reference counter"); @@ -998,5 +998,5 @@ } -int testListSort(void) +psS32 testListSort(void) { psList* list; @@ -1004,6 +1004,6 @@ list = psListAlloc(NULL); - for (int lcv=0;lcv<15;lcv++) { - float* data = psAlloc(sizeof(int)); + for (psS32 lcv=0;lcv<15;lcv++) { + float* data = psAlloc(sizeof(psS32)); if (lcv < 7) { *data = 13-lcv*2; @@ -1070,6 +1070,6 @@ list = psListAlloc(NULL); - for (int lcv=0;lcv<15;lcv++) { - psU32* data = psAlloc(sizeof(int)); + for (psS32 lcv=0;lcv<15;lcv++) { + psU32* data = psAlloc(sizeof(psS32)); if (lcv < 7) { *data = 13-lcv*2; Index: /trunk/psLib/test/collections/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 2204) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 22:51:31 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -80,5 +80,5 @@ vec = (psVector*)metadataItem->data.V; printf("Key Value: "); - for(int i=0; inalloc;i++) { + for(psS32 i=0; inalloc;i++) { printf("%d ", vec->data.S32[i]); } @@ -103,5 +103,5 @@ static void printMetadataTable(psHash *mdTable) { - int i; + psS32 i; psHashBucket* ptr = NULL; for(i=0; inbucket; i++) { @@ -123,10 +123,10 @@ -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { // Test A - Read config file with overwrite set true printPositiveTestHeader(stdout, "psMetadata", "Test A - Read config file with overwrite set true"); psMetadata *metadata1 = NULL; - int failedLines1 = 0; + psS32 failedLines1 = 0; failedLines1 = psMetadataParseConfig(&metadata1, "test.config", true); printf("Failed lines: %d Expected: 6\n", failedLines1); @@ -138,5 +138,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test B - Read config file with overwrite set false"); psMetadata *metadata2 = NULL; - int failedLines2 = 0; + psS32 failedLines2 = 0; failedLines2 = psMetadataParseConfig(&metadata2, "test.config", false); printf("Failed lines: %d Expected: 7", failedLines2); @@ -148,5 +148,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata"); psMetadata *metadata3 = psMetadataAlloc(); - int failedLines3 = 0; + psS32 failedLines3 = 0; failedLines3 = psMetadataParseConfig(&metadata3, "test.config", false); printf("Failed lines: %d Expected: 7", failedLines3); @@ -176,5 +176,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 2204) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-15 19:26:31 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -96,5 +96,5 @@ static void printMetadataTable(psHash *mdTable) { - int i; + psS32 i; psHashBucket* ptr = NULL; for(i=0; inbucket; i++) { @@ -116,5 +116,5 @@ -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psMetadata *metadata1 = NULL; @@ -262,5 +262,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 2204) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-07 22:31:31 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -60,5 +60,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1 = NULL; @@ -136,5 +136,5 @@ psMemCheckLeaks(0, NULL, stdout); psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_03.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psMetadata_03.c (revision 2204) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 01:33:14 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -60,5 +60,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1 = NULL; @@ -231,5 +231,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 2204) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 20:53:21 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -64,5 +64,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1 = NULL; @@ -201,5 +201,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 2204) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-12 01:40:32 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -68,7 +68,7 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { - long data; + psS64 data; psF32 fpdata; psMetadataItem *item1 = NULL; @@ -271,5 +271,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_06.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psMetadata_06.c (revision 2204) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-12 01:54:00 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psMetadataItem *item1a = NULL; @@ -134,5 +134,5 @@ } psMemCheckCorruption(0); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psVector.c =================================================================== --- /trunk/psLib/test/collections/tst_psVector.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psVector.c (revision 2204) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-28 23:26:49 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -24,6 +24,6 @@ #include "psTest.h" -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { @@ -40,5 +40,5 @@ // Test B - Add data to integer vector printPositiveTestHeader(stdout, "psVector", "Add data to S32 vector"); - for(int i = 0; i < 5; i++) { + for(psS32 i = 0; i < 5; i++) { psVec->data.S32[i] = i*10; printf("Elem %d = %d\n", i, psVec->data.S32[i]); @@ -53,5 +53,5 @@ psVec = psVectorRealloc(psVec,10); printf("Adding more elements to S32 vector...\n"); - for(int i = 5; i < 10; i++) { + for(psS32 i = 5; i < 10; i++) { psVec->data.S32[i] = i*10; psVec->n++; @@ -67,5 +67,5 @@ psVec = psVectorRealloc(psVec,3); printf("Vector size = %d\n", psVec->nalloc); - for(int i = 0; i < 3; i++) { + for(psS32 i = 0; i < 3; i++) { printf("Elem %d = %d\n", i, psVec->data.S32[i]); } @@ -78,9 +78,9 @@ printPositiveTestHeader(stdout, "psVector", "Free S32 vector"); psFree(psVec); - int leaks = psMemCheckLeaks(0, NULL, stdout); + psS32 leaks = psMemCheckLeaks(0, NULL, stdout); if(leaks != 0) { printf("ERROR: Found %d memory leaks\n",leaks); } - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psVectorSort_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:05 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,6 +20,6 @@ #include "psTest.h" -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { psVector *in = NULL; @@ -41,5 +41,5 @@ in->data.F32[5] = 5.0f; in->data.F32[6] = -20.0f; - for(int i=0; i<7; i++) { + for(psS32 i=0; i<7; i++) { printf("vec[%d] = %f\n", i, in->data.F32[i]); } @@ -51,5 +51,5 @@ tempVec = out; out = psVectorSort(out, in); - for(int i=0; i<7; i++) { + for(psS32 i=0; i<7; i++) { printf("vec[%d] = %f\n", i, out->data.F32[i]); } @@ -63,5 +63,5 @@ printPositiveTestHeader(stdout,"psVectorSort", "Sort input float vector into itself"); in = psVectorSort(in, in); - for(int i=0; i<7; i++) { + for(psS32 i=0; i<7; i++) { printf("vec[%d] = %f\n", i, out->data.F32[i]); } @@ -74,5 +74,5 @@ psFree(out); psMemCheckLeaks(0, NULL, stdout); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psVectorSort_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:05 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,6 +20,6 @@ #include "psTest.h" -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { psVector *in = NULL; @@ -36,5 +36,5 @@ in->data.F32[3] = 1.0f; in->data.F32[4] = 5.0f; - for(int i=0; i<5; i++) { + for(psS32 i=0; i<5; i++) { printf("arr[%d] = %f\n", i, in->data.F32[i]); } @@ -45,5 +45,5 @@ printPositiveTestHeader(stdout,"psVectorSortIndex", "Create sorted index vector"); out = psVectorSortIndex(out, in); - for(int i=0; i<5; i++) { + for(psS32 i=0; i<5; i++) { printf("arr[%d] = %d\n", i, out->data.U32[i]); } @@ -61,9 +61,9 @@ psFree(in); psFree(out); - int nLeaks = psMemCheckLeaks(0, NULL, stdout); + psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout); if(nLeaks) { printf("ERROR: Found %d memory leaks\n", nLeaks); } - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psVectorSort_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:05 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,6 +22,6 @@ #include "psTest.h" -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { psVector *in = NULL; @@ -37,5 +37,5 @@ out->n = 6; in->n = 5; - for(int i=0; i<5; i++) { + for(psS32 i=0; i<5; i++) { printf("arr[%d] = %f\n", i, in->data.F32[i]); } @@ -55,5 +55,5 @@ out2 = psVectorAlloc(5, PS_TYPE_F64); out2->n = 5; - for(int j=0; j<5; j++) { + for(psS32 j=0; j<5; j++) { printf("vec[%d] = %f\n", j, in2->data.F32[j]); } @@ -72,9 +72,9 @@ psFree(out); psFree(out2); - int nLeaks = psMemCheckLeaks(0, NULL, stdout); + psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout); if(nLeaks) { printf("ERROR: Found %d memory leaks\n", nLeaks); } - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/collections/tst_psVectorSort_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_04.c (revision 2203) +++ /trunk/psLib/test/collections/tst_psVectorSort_04.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:05 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,6 +19,6 @@ #include "psTest.h" -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { psVector *badIn = NULL; @@ -34,9 +34,9 @@ printPositiveTestHeader(stdout, "psVectorSort", "Free vectors"); psFree(goodOut); - int nLeaks = psMemCheckLeaks(0, NULL, stdout); + psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout); if(nLeaks) { printf("ERROR: Found %d memory blocks\n", nLeaks); } - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/dataManip/tst_psFunc00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 2204) @@ -22,5 +22,5 @@ #define CN 6 #define DN 8 -int main() +psS32 main() { psPolynomial1D *my1DPoly = NULL; @@ -32,11 +32,11 @@ psDPolynomial3D *my3DPolyD = NULL; psDPolynomial4D *my4DPolyD = NULL; - int testStatus = true; - int memLeaks = 0; - int a = 0; - int b = 0; - int c = 0; - int d = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 a = 0; + psS32 b = 0; + psS32 c = 0; + psS32 d = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/dataManip/tst_psFunc01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc01.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psFunc01.c (revision 2204) @@ -13,10 +13,10 @@ #define MY_STDEV 2.0 #define N 30 -int main() +psS32 main() { - int testStatus = true; + psS32 testStatus = true; float x = 0.0; - int memLeaks; - int currentId = psMemGetId(); + psS32 memLeaks; + psS32 currentId = psMemGetId(); psVector *myGaussData = NULL; printPositiveTestHeader(stdout, @@ -52,5 +52,5 @@ myGaussData = psGaussianDev(MY_MEAN, MY_STDEV, N); - for (int i = 0; i < N ; i++) { + for (psS32 i = 0; i < N ; i++) { printf("Gaussian Deviate [%d] is %f\n", i, myGaussData->data.F32[i]); } Index: /trunk/psLib/test/dataManip/tst_psFunc02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 2204) @@ -14,10 +14,10 @@ #define CUBIC 3 -int main() +psS32 main() { - int testStatus = true; - int memLeaks=0; - int i; - int currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks=0; + psS32 i; + psS32 currentId = psMemGetId(); psSpline1D *tmpSpline; Index: /trunk/psLib/test/dataManip/tst_psFunc03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 2204) @@ -15,10 +15,10 @@ #define CUBIC 3 -int main() +psS32 main() { - int testStatus = true; - int memLeaks=0; - int i; - int currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks=0; + psS32 i; + psS32 currentId = psMemGetId(); psSpline1D *tmpSpline; psVector *bounds; Index: /trunk/psLib/test/dataManip/tst_psFunc04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 2204) @@ -17,12 +17,12 @@ #define N 8 -int t00() +psS32 t00() { - int testStatus = true; - int memLeaks=0; - int i; + psS32 testStatus = true; + psS32 memLeaks=0; + psS32 i; float x; float y; - int currentId = psMemGetId(); + psS32 currentId = psMemGetId(); psSpline1D *tmpSpline; psVector *data; @@ -69,12 +69,12 @@ } -int t01() +psS32 t01() { - int testStatus = true; - int memLeaks=0; - int i; + psS32 testStatus = true; + psS32 memLeaks=0; + psS32 i; float x; float y; - int currentId = psMemGetId(); + psS32 currentId = psMemGetId(); psSpline1D *tmpSpline; psVector *data; @@ -121,5 +121,5 @@ } -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psFunc05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 2204) @@ -18,10 +18,10 @@ #define SPLINE_ORDER 1 -int main() +psS32 main() { - int testStatus = true; - int memLeaks=0; - int i; - int currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks=0; + psS32 i; + psS32 currentId = psMemGetId(); psSpline1D *tmpSpline; psVector *data; Index: /trunk/psLib/test/dataManip/tst_psFunc07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 2204) @@ -32,10 +32,10 @@ } -int t00() +psS32 t00() { - int testStatus = true; - int memLeaks=0; - int currentId = psMemGetId(); - int i; + psS32 testStatus = true; + psS32 memLeaks=0; + psS32 currentId = psMemGetId(); + psS32 i; psSpline1D *tmpSpline = NULL; psVector *x = NULL; @@ -101,10 +101,10 @@ // This is the F64 version of the above test code. -int t01() +psS32 t01() { - int testStatus = true; - int memLeaks=0; - int currentId = psMemGetId(); - int i; + psS32 testStatus = true; + psS32 memLeaks=0; + psS32 currentId = psMemGetId(); + psS32 i; psSpline1D *tmpSpline = NULL; psVector *x = NULL; @@ -169,5 +169,5 @@ } -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psHist00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist00.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psHist00.c (revision 2204) @@ -10,13 +10,13 @@ #define UPPER 30.0 -int main() +psS32 main() { psHistogram *myHist = NULL; - int testStatus = true; - int memLeaks = 0; - int i = 0; - int nb = 0; - int numBins = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 i = 0; + psS32 nb = 0; + psS32 numBins = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/dataManip/tst_psHist01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist01.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psHist01.c (revision 2204) @@ -10,14 +10,14 @@ #define UPPER 30.0 -int main() +psS32 main() { psHistogram *myHist = NULL; psVector *myBounds = NULL; - int testStatus = true; - int memLeaks = 0; - int i = 0; - int nb = 0; - int numBins = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 i = 0; + psS32 nb = 0; + psS32 numBins = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist02.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psHist02.c (revision 2204) @@ -14,5 +14,5 @@ #define NUM_DATA 10000 -int main() +psS32 main() { psHistogram * myHist = NULL; @@ -20,10 +20,10 @@ psVector *myData = NULL; psVector *myMask = NULL; - int testStatus = true; - int memLeaks = 0; - int nb = 0; - int numBins = 0; - int i = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 nb = 0; + psS32 numBins = 0; + psS32 i = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/dataManip/tst_psHist03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist03.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psHist03.c (revision 2204) @@ -12,15 +12,15 @@ #define NUM_DATA 20 -int main() +psS32 main() { psHistogram *myHist = NULL; psVector *myBounds = NULL; psVector *myData = psVectorAlloc( NUM_DATA, PS_TYPE_F32 ); - int testStatus = true; - int memLeaks = 0; - int i = 0; - int nb = 0; - int numBins = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 i = 0; + psS32 nb = 0; + psS32 numBins = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/dataManip/tst_psMatrix01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 22:34:06 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -22,6 +22,6 @@ #define PRINT_MATRIX(IMAGE) \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=IMAGE->numRows-1; i>-1; i--) { \ + for(psS32 j=0; jnumCols; j++) { \ printf("%f ", IMAGE->data.F64[i][j]); \ } \ @@ -29,6 +29,6 @@ } -int main( int argc, - char* argv[] ) +psS32 main( psS32 argc, + char* argv[] ) { psImage * tempImage = NULL; @@ -79,9 +79,9 @@ psFree( outImage ); psFree( outImageNull ); - int nLeaks = psMemCheckLeaks( 0, NULL, stdout ); + psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout ); if ( nLeaks != 0 ) { printf( "ERROR: Found %d memory leaks\n", nLeaks ); } - int nBad = psMemCheckCorruption( 0 ); + psS32 nBad = psMemCheckCorruption( 0 ); if ( nBad ) { printf( "ERROR: Found %d bad memory blocks\n", nBad ); Index: /trunk/psLib/test/dataManip/tst_psMatrix02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix02.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrix02.c (revision 2204) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:06 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -23,6 +23,6 @@ #include "psTest.h" -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { psImage *nullImage = NULL; Index: /trunk/psLib/test/dataManip/tst_psMatrix03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 2204) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:06 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,6 +25,6 @@ #define PRINT_MATRIX(IMAGE) \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=IMAGE->numRows-1; i>-1; i--) { \ + for(psS32 j=0; jnumCols; j++) { \ printf("%f ", IMAGE->data.F64[i][j]); \ } \ @@ -33,11 +33,11 @@ \ #define PRINT_VECTOR(VECTOR) \ -for(int i=0; in; i++) { \ +for(psS32 i=0; in; i++) { \ printf("%f\n", VECTOR->data.F64[i]); \ } -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { psImage *luImage = NULL; @@ -112,5 +112,5 @@ psFree(inVector); psMemCheckLeaks(0, NULL, stdout); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/dataManip/tst_psMatrix04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 2204) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:06 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -24,6 +24,6 @@ #define PRINT_MATRIX(IMAGE) \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=IMAGE->numRows-1; i>-1; i--) { \ + for(psS32 j=0; jnumCols; j++) { \ printf("%f ", IMAGE->data.F64[i][j]); \ } \ @@ -32,6 +32,6 @@ -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { float det = 0.0f; @@ -87,5 +87,5 @@ psFree(det2); psMemCheckLeaks(0, NULL, stdout); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/dataManip/tst_psMatrix05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 22:34:06 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,6 +21,6 @@ #define PRINT_MATRIX(IMAGE) \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=0; inumRows; i++) { \ + for(psS32 j=0; jnumCols; j++) { \ printf("%f ", IMAGE->data.F64[i][j]); \ } \ @@ -29,6 +29,6 @@ -int main( int argc, - char* argv[] ) +psS32 main( psS32 argc, + char* argv[] ) { psImage * outImage = NULL; @@ -68,9 +68,9 @@ psFree( inImage1 ); psFree( inImage2 ); - int nLeaks = psMemCheckLeaks( 0, NULL, stdout ); + psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout ); if ( nLeaks != 0 ) { printf( "ERROR: Found %d memory leaks\n", nLeaks ); } - int nBad = psMemCheckCorruption( 0 ); + psS32 nBad = psMemCheckCorruption( 0 ); if ( nBad ) { printf( "ERROR: Found %d bad memory blocks\n", nBad ); Index: /trunk/psLib/test/dataManip/tst_psMatrix06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 22:34:06 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,6 +21,6 @@ #define PRINT_MATRIX(IMAGE) \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=0; inumRows; i++) { \ + for(psS32 j=0; jnumCols; j++) { \ printf("%f ", IMAGE->data.F64[i][j]); \ } \ @@ -29,6 +29,6 @@ -int main( int argc, - char* argv[] ) +psS32 main( psS32 argc, + char* argv[] ) { psImage * outImage = NULL; @@ -76,9 +76,9 @@ psFree( outImage ); psFree( inImage ); - int nLeaks = psMemCheckLeaks( 0, NULL, stdout ); + psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout ); if ( nLeaks != 0 ) { printf( "ERROR: Found %d memory leaks\n", nLeaks ); } - int nBad = psMemCheckCorruption( 0 ); + psS32 nBad = psMemCheckCorruption( 0 ); if ( nBad ) { printf( "ERROR: Found %d bad memory blocks\n", nBad ); Index: /trunk/psLib/test/dataManip/tst_psMatrix07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 2204) @@ -16,6 +16,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:06 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -27,6 +27,6 @@ #define PRINT_MATRIX(IMAGE) \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=0; inumRows; i++) { \ + for(psS32 j=0; jnumCols; j++) { \ printf("%f ", IMAGE->data.F64[i][j]); \ } \ @@ -35,11 +35,11 @@ #define PRINT_VECTOR(VECTOR) \ -for(int i=0; in; i++) { \ +for(psS32 i=0; in; i++) { \ printf("%f\n", VECTOR->data.F64[i]); \ } -int main(int argc, - char* argv[]) +psS32 main(psS32 argc, + char* argv[]) { psVector *v1 = NULL; @@ -169,5 +169,5 @@ psFree(badImage); psMemCheckLeaks(0, NULL, stdout); - int nBad = psMemCheckCorruption(0); + psS32 nBad = psMemCheckCorruption(0); if(nBad) { printf("ERROR: Found %d bad memory blocks\n", nBad); Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-27 23:31:22 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -24,5 +24,5 @@ printf("%f+%fi ", creal(SCALAR->data.TYPE), cimag(SCALAR->data.TYPE)); \ } else if(PS_IS_PSELEMTYPE_INT(SCALAR->type.type)) { \ - printf("%d ", (int)SCALAR->data.TYPE); \ + printf("%d ", (psS32)SCALAR->data.TYPE); \ } else { \ printf("%f ", (double)SCALAR->data.TYPE); \ @@ -31,9 +31,9 @@ #define PRINT_VECTOR(VECTOR,TYPE) \ -for(int i=0; in; i++) { \ +for(psS32 i=0; in; i++) { \ if(PS_IS_PSELEMTYPE_COMPLEX(VECTOR->type.type)) { \ printf("%f+%fi ", creal(VECTOR->data.TYPE[i]), cimag(VECTOR->data.TYPE[i])); \ } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) { \ - printf("%d ", (int)VECTOR->data.TYPE[i]); \ + printf("%d ", (psS32)VECTOR->data.TYPE[i]); \ } else { \ printf("%f ", (double)VECTOR->data.TYPE[i]); \ @@ -44,10 +44,10 @@ #define PRINT_MATRIX(IMAGE,TYPE) \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=IMAGE->numRows-1; i>-1; i--) { \ + for(psS32 j=0; jnumCols; j++) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ printf("%f+%fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ - printf("%d ", (int)IMAGE->data.TYPE[i][j]); \ + printf("%d ", (psS32)IMAGE->data.TYPE[i][j]); \ } else { \ printf("%f ", (double)IMAGE->data.TYPE[i][j]); \ @@ -61,5 +61,5 @@ #define CREATE_AND_SET_VECTOR(NAME,TYPE,VALUE,SIZE) \ psVector *NAME = (psVector*)psVectorAlloc(SIZE, PS_TYPE_##TYPE); \ -for(int i=0; idata.TYPE[i] = VALUE; \ } \ @@ -69,6 +69,6 @@ #define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=0; inumRows; i++) { \ + for(psS32 j=0; jnumCols; j++) { \ NAME->data.TYPE[i][j] = VALUE; \ } \ @@ -78,5 +78,5 @@ #define CHECK_MEMORY \ psMemCheckLeaks(0, NULL, stdout); \ -int nBad = psMemCheckCorruption(0); \ +psS32 nBad = psMemCheckCorruption(0); \ if(nBad) { \ printf("ERROR: Found %d bad memory blocks\n", nBad); \ @@ -84,5 +84,5 @@ -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 2204) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-12 20:50:40 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -24,5 +24,5 @@ #define CHECK_VECTOR(VECTOR,TYPE,TRUTH) \ -for(int i=0; in; i++) { \ +for(psS32 i=0; in; i++) { \ if(cabs(VECTOR->data.TYPE[i])-cabs(TRUTH) > FLT_EPSILON){ \ printf("ERROR:Truth and calculated values don't match for vector operation:\n"); \ @@ -31,6 +31,6 @@ printf("Calculated: %.2f%+.2fi\n", creal(TRUTH), cimag(TRUTH)); \ } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) { \ - printf("Truth: %d\n", (int)(VECTOR->data.TYPE[i])); \ - printf("Calculated: %d\n", (int)(TRUTH)); \ + printf("Truth: %d\n", (psS32)(VECTOR->data.TYPE[i])); \ + printf("Calculated: %d\n", (psS32)(TRUTH)); \ } else { \ printf("Truth: %.2f\n", (double)(VECTOR->data.TYPE[i])); \ @@ -43,6 +43,6 @@ #define CHECK_MATRIX(IMAGE,TYPE,TRUTH) \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=IMAGE->numRows-1; i>-1; i--) { \ + for(psS32 j=0; jnumCols; j++) { \ if(cabs(IMAGE->data.TYPE[i][j])-cabs(TRUTH) > FLT_EPSILON){ \ printf("ERROR:Truth and calculated values don't match for matrix operation:\n"); \ @@ -51,6 +51,6 @@ printf("Calculated: %.2f%+.2fi\n", creal(TRUTH), cimag(TRUTH)); \ } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ - printf("Truth: %d\n", (int)(IMAGE->data.TYPE[i][j])); \ - printf("Calculated: %d\n", (int)(TRUTH)); \ + printf("Truth: %d\n", (psS32)(IMAGE->data.TYPE[i][j])); \ + printf("Calculated: %d\n", (psS32)(TRUTH)); \ } else { \ printf("Truth: %.2f\n", (double)(IMAGE->data.TYPE[i][j])); \ @@ -66,5 +66,5 @@ #define CREATE_AND_SET_VECTOR(NAME,TYPE,VALUE,SIZE) \ psVector *NAME = (psVector*)psVectorAlloc(SIZE, PS_TYPE_##TYPE); \ -for(int i=0; idata.TYPE[i] = VALUE; \ } \ @@ -74,6 +74,6 @@ #define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=0; inumRows; i++) { \ + for(psS32 j=0; jnumCols; j++) { \ NAME->data.TYPE[i][j] = VALUE; \ } \ @@ -86,5 +86,5 @@ return 50; \ } \ -int nBad = psMemCheckCorruption(0); \ +psS32 nBad = psMemCheckCorruption(0); \ if(nBad) { \ psError(__func__,"ERROR: Found %d bad memory blocks\n", nBad); \ @@ -93,5 +93,5 @@ -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c (revision 2204) @@ -15,6 +15,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-12 19:18:20 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -27,9 +27,9 @@ #define PRINT_VECTOR(VECTOR,TYPE) \ -for(int i=0; in; i++) { \ +for(psS32 i=0; in; i++) { \ if(PS_IS_PSELEMTYPE_COMPLEX(VECTOR->type.type)) { \ printf("%f+%fi ", creal(VECTOR->data.TYPE[i]), cimag(VECTOR->data.TYPE[i])); \ } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) { \ - printf("%d ", (int)VECTOR->data.TYPE[i]); \ + printf("%d ", (psS32)VECTOR->data.TYPE[i]); \ } else { \ printf("%f ", (double)VECTOR->data.TYPE[i]); \ @@ -40,10 +40,10 @@ #define PRINT_MATRIX(IMAGE,TYPE) \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=IMAGE->numRows-1; i>-1; i--) { \ + for(psS32 j=0; jnumCols; j++) { \ if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ printf("%f+%fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ - printf("%d ", (int)IMAGE->data.TYPE[i][j]); \ + printf("%d ", (psS32)IMAGE->data.TYPE[i][j]); \ } else { \ printf("%f ", (double)IMAGE->data.TYPE[i][j]); \ @@ -57,5 +57,5 @@ #define CREATE_AND_SET_VECTOR(NAME,TYPE,VALUE,SIZE) \ psVector *NAME = (psVector*)psVectorAlloc(SIZE, PS_TYPE_##TYPE); \ -for(int i=0; idata.TYPE[i] = VALUE; \ } \ @@ -65,6 +65,6 @@ #define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ +for(psS32 i=0; inumRows; i++) { \ + for(psS32 j=0; jnumCols; j++) { \ NAME->data.TYPE[i][j] = VALUE; \ } \ @@ -72,5 +72,5 @@ -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { CREATE_AND_SET_IMAGE(image1,F64,0,3,3); Index: /trunk/psLib/test/dataManip/tst_psMinimize00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize00.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize00.c (revision 2204) @@ -36,5 +36,5 @@ float myFuncDeriv(const psVector *restrict myData, const psVector *restrict myParams, - int whichParamDeriv) + psS32 whichParamDeriv) { float x = myData->data.F32[0]; @@ -65,5 +65,5 @@ -int main() +psS32 main() { psImage *domain = NULL; @@ -74,9 +74,9 @@ psVector *tmpVecPtr = NULL; float chiSq = 0.0; - int i = 0; - int j = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 j = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; psVector *theParams = NULL; Index: /trunk/psLib/test/dataManip/tst_psMinimize01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize01.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize01.c (revision 2204) @@ -35,5 +35,5 @@ float myFuncDeriv(const psVector *restrict myData, const psVector *restrict myParams, - int whichParamDeriv) + psS32 whichParamDeriv) { float x = myData->data.F32[0]; @@ -58,5 +58,5 @@ } -int main() +psS32 main() { psImage *domain = NULL; @@ -67,9 +67,9 @@ psVector *tmpVecPtr = NULL; float chiSq = 0.0; - int i = 0; + psS32 i = 0; psVector *theParams = NULL; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; domain = psImageAlloc(DATA_WIDTH, NUM_DATA, PS_TYPE_F32); Index: /trunk/psLib/test/dataManip/tst_psMinimize02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize02.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize02.c (revision 2204) @@ -34,5 +34,5 @@ float myFuncDeriv0(const psVector *restrict myParams, const psVector *restrict myCoords, - int whichParamDeriv) + psS32 whichParamDeriv) { float P0 = myCoords->data.F32[0]; @@ -75,5 +75,5 @@ float myFuncDeriv(const psVector *restrict myParams, const psVector *restrict myCoords, - int whichParamDeriv) + psS32 whichParamDeriv) { float x = myCoords->data.F32[0]; @@ -104,13 +104,13 @@ -int main() +psS32 main() { psVector *initialGuess = NULL; psVector *paramMask = NULL; psVector *coord = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; psVector *theParams = NULL; Index: /trunk/psLib/test/dataManip/tst_psMinimize03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize03.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize03.c (revision 2204) @@ -34,5 +34,5 @@ float myFuncDeriv0(const psVector *restrict myParams, const psVector *restrict myCoords, - int whichParamDeriv) + psS32 whichParamDeriv) { float P0 = myCoords->data.F32[0]; @@ -75,5 +75,5 @@ float myFuncDeriv(const psVector *restrict myParams, const psVector *restrict myCoords, - int whichParamDeriv) + psS32 whichParamDeriv) { float x = myCoords->data.F32[0]; @@ -104,13 +104,13 @@ -int main() +psS32 main() { psVector *initialGuess = NULL; psVector *paramMask = NULL; psVector *coord = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; psVector *theParams = NULL; Index: /trunk/psLib/test/dataManip/tst_psMinimize04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize04.c (revision 2204) @@ -33,5 +33,5 @@ } -int t00() +psS32 t00() { psPolynomial1D *myPoly = NULL; @@ -39,8 +39,8 @@ psVector *y = NULL; psVector *yErr = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; double expectData; double actualData; @@ -101,13 +101,13 @@ } -int t01() +psS32 t01() { psPolynomial1D *myPoly = NULL; psVector *x = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; double expectData; double actualData; @@ -164,12 +164,12 @@ } -int t02() +psS32 t02() { psPolynomial1D *myPoly = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; double expectData; double actualData; @@ -223,9 +223,9 @@ } -int t03() -{ - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; +psS32 t03() +{ + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; psPolynomial1D *myPoly = NULL; @@ -257,5 +257,5 @@ -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c (revision 2204) @@ -33,5 +33,5 @@ } -int t00() +psS32 t00() { psPolynomial1D *myPoly = NULL; @@ -39,8 +39,8 @@ psVector *y = NULL; psVector *yErr = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; float expectData; float actualData; @@ -100,13 +100,13 @@ } -int t01() +psS32 t01() { psPolynomial1D *myPoly = NULL; psVector *x = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; float expectData; float actualData; @@ -163,12 +163,12 @@ } -int t02() +psS32 t02() { psPolynomial1D *myPoly = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; float expectData; float actualData; @@ -222,9 +222,9 @@ } -int t03() -{ - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; +psS32 t03() +{ + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; printPositiveTestHeader(stdout, @@ -251,5 +251,5 @@ -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psMinimize04b.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04b.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize04b.c (revision 2204) @@ -26,5 +26,5 @@ } -int t00() +psS32 t00() { psPolynomial1D *myPoly = NULL; @@ -32,8 +32,8 @@ psVector *y = NULL; psVector *yErr = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; myPoly = psPolynomial1DAlloc(POLY_ORDER+1, PS_POLYNOMIAL_CHEB); @@ -95,13 +95,13 @@ -int t01() +psS32 t01() { psPolynomial1D *myPoly = NULL; psVector *x = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; myPoly = psPolynomial1DAlloc(POLY_ORDER+1, PS_POLYNOMIAL_CHEB); @@ -155,13 +155,13 @@ -int t02() +psS32 t02() { psPolynomial1D *myPoly = NULL; psVector *x = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; myPoly = psPolynomial1DAlloc(POLY_ORDER+1, PS_POLYNOMIAL_CHEB); @@ -214,10 +214,10 @@ } -int t03() -{ - psPolynomial1D *myPoly = NULL; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; +psS32 t03() +{ + psPolynomial1D *myPoly = NULL; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; printPositiveTestHeader(stdout, @@ -244,5 +244,5 @@ } -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c (revision 2204) @@ -26,5 +26,5 @@ } -int t00() +psS32 t00() { psPolynomial1D *myPoly = NULL; @@ -32,8 +32,8 @@ psVector *y = NULL; psVector *yErr = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; myPoly = psPolynomial1DAlloc(POLY_ORDER+1, PS_POLYNOMIAL_CHEB); @@ -95,13 +95,13 @@ -int t01() +psS32 t01() { psPolynomial1D *myPoly = NULL; psVector *x = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; myPoly = psPolynomial1DAlloc(POLY_ORDER+1, PS_POLYNOMIAL_CHEB); @@ -155,13 +155,13 @@ -int t02() +psS32 t02() { psPolynomial1D *myPoly = NULL; psVector *x = NULL; psVector *y = NULL; - int i = 0; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; + psS32 i = 0; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; myPoly = psPolynomial1DAlloc(POLY_ORDER+1, PS_POLYNOMIAL_CHEB); @@ -214,10 +214,10 @@ } -int t03() -{ - psPolynomial1D *myPoly = NULL; - int currentId = psMemGetId(); - int testStatus = true; - int memLeaks = 0; +psS32 t03() +{ + psPolynomial1D *myPoly = NULL; + psS32 currentId = psMemGetId(); + psS32 testStatus = true; + psS32 memLeaks = 0; printPositiveTestHeader(stdout, @@ -244,5 +244,5 @@ } -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psMinimize05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize05.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize05.c (revision 2204) @@ -15,5 +15,5 @@ #define ERROR_TOLERANCE 0.10 float expectedParm[NUM_PARAMS]; -int testStatus = true; +psS32 testStatus = true; /***************************************************************************** @@ -32,5 +32,5 @@ float coordData = 0.0; float expData = 0.0; - int i; + psS32 i; for (i=0;idata[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32); + myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32); ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10); ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3); @@ -137,9 +137,9 @@ } -int t01() -{ - int currentId = psMemGetId(); - int memLeaks = 0; - int i = 0; +psS32 t01() +{ + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; + psS32 i = 0; psArray *myCoords; psVector *myParams; @@ -154,5 +154,5 @@ myCoords = psArrayAlloc(N); for (i=0;idata[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32); + myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32); ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10); ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3); @@ -208,9 +208,9 @@ } -int t02() -{ - int currentId = psMemGetId(); - int memLeaks = 0; - int i = 0; +psS32 t02() +{ + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; + psS32 i = 0; psArray *myCoords; psVector *myParams; @@ -227,5 +227,5 @@ myCoords = psArrayAlloc(N); for (i=0;idata[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32); + myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32); ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10); ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3); @@ -269,5 +269,5 @@ } -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psMinimize06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize06.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psMinimize06.c (revision 2204) @@ -12,5 +12,5 @@ #define NUM_PARAMS 3 float expectedParm[NUM_PARAMS]; -int testStatus = true; +psS32 testStatus = true; /***************************************************************************** @@ -29,6 +29,6 @@ { psVector *sum = psVectorAlloc(myCoords->n, PS_TYPE_F32); - int i; - int j; + psS32 i; + psS32 j; @@ -52,9 +52,9 @@ } -int t01() +psS32 t01() { - int currentId = psMemGetId(); - int memLeaks = 0; - int i = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; + psS32 i = 0; psArray *myCoords; psVector *myParams; @@ -73,5 +73,5 @@ for (i=0;idata[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32); + myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32); ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10); ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3); @@ -115,5 +115,5 @@ } -int main() +psS32 main() { t01(); Index: /trunk/psLib/test/dataManip/tst_psStats00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats00.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats00.c (revision 2204) @@ -8,11 +8,11 @@ #define N 10 -int main() +psS32 main() { psStats *myStats = NULL; psStats *myStats2 = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector= NULL; @@ -20,7 +20,7 @@ float realMeanNoMask = 0.0; float realMeanWithMask = 0.0; - int count = 0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 count = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psStats01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats01.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats01.c (revision 2204) @@ -8,10 +8,10 @@ #define N 10 -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector= NULL; @@ -19,6 +19,6 @@ float realMaxNoMask = 0.0; float realMaxWithMask = 0.0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psStats02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats02.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats02.c (revision 2204) @@ -8,10 +8,10 @@ #define N 10 -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector= NULL; @@ -19,6 +19,6 @@ float realMinNoMask = 1e99; float realMinWithMask = 1e99; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psStats03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats03.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats03.c (revision 2204) @@ -9,10 +9,10 @@ #define N ((4 * N1) + 1) -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector= NULL; @@ -20,6 +20,6 @@ float realMedianWithMask = (float) (N-3)/4; float realMedianNoMask = (float) (N-1)/2; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psStats04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats04.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats04.c (revision 2204) @@ -12,9 +12,9 @@ #define N ((4 * N1) + 1) -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector= NULL; Index: /trunk/psLib/test/dataManip/tst_psStats05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats05.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats05.c (revision 2204) @@ -8,10 +8,10 @@ #define MISC_FLOAT_NUMBER 345.0 -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 testStatus = true; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psStats06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats06.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats06.c (revision 2204) @@ -12,10 +12,10 @@ #define N 15 -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector= NULL; @@ -26,7 +26,7 @@ float realStdevNoMask = 4.472136; float realStdevWithMask = 2.160247; - int count = 0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 count = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psStats07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats07.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats07.c (revision 2204) @@ -15,10 +15,10 @@ #define ERROR_TOLERANCE 0.10 -int t00() +psS32 t00() { psStats * myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector = NULL; @@ -26,7 +26,7 @@ // They must be changed if we adjust the number of data points. // We don't really know that they are correct. - int count = 0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 count = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; float realMeanNoMask = MEAN; float realMedianNoMask = MEAN; @@ -35,6 +35,6 @@ float realLQNoMask = MEAN - ( 0.6 * STDEV ); float realUQNoMask = MEAN + ( 0.6 * STDEV ); - int realN50NoMask = N / 4; - int realNfitNoMask = N / 4; + psS32 realN50NoMask = N / 4; + psS32 realNfitNoMask = N / 4; psTraceSetLevel(".psLib.dataManip.psStats", 10); @@ -253,10 +253,10 @@ -int t01() +psS32 t01() { psStats * myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector = NULL; @@ -264,7 +264,7 @@ // A: They must be changed if we adjust the number of data points. // B: We don't really know that they are correct. - int count = 0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 count = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; float realMeanWithMask = MEAN; float realMedianWithMask = MEAN; @@ -273,6 +273,6 @@ float realLQWithMask = MEAN; float realUQWithMask = MEAN; - int realN50WithMask = N / 4; - int realNfitWithMask = N / 4; + psS32 realN50WithMask = N / 4; + psS32 realNfitWithMask = N / 4; psTraceSetLevel(".psLib.dataManip.psStats", 10); @@ -487,5 +487,5 @@ } -int main() +psS32 main() { t00(); Index: /trunk/psLib/test/dataManip/tst_psStats08.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats08.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats08.c (revision 2204) @@ -13,10 +13,10 @@ #define N (8 * N1) // Don't change this (N must be a multiple of 8) -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *myVector = NULL; psVector *maskVector= NULL; @@ -28,7 +28,7 @@ float realLQWithMask = N/8.0; float realUQWithMask = 3.0 * (N/8.0); - int count = 0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 count = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psStats09.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats09.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psStats09.c (revision 2204) @@ -16,10 +16,10 @@ #define MY_RANGE 2.0 -int main() +psS32 main() { psStats *myStats = NULL; - int testStatus = true; - int globalTestStatus = true; - int i = 0; + psS32 testStatus = true; + psS32 globalTestStatus = true; + psS32 i = 0; psVector *maskVector= NULL; psVector *myGaussData = NULL; @@ -31,7 +31,7 @@ // float realclippedMeanWithMask = 0.0; // float realclippedStdevWithMask = 0.0; - int count = 0; - int currentId = psMemGetId(); - int memLeaks = 0; + psS32 count = 0; + psS32 currentId = psMemGetId(); + psS32 memLeaks = 0; /*************************************************************************/ Index: /trunk/psLib/test/dataManip/tst_psVectorFFT.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 2203) +++ /trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 22:34:06 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,16 +20,16 @@ #define GENIMAGE(img,c,r,TYP, valueFcn) \ img = psImageAlloc(c,r,PS_TYPE_##TYP); \ -for (unsigned int row=0;rowdata.TYP[row]; \ - for (unsigned int col=0;coln = vec->nalloc; - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { vec->data.F32[ n ] = sinf( ( psF32 ) n / 50.0f * M_PI ); } @@ -91,5 +91,5 @@ // 3. verify that the only significant component cooresponds to the freqency of the input in step 1. - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { if ( n == 1 || n == 99 ) { if ( fabsf( cabsf( vec2->data.C32[ n ] ) - 50.0f ) > 0.1f ) { @@ -111,5 +111,5 @@ return 4; } - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { psF32 val = sinf( ( psF32 ) n / 50.0f * M_PI ); psF32 vecVal = crealf( vec3->data.C32[ n ] ) / 100; @@ -128,5 +128,5 @@ } -int testVectorRealImaginary( void ) +psS32 testVectorRealImaginary( void ) { psVector * vec = NULL; @@ -143,5 +143,5 @@ vec = psVectorAlloc( 100, PS_TYPE_C32 ); vec->n = vec->nalloc; - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { vec->data.C32[ n ] = n + I * ( n * 2 ); } @@ -171,5 +171,5 @@ // 3. compare results to the real/imaginary components of input - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { psF32 r = n; psF32 i = ( n * 2 ); @@ -193,5 +193,5 @@ } -int testVectorComplex( void ) +psS32 testVectorComplex( void ) { psVector * vec = NULL; @@ -220,5 +220,5 @@ vec->n = vec->nalloc; vec2->n = vec2->nalloc; - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { vec->data.F32[ n ] = n; vec2->data.F32[ n ] = ( n * 2 ); @@ -237,5 +237,5 @@ // 4. call psVectorReal and psVectorImaginary on step 2 results (not needed, just use crealf/cimagf) // 5. compare step 4 results to input. - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { if ( fabsf( crealf( vec3->data.C32[ n ] ) - n ) > FLT_EPSILON || fabsf( cimagf( vec3->data.C32[ n ] ) - ( n * 2 ) ) > FLT_EPSILON ) { @@ -278,5 +278,5 @@ } -int testVectorConjugate( void ) +psS32 testVectorConjugate( void ) { psVector * vec = NULL; @@ -293,5 +293,5 @@ vec = psVectorAlloc( 100, PS_TYPE_C32 ); vec->n = vec->nalloc; - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { vec->data.C32[ n ] = n + I * ( n * 2 ); } @@ -307,5 +307,5 @@ // 4. verify each value is conjugate of input (a+bi -> a-bi) - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { if ( fabsf( crealf( vec->data.C32[ n ] ) - crealf( vec2->data.C32[ n ] ) ) > FLT_EPSILON || fabsf( cimagf( vec->data.C32[ n ] ) + cimagf( vec2->data.C32[ n ] ) ) > FLT_EPSILON ) { @@ -322,5 +322,5 @@ } -int testVectorPowerSpectrum( void ) +psS32 testVectorPowerSpectrum( void ) { psVector * vec = NULL; @@ -338,5 +338,5 @@ vec = psVectorAlloc( 100, PS_TYPE_C32 ); vec->n = vec->nalloc; - for ( unsigned int n = 0; n < 100; n++ ) { + for ( psU32 n = 0; n < 100; n++ ) { vec->data.C32[ n ] = n + I * sinf( ( ( psF32 ) n ) / 50.f * M_PI ); } @@ -365,5 +365,5 @@ }; - for ( unsigned int n = 1; n < 50; n++ ) { + for ( psU32 n = 1; n < 50; n++ ) { val = ( cabsf( vec->data.C32[ n ] ) * cabsf( vec->data.C32[ n ] ) + cabsf( vec->data.C32[ 100 - n ] ) * cabsf( vec->data.C32[ 100 - n ] ) ) / 100 / 100; Index: /trunk/psLib/test/image/tst_psImage.c =================================================================== --- /trunk/psLib/test/image/tst_psImage.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImage.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-29 20:17:58 $ + * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,6 +21,6 @@ #include "psType.h" -static int testImageAlloc(void); -static int testImageCopy(void); +static psS32 testImageAlloc(void); +static psS32 testImageCopy(void); testDescription tests[] = { @@ -31,5 +31,5 @@ }; -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psLogSetLevel(PS_LOG_INFO); @@ -38,15 +38,15 @@ } -int testImageAlloc(void) +psS32 testImageAlloc(void) { psImage* image = NULL; - unsigned int sizes = 6; - unsigned int numCols[] = { - 0,1,1,100,100,150 - }; - unsigned int numRows[] = { - 0,1,100,1,150,100 - }; - unsigned int types = 13; + psU32 sizes = 6; + psU32 numCols[] = { + 0,1,1,100,100,150 + }; + psU32 numRows[] = { + 0,1,100,1,150,100 + }; + psU32 types = 13; psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64, PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64, @@ -56,8 +56,8 @@ psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure"); - for (unsigned int t=0;tdata.U16[r][c] = 2*c+r; } } - for (int r=0;rdata.U16[r][c] != 2*c+r) { psError(__func__,"Could not set all pixels in uint16 image at (%d,%d)",c,r); @@ -132,14 +132,14 @@ break; case PS_TYPE_F32: { - unsigned int rows = numRows[i]; - unsigned int cols = numCols[i]; - - for (int r=0;rdata.F32[r][c] = 2.0f*c+r; } } - for (int r=0;rdata.F32[r][c] - (2.0f*c+r)) > FLT_EPSILON) { psError(__func__,"Could not set all pixels in float image at (%d,%d)",c,r); @@ -152,14 +152,14 @@ break; case PS_TYPE_F64: { - unsigned int rows = numRows[i]; - unsigned int cols = numCols[i]; - - for (int r=0;rdata.F64[r][c] = 2.0f*c+r; } } - for (int r=0;rdata.F64[r][c] - (2.0f*c+r)) > DBL_EPSILON) { psError(__func__,"Could not set all pixels in double image at (%d,%d)",c,r); @@ -172,14 +172,14 @@ break; case PS_TYPE_C32: { - unsigned int rows = numRows[i]; - unsigned int cols = numCols[i]; - - for (int r=0;rdata.C32[r][c] = r + I * c; } } - for (int r=0;rdata.C32[r][c]) - r) > FLT_EPSILON || fabsf(cimagf(image->data.C32[r][c]) - c) > FLT_EPSILON ) { @@ -193,15 +193,15 @@ break; case PS_TYPE_PTR: { - unsigned int rows = numRows[i]; - unsigned int cols = numCols[i]; + psU32 rows = numRows[i]; + psU32 cols = numCols[i]; psImage* temp = psImageAlloc(1,1,PS_TYPE_F32); - for (int r=0;rdata.PTR[r][c] = psMemIncrRefCounter(temp); } } - for (int r=0;rdata.PTR[r][c] != temp) { psError(__func__, "Could not set pixel in pointer image at (%d,%d): %x %x", @@ -218,14 +218,14 @@ default: { // ignore type and just use as byte bucket. - unsigned int rows = numRows[i]; - unsigned int cols = numCols[i]*PSELEMTYPE_SIZEOF(type[t]); - - for (int r=0;rdata.U8[r][c] = (uint8_t)(r + c); } } - for (int r=0;rdata.U8[r][c] != (uint8_t)(r + c)) { psError(__func__,"Could not set all pixels in image (type=%d) at (%d,%d)", @@ -253,5 +253,5 @@ } -int testImageCopy(void) +psS32 testImageCopy(void) { psImage* img = NULL; @@ -259,6 +259,6 @@ psImage* img3 = NULL; psImage* img4 = NULL; - unsigned int c = 128; - unsigned int r = 256; + psU32 c = 128; + psU32 r = 256; img = psImageAlloc(c,r,PS_TYPE_F32); @@ -296,5 +296,5 @@ return 4; } - for (unsigned int row=0;rowdata.F32[row]; psF32* imgOutRow = img4->data.F32[row]; @@ -324,8 +324,8 @@ return 2; \ } \ - for (unsigned int row=0;rowdata.IN[row]; \ ps##OUT* img2Row = img2->data.OUT[row]; \ - for (unsigned int col=0;col 0.5) { \ psError(__func__,"Input image was changed at %d,%d!", \ Index: /trunk/psLib/test/image/tst_psImageConvolve.c =================================================================== --- /trunk/psLib/test/image/tst_psImageConvolve.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageConvolve.c (revision 2204) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-13 01:22:38 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,7 +20,7 @@ #include "psType.h" -static int testKernelAlloc(void); -static int testKernelGenerate(void); -//static int testImageConvolve(void); +static psS32 testKernelAlloc(void); +static psS32 testKernelGenerate(void); +//static psS32 testImageConvolve(void); testDescription tests[] = { @@ -31,5 +31,5 @@ }; -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psLogSetLevel(PS_LOG_INFO); @@ -38,12 +38,12 @@ } -static int testKernelAlloc(void) +static psS32 testKernelAlloc(void) { - int numCases = 4; - int xMin[] = { -5, 0,-10, 5}; - int xMax[] = { 0, 5, -5, 10}; - int yMin[] = { -4, 0, -8, 4}; - int yMax[] = { 0, 4, -4, 8}; - int i; + psS32 numCases = 4; + psS32 xMin[] = { -5, 0,-10, 5}; + psS32 xMax[] = { 0, 5, -5, 10}; + psS32 yMin[] = { -4, 0, -8, 4}; + psS32 yMax[] = { 0, 4, -4, 8}; + psS32 i; psKernel* k; @@ -73,5 +73,5 @@ } - for (int j=yMin[i]; jkernel[j]+xMin[i] != k->image->data.PS_TYPE_KERNEL_DATA[j-yMin[i]]) { psError(__func__,"The kernel pointer was set wrong for row %d.", @@ -115,10 +115,10 @@ } -static int testKernelGenerate(void) +static psS32 testKernelGenerate(void) { - int size = 4; - int t[] = { 1, 2, 8, 10 }; - int x[] = { 0, 1, 0, -1 }; - int y[] = { 2, 1, -1, -2 }; + psS32 size = 4; + psS32 t[] = { 1, 2, 8, 10 }; + psS32 x[] = { 0, 1, 0, -1 }; + psS32 y[] = { 2, 1, -1, -2 }; psKernelType sum; @@ -127,5 +127,5 @@ psVector* tVec = psVectorAlloc(size,PS_TYPE_U32); - for (int i = 0; i < size; i++) { + for (psS32 i = 0; i < size; i++) { xVec->data.U32[i] = x[i]; yVec->data.U32[i] = y[i]; @@ -148,6 +148,6 @@ sum = 0.0; - for (int y = result->yMin; y <= result->yMax; y++) { - for (int x = result->xMin; x <= result->xMax; x++) { + for (psS32 y = result->yMin; y <= result->yMax; y++) { + for (psS32 x = result->xMin; x <= result->xMax; x++) { sum += result->kernel[y][x]; } @@ -182,5 +182,5 @@ tVec = psVectorAlloc(size,PS_TYPE_S16); - for (int i = 0; i < size; i++) { + for (psS32 i = 0; i < size; i++) { xVec->data.S16[i] = x[i]; yVec->data.S16[i] = y[i]; @@ -203,6 +203,6 @@ sum = 0.0; - for (int y = result->yMin; y <= result->yMax; y++) { - for (int x = result->xMin; x <= result->xMax; x++) { + for (psS32 y = result->yMin; y <= result->yMax; y++) { + for (psS32 x = result->xMin; x <= result->xMax; x++) { sum += result->kernel[y][x]; } @@ -236,5 +236,5 @@ tVec = psVectorAlloc(size,PS_TYPE_F32); - for (int i = 0; i < size; i++) { + for (psS32 i = 0; i < size; i++) { xVec->data.F32[i] = x[i]+0.1; yVec->data.F32[i] = y[i]+0.2; @@ -291,9 +291,9 @@ /* -static int testImageConvolve(void) +static psS32 testImageConvolve(void) { - const int r = 200; - const int c = 300; - int sum; + const psS32 r = 200; + const psS32 c = 300; + psS32 sum; // approximate a normalized gaussian kernel. @@ -312,12 +312,12 @@ psKernel* nsk = psKernelAlloc(0,2,0,2); sum = 0.0; - for (int i=0;i<2;i++) { - for (int j=0;j<2;j++) { + for (psS32 i=0;i<2;i++) { + for (psS32 j=0;j<2;j++) { nsk->kernel[i][j] = i+j; sum = i+j; } } - for (int i=0;i<2;i++) { - for (int j=0;j<2;j++) { + for (psS32 i=0;i<2;i++) { + for (psS32 j=0;j<2;j++) { nsk->kernel[i][j] /= sum; } @@ -356,6 +356,6 @@ // test values - for (int i=-1;i<1;i++) { - for (int j=-1;j<1;j++) { + for (psS32 i=-1;i<1;i++) { + for (psS32 j=-1;j<1;j++) { if (fabsf(out->data.F32[r/2+i][c/2+j] - g->kernel[i][j]) > 0.0001) { psError(__func__,"Convolved image wrong at %d,%d. Value is %g, expected %g.", @@ -423,6 +423,6 @@ psImageWriteSection(out2,0,0,0,NULL,0,"out2.fits"); // test values - for (int i=-1;i<1;i++) { - for (int j=-1;j<1;j++) { + for (psS32 i=-1;i<1;i++) { + for (psS32 j=-1;j<1;j++) { if (fabsf(out->data.F32[r/2+i][c/2+j] - g->kernel[i][j]) > 0.0001) { psError(__func__,"Convolved image wrong at %d,%d. Value is %g, expected %g.", Index: /trunk/psLib/test/image/tst_psImageExtraction.c =================================================================== --- /trunk/psLib/test/image/tst_psImageExtraction.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageExtraction.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-15 20:00:56 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,10 +18,10 @@ #include "psType.h" -static int testImageSlice(void); -static int testImageSubset(void); -static int testImageSubsection(void); -static int testImageTrim(void); -static int testImageCut(void); -static int testImageRadialCut(void); +static psS32 testImageSlice(void); +static psS32 testImageSubset(void); +static psS32 testImageSubsection(void); +static psS32 testImageTrim(void); +static psS32 testImageCut(void); +static psS32 testImageRadialCut(void); @@ -37,15 +37,15 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { return ! runTestSuite( stderr, "psImage", tests, argc, argv ); } -int testImageSlice(void) +psS32 testImageSlice(void) { - const int r = 200; - const int c = 300; - const int m = r / 2 -1; - const int n = r / 4 -1; + const psS32 r = 200; + const psS32 c = 300; + const psS32 m = r / 2 -1; + const psS32 n = r / 4 -1; psVector* out = NULL; psImage* image; @@ -68,7 +68,7 @@ */ - for ( int row = 0;row < r;row++ ) { + for ( psS32 row = 0;row < r;row++ ) { psMaskType* maskRow = mask->data.PS_TYPE_MASK_DATA[row]; - for ( int col = 0;col < c;col++ ) { + for ( psS32 col = 0;col < c;col++ ) { maskRow[ col ] = 0; } @@ -77,8 +77,8 @@ #define PSIMAGESLICE_TEST1(TYPE,M,N,DIRECTION,TRUTH_SIZE,TRUTHPIX_X,TRUTHPIX_Y,TESTNUM) \ image = psImageAlloc( c, r, PS_TYPE_##TYPE ); \ - for ( int row = 0;row < r;row++ ) { \ + for ( psS32 row = 0;row < r;row++ ) { \ ps##TYPE *imageRow = image->data.TYPE[ row ]; \ ps##TYPE rowOffset = row * 2; \ - for ( int col = 0;col < c;col++ ) { \ + for ( psS32 col = 0;col < c;col++ ) { \ imageRow[ col ] = col + rowOffset; \ } \ @@ -98,5 +98,5 @@ } \ \ - for (int i=0;in;i++) { \ + for (psS32 i=0;in;i++) { \ if (fabs(out->data.F64[i]-image->data.TYPE[r/10+TRUTHPIX_Y][c/10+TRUTHPIX_X]) > 1.0/(psF64)r) { \ psError(__func__,"Improper result at position %d. Got %g, expected %g",i, \ @@ -363,5 +363,5 @@ // #547: psImageSubset shall create child image of a specified size from a parent psImage structure -int testImageSubset(void) +psS32 testImageSubset(void) { psImage preSubsetStruct; @@ -370,10 +370,10 @@ psImage* subset2 = NULL; psImage* subset3 = NULL; - int c = 128; - int r = 256; + psS32 c = 128; + psS32 r = 256; original = psImageAlloc(c,r,PS_TYPE_U32); - for (int row=0;rowdata.F32[row][col] = row*1000+col; } @@ -404,6 +404,6 @@ "row member, if the input psImage structure image contains known values."); - for (int row=0;rowdata.U32[row][col] != original->data.U32[row+r/4][col+c/4]) { psError(__func__,"psImageSubset output #1 was wrong at %dx%d (%d vs %d).", @@ -596,20 +596,20 @@ // #730: psImageSubsection shall create child image of a specified size from a parent psImage structure -int testImageSubsection(void) +psS32 testImageSubsection(void) { psImage* original; psImage* subset; - int c = 128; - int r = 256; - int i; - int numRegions = 4; - int x1[] = { 0, 32, 64, 32}; - int x2[] = { 32, 64,127, 64}; - int y1[] = { 0, 32, 32,128}; - int y2[] = { 32, 64, 64,255}; + psS32 c = 128; + psS32 r = 256; + psS32 i; + psS32 numRegions = 4; + psS32 x1[] = { 0, 32, 64, 32}; + psS32 x2[] = { 32, 64,127, 64}; + psS32 y1[] = { 0, 32, 32,128}; + psS32 y2[] = { 32, 64, 64,255}; original = psImageAlloc(c,r,PS_TYPE_U32); - for (int row=0;rowdata.F32[row][col] = row*1000+col; } @@ -664,6 +664,6 @@ } - int numCols = x2[i]-x1[i]+1; - int numRows = y2[i]-y1[i]+1; + psS32 numCols = x2[i]-x1[i]+1; + psS32 numRows = y2[i]-y1[i]+1; if (subset->numCols != numCols || subset->numRows != numRows) { psError(__func__,"psImageSubsection output size was not proper(%dx%d, should be %dx%d).", @@ -672,6 +672,6 @@ } - for (int row=0;rowdata.U32[row][col] != original->data.U32[row+y1[i]][col+x1[i]]) { psError(__func__,"psImageSubset output #1 was wrong at %dx%d (%d vs %d).", @@ -751,16 +751,16 @@ } -static int testImageTrim(void) +static psS32 testImageTrim(void) { - int r = 200; - int c = 300; - int qtrR = r/4; - int qtrC = c/4; - int halfR = r/2; - int halfC = c/2; + psS32 r = 200; + psS32 c = 300; + psS32 qtrR = r/4; + psS32 qtrC = c/4; + psS32 halfR = r/2; + psS32 halfC = c/2; psImage* image = psImageAlloc(c,r,PS_TYPE_F32); - for (int row = 0; row < image->numRows; row++) { - for (int col = 0; col < image->numCols; col++) { + for (psS32 row = 0; row < image->numRows; row++) { + for (psS32 col = 0; col < image->numCols; col++) { image->data.F32[row][col] = (psF32)col + (psF32)row/1000.0f; } @@ -792,6 +792,6 @@ } - for (int row = 0; row < image2->numRows; row++) { - for (int col = 0; col < image2->numCols; col++) { + for (psS32 row = 0; row < image2->numRows; row++) { + for (psS32 col = 0; col < image2->numCols; col++) { if (fabsf(image2->data.F32[row][col] - image->data.F32[row+qtrR][col+qtrC]) > FLT_EPSILON) { psLogMsg(__func__,PS_LOG_ERROR, @@ -830,6 +830,6 @@ } - for (int row = 0; row < image2->numRows; row++) { - for (int col = 0; col < image2->numCols; col++) { + for (psS32 row = 0; row < image2->numRows; row++) { + for (psS32 col = 0; col < image2->numCols; col++) { if (fabsf(image2->data.F32[row][col] - image->data.F32[row+qtrR][col+qtrC]) > FLT_EPSILON) { @@ -869,6 +869,6 @@ } - for (int row = 0; row < image2->numRows; row++) { - for (int col = 0; col < image2->numCols; col++) { + for (psS32 row = 0; row < image2->numRows; row++) { + for (psS32 col = 0; col < image2->numCols; col++) { if (fabsf(image2->data.F32[row][col] - image->data.F32[row+qtrR][col+qtrC]) > FLT_EPSILON) { @@ -1014,20 +1014,20 @@ } -static int testImageCut(void) +static psS32 testImageCut(void) { - int c = 300; - int r = 200; - int numPoints = 15; + psS32 c = 300; + psS32 r = 200; + psS32 numPoints = 15; float startCol[] = { 40,150, 40, 0,280, 40,280, -1,300, 20, 20, 20, 20, 20, 20}; float endCol[] = {240,150,240,299, 40,240, 40,240,240, -1,300,240,240,240,240}; float startRow[] = { 20, 10,100, 0, 20,180,180, 10, 10, 10, 10, -1,200, 10, 10}; float endRow[] = {160,180,100,199,160, 10, 10,180,180,180,180,180,180, -1,200}; - bool success[] = {true,true,true,true,true,true,true,false,false,false,false,false,false,false,false}; - unsigned int length = 100; + psBool success[] = {true,true,true,true,true,true,true,false,false,false,false,false,false,false,false}; + psU32 length = 100; psImage* image = psImageAlloc(c,r,PS_TYPE_F32); psImage* mask = psImageAlloc(c,r,PS_TYPE_MASK); - for (int row = 0; row < image->numRows; row++) { - for (int col = 0; col < image->numCols; col++) { + for (psS32 row = 0; row < image->numRows; row++) { + for (psS32 col = 0; col < image->numCols; col++) { image->data.F32[row][col] = (psF32)col + (psF32)row/1000.0f; if ((row & 0x0F) == 0) { @@ -1042,5 +1042,5 @@ psVector* result = NULL; - for (int n = 0; n < numPoints; n++) { + for (psS32 n = 0; n < numPoints; n++) { psVector* orig = result; if (! success[n]) { @@ -1083,5 +1083,5 @@ float deltaCol = (endCol[n]-startCol[n])/(length-1); psF32 truth; - for (int i = 0; i < length; i++) { + for (psS32 i = 0; i < length; i++) { float x = (float)startCol[n]+(float)i*deltaCol; float y = (float)startRow[n]+(float)i*deltaRow; @@ -1177,16 +1177,16 @@ } -static int testImageRadialCut(void) +static psS32 testImageRadialCut(void) { - int c = 300; - int r = 200; - int centerX = c/2; - int centerY = r/2; + psS32 c = 300; + psS32 r = 200; + psS32 centerX = c/2; + psS32 centerY = r/2; psErr* err = NULL; psImage* image = psImageAlloc(c,r,PS_TYPE_F32); psImage* mask = psImageAlloc(c,r,PS_TYPE_MASK); - for (int row = 0; row < image->numRows; row++) { - for (int col = 0; col < image->numCols; col++) { + for (psS32 row = 0; row < image->numRows; row++) { + for (psS32 col = 0; col < image->numCols; col++) { image->data.F32[row][col] = sqrtf((col-centerX)*(col-centerX)+(row-centerY)*(row-centerY)); if ((row & 0x0F) == 0) { @@ -1200,5 +1200,5 @@ psStats* stat = psStatsAlloc(PS_STAT_SAMPLE_MEAN); psVector* radii = psVectorAlloc(10,PS_TYPE_F32); - for (int i=0; i < 10; i++) { + for (psS32 i=0; i < 10; i++) { radii->data.F32[i] = 10+i*10; } @@ -1220,5 +1220,5 @@ } - for (int i=0; i < 9; i++) { + for (psS32 i=0; i < 9; i++) { if (fabs(result->data.F64[i] - (15.0+i*10)) > 1) { psLogMsg(__func__,PS_LOG_ERROR, @@ -1245,5 +1245,5 @@ } - for (int i=0; i < 9; i++) { + for (psS32 i=0; i < 9; i++) { if (fabs(result->data.F64[i] - (15.0+i*10)) > 1) { psLogMsg(__func__,PS_LOG_ERROR, Index: /trunk/psLib/test/image/tst_psImageFFT.c =================================================================== --- /trunk/psLib/test/image/tst_psImageFFT.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageFFT.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-13 19:50:12 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -20,16 +20,16 @@ #define GENIMAGE(img,c,r,TYP, valueFcn) \ img = psImageAlloc(c,r,PS_TYPE_##TYP); \ -for (unsigned int row=0;rowdata.TYP[row]; \ - for (unsigned int col=0;coldata.C32[row]; - for (unsigned int col=0;col 0.1f) { @@ -130,8 +130,8 @@ } - for (unsigned int row=0;rowdata.C32[row]; psF32* imgRow = img->data.F32[row]; - for (unsigned int col=0;col 0.1) { @@ -159,8 +159,8 @@ } - for (unsigned int row=0;rowdata.F32[row]; psF32* imgRow = img->data.F32[row]; - for (unsigned int col=0;col 0.1) { @@ -209,11 +209,11 @@ } -int testImageRealImaginary(void) +psS32 testImageRealImaginary(void) { psImage* img = NULL; psImage* img2 = NULL; psImage* img3 = NULL; - unsigned int m = 128; - unsigned int n = 64; + psU32 m = 128; + psU32 n = 64; /* @@ -250,8 +250,8 @@ // 3. compare results to the real/imaginary components of input - for (unsigned int row=0;rowdata.F32[row]; psF32* img3Row = img3->data.F32[row]; - for (unsigned int col=0;col FLT_EPSILON) { psError(__func__,"psImageReal didn't return the real portion at n=%d", @@ -274,11 +274,11 @@ } -int testImageComplex(void) +psS32 testImageComplex(void) { psImage* img = NULL; psImage* img2 = NULL; psImage* img3 = NULL; - unsigned int m = 128; - unsigned int n = 64; + psU32 m = 128; + psU32 n = 64; /* @@ -314,7 +314,7 @@ // 4. call psImageReal and psImageImaginary on step 2 results (not needed, just use crealf/cimagf) // 5. compare step 4 results to input. - for (unsigned int row=0;rowdata.C32[row]; - for (unsigned int col=0;col FLT_EPSILON || fabsf(cimagf(img3Row[col]) - col) > FLT_EPSILON) { @@ -358,10 +358,10 @@ } -int testImageConjugate(void) +psS32 testImageConjugate(void) { psImage* img = NULL; psImage* img2 = NULL; - unsigned int m = 128; - unsigned int n = 64; + psU32 m = 128; + psU32 n = 64; /* @@ -385,7 +385,7 @@ // 4. verify each value is conjugate of input (a+bi -> a-bi) - for (unsigned int row=0;rowdata.C32[row]; - for (unsigned int col=0;col FLT_EPSILON || fabsf(cimagf(img2Row[col]) + col) > FLT_EPSILON) { @@ -403,10 +403,10 @@ } -int testImagePowerSpectrum(void) +psS32 testImagePowerSpectrum(void) { psImage* img = NULL; psImage* img2 = NULL; - unsigned int m = 128; - unsigned int n = 64; + psU32 m = 128; + psU32 n = 64; /* @@ -430,8 +430,8 @@ // 4. verify the values are the square of the absolute values of the original - for (unsigned int row=0;rowdata.C32[row]; psF32* img2Row = img2->data.F32[row]; - for (unsigned int col=0;coldata.TYP[row]; \ - for (unsigned int col=0;coldata.TYP[row-readN0]; \ ps##TYP* img2Row = img2->data.TYP[row]; \ ps##TYP* img3Row = img3->data.TYP[row-readN0]; \ ps##TYP* img4Row = img4->data.TYP[row]; \ - for (unsigned int col = readM0; col < readM; col++) { \ + for (psU32 col = readM0; col < readM; col++) { \ if (fabsf(imgRow[col-readM0]-img2Row[col]) > FLT_EPSILON) { \ psError(__func__,"Image changed in I/O operation at %d,%d,0 (%.2f vs %.2f) for %s", \ @@ -155,10 +155,10 @@ return 9; \ } \ - for (unsigned int row = readN0; row < readN; row++) { \ + for (psU32 row = readN0; row < readN; row++) { \ ps##TYP* imgRow = img->data.TYP[row-readN0]; \ ps##TYP* img2Row = img2->data.TYP[row]; \ ps##TYP* img3Row = img3->data.TYP[row-readN0]; \ ps##TYP* img4Row = img4->data.TYP[row]; \ - for (unsigned int col = readM0; col < readM; col++) { \ + for (psU32 col = readM0; col < readM; col++) { \ if (fabsf(imgRow[col-readM0]-img2Row[col]) > FLT_EPSILON) { \ psError(__func__,"Image changed in I/O operation at %d,%d,0 (%.2f vs %.2f) for %s", \ @@ -258,10 +258,10 @@ } -int testImageWrite(void) +psS32 testImageWrite(void) { psImage* img = NULL; psImage* img2 = NULL; - int m = 64; - int n = 96; + psS32 m = 64; + psS32 n = 96; /* @@ -318,7 +318,7 @@ return 16; } - for (unsigned int row=0;rowdata.F32[row]; - for (unsigned int col=0;col FLT_EPSILON) { psError(__func__,"The image values were not overwritten at %d,%d (%.2f vs %.2f)", Index: /trunk/psLib/test/image/tst_psImageManip.c =================================================================== --- /trunk/psLib/test/image/tst_psImageManip.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageManip.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 01:22:59 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,14 +25,14 @@ #include "psType.h" -static int testImageClip(void); -static int testImageClipNAN(void); -static int testImageClipComplexRegion(void); -static int testImageOverlay(void); -static int testImageRebin(void); -static int testImageRoll(void); -static int testImageRotate(void); -static int testImageShift(void); -static int testImageShiftCase(int cols, int rows, float colShift,float rowShift); -static int testImageResample(void); +static psS32 testImageClip(void); +static psS32 testImageClipNAN(void); +static psS32 testImageClipComplexRegion(void); +static psS32 testImageOverlay(void); +static psS32 testImageRebin(void); +static psS32 testImageRoll(void); +static psS32 testImageRotate(void); +static psS32 testImageShift(void); +static psS32 testImageShiftCase(psS32 cols, psS32 rows, float colShift,float rowShift); +static psS32 testImageResample(void); testDescription tests[] = { @@ -49,5 +49,5 @@ }; -int main(int argc, char* argv[]) +psS32 main(psS32 argc, char* argv[]) { psLogSetLevel(PS_LOG_INFO); @@ -57,13 +57,13 @@ -int testImageClip(void) +psS32 testImageClip(void) { psImage* img = NULL; - unsigned int c = 128; - unsigned int r = 256; + psU32 c = 128; + psU32 r = 256; psF64 min; psF64 max; - int numClipped = 0; - int retVal; + psS32 numClipped = 0; + psS32 retVal; psLogMsg(__func__,PS_LOG_INFO, @@ -95,7 +95,7 @@ #define testImageClipByType(datatype) \ img = psImageAlloc(c,r,PS_TYPE_##datatype); \ - for (unsigned int row=0;rowdata.datatype[row]; \ - for (unsigned int col=0;coldata.datatype[row]; \ - for (unsigned int col=0;coldata.datatype[row]; \ - for (unsigned int col=0;coldata.datatype[row]; \ - for (unsigned int col=0;coldata.F32[0],0,sizeof(psF32)*4*4); \ memset(maxTruth->data.F32[0],0,sizeof(psF32)*6*6); \ - for (int row = 0; row<16; row++) { \ + for (psS32 row = 0; row<16; row++) { \ ps##DATATYPE* inRow = in->data.DATATYPE[row]; \ psF32* meanTruthRow = meanTruth->data.F32[row/4]; \ @@ -875,5 +875,5 @@ psF32* maxTruthRow = maxTruth->data.F32[row/3]; \ psU8* maskRow = mask->data.U8[row]; \ - for (int col = 0; col<16; col++) { \ + for (psS32 col = 0; col<16; col++) { \ if(col != 15) { \ maskRow[col] = 0; \ @@ -891,8 +891,8 @@ } \ } \ - for (int row = 0; row<4; row++) { \ + for (psS32 row = 0; row<4; row++) { \ psF32* meanTruthRow = meanTruth->data.F32[row]; \ psF32* meanTruthWMaskRow = meanTruthWMask->data.F32[row]; \ - for (int col = 0; col<4; col++) { \ + for (psS32 col = 0; col<4; col++) { \ meanTruthRow[col] /= 16; \ if ( col == 3 ) { \ @@ -915,8 +915,8 @@ return 2; \ } \ - for (int row = 0; row<4; row++) { \ + for (psS32 row = 0; row<4; row++) { \ ps##DATATYPE* outRow = out->data.DATATYPE[row]; \ psF32* truthRow = meanTruth->data.F32[row]; \ - for (int col = 0; col<4; col++) { \ + for (psS32 col = 0; col<4; col++) { \ if (fabsf((float)outRow[col]-(float)truthRow[col]) > FLT_EPSILON) { \ psError(__func__,"psImageRebin didn't produce the proper mean " \ @@ -929,9 +929,9 @@ stats.options = PS_STAT_SAMPLE_MEAN; \ out3 = psImageRebin(NULL,in,mask,1,4,&stats); \ - for (int row = 0; row<4; row++) { \ + for (psS32 row = 0; row<4; row++) { \ ps##DATATYPE* outRow = out3->data.DATATYPE[row]; \ psF32* truthRow = meanTruthWMask->data.F32[row]; \ - for ( int col = 0; col<4; col++) { \ - if(abs((int)outRow[col]-(int)truthRow[col]) > FLT_EPSILON) { \ + for ( psS32 col = 0; col<4; col++) { \ + if(abs((psS32)outRow[col]-(psS32)truthRow[col]) > FLT_EPSILON) { \ psError(__func__,"psImageRebin with mask didn't produce the proper mean " \ "result at (%d,%d) [%f vs %f].", \ @@ -957,8 +957,8 @@ return 5; \ } \ - for (int row = 0; row<6; row++) { \ + for (psS32 row = 0; row<6; row++) { \ ps##DATATYPE* outRow = out->data.DATATYPE[row]; \ psF32* truthRow = maxTruth->data.F32[row]; \ - for (int col = 0; col<6; col++) { \ + for (psS32 col = 0; col<6; col++) { \ if (fabsf((float)outRow[col]-(float)truthRow[col]) > FLT_EPSILON) { \ psError(__func__,"psImageRebin didn't produce the proper " \ @@ -1082,5 +1082,5 @@ } -static int testImageRoll(void) +static psS32 testImageRoll(void) { @@ -1088,8 +1088,8 @@ psImage* out; psImage* out2; - int rows = 64; - int cols = 64; - int rows1 = 8; - int cols1 = 8; + psS32 rows = 64; + psS32 cols = 64; + psS32 rows1 = 8; + psS32 cols1 = 8; /* @@ -1108,7 +1108,7 @@ in = psImageAlloc(cols,rows,PS_TYPE_F32); - for (int row=0;rowdata.F32[row]; - for (int col=0;coldata.F32[row]; psF32* outRow = out->data.F32[row]; - for (int col=0;coldata.F32[row]; psF32* outRow = out->data.F32[row]; - for (int col=0;coldata.F32[(row+rows/4)%rows]; psF32* outRow = out->data.F32[row]; - for (int col=0;coldata.F32[(row+rows/4)%rows]; psF32* outRow = out->data.F32[row]; - for (int col=0;coldata.F32[row]; psF32* outRow = out->data.F32[row]; - for (int col=0;coldata.F32[(row+rows-rows/4)%rows]; psF32* outRow = out->data.F32[row]; - for (int col=0;coldata.F32[(row+rows-rows/4)%rows]; psF32* outRow = out->data.F32[row]; - for (int col=0;coldata.DATATYPE[row]; \ - for (int col=0;coldata.DATATYPE[(row+rows1/4)%rows1]; \ ps##DATATYPE* outRow = out->data.DATATYPE[row]; \ - for (int col=0;coldata.F32[row]; psS16* sRow = sImg->data.S16[row]; psS32* s32Row = s32Img->data.S32[row]; - for (int col=0;colnumRows;row++) { + for (psS32 row=0;rownumRows;row++) { psF32* truthRow = fTruth->data.F32[row]; psF32* outRow = fOut->data.F32[row]; - for (int col=0;colnumCols;col++) { + for (psS32 col=0;colnumCols;col++) { if (fabsf(truthRow[col]-outRow[col]) > 1) { psError(__func__,"Float Image mismatch (%f vs %f) at %d,%d.", @@ -1409,12 +1409,12 @@ if (sTruth->numRows != sOut->numRows || sTruth->numCols != sOut->numCols) { - psError(__func__,"Rotated short image size did not match truth " + psError(__func__,"Rotated psS16 image size did not match truth " "image for %d deg rotation.",rot); fail = true; } else { - for (int row=0;rownumRows;row++) { + for (psS32 row=0;rownumRows;row++) { psS16* truthRow = sTruth->data.S16[row]; psS16* outRow = sOut->data.S16[row]; - for (int col=0;colnumCols;col++) { + for (psS32 col=0;colnumCols;col++) { if (fabsf(truthRow[col]-outRow[col]) > 1) { psError(__func__,"Short Image mismatch (%d vs %d) " @@ -1440,8 +1440,8 @@ fail = true; } else { - for (int row=0;rownumRows;row++) { + for (psS32 row=0;rownumRows;row++) { psF32* truthRow = fBiTruth->data.F32[row]; psF32* outRow = fBiOut->data.F32[row]; - for (int col=0;colnumCols;col++) { + for (psS32 col=0;colnumCols;col++) { if (fabsf(truthRow[col]-outRow[col]) > 1) { psError(__func__,"Float Image mismatch (%f vs %f) at %d,%d. BILINEAR", @@ -1461,12 +1461,12 @@ if (sBiTruth->numRows != sBiOut->numRows || sBiTruth->numCols != sBiOut->numCols) { - psError(__func__,"Rotated short image size did not match truth " + psError(__func__,"Rotated psS16 image size did not match truth " "image for %d deg rotation. BILINEAR",rot); fail = true; } else { - for (int row=0;rownumRows;row++) { + for (psS32 row=0;rownumRows;row++) { psS16* truthRow = sBiTruth->data.S16[row]; psS16* outRow = sBiOut->data.S16[row]; - for (int col=0;colnumCols;col++) { + for (psS32 col=0;colnumCols;col++) { if (fabsf(truthRow[col]-outRow[col]) > 1) { psError(__func__,"Short Image mismatch (%d vs %d) " @@ -1537,5 +1537,5 @@ } -static int testImageShift(void) +static psS32 testImageShift(void) { /* psImageShift: @@ -1558,5 +1558,5 @@ */ - int retVal=0; + psS32 retVal=0; // integer shift @@ -1627,8 +1627,8 @@ } -static int testImageShiftCase(int cols, - int rows, - float colShift, - float rowShift) +static psS32 testImageShiftCase(psS32 cols, + psS32 rows, + float colShift, + float rowShift) { psImage* fOut = NULL; @@ -1643,8 +1643,8 @@ psImage* sBiOut = psImageAlloc(cols,rows,PS_TYPE_S16); - for(int row=0;rowdata.F32[row]; psS16* sRow = sImg->data.S16[row]; - for (int col=0;coldata.F32[row]; psS16* sRow = sOut->data.S16[row]; @@ -1663,5 +1663,5 @@ psS16* sBiRow = sBiOut->data.S16[row]; - for (int col=0;coldata.F32[row]; - for (int col=0;colnumRows;row++) { - for (int col=0;colnumCols;col++) { + for(psS32 row=0;rownumRows;row++) { + for (psS32 col=0;colnumCols;col++) { truthValue = psImagePixelInterpolate(image, (float)col/(float)scale,(float)row/(float)scale, Index: /trunk/psLib/test/image/tst_psImageStats00.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats00.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageStats00.c (revision 2204) @@ -14,5 +14,5 @@ #define M 64 -int main() +psS32 main() { psHistogram * myHist = NULL; @@ -20,12 +20,12 @@ psImage *tmpImage = NULL; psImage *tmpMask = NULL; - int testStatus = true; - int memLeaks = 0; - int nb = 0; - int i = 0; - int j = 0; - int IMAGE_X_SIZE = 0; - int IMAGE_Y_SIZE = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 nb = 0; + psS32 i = 0; + psS32 j = 0; + psS32 IMAGE_X_SIZE = 0; + psS32 IMAGE_Y_SIZE = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/image/tst_psImageStats01.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats01.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageStats01.c (revision 2204) @@ -15,5 +15,5 @@ #define M 64 -int main() +psS32 main() { psStats * myStats = NULL; @@ -21,12 +21,12 @@ psImage *tmpImage = NULL; psImage *tmpMask = NULL; - int testStatus = true; - int memLeaks = 0; - int nb = 0; - int i = 0; - int j = 0; - int IMAGE_X_SIZE = 0; - int IMAGE_Y_SIZE = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 nb = 0; + psS32 i = 0; + psS32 j = 0; + psS32 IMAGE_X_SIZE = 0; + psS32 IMAGE_Y_SIZE = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/image/tst_psImageStats02.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats02.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageStats02.c (revision 2204) @@ -18,5 +18,5 @@ #define CHEBY_Y_DIM 8 #define THRESHOLD 10 -int main() +psS32 main() { psStats * myStats = NULL; @@ -26,9 +26,9 @@ psPolynomial2D *my2DPoly = NULL; psPolynomial2D *null2DPoly = NULL; - int testStatus = true; - int memLeaks = 0; - int i = 0; - int j = 0; - int currentId = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 i = 0; + psS32 j = 0; + psS32 currentId = 0; currentId = psMemGetId(); Index: /trunk/psLib/test/image/tst_psImageStats03.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats03.c (revision 2203) +++ /trunk/psLib/test/image/tst_psImageStats03.c (revision 2204) @@ -13,15 +13,15 @@ #define IMAGE_SIZE 10 -int main() +psS32 main() { psImage *tmpImage = NULL; - int testStatus = true; - int memLeaks = 0; - int i = 0; - int j = 0; + psS32 testStatus = true; + psS32 memLeaks = 0; + psS32 i = 0; + psS32 j = 0; float pixel = 0.0; float x = 0.0; float y = 0.0; - int currentId = psMemGetId(); + psS32 currentId = psMemGetId(); /*************************************************************************/ Index: /trunk/psLib/test/image/verified/fBiOut.fits =================================================================== --- /trunk/psLib/test/image/verified/fBiOut.fits (revision 2203) +++ /trunk/psLib/test/image/verified/fBiOut.fits (revision 2204) Index: /trunk/psLib/test/image/verified/sBiOut.fits =================================================================== --- /trunk/psLib/test/image/verified/sBiOut.fits (revision 2203) +++ /trunk/psLib/test/image/verified/sBiOut.fits (revision 2204) Index: /trunk/psLib/test/psTest.c =================================================================== --- /trunk/psLib/test/psTest.c (revision 2203) +++ /trunk/psLib/test/psTest.c (revision 2204) @@ -28,13 +28,13 @@ #define HEADER_BOTTOM "\\**********************************************************************************/\n\n" -bool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName, - testDescription tests[], int argc, char * const argv[] ) -{ - bool success = true; - bool runAll = true; - bool useFork = true; - bool found; - int c; - int n; +psBool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName, + testDescription tests[], psS32 argc, char * const argv[] ) +{ + psBool success = true; + psBool runAll = true; + psBool useFork = true; + psBool found; + psS32 c; + psS32 n; extern char *optarg; @@ -62,5 +62,5 @@ printf( "Testpoints:\n" ); runAll = false; - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { printf( " %6d - %s \n", tests[ index ].testPointNumber, tests[ index ].testPointName ); @@ -70,5 +70,5 @@ case 't': runAll = false; - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { if ( strcmp( optarg, tests[ index ].testPointName ) == 0 ) { success = p_runTest( fp, @@ -90,5 +90,5 @@ } found = false; - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { if ( n == tests[ index ].testPointNumber ) { found = true; @@ -116,5 +116,5 @@ if ( runAll ) { - for ( int index = 0; tests[ index ].fcn != NULL; index++ ) { + for ( psS32 index = 0; tests[ index ].fcn != NULL; index++ ) { if ( ! tests[ index ].isDuplicateEntry ) { success = p_runTest( fp, @@ -136,8 +136,8 @@ } -bool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName, - testFcn fcn, int expectedReturn, bool useFork ) -{ - int childReturn = 0; +psBool p_runTest( FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName, + testFcn fcn, psS32 expectedReturn, psBool useFork ) +{ + psS32 childReturn = 0; pid_t child; @@ -147,6 +147,6 @@ child = fork(); if ( child == 0 ) { // I am the child process, run the test - int currentId = psMemGetId(); - int retVal = fcn(); + psS32 currentId = psMemGetId(); + psS32 retVal = fcn(); if ( retVal == 0 ) { // only bother checking memory if test executed to end. if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) { @@ -171,5 +171,5 @@ } } else { - int currentId = psMemGetId(); + psS32 currentId = psMemGetId(); childReturn = fcn(); if ( childReturn == 0 ) { // only bother checking memory if test executed to end. @@ -215,5 +215,5 @@ const char* testPointName, const char* expectedError, - int exitValue ) + psS32 exitValue ) { char TP[ 80 ]; @@ -235,5 +235,5 @@ const char* packageName, const char* testPointName, - bool success ) + psBool success ) { if ( success ) { Index: /trunk/psLib/test/psTest.h =================================================================== --- /trunk/psLib/test/psTest.h (revision 2203) +++ /trunk/psLib/test/psTest.h (revision 2204) @@ -4,5 +4,6 @@ #include -#include + +#include "psType.h" #define printPositiveTestHeader(filePtr, packageName, testPointName) \ @@ -15,13 +16,13 @@ p_printFooter(filePtr, __FILE__, packageName, testPointName, success) -typedef int (*testFcn)(void); +typedef psS32 (*testFcn)(void); typedef struct { testFcn fcn; - int testPointNumber; + psS32 testPointNumber; const char* testPointName; - int expectedReturn; - bool isDuplicateEntry; + psS32 expectedReturn; + psBool isDuplicateEntry; } testDescription; @@ -36,5 +37,5 @@ /////////////////////////// PRIVATE FUNCTIONS ////////////////////////////// -bool p_runTest( +psBool p_runTest( FILE *fp, const char* testPointFile, @@ -42,14 +43,14 @@ const char* testPointName, testFcn fcn, - int expectedReturn, - bool useFork + psS32 expectedReturn, + psBool useFork ); -bool p_runTestSuite( +psBool p_runTestSuite( FILE *fp, const char* testPointFile, const char* packageName, testDescription tests[], - int argc, + psS32 argc, char * const argv[] ); @@ -68,5 +69,5 @@ const char* testPointName, const char* expectedError, - int exitValue + psS32 exitValue ); @@ -76,5 +77,5 @@ const char* packageName, const char* testPointName, - bool success + psBool success ); Index: /trunk/psLib/test/runTest =================================================================== --- /trunk/psLib/test/runTest (revision 2203) +++ /trunk/psLib/test/runTest (revision 2204) @@ -30,5 +30,5 @@ # # $Revison: $ $Name: not supported by cvs2svn $ -# $Date: 2004-08-20 00:51:22 $ +# $Date: 2004-10-27 00:57:31 $ # # Copyright 2004 Maui High Performance Computering Center, University of Hawaii @@ -36,5 +36,5 @@ ################################################################################ -# Provides functions for handling long command line options +# Provides functions for handling psS64 command line options use Getopt::Long; Index: /trunk/psLib/test/sysUtils/tst_psAbort.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psAbort.c (revision 2203) +++ /trunk/psLib/test/sysUtils/tst_psAbort.c (revision 2204) @@ -8,6 +8,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-07 21:26:13 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -17,7 +17,7 @@ #include "psTest.h" -static int testAbort00(void); -static int testAbort01(void); -static int testAbort02(void); +static psS32 testAbort00(void); +static psS32 testAbort01(void); +static psS32 testAbort02(void); testDescription tests[] = { @@ -28,5 +28,5 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -35,8 +35,8 @@ } -static int testAbort00(void) +static psS32 testAbort00(void) { - int intval = 1; - long longval = 2; + psS32 intval = 1; + psS64 longval = 2; float floatval = 3.01; char charval = 'E'; @@ -54,5 +54,5 @@ } -static int testAbort01(void) +static psS32 testAbort01(void) { // Test point #2 String values in abort message @@ -65,5 +65,5 @@ } -static int testAbort02(void) +static psS32 testAbort02(void) { // Test point #2 String values in abort message Index: /trunk/psLib/test/sysUtils/tst_psError.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psError.c (revision 2203) +++ /trunk/psLib/test/sysUtils/tst_psError.c (revision 2204) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 21:14:58 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,11 +26,11 @@ #include "psTest.h" -static int testError00(void); -static int testError01(void); -static int testError02(void); -static int testError03(void); -static int testError04(void); -static int testError05(void); -static int testErrorRegister(void); +static psS32 testError00(void); +static psS32 testError01(void); +static psS32 testError02(void); +static psS32 testError03(void); +static psS32 testError04(void); +static psS32 testError05(void); +static psS32 testErrorRegister(void); // Function used in testError02 to verify the psErrorStackPrintV function @@ -58,5 +58,5 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -65,5 +65,5 @@ } -static int testError05(void) +static psS32 testError05(void) { psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; @@ -81,5 +81,5 @@ } -static int testError04(void) +static psS32 testError04(void) { psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; @@ -134,5 +134,5 @@ } -static int testError03(void) +static psS32 testError03(void) { psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; @@ -214,5 +214,5 @@ } -static int testError02(void) +static psS32 testError02(void) { psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; @@ -228,5 +228,5 @@ } -static int testError01(void) +static psS32 testError01(void) { psErrorCode code=PS_ERR_BAD_PARAMETER_VALUE; @@ -277,9 +277,9 @@ } -static int testError00(void) -{ - - int intval=1; - long longval = 2; +static psS32 testError00(void) +{ + + psS32 intval=1; + psS64 longval = 2; float floatval = 3.01; char charval = 'E'; @@ -300,8 +300,8 @@ } -static int testErrorRegister(void) -{ - - int numErr = 4; +static psS32 testErrorRegister(void) +{ + + psS32 numErr = 4; psErrorDescription errDesc[] = { {PS_ERR_N_ERR_CLASSES+1,"first"}, {PS_ERR_N_ERR_CLASSES+2,"second"}, @@ -314,5 +314,5 @@ psErrorRegister(errDesc,numErr); - for (int i = 0; i < numErr; i++) { + for (psS32 i = 0; i < numErr; i++) { const char* desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES+1+i); if (desc == NULL) { Index: /trunk/psLib/test/sysUtils/tst_psLogMsg.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psLogMsg.c (revision 2203) +++ /trunk/psLib/test/sysUtils/tst_psLogMsg.c (revision 2204) @@ -8,10 +8,10 @@ #include "psTest.h" -static int testLogMsg00(); -static int testLogMsg01(); -static int testLogMsg02(); -static int testLogMsg03(); -static int testLogMsg04(); -static int testLogMsg05(); +static psS32 testLogMsg00(); +static psS32 testLogMsg01(); +static psS32 testLogMsg02(); +static psS32 testLogMsg03(); +static psS32 testLogMsg04(); +static psS32 testLogMsg05(); testDescription tests[] = { @@ -39,5 +39,5 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -48,5 +48,5 @@ static void myLogMsg(const char *name, - int level, + psS32 level, const char *fmt, ...) @@ -60,7 +60,7 @@ } -static int testLogMsg00() -{ - int i = 0; +static psS32 testLogMsg00() +{ + psS32 i = 0; // Send a log messages for levels 0:9. Only the first four messages @@ -74,7 +74,7 @@ } -static int testLogMsg01() -{ - int i = 0; +static psS32 testLogMsg01() +{ + psS32 i = 0; // Send a log messages for levels 0:9. Only the first four messages @@ -88,10 +88,10 @@ } -static int testLogMsg02() +static psS32 testLogMsg02() { psLogSetLevel(9); // Send a log messages for levels 0:9. - for (int i=0;i<10;i++) { + for (psS32 i=0;i<10;i++) { psLogMsg(__func__, i, "Hello World! My level is %d\n", i); } @@ -105,7 +105,7 @@ } -static int testLogMsg03() -{ - int i; +static psS32 testLogMsg03() +{ + psS32 i; fprintf(stderr,"------------- psLogSetFormat() -------------\n"); @@ -161,5 +161,5 @@ -int testLogMsg04() +psS32 testLogMsg04() { psLogMsg("Under 15 chars", 0, "Hello World!\n"); @@ -173,7 +173,7 @@ } -int testLogMsg05() -{ - int i = 0; +psS32 testLogMsg05() +{ + psS32 i = 0; FILE* file; char line[256]; Index: /trunk/psLib/test/sysUtils/tst_psMemory.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psMemory.c (revision 2203) +++ /trunk/psLib/test/sysUtils/tst_psMemory.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-09-14 23:55:47 $ +* @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,22 +26,22 @@ #include "pslib.h" -static int TPFreeReferencedMemory( void ); -static int TPOutOfMemory( void ); -static int TPReallocOutOfMemory( void ); -static void* TPOutOfMemoryExhaustedCallback( size_t size ); -static int TPCheckBufferPositive( void ); -static int TPrealloc( void ); -static int TPallocCallback( void ); +static psS32 TPFreeReferencedMemory( void ); +static psS32 TPOutOfMemory( void ); +static psS32 TPReallocOutOfMemory( void ); +static psPtr TPOutOfMemoryExhaustedCallback( size_t size ); +static psS32 TPCheckBufferPositive( void ); +static psS32 TPrealloc( void ); +static psS32 TPallocCallback( void ); static psMemoryId memAllocateCallback( const psMemBlock *ptr ); static psMemoryId memFreeCallback( const psMemBlock *ptr ); -static int TPcheckLeaks( void ); -static int TPmemCorruption( void ); -static int TPmultipleFree( void ); -void memProblemCallback( const psMemBlock *ptr, const char *file, int lineno ); - -static int problemCallbackCalled = 0; -static int allocCallbackCalled = 0; -static int freeCallbackCalled = 0; -static int exhaustedCallbackCalled = 0; +static psS32 TPcheckLeaks( void ); +static psS32 TPmemCorruption( void ); +static psS32 TPmultipleFree( void ); +void memProblemCallback( const psMemBlock *ptr, const char *file, psS32 lineno ); + +static psS32 problemCallbackCalled = 0; +static psS32 allocCallbackCalled = 0; +static psS32 freeCallbackCalled = 0; +static psS32 exhaustedCallbackCalled = 0; testDescription tests[] = { @@ -81,5 +81,5 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -89,13 +89,13 @@ // Testpoint #449, psAlloc shall allocate memory blocks writeable by caller. -int TPCheckBufferPositive( void ) -{ - int * mem; - const int size = 100; - int failed = 0; +psS32 TPCheckBufferPositive( void ) +{ + psS32 * mem; + const psS32 size = 100; + psS32 failed = 0; psLogMsg( __func__, PS_LOG_INFO, "psAlloc shall allocate memory blocks writeable by caller.\n" ); - mem = ( int* ) psAlloc( size * sizeof( int ) ); + mem = ( psS32* ) psAlloc( size * sizeof( psS32 ) ); if ( mem == NULL ) { psError( __FILE__, "psAlloc returned a NULL value in %s!", __func__ ); @@ -103,9 +103,9 @@ } - for ( int index = 0;index < size;index++ ) { + for ( psS32 index = 0;index < size;index++ ) { mem[ index ] = index; } - for ( int index = 0;index < size;index++ ) { + for ( psS32 index = 0;index < size;index++ ) { if ( mem[ index ] != index ) { failed++; @@ -118,13 +118,13 @@ } -int TPFreeReferencedMemory( void ) +psS32 TPFreeReferencedMemory( void ) { // create memory - int * mem; - int ref = 0; + psS32 * mem; + psS32 ref = 0; psLogMsg( __func__, PS_LOG_INFO, "memory reference count shall be incrementable/decrementable" ); - mem = ( int* ) psAlloc( 100 * sizeof( int ) ); + mem = ( psS32* ) psAlloc( 100 * sizeof( psS32 ) ); ref = psMemGetRefCounter( mem ); @@ -170,10 +170,10 @@ // Bug/Task #562 regression test. Upon requesting more memory than is available, psRealloc shall call // the psMemExhaustedCallback. -int TPReallocOutOfMemory( void ) -{ - int * mem[ 100 ]; +psS32 TPReallocOutOfMemory( void ) +{ + psS32 * mem[ 100 ]; psMemExhaustedCallback cb; - for ( int lcv = 0; lcv < 100; lcv++ ) { + for ( psS32 lcv = 0; lcv < 100; lcv++ ) { mem[ lcv ] = NULL; } @@ -186,10 +186,10 @@ cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback ); - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( int* ) psAlloc( 10 ); - } - - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( int* ) psRealloc( mem[ lcv ], SIZE_MAX/2 - 1000 ); + for ( psS32 lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = ( psS32* ) psAlloc( 10 ); + } + + for ( psS32 lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = ( psS32* ) psRealloc( mem[ lcv ], SIZE_MAX/2 - 1000 ); } @@ -201,5 +201,5 @@ } - for ( int lcv = 0; lcv < 100; lcv++ ) { + for ( psS32 lcv = 0; lcv < 100; lcv++ ) { psFree( mem[ lcv ] ); } @@ -209,10 +209,10 @@ // Testpoint #450, Upon requesting more memory than is available, psalloc shall call // the psMemExhaustedCallback. -int TPOutOfMemory( void ) -{ - int * mem[ 100 ]; +psS32 TPOutOfMemory( void ) +{ + psS32 * mem[ 100 ]; psMemExhaustedCallback cb; - for ( int lcv = 0; lcv < 100; lcv++ ) { + for ( psS32 lcv = 0; lcv < 100; lcv++ ) { mem[ lcv ] = NULL; } @@ -225,6 +225,6 @@ cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback ); - for ( int lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( int* ) psAlloc( SIZE_MAX/2 - 1000 ); + for ( psS32 lcv = 0; lcv < 100; lcv++ ) { + mem[ lcv ] = ( psS32* ) psAlloc( SIZE_MAX/2 - 1000 ); } @@ -236,5 +236,5 @@ } - for ( int lcv = 0; lcv < 100; lcv++ ) { + for ( psS32 lcv = 0; lcv < 100; lcv++ ) { psFree( mem[ lcv ] ); } @@ -244,10 +244,10 @@ // Testpoint #451, psRealloc shall increase/decrease memory buffer while preserving contents -int TPrealloc( void ) -{ - int * mem1; - int* mem2; - int* mem3; - const int initialSize = 100; +psS32 TPrealloc( void ) +{ + psS32 * mem1; + psS32* mem2; + psS32* mem3; + const psS32 initialSize = 100; psLogMsg( __func__, PS_LOG_INFO, "psRealloc shall increase/decrease memory buffer while " @@ -255,8 +255,8 @@ // allocate buffer with known values. - mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) ); - mem2 = ( int* ) psAlloc( initialSize * sizeof( int ) ); - mem3 = ( int* ) psAlloc( initialSize * sizeof( int ) ); - for ( int lcv = 0;lcv < initialSize;lcv++ ) { + mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); + mem2 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); + mem3 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); + for ( psS32 lcv = 0;lcv < initialSize;lcv++ ) { mem1[ lcv ] = mem2[ lcv ] = mem3[ lcv ] = lcv; } @@ -266,10 +266,10 @@ // realloc to 2x - mem1 = ( int* ) psRealloc( mem1, 2 * initialSize * sizeof( int ) ); - mem2 = ( int* ) psRealloc( mem2, 2 * initialSize * sizeof( int ) ); - mem3 = ( int* ) psRealloc( mem3, 2 * initialSize * sizeof( int ) ); + mem1 = ( psS32* ) psRealloc( mem1, 2 * initialSize * sizeof( psS32 ) ); + mem2 = ( psS32* ) psRealloc( mem2, 2 * initialSize * sizeof( psS32 ) ); + mem3 = ( psS32* ) psRealloc( mem3, 2 * initialSize * sizeof( psS32 ) ); // check values of initial block - for ( int i = 0;i < initialSize;i++ ) { + for ( psS32 i = 0;i < initialSize;i++ ) { if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { psError( __FILE__, "Realloc didn't preserve the contents with expanding buffer in %s.", @@ -283,10 +283,10 @@ // realloc to 1/2 initial value. - mem1 = ( int* ) psRealloc( mem1, ( initialSize / 2 ) * sizeof( int ) ); - mem2 = ( int* ) psRealloc( mem2, ( initialSize / 2 ) * sizeof( int ) ); - mem3 = ( int* ) psRealloc( mem3, ( initialSize / 2 ) * sizeof( int ) ); + mem1 = ( psS32* ) psRealloc( mem1, ( initialSize / 2 ) * sizeof( psS32 ) ); + mem2 = ( psS32* ) psRealloc( mem2, ( initialSize / 2 ) * sizeof( psS32 ) ); + mem3 = ( psS32* ) psRealloc( mem3, ( initialSize / 2 ) * sizeof( psS32 ) ); // check values of initial block - for ( int i = 0;i < initialSize / 2;i++ ) { + for ( psS32 i = 0;i < initialSize / 2;i++ ) { if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { psError( __FILE__, "Realloc didn't preserve the contents with shrinking buffer in %s.", @@ -303,12 +303,12 @@ } -int TPallocCallback( void ) -{ - int * mem1; - int* mem2; - int* mem3; - int currentId = psMemGetId(); - const int initialSize = 100; - int mark; +psS32 TPallocCallback( void ) +{ + psS32 * mem1; + psS32* mem2; + psS32* mem3; + psS32 currentId = psMemGetId(); + const psS32 initialSize = 100; + psS32 mark; allocCallbackCalled = 0; @@ -324,7 +324,7 @@ // allocate buffer with known values. - mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) ); - mem2 = ( int* ) psAlloc( initialSize * sizeof( int ) ); - mem3 = ( int* ) psAlloc( initialSize * sizeof( int ) ); + mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); + mem2 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); + mem3 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); psFree( mem1 ); @@ -343,9 +343,9 @@ mark = psMemGetId(); - mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) ); + mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); psMemAllocateCallbackSetID( mark ); - mem1 = ( int* ) psRealloc( mem1, initialSize * 2 * sizeof( int ) ); + mem1 = ( psS32* ) psRealloc( mem1, initialSize * 2 * sizeof( psS32 ) ); psFree( mem1 ); @@ -361,13 +361,13 @@ } -int TPcheckLeaks( void ) -{ - const int numBuffers = 5; - int* buffers[ 5 ]; - int lcv; - int currentId = psMemGetId(); +psS32 TPcheckLeaks( void ) +{ + const psS32 numBuffers = 5; + psS32* buffers[ 5 ]; + psS32 lcv; + psS32 currentId = psMemGetId(); psMemBlock** blks; - int nLeaks = 0; - int lineMark = 0; + psS32 nLeaks = 0; + psS32 lineMark = 0; psLogMsg( __func__, PS_LOG_INFO, "psMemCheckLeaks shall return the number of blocks above an ID " @@ -376,5 +376,5 @@ for ( lcv = 0;lcv < numBuffers;lcv++ ) { lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( int ) ); + buffers[ lcv ] = psAlloc( sizeof( psS32 ) ); } @@ -406,5 +406,5 @@ for ( lcv = 0;lcv < numBuffers;lcv++ ) { lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( int ) ); + buffers[ lcv ] = psAlloc( sizeof( psS32 ) ); } @@ -434,5 +434,5 @@ for ( lcv = 0;lcv < numBuffers;lcv++ ) { lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( int ) ); + buffers[ lcv ] = psAlloc( sizeof( psS32 ) ); } @@ -464,14 +464,14 @@ } -int TPmemCorruption( void ) -{ - int * buffer = NULL; - int oldValue = 0; - int corruptions = 0; +psS32 TPmemCorruption( void ) +{ + psS32 * buffer = NULL; + psS32 oldValue = 0; + psS32 corruptions = 0; psMemProblemCallback cb; psLogMsg( __func__, PS_LOG_INFO, "psMemCheckCorruption shall detect memory corruptions" ); - buffer = psAlloc( sizeof( int ) ); + buffer = psAlloc( sizeof( psS32 ) ); // cause memory corruption via buffer underflow @@ -514,5 +514,5 @@ } -void memProblemCallback( const psMemBlock *ptr, const char *file, int lineno ) +void memProblemCallback( const psMemBlock *ptr, const char *file, psS32 lineno ) { psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %d (%s:%d).", @@ -536,5 +536,5 @@ } -void* TPOutOfMemoryExhaustedCallback( size_t size ) +psPtr TPOutOfMemoryExhaustedCallback( size_t size ) { psLogMsg( __func__, PS_LOG_INFO, "Custom MemExhaustedCallback was invoked." ); @@ -543,8 +543,8 @@ } -int TPmultipleFree( void ) -{ - - void * buffer = psAlloc( 1024 ); +psS32 TPmultipleFree( void ) +{ + + psPtr buffer = psAlloc( 1024 ); psFree( buffer ); Index: /trunk/psLib/test/sysUtils/tst_psString.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psString.c (revision 2203) +++ /trunk/psLib/test/sysUtils/tst_psString.c (revision 2204) @@ -17,6 +17,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 01:59:08 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,11 +28,11 @@ #include "psTest.h" -static int testStringCopy00(void); -static int testStringCopy01(void); -static int testStringCopy02(void); -static int testStringCopy03(void); -static int testStringCopy04(void); -static int testStringCopy05(void); -static int testStringCopy06(void); +static psS32 testStringCopy00(void); +static psS32 testStringCopy01(void); +static psS32 testStringCopy02(void); +static psS32 testStringCopy03(void); +static psS32 testStringCopy04(void); +static psS32 testStringCopy05(void); +static psS32 testStringCopy06(void); testDescription tests[] = { @@ -47,5 +47,5 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -55,30 +55,30 @@ /* -int main( int argc, +psS32 main( psS32 argc, char * argv[] ) { - bool tpResult = false; + psBool tpResult = false; char stringval[20] = "E R R O R"; char stringval1[20] = "e r r o r"; char *stringvalnocopy = "F A I L"; char *substringval = "e r r"; - int substringlen = 6; + psS32 substringlen = 6; char *emptyval = ""; - int tpFails = 0; - char *strResult; - int increaseSize = 5; - int negativeSize = -5; - int result = 0; - int result1 = 0; - int memBlockAllocated = 0; + psS32 tpFails = 0; + char *strResult; + psS32 increaseSize = 5; + psS32 negativeSize = -5; + psS32 result = 0; + psS32 result1 = 0; + psS32 memBlockAllocated = 0; psMemBlock ***memBlockPtr = NULL; */ -static int testStringCopy00(void) -{ - char stringval[20] = "E R R O R"; - int result = 0; - int result1 = 0; +static psS32 testStringCopy00(void) +{ + char stringval[20] = "E R R O R"; + psS32 result = 0; + psS32 result1 = 0; char *strResult; @@ -107,8 +107,8 @@ } -static int testStringCopy01(void) +static psS32 testStringCopy01(void) { char *emptyval = ""; - int result = 0; + psS32 result = 0; char *strResult; @@ -130,11 +130,11 @@ } -static int testStringCopy02(void) -{ - int result = 0; - int result1 = 0; +static psS32 testStringCopy02(void) +{ + psS32 result = 0; + psS32 result1 = 0; char *strResult; char stringval1[20] = "e r r o r"; - int substringlen = 5; + psS32 substringlen = 5; char *substringval = "e r r"; @@ -161,8 +161,8 @@ } -static int testStringCopy03(void) -{ - int result = 0; - int result1 = 0; +static psS32 testStringCopy03(void) +{ + psS32 result = 0; + psS32 result1 = 0; char *strResult; char *stringvalnocopy = "F A I L"; @@ -185,11 +185,11 @@ } -static int testStringCopy04(void) -{ - int result = 0; - int result1 = 0; - char *strResult; - char stringval[20] = "E R R O R"; - int increaseSize = 5; +static psS32 testStringCopy04(void) +{ + psS32 result = 0; + psS32 result1 = 0; + char *strResult; + char stringval[20] = "E R R O R"; + psS32 increaseSize = 5; // Test point #5 Copy string to larger string - psStringNCopy @@ -205,5 +205,5 @@ strResult, stringval); fprintf(stderr," strlne result = %d expected %d\n",result1, - (int)strlen(stringval)); + (psS32)strlen(stringval)); return 1; } @@ -214,9 +214,9 @@ } -static int testStringCopy05(void) -{ - char *strResult; - char stringval[20] = "E R R O R"; - int negativeSize = -5; +static psS32 testStringCopy05(void) +{ + char *strResult; + char stringval[20] = "E R R O R"; + psS32 negativeSize = -5; // Test point #6 Copy string with negative size - psStringNCopy @@ -224,5 +224,5 @@ if ( strResult != NULL ) { fprintf(stderr,"Failed test point #6 return value = %ld expected NULL\n", - (unsigned long)strResult); + (psU64)strResult); return 1; } @@ -232,9 +232,9 @@ } -static int testStringCopy06(void) -{ - char *strResult; - char stringval[20] = "E R R O R"; - int result = 0; +static psS32 testStringCopy06(void) +{ + char *strResult; + char stringval[20] = "E R R O R"; + psS32 result = 0; // Test point #7 Verify creation of string literal - PS_STRING Index: /trunk/psLib/test/sysUtils/tst_psStringCopy.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psStringCopy.c (revision 2203) +++ /trunk/psLib/test/sysUtils/tst_psStringCopy.c (revision 2204) @@ -17,6 +17,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-06 01:59:08 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,11 +28,11 @@ #include "psTest.h" -static int testStringCopy00(void); -static int testStringCopy01(void); -static int testStringCopy02(void); -static int testStringCopy03(void); -static int testStringCopy04(void); -static int testStringCopy05(void); -static int testStringCopy06(void); +static psS32 testStringCopy00(void); +static psS32 testStringCopy01(void); +static psS32 testStringCopy02(void); +static psS32 testStringCopy03(void); +static psS32 testStringCopy04(void); +static psS32 testStringCopy05(void); +static psS32 testStringCopy06(void); testDescription tests[] = { @@ -47,5 +47,5 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -55,30 +55,30 @@ /* -int main( int argc, +psS32 main( psS32 argc, char * argv[] ) { - bool tpResult = false; + psBool tpResult = false; char stringval[20] = "E R R O R"; char stringval1[20] = "e r r o r"; char *stringvalnocopy = "F A I L"; char *substringval = "e r r"; - int substringlen = 6; + psS32 substringlen = 6; char *emptyval = ""; - int tpFails = 0; - char *strResult; - int increaseSize = 5; - int negativeSize = -5; - int result = 0; - int result1 = 0; - int memBlockAllocated = 0; + psS32 tpFails = 0; + char *strResult; + psS32 increaseSize = 5; + psS32 negativeSize = -5; + psS32 result = 0; + psS32 result1 = 0; + psS32 memBlockAllocated = 0; psMemBlock ***memBlockPtr = NULL; */ -static int testStringCopy00(void) -{ - char stringval[20] = "E R R O R"; - int result = 0; - int result1 = 0; +static psS32 testStringCopy00(void) +{ + char stringval[20] = "E R R O R"; + psS32 result = 0; + psS32 result1 = 0; char *strResult; @@ -107,8 +107,8 @@ } -static int testStringCopy01(void) +static psS32 testStringCopy01(void) { char *emptyval = ""; - int result = 0; + psS32 result = 0; char *strResult; @@ -130,11 +130,11 @@ } -static int testStringCopy02(void) -{ - int result = 0; - int result1 = 0; +static psS32 testStringCopy02(void) +{ + psS32 result = 0; + psS32 result1 = 0; char *strResult; char stringval1[20] = "e r r o r"; - int substringlen = 5; + psS32 substringlen = 5; char *substringval = "e r r"; @@ -161,8 +161,8 @@ } -static int testStringCopy03(void) -{ - int result = 0; - int result1 = 0; +static psS32 testStringCopy03(void) +{ + psS32 result = 0; + psS32 result1 = 0; char *strResult; char *stringvalnocopy = "F A I L"; @@ -185,11 +185,11 @@ } -static int testStringCopy04(void) -{ - int result = 0; - int result1 = 0; - char *strResult; - char stringval[20] = "E R R O R"; - int increaseSize = 5; +static psS32 testStringCopy04(void) +{ + psS32 result = 0; + psS32 result1 = 0; + char *strResult; + char stringval[20] = "E R R O R"; + psS32 increaseSize = 5; // Test point #5 Copy string to larger string - psStringNCopy @@ -205,5 +205,5 @@ strResult, stringval); fprintf(stderr," strlne result = %d expected %d\n",result1, - (int)strlen(stringval)); + (psS32)strlen(stringval)); return 1; } @@ -214,9 +214,9 @@ } -static int testStringCopy05(void) -{ - char *strResult; - char stringval[20] = "E R R O R"; - int negativeSize = -5; +static psS32 testStringCopy05(void) +{ + char *strResult; + char stringval[20] = "E R R O R"; + psS32 negativeSize = -5; // Test point #6 Copy string with negative size - psStringNCopy @@ -224,5 +224,5 @@ if ( strResult != NULL ) { fprintf(stderr,"Failed test point #6 return value = %ld expected NULL\n", - (unsigned long)strResult); + (psU64)strResult); return 1; } @@ -232,9 +232,9 @@ } -static int testStringCopy06(void) -{ - char *strResult; - char stringval[20] = "E R R O R"; - int result = 0; +static psS32 testStringCopy06(void) +{ + char *strResult; + char stringval[20] = "E R R O R"; + psS32 result = 0; // Test point #7 Verify creation of string literal - PS_STRING Index: /trunk/psLib/test/sysUtils/tst_psTrace.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psTrace.c (revision 2203) +++ /trunk/psLib/test/sysUtils/tst_psTrace.c (revision 2204) @@ -10,13 +10,13 @@ -static int testTrace00(void); -static int testTrace01(void); -static int testTrace02(void); -static int testTrace03(void); -static int testTrace04(void); -static int testTrace05(void); -static int testTrace05a(void); -static int testTrace06(void); -static int testTrace08(void); +static psS32 testTrace00(void); +static psS32 testTrace01(void); +static psS32 testTrace02(void); +static psS32 testTrace03(void); +static psS32 testTrace04(void); +static psS32 testTrace05(void); +static psS32 testTrace05a(void); +static psS32 testTrace06(void); +static psS32 testTrace08(void); testDescription tests[] = { @@ -37,5 +37,5 @@ }; -int main( int argc, char* argv[] ) +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); @@ -44,8 +44,8 @@ } -static int testTrace00(void) -{ - int i; - int lev = 0; +static psS32 testTrace00(void) +{ + psS32 i; + psS32 lev = 0; psTraceSetDestination(stderr); @@ -94,5 +94,5 @@ } -static int testTrace01(void) +static psS32 testTrace01(void) { psTraceSetDestination(stderr); @@ -104,5 +104,5 @@ } -static int testTrace02(void) +static psS32 testTrace02(void) { psTraceReset(); @@ -133,8 +133,8 @@ } -static int testTrace03(void) -{ - int i = 0; - int lev = 0; +static psS32 testTrace03(void) +{ + psS32 i = 0; + psS32 lev = 0; psTraceSetDestination(stderr); @@ -176,8 +176,8 @@ -static int testTrace04(void) +static psS32 testTrace04(void) { FILE *fp; - int nb = 0; + psS32 nb = 0; fp = fopen("tst_psTrace02_OUT", "w"); @@ -221,5 +221,5 @@ } -static int testTrace05(void) +static psS32 testTrace05(void) { psTraceSetDestination(stderr); @@ -247,5 +247,5 @@ } -static int testTrace05a(void) +static psS32 testTrace05a(void) { (void)psTraceSetLevel(".", 9); @@ -271,5 +271,5 @@ } -static int testTrace06(void) +static psS32 testTrace06(void) { psTraceSetDestination(stderr); @@ -311,5 +311,5 @@ // Ensure that the leading dot in the component names are optional. -static int testTrace08(void) +static psS32 testTrace08(void) { psTraceReset(); Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr =================================================================== --- /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr (revision 2203) +++ /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr (revision 2204) @@ -25,5 +25,5 @@ /***************************** TESTPOINT ******************************************\ * TestFile: tst_psTrace.c * -* TestPoint: psTrace{psTraceSetLevel(): test static inheritance} * +* TestPoint: psTrace{psTraceSetLevel(): test static/dynamic inheritance} * * TestType: Positive * \**********************************************************************************/ @@ -42,5 +42,5 @@ E 5 ----> TESTPOINT PASSED (psTrace{psTraceSetLevel(): test static inheritance} | tst_psTrace.c) +---> TESTPOINT PASSED (psTrace{psTraceSetLevel(): test static/dynamic inheritance} | tst_psTrace.c) /***************************** TESTPOINT ******************************************\ Index: /trunk/psLib/test/tst_template.c =================================================================== --- /trunk/psLib/test/tst_template.c (revision 2203) +++ /trunk/psLib/test/tst_template.c (revision 2204) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-02 18:30:10 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:31 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -15,7 +15,7 @@ #include "pslib.h" -static int test1( void ); -static int test2( void ); -static int test3( void ); +static psS32 test1( void ); +static psS32 test2( void ); +static psS32 test3( void ); // test descrription consists of: @@ -45,10 +45,10 @@ test3, 1114, "psFunctionFunk", 0, false }, - + // testpoint #1112 handled by same test function as #1111 { test1, 1112, "psFunctionBang", 0, true }, - + // A null terminates the testDescription list { @@ -56,36 +56,36 @@ } }; - -int main( int argc, char* argv[] ) + +psS32 main( psS32 argc, char* argv[] ) { psLogSetLevel( PS_LOG_INFO ); - + return ( ! runTestSuite( stderr, "psImage", tests, argc, argv ) ); } -int test1( void ) +psS32 test1( void ) { // no need to check for memory leaks, as the runTestSuite does that for you. - + // here is where one implements the tests for generally a single testpoint. - + return 0; // the value that indicates success is part of the testDescription } -int test2( void ) +psS32 test2( void ) { // no need to check for memory leaks, as the runTestSuite does that for you. - + // here is where one implements the tests for generally a single testpoint. - + return 0; // the value that indicates success is part of the testDescription } -int test3( void ) +psS32 test3( void ) { // no need to check for memory leaks, as the runTestSuite does that for you. - + // here is where one implements the tests for generally a single testpoint. - + return 0; // the value that indicates success is part of the testDescription }