Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 1439) +++ /trunk/psLib/src/astro/psCoord.c (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,8 +32,8 @@ // This is the only function in this file which I understand. -psPlane *psPlaneTransformApply(psPlane * out, const psPlaneTransform * transform, const psPlane * coords) +psPlane* psPlaneTransformApply(psPlane* out, const psPlaneTransform* transform, const psPlane* coords) { if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); + out = (psPlane* ) psAlloc(sizeof(psPlane)); } out->x = transform->x->coeff[0][0] + @@ -48,10 +48,10 @@ // This transformation takes into account parameters beyond an objects // spatial coordinates: term3 and term4. -psPlane *psPlaneDistortApply(psPlane * out, - const psPlaneDistort * transform, - const psPlane * coords, float term3, float term4) +psPlane* psPlaneDistortApply(psPlane* out, + const psPlaneDistort* transform, + const psPlane* coords, float term3, float term4) { if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); + out = (psPlane* ) psAlloc(sizeof(psPlane)); } @@ -70,7 +70,7 @@ // This function prototype has been modified since the SDRS. -psSphereTransform *psSphereTransformAlloc(double NPlat, double Xo, double xo) -{ - psSphereTransform *tmp = (psSphereTransform *) psAlloc(sizeof(psSphereTransform)); +psSphereTransform* psSphereTransformAlloc(double NPlat, double Xo, double xo) +{ + psSphereTransform* tmp = (psSphereTransform* ) psAlloc(sizeof(psSphereTransform)); tmp->sinPhi = sin(NPlat); @@ -89,5 +89,5 @@ // there are no typo's. -psSphere *psSphereTransformApply(psSphere * out, const psSphereTransform * transform, const psSphere * coord) +psSphere* psSphereTransformApply(psSphere* out, const psSphereTransform* transform, const psSphere* coord) { double sinY = 0.0; @@ -100,5 +100,5 @@ if (out == NULL) { - out = (psSphere *) psAlloc(sizeof(psSphere)); + out = (psSphere* ) psAlloc(sizeof(psSphere)); } @@ -117,5 +117,5 @@ } -psSphereTransform *psSphereTransformICRStoEcliptic(psTime time) +psSphereTransform* psSphereTransformICRStoEcliptic(psTime time) { struct tm *tmTime = psTimeToTM(time); @@ -129,5 +129,5 @@ } -psSphereTransform *psSphereTransformEcliptictoICRS(psTime time) +psSphereTransform* psSphereTransformEcliptictoICRS(psTime time) { struct tm *tmTime = psTimeToTM(time); @@ -141,10 +141,10 @@ } -psSphereTransform *psSphereTransformICRStoGalatic(void) +psSphereTransform* psSphereTransformICRStoGalatic(void) { return (psSphereTransformAlloc(62.6, 282.25, 33.0)); } -psSphereTransform *psSphereTransformGalatictoICRS(void) +psSphereTransform* psSphereTransformGalatictoICRS(void) { return (psSphereTransformAlloc(-62.6, 33.0, 282.25)); @@ -178,9 +178,9 @@ // XXX: Waiting for the definition of the PS_PROJ_PAR projection. // XXX: Waiting for the definition of the PS_PROJ_GLS projection. -psPlane *psProject(const psSphere * coord, const psProjection * projection) +psPlane* psProject(const psSphere* coord, const psProjection* projection) { float R = 0.0; float alpha = 0.0; - psPlane *tmp = (psPlane *) psAlloc(sizeof(psPlane)); + psPlane* tmp = (psPlane* ) psAlloc(sizeof(psPlane)); if (projection->type == PS_PROJ_TAN) { @@ -220,5 +220,5 @@ // XXX: Waiting for the definition of the PS_PROJ_PAR projection. // XXX: Waiting for the definition of the PS_PROJ_GLS projection. -psSphere *psDeproject(const psPlane * coord, const psProjection * projection) +psSphere* psDeproject(const psPlane* coord, const psProjection* projection) { float R = 0.0; @@ -226,5 +226,5 @@ float chu1 = 0.0; float chu2 = 0.0; - psSphere *tmp = (psSphere *) psAlloc(sizeof(psSphere)); + psSphere* tmp = (psSphere* ) psAlloc(sizeof(psSphere)); if (projection->type == PS_PROJ_TAN) { @@ -267,11 +267,11 @@ // XXX: Do I need to check for unacceptable transformation parameters? // Maybe, if the points are on the North/South Pole, etc? -psSphere *psSphereGetOffset(const psSphere * restrict position1, - const psSphere * restrict position2, +psSphere* psSphereGetOffset(const psSphere* restrict position1, + const psSphere* restrict position2, psSphereOffsetMode mode, psSphereOffsetUnit unit) { - // psPlane *lin; + // psPlane* lin; psProjection proj; - psSphere *tmp; + psSphere* tmp; double tmpR = 0.0; double tmpD = 0.0; @@ -313,5 +313,5 @@ } - tmp = (psSphere *) psAlloc(sizeof(psSphere)); + tmp = (psSphere* ) psAlloc(sizeof(psSphere)); tmp->r = tmpR; tmp->d = tmpD; @@ -328,10 +328,10 @@ // Maybe, if the points are on the North/South Pole, etc? // XXX: I copied the algorithm from the ADD exactly. -psSphere *psSphereSetOffset(const psSphere * restrict position, - const psSphere * restrict offset, +psSphere* psSphereSetOffset(const psSphere* restrict position, + const psSphere* restrict offset, psSphereOffsetMode mode, psSphereOffsetUnit unit) { psPlane lin; - psSphere *tmp; + psSphere* tmp; psProjection proj; double tmpR = 0.0; @@ -368,5 +368,5 @@ } - tmp = (psSphere *) psAlloc(sizeof(psSphere)); + tmp = (psSphere* ) psAlloc(sizeof(psSphere)); tmp->r = position->r + tmpR; tmp->r = position->d + tmpD; Index: /trunk/psLib/src/astro/psCoord.h =================================================================== --- /trunk/psLib/src/astro/psCoord.h (revision 1439) +++ /trunk/psLib/src/astro/psCoord.h (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -72,6 +72,6 @@ typedef struct { - psDPolynomial2D *x; ///< 2D polynomial transform of X coordinates - psDPolynomial2D *y; ///< 2D polynomial transform of Y coordinates + psDPolynomial2D* x; ///< 2D polynomial transform of X coordinates + psDPolynomial2D* y; ///< 2D polynomial transform of Y coordinates } psPlaneTransform; @@ -91,6 +91,6 @@ typedef struct { - psDPolynomial4D *x; ///< 4D polynomial transform of X coordinates - psDPolynomial4D *y; ///< 4D polynomial transform of Y coordinates + psDPolynomial4D* x; ///< 4D polynomial transform of X coordinates + psDPolynomial4D* y; ///< 4D polynomial transform of Y coordinates } psPlaneDistort; @@ -171,7 +171,7 @@ * */ -psPlane *psPlaneTransformApply(psPlane * out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneTransform * transform, ///< the transform to apply - const psPlane * coords ///< the coordinate to apply the transform above. +psPlane* psPlaneTransformApply(psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. + const psPlaneTransform* transform, ///< the transform to apply + const psPlane* coords ///< the coordinate to apply the transform above. ); @@ -179,7 +179,7 @@ * */ -psPlane *psPlaneDistortApply(psPlane * out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneDistort * transform, ///< the transform to apply - const psPlane * coords, ///< the coordinate to apply the transform above. +psPlane* psPlaneDistortApply(psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. + const psPlaneDistort* transform, ///< the transform to apply + const psPlane* coords, ///< the coordinate to apply the transform above. float term3, ///< third term -- maybe magnitude float term4 ///< forth term -- maybe color @@ -189,5 +189,5 @@ * */ -psSphereTransform *psSphereTransformAlloc(double NPlat, ///< north pole latitude +psSphereTransform* psSphereTransformAlloc(double NPlat, ///< north pole latitude double Xo, ///< First PT of Ares lon double xo ///< First PT of Ares equiv lon @@ -197,28 +197,28 @@ * */ -psSphere *psSphereTransformApply(psSphere * out, ///< a psSphere to recycle. If NULL, a new one is +psSphere* psSphereTransformApply(psSphere* out, ///< a psSphere to recycle. If NULL, a new one is // generated. - const psSphereTransform * transform, ///< the transform to apply - const psSphere * coord ///< the coordinate to apply the transform above.x + const psSphereTransform* transform, ///< the transform to apply + const psSphere* coord ///< the coordinate to apply the transform above.x ); -psSphereTransform *psSphereTransformICRStoEcliptic(psTime time); - -psSphereTransform *psSphereTransformEcliptictoICRS(psTime time); - -psSphereTransform *psSphereTransformICRStoGalatic(void); - -psSphereTransform *psSphereTransformGalatictoICRS(void); - -psPlane *psProject(const psSphere * coord, const psProjection * projection); - -psSphere *psDeproject(const psPlane * coord, const psProjection * projection); - -psSphere *psSphereGetOffset(const psSphere * restrict position1, - const psSphere * restrict position2, +psSphereTransform* psSphereTransformICRStoEcliptic(psTime time); + +psSphereTransform* psSphereTransformEcliptictoICRS(psTime time); + +psSphereTransform* psSphereTransformICRStoGalatic(void); + +psSphereTransform* psSphereTransformGalatictoICRS(void); + +psPlane* psProject(const psSphere* coord, const psProjection* projection); + +psSphere* psDeproject(const psPlane* coord, const psProjection* projection); + +psSphere* psSphereGetOffset(const psSphere* restrict position1, + const psSphere* restrict position2, psSphereOffsetMode mode, psSphereOffsetUnit unit); -psSphere *psSphereSetOffset(const psSphere * restrict position, - const psSphere * restrict offset, +psSphere* psSphereSetOffset(const psSphere* restrict position, + const psSphere* restrict offset, psSphereOffsetMode mode, psSphereOffsetUnit unit); Index: /trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.c (revision 1439) +++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 1440) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -21,14 +21,14 @@ #include "psMemory.h" -static void grommitFree(psGrommit * grommit); -static int checkValidChipCoords(double x, double y, psChip * tmpChip); -static int checkValidImageCoords(double x, double y, psImage * tmpImage); - -psExposure *psExposureAlloc(double ra, double dec, double hourAngle, +static void grommitFree(psGrommit* grommit); +static int checkValidChipCoords(double x, double y, psChip* tmpChip); +static int checkValidImageCoords(double x, double y, psImage* tmpImage); + +psExposure* psExposureAlloc(double ra, double dec, double hourAngle, double zenith, double azimuth, double localTime, float date, float rotAngle, float temperature, float pressure, float humidity, float exposureTime) { - psExposure *exp = psAlloc(sizeof(psExposure)); + psExposure* exp = psAlloc(sizeof(psExposure)); *(double *)&exp->ra = ra; @@ -49,8 +49,8 @@ } -psGrommit *psGrommitAlloc(const psExposure * exp) +psGrommit* psGrommitAlloc(const psExposure* exp) { double *slaGrommit = (double *)psAlloc(14 * sizeof(double)); - psGrommit *grommit = (psGrommit *) psAlloc(sizeof(psGrommit)); + psGrommit* grommit = (psGrommit* ) psAlloc(sizeof(psGrommit)); /* @@ -79,13 +79,13 @@ } -void p_psGrommitFree(psGrommit * grommit) +void p_psGrommitFree(psGrommit* grommit) { psFree(grommit); } -psCell *psCellinFPA(psCell * out, const psPlane * coord, const psFPA * FPA) -{ - psChip *tmpChip = NULL; - psCell *tmpCell = NULL; +psCell* psCellinFPA(psCell* out, const psPlane* coord, const psFPA* FPA) +{ + psChip* tmpChip = NULL; + psCell* tmpCell = NULL; tmpChip = psChipinFPA(tmpChip, coord, FPA); @@ -94,17 +94,17 @@ } -int checkValidChipCoords(double x, double y, psChip * tmpChip) +int checkValidChipCoords(double x, double y, psChip* tmpChip) { return (0); } -psChip *psChipinFPA(psChip * out, const psPlane * coord, const psFPA * FPA) -{ - psArray *chips = FPA->chips; +psChip* psChipinFPA(psChip* out, const psPlane* coord, const psFPA* FPA) +{ + psArray* chips = FPA->chips; int nChips = chips->n; - psPlane *tmpCoord = NULL; + psPlane* tmpCoord = NULL; for (int i = 0; i < nChips; i++) { - psChip *tmpChip = chips->data[i]; + psChip* tmpChip = chips->data[i]; tmpCoord = psPlaneTransformApply(tmpCoord, tmpChip->fromFPA, coord); @@ -120,5 +120,5 @@ } -int checkValidImageCoords(double x, double y, psImage * tmpImage) +int checkValidImageCoords(double x, double y, psImage* tmpImage) { if ((x < 0.0) || (x > (double)tmpImage->numCols) || (y < 0.0) || (y > (double)tmpImage->numRows)) { @@ -140,8 +140,8 @@ XXX: must deallocate memory. *****************************************************************************/ -psCell *psCellinChip(psCell * out, const psPlane * coord, const psChip * chip) -{ - psPlane *tmpCoord = NULL; - psArray *cells; +psCell* psCellinChip(psCell* out, const psPlane* coord, const psChip* chip) +{ + psPlane* tmpCoord = NULL; + psArray* cells; if (chip == NULL) { @@ -156,10 +156,10 @@ for (int i = 0; i < cells->n; i++) { - psCell *tmpCell = (psCell *) cells->data[i]; - psArray *readouts = tmpCell->readouts; + psCell* tmpCell = (psCell* ) cells->data[i]; + psArray* readouts = tmpCell->readouts; if (readouts != NULL) { for (int j = 0; j < readouts->n; j++) { - psReadout *tmpReadout = readouts->data[j]; + psReadout* tmpReadout = readouts->data[j]; tmpCoord = psPlaneTransformApply(tmpCoord, tmpCell->fromChip, coord); @@ -173,15 +173,15 @@ } -psPlane *psCoordCelltoChip(psPlane * out, const psPlane * in, const psCell * cell) +psPlane* psCoordCelltoChip(psPlane* out, const psPlane* in, const psCell* cell) { return (psPlaneTransformApply(out, cell->toChip, in)); } -psPlane *psCoordChipToFPA(psPlane * out, const psPlane * in, const psChip * chip) +psPlane* psCoordChipToFPA(psPlane* out, const psPlane* in, const psChip* chip) { return (psPlaneTransformApply(out, chip->toFPA, in)); } -psPlane *psCoordFPAtoTP(psPlane * out, const psPlane * in, const psFPA * fpa) +psPlane* psCoordFPAtoTP(psPlane* out, const psPlane* in, const psFPA* fpa) { // XXX: This code doesn't work; fpa->toTangentPlane is of the wrong type. @@ -191,5 +191,5 @@ // XXX: must wrap SLA_QAPQK here. -psSphere *psCoordTPtoSky(psSphere * out, const psPlane * in, const psGrommit * grommit) +psSphere* psCoordTPtoSky(psSphere* out, const psPlane* in, const psGrommit* grommit) { /* @@ -202,5 +202,5 @@ } -psPlane *psCoordCellToFPA(psPlane * out, const psPlane * in, const psCell * cell) +psPlane* psCoordCellToFPA(psPlane* out, const psPlane* in, const psCell* cell) { return (psPlaneTransformApply(out, cell->toFPA, in)); @@ -210,10 +210,10 @@ // transformation, as well as a few psPlane structs. Can this be implemented // better? -psSphere *psCoordCelltoSky(psSphere * out, const psPlane * in, const psCell * cell) -{ - psPlane *tmp1 = NULL; - psPlane *tmp2 = NULL; - psFPA *parFPA = (cell->parent)->parent; - psGrommit *tmpGrommit = NULL; +psSphere* psCoordCelltoSky(psSphere* out, const psPlane* in, const psCell* cell) +{ + psPlane* tmp1 = NULL; + psPlane* tmp2 = NULL; + psFPA* parFPA = (cell->parent)->parent; + psGrommit* tmpGrommit = NULL; tmp1 = psPlaneTransformApply(tmp1, cell->toFPA, in); @@ -230,7 +230,7 @@ } -psSphere *psCoordCelltoSkyQuick(psSphere * out, const psPlane * in, const psCell * cell) -{ - psPlane *tmp1 = NULL; +psSphere* psCoordCelltoSkyQuick(psSphere* out, const psPlane* in, const psCell* cell) +{ + psPlane* tmp1 = NULL; tmp1 = psPlaneTransformApply(tmp1, cell->toSky, in); @@ -245,5 +245,5 @@ // XXX: must wrap SLA_AOPQK here. -psPlane *psCoordSkytoTP(psPlane * out, const psSphere * in, const psGrommit * grommit) +psPlane* psCoordSkytoTP(psPlane* out, const psSphere* in, const psGrommit* grommit) { extern void sla_AOPQK(RAP, DAP, AOPRMS, AOB, ZOB, HOB, DOB, ROB); @@ -255,5 +255,5 @@ if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); + out = (psPlane* ) psAlloc(sizeof(psPlane)); } @@ -264,20 +264,20 @@ } -psPlane *psCoordTPtoFPA(psPlane * out, const psPlane * in, const psFPA * fpa) +psPlane* psCoordTPtoFPA(psPlane* out, const psPlane* in, const psFPA* fpa) { return (psPlaneTransformApply(out, fpa->fromTangentPlane, in)); } -psPlane *psCoordFPAtoChip(psPlane * out, const psPlane * in, const psChip * chip) +psPlane* psCoordFPAtoChip(psPlane* out, const psPlane* in, const psChip* chip) { return (psPlaneTransformApply(out, chip->fromFPA, in)); } -psPlane *psCoordChiptoCell(psPlane * out, const psPlane * in, const psCell * cell) +psPlane* psCoordChiptoCell(psPlane* out, const psPlane* in, const psCell* cell) { return (psPlaneTransformApply(out, cell->fromChip, in)); } -psPlane *psCoordSkytoCell(psPlane * out, const psSphere * in, const psCell * cell) +psPlane* psCoordSkytoCell(psPlane* out, const psSphere* in, const psCell* cell) { out = psCoordSkytoTP(out, in, tmpGrommit); @@ -289,10 +289,10 @@ } -psPlane *psCoordSkytoCellQuick(psPlane * out, const psSphere * in, const psCell * cell) +psPlane* psCoordSkytoCellQuick(psPlane* out, const psSphere* in, const psCell* cell) { if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); - } - - return (out); -} + out = (psPlane* ) psAlloc(sizeof(psPlane)); + } + + return (out); +} Index: /trunk/psLib/src/astronomy/psAstrometry.h =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.h (revision 1439) +++ /trunk/psLib/src/astronomy/psAstrometry.h (revision 1440) @@ -9,6 +9,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -100,7 +100,7 @@ const int row0; ///< Offset from the bottom of chip. - psImage *image; ///< imaging area of Readout - psList *objects; ///< objects derived from Readout - psMetadata *metadata; ///< readout-level metadata + psImage* image; ///< imaging area of Readout + psList* objects; ///< objects derived from Readout + psMetadata* metadata; ///< readout-level metadata } psReadout; @@ -117,13 +117,13 @@ typedef struct psCell { - psArray *readouts; ///< readouts from the cell - psMetadata *metadata; ///< cell-level metadata - - psPlaneTransform *toChip; ///< transformations from cell to chip coordinates - psPlaneTransform *fromChip; ///< transformations from chip to cell coordinates - psPlaneTransform *toFPA; ///< transformations from cell to FPA coordinates - psPlaneTransform *toSky; ///< transformations from cell to sky coordinates - - struct psChip *parent; ///< chip in which contains this cell + psArray* readouts; ///< readouts from the cell + psMetadata* metadata; ///< cell-level metadata + + psPlaneTransform* toChip; ///< transformations from cell to chip coordinates + psPlaneTransform* fromChip; ///< transformations from chip to cell coordinates + psPlaneTransform* toFPA; ///< transformations from cell to FPA coordinates + psPlaneTransform* toSky; ///< transformations from cell to sky coordinates + + struct psChip* parent; ///< chip in which contains this cell } psCell; @@ -139,11 +139,11 @@ typedef struct psChip { - psArray *cells; ///< cells in the chip - psMetadata *metadata; ///< chip-level metadata - - psPlaneTransform *toFPA; ///< transformation from chip to FPA coordinates - psPlaneTransform *fromFPA; ///< transformation from FPA to chip coordinates - - struct psFPA *parent; ///< FPA which contains this chip + psArray* cells; ///< cells in the chip + psMetadata* metadata; ///< chip-level metadata + + psPlaneTransform* toFPA; ///< transformation from chip to FPA coordinates + psPlaneTransform* fromFPA; ///< transformation from FPA to chip coordinates + + struct psFPA* parent; ///< FPA which contains this chip } psChip; @@ -164,15 +164,15 @@ typedef struct psFPA { - psArray *chips; ///< chips in the focal plane array - psMetadata *metadata; ///< focal-plane's metadata - - psPlaneDistort *fromTangentPlane; ///< transformation from tangent plane to focal plane - psPlaneDistort *toTangentPlane; ///< transformation from focal plane to tangent plane - psFixedPattern *pattern; ///< fixed pattern residual offsets - - const struct psExposure *exposure; ///< information about this exposure - - psPhotSystem *colorPlus; ///< Color reference - psPhotSystem *colorMinus; ///< Color reference + psArray* chips; ///< chips in the focal plane array + psMetadata* metadata; ///< focal-plane's metadata + + psPlaneDistort* fromTangentPlane; ///< transformation from tangent plane to focal plane + psPlaneDistort* toTangentPlane; ///< transformation from focal plane to tangent plane + psFixedPattern* pattern; ///< fixed pattern residual offsets + + const struct psExposure* exposure; ///< information about this exposure + + psPhotSystem* colorPlus; ///< Color reference + psPhotSystem* colorMinus; ///< Color reference float rmsX; ///< RMS for x transformation fits @@ -214,5 +214,5 @@ psExposure; -psExposure *psExposureAlloc(double ra, ///< Telescope boresight, right ascention +psExposure* psExposureAlloc(double ra, ///< Telescope boresight, right ascention double dec, ///< Telescope boresight, declination double hourAngle, ///< Hour angle @@ -233,40 +233,40 @@ * exposure. * - * @return psGrommit* New grommit structure. - */ -psGrommit *psGrommitAlloc(const psExposure * exp ///< the cooresponding exposure structure. + * @return psGrommit* New grommit structure. + */ +psGrommit* psGrommitAlloc(const psExposure* exp ///< the cooresponding exposure structure. ); -psCell *psCellinFPA(psCell * out, const psPlane * coord, const psFPA * FPA); - -psChip *psChipinFPA(psChip * out, const psPlane * coord, const psFPA * FPA); - -psCell *psCellinChip(psCell * out, const psPlane * coord, const psChip * chip); - -psPlane *psCoordCelltoChip(psPlane * out, const psPlane * in, const psCell * cell); - -psPlane *psCoordChipToFPA(psPlane * out, const psPlane * in, const psChip * chip); - -psPlane *psCoordFPAtoTP(psPlane * out, const psPlane * in, const psFPA * fpa); - -psSphere *psCoordTPtoSky(psSphere * out, const psPlane * in, const psGrommit * grommit); - -psPlane *psCoordCellToFPA(psPlane * out, const psPlane * in, const psCell * cell); - -psSphere *psCoordCelltoSky(psSphere * out, const psPlane * in, const psCell * cell); - -psSphere *psCoordCelltoSkyQuick(psSphere * out, const psPlane * in, const psCell * cell); - -psPlane *psCoordSkytoTP(psPlane * out, const psSphere * in, const psGrommit * grommit); - -psPlane *psCoordTPtoFPA(psPlane * out, const psPlane * in, const psFPA * fpa); - -psPlane *psCoordFPAtoChip(psPlane * out, const psPlane * in, const psChip * chip); - -psPlane *psCoordChiptoCell(psPlane * out, const psPlane * in, const psCell * cell); - -psPlane *psCoordSkytoCell(psPlane * out, const psSphere * in, const psCell * cell); - -psPlane *psCoordSkytoCellQuick(psPlane * out, const psSphere * in, const psCell * cell); +psCell* psCellinFPA(psCell* out, const psPlane* coord, const psFPA* FPA); + +psChip* psChipinFPA(psChip* out, const psPlane* coord, const psFPA* FPA); + +psCell* psCellinChip(psCell* out, const psPlane* coord, const psChip* chip); + +psPlane* psCoordCelltoChip(psPlane* out, const psPlane* in, const psCell* cell); + +psPlane* psCoordChipToFPA(psPlane* out, const psPlane* in, const psChip* chip); + +psPlane* psCoordFPAtoTP(psPlane* out, const psPlane* in, const psFPA* fpa); + +psSphere* psCoordTPtoSky(psSphere* out, const psPlane* in, const psGrommit* grommit); + +psPlane* psCoordCellToFPA(psPlane* out, const psPlane* in, const psCell* cell); + +psSphere* psCoordCelltoSky(psSphere* out, const psPlane* in, const psCell* cell); + +psSphere* psCoordCelltoSkyQuick(psSphere* out, const psPlane* in, const psCell* cell); + +psPlane* psCoordSkytoTP(psPlane* out, const psSphere* in, const psGrommit* grommit); + +psPlane* psCoordTPtoFPA(psPlane* out, const psPlane* in, const psFPA* fpa); + +psPlane* psCoordFPAtoChip(psPlane* out, const psPlane* in, const psChip* chip); + +psPlane* psCoordChiptoCell(psPlane* out, const psPlane* in, const psCell* cell); + +psPlane* psCoordSkytoCell(psPlane* out, const psSphere* in, const psCell* cell); + +psPlane* psCoordSkytoCellQuick(psPlane* out, const psSphere* in, const psCell* cell); #endif Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 1439) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,8 +32,8 @@ // This is the only function in this file which I understand. -psPlane *psPlaneTransformApply(psPlane * out, const psPlaneTransform * transform, const psPlane * coords) +psPlane* psPlaneTransformApply(psPlane* out, const psPlaneTransform* transform, const psPlane* coords) { if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); + out = (psPlane* ) psAlloc(sizeof(psPlane)); } out->x = transform->x->coeff[0][0] + @@ -48,10 +48,10 @@ // This transformation takes into account parameters beyond an objects // spatial coordinates: term3 and term4. -psPlane *psPlaneDistortApply(psPlane * out, - const psPlaneDistort * transform, - const psPlane * coords, float term3, float term4) +psPlane* psPlaneDistortApply(psPlane* out, + const psPlaneDistort* transform, + const psPlane* coords, float term3, float term4) { if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); + out = (psPlane* ) psAlloc(sizeof(psPlane)); } @@ -70,7 +70,7 @@ // This function prototype has been modified since the SDRS. -psSphereTransform *psSphereTransformAlloc(double NPlat, double Xo, double xo) -{ - psSphereTransform *tmp = (psSphereTransform *) psAlloc(sizeof(psSphereTransform)); +psSphereTransform* psSphereTransformAlloc(double NPlat, double Xo, double xo) +{ + psSphereTransform* tmp = (psSphereTransform* ) psAlloc(sizeof(psSphereTransform)); tmp->sinPhi = sin(NPlat); @@ -89,5 +89,5 @@ // there are no typo's. -psSphere *psSphereTransformApply(psSphere * out, const psSphereTransform * transform, const psSphere * coord) +psSphere* psSphereTransformApply(psSphere* out, const psSphereTransform* transform, const psSphere* coord) { double sinY = 0.0; @@ -100,5 +100,5 @@ if (out == NULL) { - out = (psSphere *) psAlloc(sizeof(psSphere)); + out = (psSphere* ) psAlloc(sizeof(psSphere)); } @@ -117,5 +117,5 @@ } -psSphereTransform *psSphereTransformICRStoEcliptic(psTime time) +psSphereTransform* psSphereTransformICRStoEcliptic(psTime time) { struct tm *tmTime = psTimeToTM(time); @@ -129,5 +129,5 @@ } -psSphereTransform *psSphereTransformEcliptictoICRS(psTime time) +psSphereTransform* psSphereTransformEcliptictoICRS(psTime time) { struct tm *tmTime = psTimeToTM(time); @@ -141,10 +141,10 @@ } -psSphereTransform *psSphereTransformICRStoGalatic(void) +psSphereTransform* psSphereTransformICRStoGalatic(void) { return (psSphereTransformAlloc(62.6, 282.25, 33.0)); } -psSphereTransform *psSphereTransformGalatictoICRS(void) +psSphereTransform* psSphereTransformGalatictoICRS(void) { return (psSphereTransformAlloc(-62.6, 33.0, 282.25)); @@ -178,9 +178,9 @@ // XXX: Waiting for the definition of the PS_PROJ_PAR projection. // XXX: Waiting for the definition of the PS_PROJ_GLS projection. -psPlane *psProject(const psSphere * coord, const psProjection * projection) +psPlane* psProject(const psSphere* coord, const psProjection* projection) { float R = 0.0; float alpha = 0.0; - psPlane *tmp = (psPlane *) psAlloc(sizeof(psPlane)); + psPlane* tmp = (psPlane* ) psAlloc(sizeof(psPlane)); if (projection->type == PS_PROJ_TAN) { @@ -220,5 +220,5 @@ // XXX: Waiting for the definition of the PS_PROJ_PAR projection. // XXX: Waiting for the definition of the PS_PROJ_GLS projection. -psSphere *psDeproject(const psPlane * coord, const psProjection * projection) +psSphere* psDeproject(const psPlane* coord, const psProjection* projection) { float R = 0.0; @@ -226,5 +226,5 @@ float chu1 = 0.0; float chu2 = 0.0; - psSphere *tmp = (psSphere *) psAlloc(sizeof(psSphere)); + psSphere* tmp = (psSphere* ) psAlloc(sizeof(psSphere)); if (projection->type == PS_PROJ_TAN) { @@ -267,11 +267,11 @@ // XXX: Do I need to check for unacceptable transformation parameters? // Maybe, if the points are on the North/South Pole, etc? -psSphere *psSphereGetOffset(const psSphere * restrict position1, - const psSphere * restrict position2, +psSphere* psSphereGetOffset(const psSphere* restrict position1, + const psSphere* restrict position2, psSphereOffsetMode mode, psSphereOffsetUnit unit) { - // psPlane *lin; + // psPlane* lin; psProjection proj; - psSphere *tmp; + psSphere* tmp; double tmpR = 0.0; double tmpD = 0.0; @@ -313,5 +313,5 @@ } - tmp = (psSphere *) psAlloc(sizeof(psSphere)); + tmp = (psSphere* ) psAlloc(sizeof(psSphere)); tmp->r = tmpR; tmp->d = tmpD; @@ -328,10 +328,10 @@ // Maybe, if the points are on the North/South Pole, etc? // XXX: I copied the algorithm from the ADD exactly. -psSphere *psSphereSetOffset(const psSphere * restrict position, - const psSphere * restrict offset, +psSphere* psSphereSetOffset(const psSphere* restrict position, + const psSphere* restrict offset, psSphereOffsetMode mode, psSphereOffsetUnit unit) { psPlane lin; - psSphere *tmp; + psSphere* tmp; psProjection proj; double tmpR = 0.0; @@ -368,5 +368,5 @@ } - tmp = (psSphere *) psAlloc(sizeof(psSphere)); + tmp = (psSphere* ) psAlloc(sizeof(psSphere)); tmp->r = position->r + tmpR; tmp->r = position->d + tmpD; Index: /trunk/psLib/src/astronomy/psCoord.h =================================================================== --- /trunk/psLib/src/astronomy/psCoord.h (revision 1439) +++ /trunk/psLib/src/astronomy/psCoord.h (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -72,6 +72,6 @@ typedef struct { - psDPolynomial2D *x; ///< 2D polynomial transform of X coordinates - psDPolynomial2D *y; ///< 2D polynomial transform of Y coordinates + psDPolynomial2D* x; ///< 2D polynomial transform of X coordinates + psDPolynomial2D* y; ///< 2D polynomial transform of Y coordinates } psPlaneTransform; @@ -91,6 +91,6 @@ typedef struct { - psDPolynomial4D *x; ///< 4D polynomial transform of X coordinates - psDPolynomial4D *y; ///< 4D polynomial transform of Y coordinates + psDPolynomial4D* x; ///< 4D polynomial transform of X coordinates + psDPolynomial4D* y; ///< 4D polynomial transform of Y coordinates } psPlaneDistort; @@ -171,7 +171,7 @@ * */ -psPlane *psPlaneTransformApply(psPlane * out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneTransform * transform, ///< the transform to apply - const psPlane * coords ///< the coordinate to apply the transform above. +psPlane* psPlaneTransformApply(psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. + const psPlaneTransform* transform, ///< the transform to apply + const psPlane* coords ///< the coordinate to apply the transform above. ); @@ -179,7 +179,7 @@ * */ -psPlane *psPlaneDistortApply(psPlane * out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneDistort * transform, ///< the transform to apply - const psPlane * coords, ///< the coordinate to apply the transform above. +psPlane* psPlaneDistortApply(psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. + const psPlaneDistort* transform, ///< the transform to apply + const psPlane* coords, ///< the coordinate to apply the transform above. float term3, ///< third term -- maybe magnitude float term4 ///< forth term -- maybe color @@ -189,5 +189,5 @@ * */ -psSphereTransform *psSphereTransformAlloc(double NPlat, ///< north pole latitude +psSphereTransform* psSphereTransformAlloc(double NPlat, ///< north pole latitude double Xo, ///< First PT of Ares lon double xo ///< First PT of Ares equiv lon @@ -197,28 +197,28 @@ * */ -psSphere *psSphereTransformApply(psSphere * out, ///< a psSphere to recycle. If NULL, a new one is +psSphere* psSphereTransformApply(psSphere* out, ///< a psSphere to recycle. If NULL, a new one is // generated. - const psSphereTransform * transform, ///< the transform to apply - const psSphere * coord ///< the coordinate to apply the transform above.x + const psSphereTransform* transform, ///< the transform to apply + const psSphere* coord ///< the coordinate to apply the transform above.x ); -psSphereTransform *psSphereTransformICRStoEcliptic(psTime time); - -psSphereTransform *psSphereTransformEcliptictoICRS(psTime time); - -psSphereTransform *psSphereTransformICRStoGalatic(void); - -psSphereTransform *psSphereTransformGalatictoICRS(void); - -psPlane *psProject(const psSphere * coord, const psProjection * projection); - -psSphere *psDeproject(const psPlane * coord, const psProjection * projection); - -psSphere *psSphereGetOffset(const psSphere * restrict position1, - const psSphere * restrict position2, +psSphereTransform* psSphereTransformICRStoEcliptic(psTime time); + +psSphereTransform* psSphereTransformEcliptictoICRS(psTime time); + +psSphereTransform* psSphereTransformICRStoGalatic(void); + +psSphereTransform* psSphereTransformGalatictoICRS(void); + +psPlane* psProject(const psSphere* coord, const psProjection* projection); + +psSphere* psDeproject(const psPlane* coord, const psProjection* projection); + +psSphere* psSphereGetOffset(const psSphere* restrict position1, + const psSphere* restrict position2, psSphereOffsetMode mode, psSphereOffsetUnit unit); -psSphere *psSphereSetOffset(const psSphere * restrict position, - const psSphere * restrict offset, +psSphere* psSphereSetOffset(const psSphere* restrict position, + const psSphere* restrict offset, psSphereOffsetMode mode, psSphereOffsetUnit unit); Index: /trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.c (revision 1439) +++ /trunk/psLib/src/astronomy/psMetadata.c (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 23:06:10 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -88,5 +88,5 @@ /*****************************************************************************/ -static void metadataItemFree(psMetadataItem * metadataItem) +static void metadataItemFree(psMetadataItem* metadataItem) { psMetadataType type; @@ -109,5 +109,5 @@ } -static void metadataFree(psMetadata * metadata) +static void metadataFree(psMetadata* metadata) { if (metadata == NULL) { @@ -124,8 +124,8 @@ /*****************************************************************************/ -psMetadataItem *psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) +psMetadataItem* psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; // Get the variable list parameters to pass to allocation function @@ -141,8 +141,8 @@ } -psMetadataItem *psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, +psMetadataItem* psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, va_list argPtr) { - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; if (name == NULL) { @@ -151,5 +151,5 @@ } // Allocate metadata item - metadataItem = (psMetadataItem *) psAlloc(sizeof(psMetadataItem)); + metadataItem = (psMetadataItem* ) psAlloc(sizeof(psMetadataItem)); if (metadataItem == NULL) { psAbort(__func__, "Failed to allocate memory"); @@ -211,12 +211,12 @@ } -psMetadata *psMetadataAlloc(void) -{ - psList *list = NULL; - psHash *table = NULL; - psMetadata *metadata = NULL; +psMetadata* psMetadataAlloc(void) +{ + psList* list = NULL; + psHash* table = NULL; + psMetadata* metadata = NULL; // Allocate metadata - metadata = (psMetadata *) psAlloc(sizeof(psMetadata)); + metadata = (psMetadata* ) psAlloc(sizeof(psMetadata)); if (metadata == NULL) { psAbort(__func__, "Failed to allocate metadata"); @@ -226,10 +226,10 @@ // Allocate metadata's internal containers - list = (psList *) psListAlloc(NULL); + list = (psList* ) psListAlloc(NULL); if (list == NULL) { psAbort(__func__, "Failed to allocate list"); } - table = (psHash *) psHashAlloc(10); + table = (psHash* ) psHashAlloc(10); if (table == NULL) { psAbort(__func__, "Failed to allocate table"); @@ -242,10 +242,10 @@ } -bool psMetadataAddItem(psMetadata * restrict md, int where, psMetadataItem * restrict metadataItem) +bool psMetadataAddItem(psMetadata* restrict md, int where, psMetadataItem* restrict metadataItem) { char *key = NULL; - psHash *mdTable = NULL; - psList *mdList = NULL; - psMetadataItem *value = NULL; + psHash* mdTable = NULL; + psList* mdList = NULL; + psMetadataItem* value = NULL; psMetadataType type = PS_META_ITEM_SET; @@ -280,5 +280,5 @@ } // Check if key is already in table - value = (psMetadataItem *) psHashLookup(mdTable, key); + value = (psMetadataItem* ) psHashLookup(mdTable, key); if (value != NULL && type != PS_META_ITEM_SET) { @@ -316,9 +316,9 @@ } -bool psMetadataAdd(psMetadata * restrict md, int where, const char *name, psMetadataType type, +bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; va_start(argPtr, comment); @@ -339,11 +339,11 @@ } -bool psMetadataRemove(psMetadata * restrict md, int where, const char *restrict key) +bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) { int numChildren = 0; - psList *mdList = NULL; - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; - psMetadataItem *entryChild = NULL; + psList* mdList = NULL; + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; + psMetadataItem* entryChild = NULL; @@ -368,5 +368,5 @@ // Remove by key name - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Couldn't find metadata item. Name: %s", key); @@ -419,8 +419,8 @@ } -psMetadataItem *psMetadataLookup(psMetadata * restrict md, const char *restrict key) -{ - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataLookup(psMetadata* restrict md, const char *restrict key) +{ + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; @@ -441,5 +441,5 @@ } - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Could not find metadata item. Key: %s", key); @@ -450,8 +450,8 @@ } -psMetadataItem *psMetadataGet(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; @@ -467,5 +467,5 @@ } - entry = (psMetadataItem *) psListGet(mdList, where); + entry = (psMetadataItem* ) psListGet(mdList, where); if (entry == NULL) { psError(__func__, "Couldn't find metadata item with given index. Index: %d", where); @@ -476,7 +476,7 @@ } -bool psMetadataSetIterator(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; +bool psMetadataSetIterator(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; if (md == NULL) { @@ -496,8 +496,8 @@ } -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -532,8 +532,8 @@ } -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -568,5 +568,5 @@ } -void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem * restrict metadataItem) +void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem) { psMetadataType type; @@ -616,5 +616,5 @@ } -psMetadata *psMetadataFReadHeader(psMetadata * output, char *extName, int extNum, fitsfile * fd) +psMetadata* psMetadataFReadHeader(psMetadata* output, char *extName, int extNum, fitsfile * fd) { bool tempBool; Index: /trunk/psLib/src/astronomy/psMetadata.h =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.h (revision 1439) +++ /trunk/psLib/src/astronomy/psMetadata.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). - psList *restrict items; ///< List of psMetadataItems with same name. + psList* restrict items; ///< List of psMetadataItems with same name. } psMetadataItem; @@ -78,6 +78,6 @@ typedef struct psMetadata { - psList *restrict list; - psHash *restrict table; + psList* restrict list; + psHash* restrict table; } psMetadata; @@ -100,7 +100,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAlloc(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAlloc(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -119,7 +119,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAllocV(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocV(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -132,7 +132,7 @@ * Returns an empty metadata container with fully allocated internal metadata containers. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataAlloc(void ///< Void. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataAlloc(void ///< Void. ); @@ -143,7 +143,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAddItem(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. - psMetadataItem * restrict item ///< Metadata item to be added. + psMetadataItem* restrict item ///< Metadata item to be added. ); @@ -154,5 +154,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAdd(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. const char *name, ///< Name of metadata item. @@ -171,5 +171,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataRemove(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. @@ -181,7 +181,7 @@ * returned. If the item is not found, null is returned. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataLookup(psMetadata * restrict md, ///< Metadata collection to insert metadat + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataLookup(psMetadata* restrict md, ///< Metadata collection to insert metadat // item. const char *restrict key ///< Name of metadata key. @@ -192,7 +192,7 @@ * Items may be found in the metadata by their entry position in the list container. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGet(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGet(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where ///< Location to be retrieved. ); @@ -204,5 +204,5 @@ * @return void: void. */ -bool psMetadataSetIterator(psMetadata * restrict md, ///< Metadata collection to iterate. +bool psMetadataSetIterator(psMetadata* restrict md, ///< Metadata collection to iterate. int where ///< Location of iterator. ); @@ -212,7 +212,7 @@ * Get next metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -223,7 +223,7 @@ * Get previous metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -238,9 +238,9 @@ * metadata type is any other data type, printing is not allowed. * - * @return psMetadataItem*: Pointer metadata item. + * @return psMetadataItem* : Pointer metadata item. */ void psMetadataItemPrint(FILE * fd, ///< Pointer to file to write metadata item. const char *format, ///< Format to print metadata item. - const psMetadataItem * restrict metadataItem ///< Metadata item to print. + const psMetadataItem* restrict metadataItem ///< Metadata item to print. ); @@ -250,7 +250,7 @@ * unimplemented. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extname, ///< File name extension string. int extnum, ///< File name extension number. Starts at 1. @@ -262,7 +262,7 @@ * Read a metadata header from file. If the file is not found, an error is reported. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataFReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataFReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. int extNum, ///< File name extension number. Index: /trunk/psLib/src/collections/psArray.c =================================================================== --- /trunk/psLib/src/collections/psArray.c (revision 1439) +++ /trunk/psLib/src/collections/psArray.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ /*****************************************************************************/ -static void arrayFree(psArray * restrict psArr); +static void arrayFree(psArray* restrict psArr); /*****************************************************************************/ @@ -39,7 +39,7 @@ /*****************************************************************************/ -psArray *psArrayAlloc(unsigned int nalloc) +psArray* psArrayAlloc(unsigned int nalloc) { - psArray *psArr = NULL; + psArray* psArr = NULL; // Invalid nalloc @@ -49,5 +49,5 @@ } // Create vector struct - psArr = (psArray *) psAlloc(sizeof(psArray)); + psArr = (psArray* ) psAlloc(sizeof(psArray)); p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); @@ -61,5 +61,5 @@ } -psArray *psArrayRealloc(unsigned int nalloc, psArray * restrict in) +psArray* psArrayRealloc(unsigned int nalloc, psArray* restrict in) { // Invalid nalloc @@ -87,5 +87,5 @@ } -static void arrayFree(psArray * restrict psArr) +static void arrayFree(psArray* restrict psArr) { if (psArr == NULL) { @@ -98,5 +98,5 @@ } -void psArrayElementFree(psArray * restrict psArr) +void psArrayElementFree(psArray* restrict psArr) { @@ -111,5 +111,5 @@ } -psArray *psArraySort(psArray * in, psComparePtrFcn compare) +psArray* psArraySort(psArray* in, psComparePtrFcn compare) { if (in == NULL) { Index: /trunk/psLib/src/collections/psArray.h =================================================================== --- /trunk/psLib/src/collections/psArray.h (revision 1439) +++ /trunk/psLib/src/collections/psArray.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -36,5 +36,5 @@ unsigned int nalloc; ///< Total number of elements available. unsigned int n; ///< Number of elements in use. - psPTR *data; ///< An Array of pointer elements + psPTR* data; ///< An Array of pointer elements } psArray; @@ -51,8 +51,8 @@ * data * - * @return psArray*: Pointer to psArray. + * @return psArray* : Pointer to psArray. * */ -psArray *psArrayAlloc(unsigned int nalloc ///< Total number of elements to make available. +psArray* psArrayAlloc(unsigned int nalloc ///< Total number of elements to make available. ); @@ -62,9 +62,9 @@ * of data. * - * @return psArray*: Pointer to psArray. + * @return psArray* : Pointer to psArray. * */ -psArray *psArrayRealloc(unsigned int nalloc, ///< Total number of elements to make available. - psArray * restrict psArr ///< array to reallocate. +psArray* psArrayRealloc(unsigned int nalloc, ///< Total number of elements to make available. + psArray* restrict psArr ///< array to reallocate. ); @@ -76,5 +76,5 @@ * */ -void psArrayElementFree(psArray * restrict psArr ///< Void pointer array to destroy. +void psArrayElementFree(psArray* restrict psArr ///< Void pointer array to destroy. ); @@ -84,7 +84,7 @@ * to specify how the objects on the array should be sorted. * - * @return psArray* The sorted array. + * @return psArray* The sorted array. */ -psArray *psArraySort(psArray * in, psComparePtrFcn compare); +psArray* psArraySort(psArray* in, psComparePtrFcn compare); /// @} Index: /trunk/psLib/src/collections/psBitSet.c =================================================================== --- /trunk/psLib/src/collections/psBitSet.c (revision 1439) +++ /trunk/psLib/src/collections/psBitSet.c (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -70,5 +70,5 @@ /*****************************************************************************/ -static void psBitSetFree(psBitSet * restrict inBitSet); +static void psBitSetFree(psBitSet* restrict inBitSet); /** Private function to create a mask. @@ -95,8 +95,8 @@ /*****************************************************************************/ -psBitSet *psBitSetAlloc(int n) +psBitSet* psBitSetAlloc(int n) { int numBytes = 0; - psBitSet *newObj = NULL; + psBitSet* newObj = NULL; if (n <= 0) { @@ -125,5 +125,5 @@ } -static void psBitSetFree(psBitSet * restrict inBitSet) +static void psBitSetFree(psBitSet* restrict inBitSet) { if (inBitSet == NULL) { @@ -134,5 +134,5 @@ } -psBitSet *psBitSetSet(psBitSet * inBitSet, int bit) +psBitSet* psBitSetSet(psBitSet* inBitSet, int bit) { char *byte = NULL; @@ -155,5 +155,5 @@ } -bool psBitSetTest(const psBitSet * inBitSet, int bit) +bool psBitSetTest(const psBitSet* inBitSet, int bit) { char *byte = NULL; @@ -178,6 +178,6 @@ } -psBitSet *psBitSetOp(psBitSet * outBitSet, const psBitSet * restrict inBitSet1, char *operator, - const psBitSet * restrict inBitSet2) +psBitSet* psBitSetOp(psBitSet* outBitSet, const psBitSet* restrict inBitSet1, char *operator, + const psBitSet* restrict inBitSet2) { int i = 0; @@ -241,5 +241,5 @@ } -psBitSet *psBitSetNot(psBitSet * outBitSet, const psBitSet * restrict inBitSet) +psBitSet* psBitSetNot(psBitSet* outBitSet, const psBitSet* restrict inBitSet) { int i = 0; @@ -278,5 +278,5 @@ } -char *psBitSetToString(const psBitSet * restrict inBitSet) +char *psBitSetToString(const psBitSet* restrict inBitSet) { int i = 0; Index: /trunk/psLib/src/collections/psBitSet.h =================================================================== --- /trunk/psLib/src/collections/psBitSet.h (revision 1439) +++ /trunk/psLib/src/collections/psBitSet.h (revision 1440) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,10 +56,10 @@ * allocation. * - * @return psBitSet*: Pointer to struct containing array of bits and size of array. + * @return psBitSet* : Pointer to struct containing array of bits and size of array. */ /*@null@*/ -psBitSet *psBitSetAlloc(int n +psBitSet* psBitSetAlloc(int n /**< Number of bits in psBitSet array */ ); @@ -71,9 +71,9 @@ * an array with two elements would result in an psBitSet that looks like 00000000 00001000. * - * @return psBitSet*: Pointer to struct containing psBitSet. + * @return psBitSet* : Pointer to struct containing psBitSet. */ -psBitSet *psBitSetSet( +psBitSet* psBitSetSet( - /* @returned@ */ psBitSet * restrict inMask, + /* @returned@ */ psBitSet* restrict inMask, /**< Pointer to psBitSet to be set. */ @@ -91,5 +91,5 @@ */ -bool psBitSetTest(const psBitSet * restrict inMask, +bool psBitSetTest(const psBitSet* restrict inMask, /**< Pointer psBitSet to be tested. */ @@ -102,17 +102,17 @@ * be performed and an error message will be logged. * - * @return psBitSet*: Pointer to struct containing result of binary operation. + * @return psBitSet* : Pointer to struct containing result of binary operation. */ -psBitSet *psBitSetOp( +psBitSet* psBitSetOp( - /* @returned@ */ psBitSet * restrict outMask, + /* @returned@ */ psBitSet* restrict outMask, /**< Resulting psBitSet from binary operation */ - const psBitSet * restrict inMask1, + const psBitSet* restrict inMask1, /**< First psBitSet on which to operate */ char *operator, /**< Bit operation */ - const psBitSet * restrict inMask2 + const psBitSet* restrict inMask2 /**< First psBitSet on which to operate */ ); @@ -122,11 +122,11 @@ * Toggles bits in a psBitset. All zero bits are set to one and all one bits are set to zero. * - * @return psBitSet*: Pointer to struct containing result of operation. + * @return psBitSet* : Pointer to struct containing result of operation. */ -psBitSet *psBitSetNot(psBitSet * outBitSet, +psBitSet* psBitSetNot(psBitSet* outBitSet, /**< Resulting psBitSet from operation */ - const psBitSet * restrict inBitSet + const psBitSet* restrict inBitSet /**< Input psBitSet */ ); @@ -140,5 +140,5 @@ */ -char *psBitSetToString(const psBitSet * restrict inMask +char *psBitSetToString(const psBitSet* restrict inMask /**< psBitSet to convert */ ); Index: /trunk/psLib/src/collections/psHash.c =================================================================== --- /trunk/psLib/src/collections/psHash.c (revision 1439) +++ /trunk/psLib/src/collections/psHash.c (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 20:29:43 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,9 +26,9 @@ #include "psAbort.h" -static psHashBucket *hashBucketAlloc(const char *key, void *data, psHashBucket * next); -static void hashBucketFree(psHashBucket * bucket); -static void *doHashWork(psHash * table, const char *key, void *data, bool remove +static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next); +static void hashBucketFree(psHashBucket* bucket); +static void *doHashWork(psHash* table, const char *key, void *data, bool remove ); -static void hashFree(psHash * table); +static void hashFree(psHash* table); /****************************************************************************** @@ -40,9 +40,9 @@ The linked list *****************************************************************************/ -psList *psHashKeyList(psHash * table) +psList* psHashKeyList(psHash* table) { int i = 0; // Loop index variable - psList *myLinkList = NULL; // The output data structure - psHashBucket *ptr = NULL; // Used to step thru linked list. + psList* myLinkList = NULL; // The output data structure + psHashBucket* ptr = NULL; // Used to step thru linked list. if (table == NULL) { @@ -81,5 +81,5 @@ the new hash bucket. *****************************************************************************/ -static psHashBucket *hashBucketAlloc(const char *key, void *data, psHashBucket * next) +static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next) { if (key == NULL) { @@ -87,5 +87,5 @@ } // Allocate memory for the new hash bucket. - psHashBucket *bucket = psAlloc(sizeof(psHashBucket)); + psHashBucket* bucket = psAlloc(sizeof(psHashBucket)); p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); @@ -114,5 +114,5 @@ NONE *****************************************************************************/ -static void hashBucketFree(psHashBucket * bucket) +static void hashBucketFree(psHashBucket* bucket) { if (bucket == NULL) { @@ -133,15 +133,15 @@ The new hash table. *****************************************************************************/ -psHash *psHashAlloc(int nbucket) // initial number of buckets +psHash* psHashAlloc(int nbucket) // initial number of buckets { int i = 0; // loop index variable // Create the new hash table. - psHash *table = psAlloc(sizeof(psHash)); + psHash* table = psAlloc(sizeof(psHash)); p_psMemSetDeallocator(table, (psFreeFcn) hashFree); // Allocate memory for the buckets. - table->buckets = psAlloc(nbucket * sizeof(psHashBucket *)); + table->buckets = psAlloc(nbucket * sizeof(psHashBucket* )); table->nbucket = nbucket; @@ -168,5 +168,5 @@ NONE *****************************************************************************/ -static void hashFree(psHash * table) +static void hashFree(psHash* table) { int i = 0; // Loop index variable. @@ -210,5 +210,5 @@ there is little common code between those functions. *****************************************************************************/ -static void *doHashWork(psHash * table, const char *key, void *data, bool remove +static void *doHashWork(psHash* table, const char *key, void *data, bool remove ) { @@ -217,6 +217,6 @@ // "hashed" from the key. char *tmpchar = NULL; // Used in computing the hash function. - psHashBucket *ptr = NULL; // Used to retrieve the hash bucket. - psHashBucket *optr = NULL; // "original pointer": used to step + psHashBucket* ptr = NULL; // Used to retrieve the hash bucket. + psHashBucket* optr = NULL; // "original pointer": used to step // thru the linked list for a bucket. @@ -338,5 +338,5 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashAdd(psHash * table, const char *key, void *data) +bool psHashAdd(psHash* table, const char *key, void *data) { if (table == NULL) { @@ -364,5 +364,5 @@ The data associated with that key. *****************************************************************************/ -void *psHashLookup(psHash * table, // table to lookup key in +void *psHashLookup(psHash* table, // table to lookup key in const char *key) // key to lookup { @@ -387,5 +387,5 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashRemove(psHash * table, const char *key) +bool psHashRemove(psHash* table, const char *key) { void *data = NULL; Index: /trunk/psLib/src/collections/psHash.h =================================================================== --- /trunk/psLib/src/collections/psHash.h (revision 1439) +++ /trunk/psLib/src/collections/psHash.h (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ char *key; ///< key for this item of data void *data; ///< the data itself - struct psHashBucket *next; ///< list of other possible keys + struct psHashBucket* next; ///< list of other possible keys } psHashBucket; @@ -41,14 +41,14 @@ { int nbucket; ///< Number of buckets in hash table. - psHashBucket **buckets; ///< The bucket data. + psHashBucket* *buckets; ///< The bucket data. } psHash; /// Allocate hash buckets in table. -psHash *psHashAlloc(int nbucket ///< The number of buckets to allocate. +psHash* psHashAlloc(int nbucket ///< The number of buckets to allocate. ); /// Insert entry into table. -bool psHashAdd(psHash * table, ///< table to insert in +bool psHashAdd(psHash* table, ///< table to insert in const char *key, ///< key to use void *data ///< data to insert @@ -56,15 +56,15 @@ /// Lookup key in table. -void *psHashLookup(psHash * table, ///< table to lookup key in +void *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 +bool psHashRemove(psHash* table, ///< table to lookup key in const char *key ///< key to lookup ); /// List all keys in table. -psList *psHashKeyList(psHash * table ///< table to list keys from. +psList* psHashKeyList(psHash* table ///< table to list keys from. ); Index: /trunk/psLib/src/collections/psList.c =================================================================== --- /trunk/psLib/src/collections/psList.c (revision 1439) +++ /trunk/psLib/src/collections/psList.c (revision 1440) @@ -7,6 +7,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,12 +29,12 @@ // private functions. -static psListElem *listGetIterator(psList * list); -static int listGetIteratorIndex(psList * list); -static void listSetIterator(psList * list, int where, bool lockList); -static void listFree(psList * list); - -psList *psListAlloc(void *data) -{ - psList *list = psAlloc(sizeof(psList)); +static psListElem* listGetIterator(psList* list); +static int listGetIteratorIndex(psList* list); +static void listSetIterator(psList* list, int where, bool lockList); +static void listFree(psList* list); + +psList* psListAlloc(void *data) +{ + psList* list = psAlloc(sizeof(psList)); p_psMemSetDeallocator(list, (psFreeFcn) listFree); @@ -55,5 +55,5 @@ } -static void listFree(psList * list) +static void listFree(psList* list) { if (list == NULL) { @@ -64,6 +64,6 @@ ; - for (psListElem * ptr = list->head; ptr != NULL;) { - psListElem *next = ptr->next; + for (psListElem* ptr = list->head; ptr != NULL;) { + psListElem* next = ptr->next; psFree(ptr->data); @@ -81,8 +81,8 @@ } -bool psListAdd(psList * list, void *data, int where) -{ - psListElem *position; - psListElem *elem; +bool psListAdd(psList* list, void *data, int where) +{ + psListElem* position; + psListElem* elem; int cursorIndex = 0; @@ -168,7 +168,7 @@ * Remove an element from a list */ -bool psListRemove(psList * list, void *data, int which) -{ - psListElem *elem = NULL; // element to remove +bool psListRemove(psList* list, void *data, int which) +{ + psListElem* elem = NULL; // element to remove int cursorIndex = 0; @@ -186,5 +186,5 @@ int i = 0; // index - for (psListElem * ptr = list->head; ptr != NULL; ptr = ptr->next) { + for (psListElem* ptr = list->head; ptr != NULL; ptr = ptr->next) { if (ptr->data == data) { which = i; @@ -243,12 +243,12 @@ } -void psListSetIterator(psList * list, int where) +void psListSetIterator(psList* list, int where) { listSetIterator(list, where, true); } -void listSetIterator(psList * list, int where, bool lockList) -{ - psListElem *cursor; +void listSetIterator(psList* list, int where, bool lockList) +{ + psListElem* cursor; int position; @@ -340,5 +340,5 @@ } -psListElem *listGetIterator(psList * list) +psListElem* listGetIterator(psList* list) { if (list == NULL) { @@ -355,5 +355,5 @@ } -int listGetIteratorIndex(psList * list) +int listGetIteratorIndex(psList* list) { if (list->iter == ITER_INIT_HEAD) { @@ -366,7 +366,7 @@ } -void *psListGet(psList * list, int which) -{ - psListElem *element; +void *psListGet(psList* list, int which) +{ + psListElem* element; psListSetIterator(list, which); @@ -383,15 +383,15 @@ * and now return the previous/next element of the list */ -void *psListGetNext(psList * list) +void *psListGetNext(psList* list) { return psListGet(list, PS_LIST_NEXT); } -void *psListGetPrevious(psList * list) +void *psListGetPrevious(psList* list) { return psListGet(list, PS_LIST_PREVIOUS); } -void *psListGetCurrent(psList * list) +void *psListGetCurrent(psList* list) { return psListGet(list, PS_LIST_CURRENT); @@ -401,9 +401,9 @@ * Convert a psList to/from a psVoidPtrArray */ -psArray *psListToArray(psList * restrict list) -{ - psListElem *ptr; +psArray* psListToArray(psList* restrict list) +{ + psListElem* ptr; unsigned int n; - psArray *restrict arr; + psArray* restrict arr; if (list == NULL) { @@ -429,8 +429,8 @@ } -psList *psArrayToList(psArray * arr) +psList* psArrayToList(psArray* arr) { unsigned int n; - psList *list; // list of elements + psList* list; // list of elements if (arr == NULL) { @@ -447,7 +447,7 @@ } -psList *psListSort(psList * list, psComparePtrFcn compare) -{ - psArray *arr; +psList* psListSort(psList* list, psComparePtrFcn compare) +{ + psArray* arr; if (list == NULL) { Index: /trunk/psLib/src/collections/psList.h =================================================================== --- /trunk/psLib/src/collections/psList.h (revision 1439) +++ /trunk/psLib/src/collections/psList.h (revision 1440) @@ -10,6 +10,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -44,6 +44,6 @@ typedef struct psListElem { - struct psListElem *prev; ///< previous link in list - struct psListElem *next; ///< next link in list + struct psListElem* prev; ///< previous link in list + struct psListElem* next; ///< next link in list void *data; ///< real data item } @@ -58,7 +58,7 @@ { unsigned int 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 + 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 pthread_mutex_t lock; ///< mutex to lock a node during changes @@ -68,7 +68,7 @@ /** Creates a psList linked list object. * - * @return psList* A new psList object. + * @return psList* A new psList object. */ -psList *psListAlloc(void *data +psList* psListAlloc(void *data ///< initial data item; may be NULL if no an empty psList is desired ) @@ -77,8 +77,8 @@ /** Adds an element to a psList at position given. * - * @return psList* The psList with added data item. If list parameter is + * @return psList* The psList with added data item. If list parameter is * NULL, the return value will also be NULL. */ -bool psListAdd(psList * restrict list, ///< list to add to (if NULL, nothing is done) +bool psListAdd(psList* restrict list, ///< list to add to (if NULL, nothing is done) void *data, ///< data item to add. If NULL, list is not modified. int where ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. @@ -89,5 +89,5 @@ * @return bool TRUE if element is successfully removed, otherwise FALSE. */ -bool psListRemove(psList * restrict list, +bool psListRemove(psList* restrict list, ///< list to remove element from void *data, @@ -104,5 +104,5 @@ * NULL is returned. */ -void *psListGet(psList * restrict list, ///< list to retrieve element from +void *psListGet(psList* restrict list, ///< list to retrieve element from int which ///< index number, or PS_LIST_NEXT, PS_LIST_PREV, PS_LIST_UNKNOWN ); @@ -112,5 +112,5 @@ * */ -void psListSetIterator(psList * restrict list, ///< list to retrieve element from +void psListSetIterator(psList* restrict list, ///< list to retrieve element from int where ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -123,5 +123,5 @@ * parameter was NULL. */ -void *psListGetNext(psList * restrict list ///< list to retrieve element from +void *psListGetNext(psList* restrict list ///< list to retrieve element from ); @@ -133,5 +133,5 @@ * iterator is not valid or list parameter was NULL. */ -void *psListGetCurrent(psList * restrict list ///< list to retrieve element from +void *psListGetCurrent(psList* restrict list ///< list to retrieve element from ); @@ -143,24 +143,24 @@ * parameter was NULL. */ -void *psListGetPrevious(psList * restrict list ///< list to retrieve element from +void *psListGetPrevious(psList* restrict list ///< list to retrieve element from ); /** Convert a linked list to an array * - * @return psArray* A new psArray populated with elements from the list, + * @return psArray* A new psArray populated with elements from the list, * or NULL if the given dlist parameter is NULL. */ -psArray *psListToArray(psList * dlist ///< List to convert +psArray* psListToArray(psList* dlist ///< List to convert ); /** Convert array to a doubly-linked list * - * @return psList* A new psList populated with elements formt the psArray, + * @return psList* A new psList populated with elements formt the psArray, * or NULL is the given arr parameter is NULL. */ -psList *psArrayToList(psArray * arr ///< vector to convert +psList* psArrayToList(psArray* arr ///< vector to convert ); -psList *psListSort(psList * list, psComparePtrFcn compare); +psList* psListSort(psList* list, psComparePtrFcn compare); /// @} End of DataGroup Functions Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 1439) +++ /trunk/psLib/src/collections/psMetadata.c (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 23:06:10 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -88,5 +88,5 @@ /*****************************************************************************/ -static void metadataItemFree(psMetadataItem * metadataItem) +static void metadataItemFree(psMetadataItem* metadataItem) { psMetadataType type; @@ -109,5 +109,5 @@ } -static void metadataFree(psMetadata * metadata) +static void metadataFree(psMetadata* metadata) { if (metadata == NULL) { @@ -124,8 +124,8 @@ /*****************************************************************************/ -psMetadataItem *psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) +psMetadataItem* psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; // Get the variable list parameters to pass to allocation function @@ -141,8 +141,8 @@ } -psMetadataItem *psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, +psMetadataItem* psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, va_list argPtr) { - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; if (name == NULL) { @@ -151,5 +151,5 @@ } // Allocate metadata item - metadataItem = (psMetadataItem *) psAlloc(sizeof(psMetadataItem)); + metadataItem = (psMetadataItem* ) psAlloc(sizeof(psMetadataItem)); if (metadataItem == NULL) { psAbort(__func__, "Failed to allocate memory"); @@ -211,12 +211,12 @@ } -psMetadata *psMetadataAlloc(void) -{ - psList *list = NULL; - psHash *table = NULL; - psMetadata *metadata = NULL; +psMetadata* psMetadataAlloc(void) +{ + psList* list = NULL; + psHash* table = NULL; + psMetadata* metadata = NULL; // Allocate metadata - metadata = (psMetadata *) psAlloc(sizeof(psMetadata)); + metadata = (psMetadata* ) psAlloc(sizeof(psMetadata)); if (metadata == NULL) { psAbort(__func__, "Failed to allocate metadata"); @@ -226,10 +226,10 @@ // Allocate metadata's internal containers - list = (psList *) psListAlloc(NULL); + list = (psList* ) psListAlloc(NULL); if (list == NULL) { psAbort(__func__, "Failed to allocate list"); } - table = (psHash *) psHashAlloc(10); + table = (psHash* ) psHashAlloc(10); if (table == NULL) { psAbort(__func__, "Failed to allocate table"); @@ -242,10 +242,10 @@ } -bool psMetadataAddItem(psMetadata * restrict md, int where, psMetadataItem * restrict metadataItem) +bool psMetadataAddItem(psMetadata* restrict md, int where, psMetadataItem* restrict metadataItem) { char *key = NULL; - psHash *mdTable = NULL; - psList *mdList = NULL; - psMetadataItem *value = NULL; + psHash* mdTable = NULL; + psList* mdList = NULL; + psMetadataItem* value = NULL; psMetadataType type = PS_META_ITEM_SET; @@ -280,5 +280,5 @@ } // Check if key is already in table - value = (psMetadataItem *) psHashLookup(mdTable, key); + value = (psMetadataItem* ) psHashLookup(mdTable, key); if (value != NULL && type != PS_META_ITEM_SET) { @@ -316,9 +316,9 @@ } -bool psMetadataAdd(psMetadata * restrict md, int where, const char *name, psMetadataType type, +bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; va_start(argPtr, comment); @@ -339,11 +339,11 @@ } -bool psMetadataRemove(psMetadata * restrict md, int where, const char *restrict key) +bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) { int numChildren = 0; - psList *mdList = NULL; - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; - psMetadataItem *entryChild = NULL; + psList* mdList = NULL; + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; + psMetadataItem* entryChild = NULL; @@ -368,5 +368,5 @@ // Remove by key name - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Couldn't find metadata item. Name: %s", key); @@ -419,8 +419,8 @@ } -psMetadataItem *psMetadataLookup(psMetadata * restrict md, const char *restrict key) -{ - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataLookup(psMetadata* restrict md, const char *restrict key) +{ + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; @@ -441,5 +441,5 @@ } - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Could not find metadata item. Key: %s", key); @@ -450,8 +450,8 @@ } -psMetadataItem *psMetadataGet(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; @@ -467,5 +467,5 @@ } - entry = (psMetadataItem *) psListGet(mdList, where); + entry = (psMetadataItem* ) psListGet(mdList, where); if (entry == NULL) { psError(__func__, "Couldn't find metadata item with given index. Index: %d", where); @@ -476,7 +476,7 @@ } -bool psMetadataSetIterator(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; +bool psMetadataSetIterator(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; if (md == NULL) { @@ -496,8 +496,8 @@ } -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -532,8 +532,8 @@ } -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -568,5 +568,5 @@ } -void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem * restrict metadataItem) +void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem) { psMetadataType type; @@ -616,5 +616,5 @@ } -psMetadata *psMetadataFReadHeader(psMetadata * output, char *extName, int extNum, fitsfile * fd) +psMetadata* psMetadataFReadHeader(psMetadata* output, char *extName, int extNum, fitsfile * fd) { bool tempBool; Index: /trunk/psLib/src/collections/psMetadata.h =================================================================== --- /trunk/psLib/src/collections/psMetadata.h (revision 1439) +++ /trunk/psLib/src/collections/psMetadata.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). - psList *restrict items; ///< List of psMetadataItems with same name. + psList* restrict items; ///< List of psMetadataItems with same name. } psMetadataItem; @@ -78,6 +78,6 @@ typedef struct psMetadata { - psList *restrict list; - psHash *restrict table; + psList* restrict list; + psHash* restrict table; } psMetadata; @@ -100,7 +100,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAlloc(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAlloc(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -119,7 +119,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAllocV(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocV(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -132,7 +132,7 @@ * Returns an empty metadata container with fully allocated internal metadata containers. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataAlloc(void ///< Void. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataAlloc(void ///< Void. ); @@ -143,7 +143,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAddItem(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. - psMetadataItem * restrict item ///< Metadata item to be added. + psMetadataItem* restrict item ///< Metadata item to be added. ); @@ -154,5 +154,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAdd(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. const char *name, ///< Name of metadata item. @@ -171,5 +171,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataRemove(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. @@ -181,7 +181,7 @@ * returned. If the item is not found, null is returned. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataLookup(psMetadata * restrict md, ///< Metadata collection to insert metadat + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataLookup(psMetadata* restrict md, ///< Metadata collection to insert metadat // item. const char *restrict key ///< Name of metadata key. @@ -192,7 +192,7 @@ * Items may be found in the metadata by their entry position in the list container. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGet(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGet(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where ///< Location to be retrieved. ); @@ -204,5 +204,5 @@ * @return void: void. */ -bool psMetadataSetIterator(psMetadata * restrict md, ///< Metadata collection to iterate. +bool psMetadataSetIterator(psMetadata* restrict md, ///< Metadata collection to iterate. int where ///< Location of iterator. ); @@ -212,7 +212,7 @@ * Get next metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -223,7 +223,7 @@ * Get previous metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -238,9 +238,9 @@ * metadata type is any other data type, printing is not allowed. * - * @return psMetadataItem*: Pointer metadata item. + * @return psMetadataItem* : Pointer metadata item. */ void psMetadataItemPrint(FILE * fd, ///< Pointer to file to write metadata item. const char *format, ///< Format to print metadata item. - const psMetadataItem * restrict metadataItem ///< Metadata item to print. + const psMetadataItem* restrict metadataItem ///< Metadata item to print. ); @@ -250,7 +250,7 @@ * unimplemented. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extname, ///< File name extension string. int extnum, ///< File name extension number. Starts at 1. @@ -262,7 +262,7 @@ * Read a metadata header from file. If the file is not found, an error is reported. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataFReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataFReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. int extNum, ///< File name extension number. Index: /trunk/psLib/src/collections/psScalar.c =================================================================== --- /trunk/psLib/src/collections/psScalar.c (revision 1439) +++ /trunk/psLib/src/collections/psScalar.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -71,10 +71,10 @@ /*****************************************************************************/ -psScalar *psScalarAlloc(psC64 value, psElemType dataType) +psScalar* psScalarAlloc(psC64 value, psElemType dataType) { - psScalar *scalar = NULL; + psScalar* scalar = NULL; // Create scalar - scalar = (psScalar *) psAlloc(sizeof(psScalar)); + scalar = (psScalar* ) psAlloc(sizeof(psScalar)); if (scalar == NULL) { psAbort(__func__, " : Line %d - Failed to allocate memory", __LINE__); @@ -128,5 +128,5 @@ } -void psScalarFree(psScalar * restrict scalar) +void psScalarFree(psScalar* restrict scalar) { if (scalar == NULL) { Index: /trunk/psLib/src/collections/psScalar.h =================================================================== --- /trunk/psLib/src/collections/psScalar.h (revision 1439) +++ /trunk/psLib/src/collections/psScalar.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -62,8 +62,8 @@ * Accepts a complex 64 bit float for input value, as max size, but resizes according to * correct type. - * @return psScalar*: Pointer to psScalar. + * @return psScalar* : Pointer to psScalar. * */ -psScalar *psScalarAlloc(psC64 value, ///< Data to be put into psScalar. +psScalar* psScalarAlloc(psC64 value, ///< Data to be put into psScalar. psElemType dataType ///< Type of data to be held by psScalar. ); @@ -76,5 +76,5 @@ * */ -void psScalarFree(psScalar * restrict scalar ///< Scalar to free. +void psScalarFree(psScalar* restrict scalar ///< Scalar to free. ); Index: /trunk/psLib/src/collections/psVector.c =================================================================== --- /trunk/psLib/src/collections/psVector.c (revision 1439) +++ /trunk/psLib/src/collections/psVector.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ /*****************************************************************************/ -static void vectorFree(psVector * restrict psVec); +static void vectorFree(psVector* restrict psVec); /*****************************************************************************/ @@ -74,7 +74,7 @@ /*****************************************************************************/ -psVector *psVectorAlloc(unsigned int nalloc, psElemType elemType) -{ - psVector *psVec = NULL; +psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType) +{ + psVector* psVec = NULL; int elementSize = 0; @@ -88,5 +88,5 @@ // Create vector struct - psVec = (psVector *) psAlloc(sizeof(psVector)); + psVec = (psVector* ) psAlloc(sizeof(psVector)); p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); @@ -102,5 +102,5 @@ } -psVector *psVectorRealloc(unsigned int nalloc, psVector * restrict in) +psVector* psVectorRealloc(unsigned int nalloc, psVector* restrict in) { int elementSize = 0; @@ -130,5 +130,5 @@ } -psVector *psVectorRecycle(psVector * restrict in, unsigned int nalloc, psElemType type) +psVector* psVectorRecycle(psVector* restrict in, unsigned int nalloc, psElemType type) { psElemType elemType; @@ -160,5 +160,5 @@ } -psVector *psVectorSort(psVector * restrict outVector, const psVector * restrict inVector) +psVector* psVectorSort(psVector* restrict outVector, const psVector* restrict inVector) { int inN = 0; @@ -261,5 +261,5 @@ } -psVector *psVectorSortIndex(psVector * restrict outVector, const psVector * restrict inVector) +psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector) { int inN = 0; @@ -270,5 +270,5 @@ int *outVec = NULL; double diff = 0.0f; - psVector *tmpVector = NULL; + psVector* tmpVector = NULL; psElemType inType = 0; @@ -348,5 +348,5 @@ } -static void vectorFree(psVector * restrict psVec) +static void vectorFree(psVector* restrict psVec) { if (psVec == NULL) { Index: /trunk/psLib/src/collections/psVector.h =================================================================== --- /trunk/psLib/src/collections/psVector.h (revision 1439) +++ /trunk/psLib/src/collections/psVector.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,16 +38,16 @@ union { - psU8 *U8; ///< Unsigned 8-bit integer data. - psU16 *U16; ///< Unsigned 16-bit integer data. - psU32 *U32; ///< Unsigned 32-bit integer data. - psU64 *U64; ///< Unsigned 64-bit integer data. - psS8 *S8; ///< Signed 8-bit integer data. - psS16 *S16; ///< Signed 16-bit integer data. - psS32 *S32; ///< Signed 32-bit integer data. - psS64 *S64; ///< Signed 64-bit integer data. - psF32 *F32; ///< Single-precision float data. - psF64 *F64; ///< Double-precision float data. - psC32 *C32; ///< Single-precision complex data. - psC64 *C64; ///< Double-precision complex data. + psU8* U8; ///< Unsigned 8-bit integer data. + psU16* U16; ///< Unsigned 16-bit integer data. + psU32* U32; ///< Unsigned 32-bit integer data. + psU64* U64; ///< Unsigned 64-bit integer data. + psS8* S8; ///< Signed 8-bit integer data. + psS16* S16; ///< Signed 16-bit integer data. + psS32* S32; ///< Signed 32-bit integer data. + psS64* S64; ///< Signed 64-bit integer data. + psF32* F32; ///< Single-precision float data. + psF64* F64; ///< Double-precision float data. + psC32* C32; ///< Single-precision complex data. + psC64* C64; ///< Double-precision complex data. psPTR V; ///< Pointer to data. } data; ///< Union for data types. @@ -65,8 +65,8 @@ * Uses psLib memory allocation functions to create a vector collection of data as defined by the psType type. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorAlloc(unsigned int nalloc, ///< Total number of elements to make available. +psVector* psVectorAlloc(unsigned int nalloc, ///< Total number of elements to make available. psElemType dataType ///< Type of data to be held by vector. ); @@ -77,9 +77,9 @@ * according to the psType type member contained within the vector. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorRealloc(unsigned int nalloc, ///< Total number of elements to make available. - psVector * restrict psVec ///< Vector to reallocate. +psVector* psVectorRealloc(unsigned int nalloc, ///< Total number of elements to make available. + psVector* restrict psVec ///< Vector to reallocate. ); @@ -89,8 +89,8 @@ * according to the psElemType type parameter. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorRecycle(psVector * restrict psVec, +psVector* psVectorRecycle(psVector* restrict psVec, ///< Vector to recycle. If NULL, a new vector is created. No effort taken to // preserve the values. @@ -104,10 +104,10 @@ * all non-complex data types. * - * @return psFloatArray*: Pointer to sorted psFloatArray. + * @return psFloatArray* : Pointer to sorted psFloatArray. */ -psVector *psVectorSort(psVector * restrict outVector, ///< the output vector to recycle, or NULL if new +psVector* psVectorSort(psVector* restrict outVector, ///< the output vector to recycle, or NULL if new // vector desired. - const psVector * restrict inVector ///< the vector to sort. + const psVector* restrict inVector ///< the vector to sort. ); @@ -117,8 +117,8 @@ * sorted float values based on pre-sort index positions. * - * @return psIntArray*: Pointer to psIntArray of sorted indices. + * @return psIntArray* : Pointer to psIntArray of sorted indices. */ -psVector *psVectorSortIndex(psVector * restrict outVector, const psVector * restrict inVector); +psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector); /// @} Index: /trunk/psLib/src/dataManip/psFFT.c =================================================================== --- /trunk/psLib/src/dataManip/psFFT.c (revision 1439) +++ /trunk/psLib/src/dataManip/psFFT.c (revision 1440) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ static bool p_fftwWisdomImported = false; -psImage *psImageFFT(psImage * out, const psImage * in, psFftDirection direction) +psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction) { unsigned int numCols; @@ -93,5 +93,5 @@ } -psImage *psImageReal(psImage * out, const psImage * in) +psImage* psImageReal(psImage* out, const psImage* in) { psElemType type; @@ -117,6 +117,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); @@ -130,6 +130,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); @@ -151,5 +151,5 @@ } -psImage *psImageImaginary(psImage * out, const psImage * in) +psImage* psImageImaginary(psImage* out, const psImage* in) { psElemType type; @@ -177,6 +177,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); @@ -190,6 +190,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); @@ -211,5 +211,5 @@ } -psImage *psImageComplex(psImage * out, psImage * real, const psImage * imag) +psImage* psImageComplex(psImage* out, psImage* real, const psImage* imag) { psElemType type; @@ -251,7 +251,7 @@ if (type == PS_TYPE_F32) { - psC32 *outRow; - psF32 *realRow; - psF32 *imagRow; + psC32* outRow; + psF32* realRow; + psF32* imagRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); @@ -267,7 +267,7 @@ } } else if (type == PS_TYPE_F64) { - psC64 *outRow; - psF64 *realRow; - psF64 *imagRow; + psC64* outRow; + psF64* realRow; + psF64* imagRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); @@ -290,5 +290,5 @@ } -psImage *psImageConjugate(psImage * out, const psImage * in) +psImage* psImageConjugate(psImage* out, const psImage* in) { psElemType type; @@ -314,6 +314,6 @@ if (type == PS_TYPE_C32) { - psC32 *outRow; - psC32 *inRow; + psC32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); @@ -327,6 +327,6 @@ } } else if (type == PS_TYPE_C64) { - psC64 *outRow; - psC64 *inRow; + psC64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); @@ -348,5 +348,5 @@ } -psImage *psImagePowerSpectrum(psImage * out, const psImage * in) +psImage* psImagePowerSpectrum(psImage* out, const psImage* in) { psElemType type; @@ -373,6 +373,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; psF32 real; psF32 imag; @@ -390,6 +390,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; psF64 real; psF64 imag; @@ -418,5 +418,5 @@ /************************************** Vector Functions ***************************************/ -psVector *psVectorFFT(psVector * out, const psVector * in, psFftDirection direction) +psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction) { unsigned int numElements; @@ -464,6 +464,6 @@ if (type == PS_TYPE_F32) { // need to convert to complex - psC32 *outVec = out->data.C32; - psF32 *inVec = in->data.F32; + psC32* outVec = out->data.C32; + psF32* inVec = in->data.F32; for (unsigned int i = 0; i < numElements; i++) { @@ -471,6 +471,6 @@ } } else { - psC32 *outVec = out->data.C32; - psC32 *inVec = in->data.C32; + psC32* outVec = out->data.C32; + psC32* inVec = in->data.C32; for (unsigned int i = 0; i < numElements; i++) { @@ -498,5 +498,5 @@ } -psVector *psVectorReal(psVector * out, const psVector * in) +psVector* psVectorReal(psVector* out, const psVector* in) { psElemType type; @@ -523,6 +523,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_F32); @@ -542,5 +542,5 @@ } -psVector *psVectorImaginary(psVector * out, const psVector * in) +psVector* psVectorImaginary(psVector* out, const psVector* in) { psElemType type; @@ -567,6 +567,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_F32); @@ -586,5 +586,5 @@ } -psVector *psVectorComplex(psVector * out, psVector * real, const psVector * imag) +psVector* psVectorComplex(psVector* out, psVector* real, const psVector* imag) { psElemType type; @@ -616,7 +616,7 @@ if (type == PS_TYPE_F32) { - psC32 *outVec; - psF32 *realVec = real->data.F32; - psF32 *imagVec = imag->data.F32; + psC32* outVec; + psF32* realVec = real->data.F32; + psF32* imagVec = imag->data.F32; out = psVectorRecycle(out, numElements, PS_TYPE_C32); @@ -636,5 +636,5 @@ } -psVector *psVectorConjugate(psVector * out, const psVector * in) +psVector* psVectorConjugate(psVector* out, const psVector* in) { psElemType type; @@ -662,6 +662,6 @@ if (type == PS_TYPE_C32) { - psC32 *outVec; - psC32 *inVec = in->data.C32; + psC32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_C32); @@ -681,5 +681,5 @@ } -psVector *psVectorPowerSpectrum(psVector * out, const psVector * in) +psVector* psVectorPowerSpectrum(psVector* out, const psVector* in) { psElemType type; @@ -708,6 +708,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; psF32 inAbs1; psF32 inAbs2; Index: /trunk/psLib/src/dataManip/psFFT.h =================================================================== --- /trunk/psLib/src/dataManip/psFFT.h (revision 1439) +++ /trunk/psLib/src/dataManip/psFFT.h (revision 1440) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,17 +33,17 @@ } psFftDirection; -psImage *psImageFFT(psImage * out, const psImage * in, psFftDirection direction); -psImage *psImageReal(psImage * out, const psImage * in); -psImage *psImageImaginary(psImage * out, const psImage * in); -psImage *psImageComplex(psImage * out, psImage * real, const psImage * imag); -psImage *psImageConjugate(psImage * out, const psImage * in); -psImage *psImagePowerSpectrum(psImage * out, const psImage * in); +psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction); +psImage* psImageReal(psImage* out, const psImage* in); +psImage* psImageImaginary(psImage* out, const psImage* in); +psImage* psImageComplex(psImage* out, psImage* real, const psImage* imag); +psImage* psImageConjugate(psImage* out, const psImage* in); +psImage* psImagePowerSpectrum(psImage* out, const psImage* in); -psVector *psVectorFFT(psVector * out, const psVector * in, psFftDirection direction); -psVector *psVectorReal(psVector * out, const psVector * in); -psVector *psVectorImaginary(psVector * out, const psVector * in); -psVector *psVectorComplex(psVector * out, psVector * real, const psVector * imag); -psVector *psVectorConjugate(psVector * out, const psVector * in); -psVector *psVectorPowerSpectrum(psVector * out, const psVector * in); +psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction); +psVector* psVectorReal(psVector* out, const psVector* in); +psVector* psVectorImaginary(psVector* out, const psVector* in); +psVector* psVectorComplex(psVector* out, psVector* real, const psVector* imag); +psVector* psVectorConjugate(psVector* out, const psVector* in); +psVector* psVectorPowerSpectrum(psVector* out, const psVector* in); /// @} Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 1439) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 1440) @@ -8,6 +8,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -49,12 +49,12 @@ /*****************************************************************************/ -static void polynomial1DFree(psPolynomial1D * myPoly); -static void polynomial2DFree(psPolynomial2D * myPoly); -static void polynomial3DFree(psPolynomial3D * myPoly); -static void polynomial4DFree(psPolynomial4D * myPoly); -static void dPolynomial1DFree(psDPolynomial1D * myPoly); -static void dPolynomial2DFree(psDPolynomial2D * myPoly); -static void dPolynomial3DFree(psDPolynomial3D * myPoly); -static void dPolynomial4DFree(psDPolynomial4D * myPoly); +static void polynomial1DFree(psPolynomial1D* myPoly); +static void polynomial2DFree(psPolynomial2D* myPoly); +static void polynomial3DFree(psPolynomial3D* myPoly); +static void polynomial4DFree(psPolynomial4D* myPoly); +static void dPolynomial1DFree(psDPolynomial1D* myPoly); +static void dPolynomial2DFree(psDPolynomial2D* myPoly); +static void dPolynomial3DFree(psDPolynomial3D* myPoly); +static void dPolynomial4DFree(psDPolynomial4D* myPoly); /*****************************************************************************/ @@ -120,7 +120,7 @@ NOTE: There is no way to seed the random generator. *****************************************************************************/ -psVector *psGaussianDev(float mean, float sigma, int Npts) -{ - psVector *gauss = NULL; +psVector* psGaussianDev(float mean, float sigma, int Npts) +{ + psVector* gauss = NULL; const gsl_rng_type *T = NULL; gsl_rng *r = NULL; @@ -144,10 +144,10 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D *psPolynomial1DAlloc(int n) +psPolynomial1D* psPolynomial1DAlloc(int n) { int i = 0; - psPolynomial1D *newPoly = NULL; - - newPoly = (psPolynomial1D *) psAlloc(sizeof(psPolynomial1D)); + psPolynomial1D* newPoly = NULL; + + newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); newPoly->n = n; @@ -164,11 +164,11 @@ } -psPolynomial2D *psPolynomial2DAlloc(int nX, int nY) -{ - int x = 0; - int y = 0; - psPolynomial2D *newPoly = NULL; - - newPoly = (psPolynomial2D *) psAlloc(sizeof(psPolynomial2D)); +psPolynomial2D* psPolynomial2DAlloc(int nX, int nY) +{ + int x = 0; + int y = 0; + psPolynomial2D* newPoly = NULL; + + newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); newPoly->nX = nX; @@ -194,12 +194,12 @@ } -psPolynomial3D *psPolynomial3DAlloc(int nX, int nY, int nZ) +psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ) { int x = 0; int y = 0; int z = 0; - psPolynomial3D *newPoly = NULL; - - newPoly = (psPolynomial3D *) psAlloc(sizeof(psPolynomial3D)); + psPolynomial3D* newPoly = NULL; + + newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); newPoly->nX = nX; @@ -233,5 +233,5 @@ } -psPolynomial4D *psPolynomial4DAlloc(int nW, int nX, int nY, int nZ) +psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ) { int w = 0; @@ -239,7 +239,7 @@ int y = 0; int z = 0; - psPolynomial4D *newPoly = NULL; - - newPoly = (psPolynomial4D *) psAlloc(sizeof(psPolynomial4D)); + psPolynomial4D* newPoly = NULL; + + newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); newPoly->nW = nW; @@ -281,5 +281,5 @@ } -static void polynomial1DFree(psPolynomial1D * myPoly) +static void polynomial1DFree(psPolynomial1D* myPoly) { psFree(myPoly->coeff); @@ -288,5 +288,5 @@ } -static void polynomial2DFree(psPolynomial2D * myPoly) +static void polynomial2DFree(psPolynomial2D* myPoly) { int x = 0; @@ -302,5 +302,5 @@ } -static void polynomial3DFree(psPolynomial3D * myPoly) +static void polynomial3DFree(psPolynomial3D* myPoly) { int x = 0; @@ -323,5 +323,5 @@ } -static void polynomial4DFree(psPolynomial4D * myPoly) +static void polynomial4DFree(psPolynomial4D* myPoly) { int w = 0; @@ -353,5 +353,5 @@ Polynomial coefficients will be accessed in [w][x][y][z] fashion. *****************************************************************************/ -float psPolynomial1DEval(float x, const psPolynomial1D * myPoly) +float psPolynomial1DEval(float x, const psPolynomial1D* myPoly) { int loop_x = 0; @@ -380,5 +380,5 @@ } -float psPolynomial2DEval(float x, float y, const psPolynomial2D * myPoly) +float psPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { int loop_x = 0; @@ -400,5 +400,5 @@ } -float psPolynomial3DEval(float x, float y, float z, const psPolynomial3D * myPoly) +float psPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { int loop_x = 0; @@ -426,5 +426,5 @@ } -float psPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D * myPoly) +float psPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { int loop_w = 0; @@ -458,10 +458,10 @@ } -psDPolynomial1D *psDPolynomial1DAlloc(int n) +psDPolynomial1D* psDPolynomial1DAlloc(int n) { int i = 0; - psDPolynomial1D *newPoly = NULL; - - newPoly = (psDPolynomial1D *) psAlloc(sizeof(psDPolynomial1D)); + psDPolynomial1D* newPoly = NULL; + + newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); newPoly->n = n; @@ -478,11 +478,11 @@ } -psDPolynomial2D *psDPolynomial2DAlloc(int nX, int nY) -{ - int x = 0; - int y = 0; - psDPolynomial2D *newPoly = NULL; - - newPoly = (psDPolynomial2D *) psAlloc(sizeof(psDPolynomial2D)); +psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY) +{ + int x = 0; + int y = 0; + psDPolynomial2D* newPoly = NULL; + + newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); newPoly->nX = nX; @@ -508,12 +508,12 @@ } -psDPolynomial3D *psDPolynomial3DAlloc(int nX, int nY, int nZ) +psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ) { int x = 0; int y = 0; int z = 0; - psDPolynomial3D *newPoly = NULL; - - newPoly = (psDPolynomial3D *) psAlloc(sizeof(psDPolynomial3D)); + psDPolynomial3D* newPoly = NULL; + + newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); newPoly->nX = nX; @@ -547,5 +547,5 @@ } -psDPolynomial4D *psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ) +psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ) { int w = 0; @@ -553,7 +553,7 @@ int y = 0; int z = 0; - psDPolynomial4D *newPoly = NULL; - - newPoly = (psDPolynomial4D *) psAlloc(sizeof(psDPolynomial4D)); + psDPolynomial4D* newPoly = NULL; + + newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); newPoly->nW = nW; @@ -595,5 +595,5 @@ } -static void dPolynomial1DFree(psDPolynomial1D * myPoly) +static void dPolynomial1DFree(psDPolynomial1D* myPoly) { psFree(myPoly->coeff); @@ -602,5 +602,5 @@ } -static void dPolynomial2DFree(psDPolynomial2D * myPoly) +static void dPolynomial2DFree(psDPolynomial2D* myPoly) { int x = 0; @@ -616,5 +616,5 @@ } -static void dPolynomial3DFree(psDPolynomial3D * myPoly) +static void dPolynomial3DFree(psDPolynomial3D* myPoly) { int x = 0; @@ -637,5 +637,5 @@ } -static void dPolynomial4DFree(psDPolynomial4D * myPoly) +static void dPolynomial4DFree(psDPolynomial4D* myPoly) { int w = 0; @@ -667,5 +667,5 @@ Polynomial coefficients will be accessed in [w][x][y][z] fashion. *****************************************************************************/ -double psDPolynomial1DEval(double x, const psDPolynomial1D * myPoly) +double psDPolynomial1DEval(double x, const psDPolynomial1D* myPoly) { int loop_x = 0; @@ -686,5 +686,5 @@ } -double psDPolynomial2DEval(double x, double y, const psDPolynomial2D * myPoly) +double psDPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { int loop_x = 0; @@ -706,5 +706,5 @@ } -double psDPolynomial3DEval(double x, double y, double z, const psDPolynomial3D * myPoly) +double psDPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { int loop_x = 0; @@ -732,5 +732,5 @@ } -double psDPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D * myPoly) +double psDPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { int loop_w = 0; Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 1439) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 1440) @@ -13,6 +13,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,5 @@ /** Produce a vector of random numbers from a Gaussian distribution with the specified mean and sigma */ -psVector *psGaussianDev(float mean, ///< The mean of the Gaussian +psVector* psGaussianDev(float mean, ///< The mean of the Gaussian float sigma, ///< The sigma of the Gaussian int Npts); ///< The size of the vector @@ -95,17 +95,17 @@ /** Constructor */ -psPolynomial1D *psPolynomial1DAlloc(int n ///< Number of terms - ); - -/** Constructor */ -psPolynomial2D *psPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y - ); - -/** Constructor */ -psPolynomial3D *psPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z - ); - -/** Constructor */ -psPolynomial4D *psPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and +psPolynomial1D* psPolynomial1DAlloc(int n ///< Number of terms + ); + +/** Constructor */ +psPolynomial2D* psPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y + ); + +/** Constructor */ +psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z + ); + +/** Constructor */ +psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and // z ); @@ -113,5 +113,5 @@ /** Evaluate 1D polynomial */ float psPolynomial1DEval(float x, ///< Value at which to evaluate - const psPolynomial1D * myPoly ///< Coefficients for the polynomial + const psPolynomial1D* myPoly ///< Coefficients for the polynomial ); @@ -119,5 +119,5 @@ float psPolynomial2DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate - const psPolynomial2D * myPoly ///< Coefficients for the polynomial + const psPolynomial2D* myPoly ///< Coefficients for the polynomial ); @@ -126,5 +126,5 @@ float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate - const psPolynomial3D * myPoly ///< Coefficients for the polynomial + const psPolynomial3D* myPoly ///< Coefficients for the polynomial ); @@ -134,5 +134,5 @@ float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate - const psPolynomial4D * myPoly ///< Coefficients for the polynomial + const psPolynomial4D* myPoly ///< Coefficients for the polynomial ); @@ -188,17 +188,17 @@ /** Constructor */ -psDPolynomial1D *psDPolynomial1DAlloc(int n ///< Number of terms - ); - -/** Constructor */ -psDPolynomial2D *psDPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y - ); - -/** Constructor */ -psDPolynomial3D *psDPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z - ); - -/** Constructor */ -psDPolynomial4D *psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and +psDPolynomial1D* psDPolynomial1DAlloc(int n ///< Number of terms + ); + +/** Constructor */ +psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y + ); + +/** Constructor */ +psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z + ); + +/** Constructor */ +psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and // z ); @@ -206,5 +206,5 @@ /** Evaluate 1D polynomial (double precision) */ double psDPolynomial1DEval(double x, ///< Value at which to evaluate - const psDPolynomial1D * myPoly ///< Coefficients for the polynomial + const psDPolynomial1D* myPoly ///< Coefficients for the polynomial ); @@ -212,5 +212,5 @@ double psDPolynomial2DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate - const psDPolynomial2D * myPoly ///< Coefficients for the polynomial + const psDPolynomial2D* myPoly ///< Coefficients for the polynomial ); @@ -219,5 +219,5 @@ double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate - const psDPolynomial3D * myPoly ///< Coefficients for the polynomial + const psDPolynomial3D* myPoly ///< Coefficients for the polynomial ); @@ -227,5 +227,5 @@ double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate - const psDPolynomial4D * myPoly ///< Coefficients for the polynomial + const psDPolynomial4D* myPoly ///< Coefficients for the polynomial ); Index: /trunk/psLib/src/dataManip/psMatrix.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrix.c (revision 1439) +++ /trunk/psLib/src/dataManip/psMatrix.c (revision 1440) @@ -21,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -160,5 +160,5 @@ /*****************************************************************************/ -psImage *psMatrixLUD(psImage * outImage, psVector * outPerm, psImage * inImage) +psImage* psMatrixLUD(psImage* outImage, psVector* outPerm, psImage* inImage) { int signum = 0; @@ -205,6 +205,6 @@ } -psVector *psMatrixLUSolve(psVector * outVector, const psImage * inImage, const psVector * inVector, const - psVector * inPerm) +psVector* psMatrixLUSolve(psVector* outVector, const psImage* inImage, const psVector* inVector, const + psVector* inPerm) { int arraySize = 0; @@ -258,5 +258,5 @@ } -psImage *psMatrixInvert(psImage * outImage, const psImage * inImage, float *restrict det) +psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *restrict det) { int signum = 0; @@ -312,5 +312,5 @@ } -float *psMatrixDeterminant(const psImage * restrict inImage) +float *psMatrixDeterminant(const psImage* restrict inImage) { int signum = 0; @@ -354,5 +354,5 @@ } -psImage *psMatrixMultiply(psImage * outImage, psImage * inImage1, psImage * inImage2) +psImage* psMatrixMultiply(psImage* outImage, psImage* inImage1, psImage* inImage2) { int arraySize = 0; @@ -396,5 +396,5 @@ } -psImage *psMatrixTranspose(psImage * outImage, const psImage * inImage) +psImage* psMatrixTranspose(psImage* outImage, const psImage* inImage) { int arraySize = 0; @@ -433,5 +433,5 @@ } -psImage *psMatrixEigenvectors(psImage * outImage, psImage * inImage) +psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage) { int numRows = 0; @@ -477,5 +477,5 @@ } -psVector *psMatrixToVector(psVector * outVector, psImage * inImage) +psVector* psMatrixToVector(psVector* outVector, psImage* inImage) { int size = 0; @@ -536,5 +536,5 @@ } -psImage *psVectorToMatrix(psImage * outImage, psVector * inVector) +psImage* psVectorToMatrix(psImage* outImage, psVector* inVector) { int size = 0; Index: /trunk/psLib/src/dataManip/psMatrix.h =================================================================== --- /trunk/psLib/src/dataManip/psMatrix.h (revision 1439) +++ /trunk/psLib/src/dataManip/psMatrix.h (revision 1440) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -41,9 +41,9 @@ * the same. GSL indexes the top row as the zero row, not the bottom. * - * @return psImage*: Pointer to LU decomposed psImage. + * @return psImage* : Pointer to LU decomposed psImage. */ -psImage *psMatrixLUD(psImage * outImage, ///< Image to return, or NULL. - psVector * outPerm, ///< Output permutation vector used by psMatrixLUSolve. - psImage * inImage ///< Image to decompose. +psImage* psMatrixLUD(psImage* outImage, ///< Image to return, or NULL. + psVector* outPerm, ///< Output permutation vector used by psMatrixLUSolve. + psImage* inImage ///< Image to decompose. ); @@ -55,10 +55,10 @@ * the top row as the zero row, not the bottom. * - * @return psVector*: Pointer to psVector solution of matrix equation. + * @return psVector* : Pointer to psVector solution of matrix equation. */ -psVector *psMatrixLUSolve(psVector * outVector, ///< Vector to return, or NULL. - const psImage * luImage, ///< LU-decomposed matrix. - const psVector * inVector, ///< Vector right-hand-side of equation. - const psVector * inPerm ///< Permutation vector resulting from psMatrixLUD +psVector* psMatrixLUSolve(psVector* outVector, ///< Vector to return, or NULL. + const psImage* luImage, ///< LU-decomposed matrix. + const psVector* inVector, ///< Vector right-hand-side of equation. + const psVector* inPerm ///< Permutation vector resulting from psMatrixLUD // function. ); @@ -71,8 +71,8 @@ * the same. GSL indexes the top row as the zero row, not the bottom. * - * @return psImage*: Pointer to inverted psImage. + * @return psImage* : Pointer to inverted psImage. */ -psImage *psMatrixInvert(psImage * outImage, ///< Image to return, or NULL for in-place substitution. - const psImage * inImage, ///< Image to be inverted +psImage* psMatrixInvert(psImage* outImage, ///< Image to return, or NULL for in-place substitution. + const psImage* inImage, ///< Image to be inverted float *restrict det ///< Determinant to return, or NULL ); @@ -86,5 +86,5 @@ * @return float: Determinant from psImage. */ -float *psMatrixDeterminant(const psImage * restrict inMatrix ///< Image used to calculate determinant. +float *psMatrixDeterminant(const psImage* restrict inMatrix ///< Image used to calculate determinant. ); @@ -96,9 +96,9 @@ * zero row, not the bottom. * - * @return psImage*: Pointer to resulting psImage. + * @return psImage* : Pointer to resulting psImage. */ -psImage *psMatrixMultiply(psImage * outImage, ///< Matrix to return, or NULL. - psImage * inImage1, ///< First input image. - psImage * inImage2 ///< Second input image. +psImage* psMatrixMultiply(psImage* outImage, ///< Matrix to return, or NULL. + psImage* inImage1, ///< First input image. + psImage* inImage2 ///< Second input image. ); @@ -110,8 +110,8 @@ * row, not the bottom. * - * @return psImage*: Pointer to transposed psImage. + * @return psImage* : Pointer to transposed psImage. */ -psImage *psMatrixTranspose(psImage * outImage, ///< Image to return, or NULL - const psImage * inImage ///< Image to transpose +psImage* psMatrixTranspose(psImage* outImage, ///< Image to return, or NULL + const psImage* inImage ///< Image to transpose ); @@ -122,8 +122,8 @@ * only with the psF64 data type. GSL indexes the top row as the zero row, not the bottom. * - * @return psImage*: Pointer to matrix of Eigenvectors. + * @return psImage* : Pointer to matrix of Eigenvectors. */ -psImage *psMatrixEigenvectors(psImage * outImage, ///< Eigenvectors to return, or NULL. - psImage * inImage ///< Input image. +psImage* psMatrixEigenvectors(psImage* outImage, ///< Eigenvectors to return, or NULL. + psImage* inImage ///< Input image. ); @@ -135,8 +135,8 @@ * input matrix must be 1. This function operates only with the psF64 data type. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. */ -psVector *psMatrixToVector(psVector * outVector, ///< Vector to return, or NULL. - psImage * inImage ///< Image to convert. +psVector* psMatrixToVector(psVector* outVector, ///< Vector to return, or NULL. + psImage* inImage ///< Image to convert. ); @@ -148,8 +148,8 @@ * automatically be created. This function operates only with the psF64 data type. * - * @return psVector*: Pointer to psIamge. + * @return psVector* : Pointer to psIamge. */ -psImage *psVectorToMatrix(psImage * outImage, ///< Matrix to return, or NULL. - psVector * inVector ///< Vector to convert. +psImage* psVectorToMatrix(psImage* outImage, ///< Matrix to return, or NULL. + psVector* inVector ///< Vector to convert. ); Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1439) +++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c (revision 1440) @@ -30,6 +30,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -114,7 +114,7 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - o = &((psScalar*)OUT)->data.TYPE; \ - i1 = &((psScalar*)IN1)->data.TYPE; \ - i2 = &((psScalar*)IN2)->data.TYPE; \ + o = &((psScalar* )OUT)->data.TYPE; \ + i1 = &((psScalar* )IN1)->data.TYPE; \ + i2 = &((psScalar* )IN2)->data.TYPE; \ *o = OP; \ } @@ -127,8 +127,8 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - npt = ((psVector*)IN1)->n; \ - o = ((psVector*)OUT)->data.TYPE; \ - i1 = &((psScalar*)IN1)->data.TYPE; \ - i2 = ((psVector*)IN2)->data.TYPE; \ + npt = ((psVector* )IN1)->n; \ + o = ((psVector* )OUT)->data.TYPE; \ + i1 = &((psScalar* )IN1)->data.TYPE; \ + i2 = ((psVector* )IN2)->data.TYPE; \ for (i=0; i < npt; i++, o++, i2++) { \ *o = OP; \ @@ -145,10 +145,10 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - numRows = ((psImage*)IN1)->numRows; \ - numCols = ((psImage*)IN1)->numCols; \ + numRows = ((psImage* )IN1)->numRows; \ + numCols = ((psImage* )IN1)->numCols; \ for(j = 0; j < numCols; j++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i1 = &((psScalar*)IN1)->data.TYPE; \ - i2 = ((psImage*)IN2)->data.TYPE[j]; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i1 = &((psScalar* )IN1)->data.TYPE; \ + i2 = ((psImage* )IN2)->data.TYPE[j]; \ for(i = 0; i < numRows; i++, o++, i2++) { \ *o = OP; \ @@ -165,8 +165,8 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - n1 = ((psVector*)IN1)->n; \ - o = ((psVector*)OUT)->data.TYPE; \ - i1 = ((psVector*)IN1)->data.TYPE; \ - i2 = &((psScalar*)IN2)->data.TYPE; \ + n1 = ((psVector* )IN1)->n; \ + o = ((psVector* )OUT)->data.TYPE; \ + i1 = ((psVector* )IN1)->data.TYPE; \ + i2 = &((psScalar* )IN2)->data.TYPE; \ for (i=0; i < n1; i++, o++, i1++) { \ *o = OP; \ @@ -182,13 +182,13 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - n1 = ((psVector*)IN1)->n; \ - n2 = ((psVector*)IN2)->n; \ + n1 = ((psVector* )IN1)->n; \ + n2 = ((psVector* )IN2)->n; \ if(n1 != n2) { \ psError(__func__, ": Inconsistent element count: %d vs %d", n1, n2); \ return OUT; \ } \ - o = ((psVector*)OUT)->data.TYPE; \ - i1 = ((psVector*)IN1)->data.TYPE; \ - i2 = ((psVector*)IN2)->data.TYPE; \ + o = ((psVector* )OUT)->data.TYPE; \ + i1 = ((psVector* )IN1)->data.TYPE; \ + i2 = ((psVector* )IN2)->data.TYPE; \ for (i=0; i < n1; i++, o++, i1++, i2++) { \ *o = OP; \ @@ -207,8 +207,8 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - n1 = ((psVector*)IN1)->n; \ - dim1 = ((psVector*)IN1)->type.dimen; \ - numRows2 = ((psImage*)IN2)->numRows; \ - numCols2 = ((psImage*)IN2)->numCols; \ + n1 = ((psVector* )IN1)->n; \ + dim1 = ((psVector* )IN1)->type.dimen; \ + numRows2 = ((psImage* )IN2)->numRows; \ + numCols2 = ((psImage* )IN2)->numCols; \ \ if(dim1 == PS_DIMEN_VECTOR) { /* Regular vectors */ \ @@ -218,8 +218,8 @@ } \ \ - i1 = ((psVector*)IN1)->data.TYPE; \ + i1 = ((psVector* )IN1)->data.TYPE; \ for(j = 0; j < numRows2; j++, i1++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i2 = ((psImage*)IN2)->data.TYPE[j]; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i2 = ((psImage* )IN2)->data.TYPE[j]; \ for(i = 0; i < numCols2; i++, o++, i2++) { \ *o = OP; \ @@ -233,7 +233,7 @@ \ for(j = 0; j < numRows2; j++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i1 = ((psVector*)IN1)->data.TYPE; \ - i2 = ((psImage*)IN2)->data.TYPE[j]; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i1 = ((psVector* )IN1)->data.TYPE; \ + i2 = ((psImage* )IN2)->data.TYPE[j]; \ for(i = 0; i < numCols2; i++, o++, i1++, i2++) { \ *o = OP; \ @@ -253,10 +253,10 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - numRows = ((psImage*)IN1)->numRows; \ - numCols = ((psImage*)IN1)->numCols; \ + numRows = ((psImage* )IN1)->numRows; \ + numCols = ((psImage* )IN1)->numCols; \ for(j = 0; j < numRows; j++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i1 = ((psImage*)IN1)->data.TYPE[j]; \ - i2 = &((psScalar*)IN2)->data.TYPE; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i1 = ((psImage* )IN1)->data.TYPE[j]; \ + i2 = &((psScalar* )IN2)->data.TYPE; \ for(i = 0; i < numCols; i++, o++, i1++) { \ *o = OP; \ @@ -276,8 +276,8 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - n2 = ((psVector*)IN2)->n; \ - dim2 = ((psVector*)IN2)->type.dimen; \ - numRows1 = ((psImage*)IN1)->numRows; \ - numCols1 = ((psImage*)IN1)->numCols; \ + n2 = ((psVector* )IN2)->n; \ + dim2 = ((psVector* )IN2)->type.dimen; \ + numRows1 = ((psImage* )IN1)->numRows; \ + numCols1 = ((psImage* )IN1)->numCols; \ \ if(dim2 == PS_DIMEN_VECTOR) { /* Regular vectors */ \ @@ -287,8 +287,8 @@ } \ \ - i2 = ((psVector*)IN2)->data.TYPE; \ + i2 = ((psVector* )IN2)->data.TYPE; \ for(j = 0; j < numRows1; j++, i1++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i1 = ((psImage*)IN1)->data.TYPE[j]; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i1 = ((psImage* )IN1)->data.TYPE[j]; \ for(i = 0; i < numCols1; i++, o++, i1++) { \ *o = OP; \ @@ -302,7 +302,7 @@ \ for(j = 0; j < numRows1; j++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i1 = ((psVector*)IN2)->data.TYPE; \ - i2 = ((psImage*)IN1)->data.TYPE[j]; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i1 = ((psVector* )IN2)->data.TYPE; \ + i2 = ((psImage* )IN1)->data.TYPE[j]; \ for(i = 0; i < numCols1; i++, o++, i2++, i1++) { \ *o = OP; \ @@ -323,8 +323,8 @@ ps##TYPE *i1 = NULL; \ ps##TYPE *i2 = NULL; \ - numRows1 = ((psImage*)IN1)->numRows; \ - numCols1 = ((psImage*)IN1)->numCols; \ - numRows2 = ((psImage*)IN2)->numRows; \ - numCols2 = ((psImage*)IN2)->numCols; \ + numRows1 = ((psImage* )IN1)->numRows; \ + numCols1 = ((psImage* )IN1)->numCols; \ + numRows2 = ((psImage* )IN2)->numRows; \ + numCols2 = ((psImage* )IN2)->numCols; \ if(numRows1!=numRows2 || numCols1!=numCols2) { \ psError(__func__, ": Inconsistent element count: numRows: %d vs %d numCols: %d vs %d", numRows1, \ @@ -333,7 +333,7 @@ } \ for(j = 0; j < numRows1; j++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i1 = ((psImage*)IN1)->data.TYPE[j]; \ - i2 = ((psImage*)IN2)->data.TYPE[j]; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i1 = ((psImage* )IN1)->data.TYPE[j]; \ + i2 = ((psImage* )IN2)->data.TYPE[j]; \ for(i = 0; i < numCols1; i++, o++, i1++, i2++) { \ *o = OP; \ @@ -409,9 +409,9 @@ psElemType elType2 = 0; psElemType elTypeOut = 0; - psType *psType1 = NULL; - psType *psType2 = NULL; - psType *psTypeOut = NULL; - - psTypeOut = (psType *) out; + psType* psType1 = NULL; + psType* psType2 = NULL; + psType* psTypeOut = NULL; + + psTypeOut = (psType* ) out; if (psTypeOut == NULL) { psError(__func__, ": Line %d - Null out argument", __LINE__); @@ -419,5 +419,5 @@ } - psType1 = (psType *) in1; + psType1 = (psType* ) in1; if (psType1 == NULL) { psError(__func__, ": Line %d - Null in1 argument", __LINE__); @@ -425,5 +425,5 @@ } - psType2 = (psType *) in2; + psType2 = (psType* ) in2; if (psType2 == NULL) { psError(__func__, ": Line %d - Null in2 argument", __LINE__); @@ -456,9 +456,9 @@ if (dim1 == PS_DIMEN_VECTOR) { - if (((psVector *) in1)->n == 0) { + if (((psVector* ) in1)->n == 0) { psError(__func__, ": Line %d - Vector contains zero elements"); } } else if (dim1 == PS_DIMEN_IMAGE) { - if (((psImage *) in1)->numCols == 0 || ((psImage *) in1)->numRows == 0) { + if (((psImage* ) in1)->numCols == 0 || ((psImage* ) in1)->numRows == 0) { psError(__func__, ": Line %d - Image contains zero length row or cols"); } @@ -466,9 +466,9 @@ if (dim2 == PS_DIMEN_VECTOR) { - if (((psVector *) in2)->n == 0) { + if (((psVector* ) in2)->n == 0) { psError(__func__, ": Line %d - Vector contains zero elements"); } } else if (dim2 == PS_DIMEN_IMAGE) { - if (((psImage *) in2)->numCols == 0 || ((psImage *) in2)->numRows == 0) { + if (((psImage* ) in2)->numCols == 0 || ((psImage* ) in2)->numRows == 0) { psError(__func__, ": Line %d - Image contains zero length row or cols"); } @@ -517,6 +517,6 @@ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ - o = &((psScalar*)OUT)->data.TYPE; \ - i1 = &((psScalar*)IN)->data.TYPE; \ + o = &((psScalar* )OUT)->data.TYPE; \ + i1 = &((psScalar* )IN)->data.TYPE; \ *o = OP; \ } @@ -530,12 +530,12 @@ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ - nIn = ((psVector*)IN)->n; \ - nOut = ((psVector*)OUT)->n; \ + nIn = ((psVector* )IN)->n; \ + nOut = ((psVector* )OUT)->n; \ if(nIn != nOut) { \ psError(__func__, ": Inconsistent element count: %d vs %d", nIn, nOut); \ return OUT; \ } \ - o = ((psVector*)OUT)->data.TYPE; \ - i1 = ((psVector*)IN)->data.TYPE; \ + o = ((psVector* )OUT)->data.TYPE; \ + i1 = ((psVector* )IN)->data.TYPE; \ for(i = 0; i < nIn; i++, o++, i1++) { \ *o = OP; \ @@ -554,8 +554,8 @@ ps##TYPE *o = NULL; \ ps##TYPE *i1 = NULL; \ - numRowsIn = ((psImage*)IN)->numRows; \ - numColsIn = ((psImage*)IN)->numCols; \ - numRowsOut = ((psImage*)OUT)->numRows; \ - numColsOut = ((psImage*)OUT)->numCols; \ + numRowsIn = ((psImage* )IN)->numRows; \ + numColsIn = ((psImage* )IN)->numCols; \ + numRowsOut = ((psImage* )OUT)->numRows; \ + numColsOut = ((psImage* )OUT)->numCols; \ if(numRowsIn!=numRowsOut || numColsIn!=numColsOut) { \ psError(__func__, ": Inconsistent element count: numRows: %d vs %d numCols: %d vs %d", numRowsIn, \ @@ -564,6 +564,6 @@ } \ for(j = 0; j < numRowsIn; j++) { \ - o = ((psImage*)OUT)->data.TYPE[j]; \ - i1 = ((psImage*)IN)->data.TYPE[j]; \ + o = ((psImage* )OUT)->data.TYPE[j]; \ + i1 = ((psImage* )IN)->data.TYPE[j]; \ for(i = 0; i < numColsIn; i++, o++, i1++) { \ *o = OP; \ @@ -713,8 +713,8 @@ psElemType elTypeIn = 0; psElemType elTypeOut = 0; - psType *psTypeIn = NULL; - psType *psTypeOut = NULL; - - psTypeOut = (psType *) out; + psType* psTypeIn = NULL; + psType* psTypeOut = NULL; + + psTypeOut = (psType* ) out; if (psTypeOut == NULL) { psError(__func__, ": Line %d - Null out argument", __LINE__); @@ -722,5 +722,5 @@ } - psTypeIn = (psType *) in; + psTypeIn = (psType* ) in; if (psTypeIn == NULL) { psError(__func__, ": Line %d - Null in argument", __LINE__); @@ -757,9 +757,9 @@ if (dimIn == PS_DIMEN_VECTOR) { - if (((psVector *) in)->n == 0) { + if (((psVector* ) in)->n == 0) { psError(__func__, ": Line %d - Vector contains zero elements"); } } else if (dimIn == PS_DIMEN_IMAGE) { - if (((psImage *) in)->numCols == 0 || ((psImage *) in)->numRows == 0) { + if (((psImage* ) in)->numCols == 0 || ((psImage* ) in)->numRows == 0) { psError(__func__, ": Line %d - Image contains zero length row or cols"); } @@ -767,9 +767,9 @@ if (dimOut == PS_DIMEN_VECTOR) { - if (((psVector *) out)->n == 0) { + if (((psVector* ) out)->n == 0) { psError(__func__, ": Line %d - Vector contains zero elements"); } } else if (dimOut == PS_DIMEN_IMAGE) { - if (((psImage *) out)->numCols == 0 || ((psImage *) out)->numRows == 0) { + if (((psImage* ) out)->numCols == 0 || ((psImage* ) out)->numRows == 0) { psError(__func__, ": Line %d - Image contains zero length row or cols"); } Index: /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.h =================================================================== --- /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.h (revision 1439) +++ /trunk/psLib/src/dataManip/psMatrixVectorArithmetic.h (revision 1440) @@ -30,6 +30,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -53,7 +53,7 @@ * This function only supports vector-vector or image-image opertions. * - * @return psType*: Pointer to either psImage or psVector. + * @return psType* : Pointer to either psImage or psVector. */ -psType *psBinaryOp(void *out, // / Output type, either psImage or psVector. +psType* psBinaryOp(void *out, // / Output type, either psImage or psVector. void *in1, // / First input, either psImage or psVector. char *op, // / Operator. @@ -75,7 +75,7 @@ * This function only supports vector-vector or image-image opertions. * - * @return psType*: Pointer to either psImage or psVector. + * @return psType* : Pointer to either psImage or psVector. */ -psType *psUnaryOp(void *out, // / Output type, either psImage or psVector. +psType* psUnaryOp(void *out, // / Output type, either psImage or psVector. void *in, // / Input, either psImage or psVector. char *op // / Operator. Index: /trunk/psLib/src/dataManip/psMinimize.c =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.c (revision 1439) +++ /trunk/psLib/src/dataManip/psMinimize.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -99,11 +99,11 @@ size_t n; // Number of data points points in domain. int paramCount; // Number of non-masked parameters. - psVector *restrict initialGuess; - const psImage *restrict domain; - const psVector *restrict data; - const psVector *restrict errors; - const psVector *restrict paramMask; - float (*evalModel) (const psVector *, const psVector *); - float (*d_evalModel) (const psVector *, const psVector *, int); + psVector* restrict initialGuess; + const psImage* restrict domain; + const psVector* restrict data; + const psVector* restrict errors; + const psVector* restrict paramMask; + float (*evalModel) (const psVector* , const psVector* ); + float (*d_evalModel) (const psVector* , const psVector* , int); } psMinChi2Data; @@ -112,9 +112,9 @@ { int paramCount; // Number of non-masked parameters. - psVector *restrict initialGuess; - const psVector *restrict coord; - const psVector *restrict paramMask; - float (*evalModel) (const psVector *, const psVector *); - float (*d_evalModel) (const psVector *, const psVector *, int); + psVector* restrict initialGuess; + const psVector* restrict coord; + const psVector* restrict paramMask; + float (*evalModel) (const psVector* , const psVector* ); + float (*d_evalModel) (const psVector* , const psVector* , int); } psMinimizeData; @@ -162,9 +162,9 @@ int j; // Loop index variable. float tmpf; // Temporary floating point variable. - const psVector *restrict coord = ((psMinimizeData *) funcData)->coord; - const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess; - float (*evalModel) (const psVector *, const psVector *) = ((psMinimizeData *) funcData)->evalModel; - psVector *inputParameterList = NULL; + const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord; + const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess; + float (*evalModel) (const psVector* , const psVector* ) = ((psMinimizeData* ) funcData)->evalModel; + psVector* inputParameterList = NULL; // The GSL routines will call this function with the masked parameters @@ -216,10 +216,10 @@ int j; // Loop index variable. float tmpf; // Temporary floating point variable. - const psVector *restrict coord = ((psMinimizeData *) funcData)->coord; - const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess; - float (*d_evalModel) (const psVector *, const psVector *, int) = - ((psMinimizeData *) funcData)->d_evalModel; - psVector *inputParameterList = NULL; + const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord; + const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess; + float (*d_evalModel) (const psVector* , const psVector* , int) = + ((psMinimizeData* ) funcData)->d_evalModel; + psVector* inputParameterList = NULL; // The GSL routines will call this function with the masked parameters @@ -293,12 +293,12 @@ int j; // Loop index variable. float tmpf; // Temporary floating point variable. - const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain; - const psVector *restrict data = ((psMinChi2Data *) funcData)->data; - const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors; - const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess; - float (*evalModel) (const psVector *, const psVector *) = ((psMinChi2Data *) funcData)->evalModel; - psVector *inputParameterList = NULL; - psVector *tmpVecPtr = NULL; + const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain; + const psVector* restrict data = ((psMinChi2Data* ) funcData)->data; + const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors; + const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess; + float (*evalModel) (const psVector* , const psVector* ) = ((psMinChi2Data* ) funcData)->evalModel; + psVector* inputParameterList = NULL; + psVector* tmpVecPtr = NULL; tmpVecPtr = psVectorAlloc(domain->numCols, PS_TYPE_F32); @@ -360,12 +360,12 @@ int p_psMinChi2FuncDeriv(const gsl_vector * params, void *funcData, gsl_matrix * J) { - const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain; - const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors; - const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess; - psVector *inputParameterList = NULL; - psVector *tmpVecPtr = NULL; - float (*d_evalModel) (const psVector *, const psVector *, int) = - ((psMinChi2Data *) funcData)->d_evalModel; + const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain; + const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors; + const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess; + psVector* inputParameterList = NULL; + psVector* tmpVecPtr = NULL; + float (*d_evalModel) (const psVector* , const psVector* , int) = + ((psMinChi2Data* ) funcData)->d_evalModel; size_t i; @@ -426,5 +426,5 @@ returned as a psVector sums. *****************************************************************************/ -void p_psBuildSums1D(double x, int polyOrder, psVector * sums) +void p_psBuildSums1D(double x, int polyOrder, psVector* sums) { int i = 0; @@ -442,8 +442,8 @@ values of the vector will be scaled uniformly between -1.0 and 1.0. *****************************************************************************/ -psVector *psBuildImageScalingFactors(int x) +psVector* psBuildImageScalingFactors(int x) { int i = 0; // loop index variable. - psVector *imageScalingFactors = NULL; + psVector* imageScalingFactors = NULL; imageScalingFactors = psVectorAlloc(x, PS_TYPE_F32); @@ -556,8 +556,8 @@ parameters of that function such that the ... *****************************************************************************/ -psVector *psMinimize(psVector * restrict initialGuess, - float (*myFunction) (const psVector * restrict, const psVector * restrict), - float (*myFunctionDeriv) (const psVector * restrict, const psVector * restrict, int), - const psVector * restrict coord, const psVector * restrict paramMask) +psVector* psMinimize(psVector* restrict initialGuess, + float (*myFunction) (const psVector* restrict, const psVector* restrict), + float (*myFunctionDeriv) (const psVector* restrict, const psVector* restrict, int), + const psVector* restrict coord, const psVector* restrict paramMask) { int status; @@ -664,10 +664,10 @@ such that they best fit the supplied data points. *****************************************************************************/ -psVector *psMinimizeChi2(float (*evalModel) (const psVector * restrict, const psVector * restrict), - float (*DevalModel) (const psVector * restrict, const psVector * restrict, int), - const psImage * restrict domain, - const psVector * restrict data, - const psVector * restrict errors, - psVector * restrict initialGuess, const psVector * restrict paramMask, float *chiSq) +psVector* psMinimizeChi2(float (*evalModel) (const psVector* restrict, const psVector* restrict), + float (*DevalModel) (const psVector* restrict, const psVector* restrict, int), + const psImage* restrict domain, + const psVector* restrict data, + const psVector* restrict errors, + psVector* restrict initialGuess, const psVector* restrict paramMask, float *chiSq) { int numData = domain->numRows; // Number of data points @@ -847,19 +847,19 @@ NOTE: yErr is currently ignored. *****************************************************************************/ -psPolynomial1D *psVectorFitPolynomial1D(psPolynomial1D * myPoly, - const psVector * restrict x, - const psVector * restrict y, const psVector * restrict yErr) +psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly, + const psVector* restrict x, + const psVector* restrict y, const psVector* restrict yErr) { int polyOrder = myPoly->n; - psImage *A = NULL; - psImage *ALUD = NULL; - psVector *B = NULL; - psVector *outPerm = NULL; - psVector *X = NULL; // NOTE: do we need this? - psVector *coeffs = NULL; + psImage* A = NULL; + psImage* ALUD = NULL; + psVector* B = NULL; + psVector* outPerm = NULL; + psVector* X = NULL; // NOTE: do we need this? + psVector* coeffs = NULL; int i = 0; int j = 0; int k = 0; - psVector *xSums = NULL; + psVector* xSums = NULL; // printf("psVectorFitPolynomial1D()\n"); Index: /trunk/psLib/src/dataManip/psMinimize.h =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.h (revision 1439) +++ /trunk/psLib/src/dataManip/psMinimize.h (revision 1440) @@ -16,11 +16,11 @@ /** This routine must minimize a non-linear function */ -psVector *psMinimize(psVector * restrict initialGuess, - float (*myFunction) (const psVector * restrict, const psVector * restrict), - float (*myFunctionDeriv) (const psVector * restrict, const psVector * restrict, int), - const psVector * restrict coord, const psVector * restrict paramMask); +psVector* psMinimize(psVector* restrict initialGuess, + float (*myFunction) (const psVector* restrict, const psVector* restrict), + float (*myFunctionDeriv) (const psVector* restrict, const psVector* restrict, int), + const psVector* restrict coord, const psVector* restrict paramMask); /** Minimize chi^2 for input data */ -psVector *psMinimizeChi2(float (*evalModel) (const psVector * restrict, const psVector * restrict), ///< +psVector* psMinimizeChi2(float (*evalModel) (const psVector* restrict, const psVector* restrict), ///< // Model // to @@ -29,5 +29,5 @@ // and // params) - float (*DevalModel) (const psVector * restrict, const psVector * restrict, int), ///< + float (*DevalModel) (const psVector* restrict, const psVector* restrict, int), ///< // Derivative // of @@ -38,19 +38,19 @@ // and // params) - const psImage * restrict domain, ///< The domain values for the corresponding + const psImage* restrict domain, ///< The domain values for the corresponding // measurements - const psVector * restrict data, ///< Data to fit - const psVector * restrict errors, ///< Errors in the data - psVector * restrict initialGuess, ///< Initial guess - const psVector * restrict paramMask, ///< 1 = fit for parameter, 0 = hold + const psVector* restrict data, ///< Data to fit + const psVector* restrict errors, ///< Errors in the data + psVector* restrict initialGuess, ///< Initial guess + const psVector* restrict paramMask, ///< 1 = fit for parameter, 0 = hold // parameter constant float *chiSq); /** Derive a polynomial fit by chi^2 minimisation (analytically) */ -psPolynomial1D *psVectorFitPolynomial1D(psPolynomial1D * myPoly, ///< Polynomial to fit - const psVector * restrict x, ///< Ordinates (or NULL to just use +psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly, ///< Polynomial to fit + const psVector* restrict x, ///< Ordinates (or NULL to just use // the indices) - const psVector * restrict y, ///< Coordinates - const psVector * restrict yErr ///< Errors in coordinates, or NULL + const psVector* restrict y, ///< Coordinates + const psVector* restrict yErr ///< Errors in coordinates, or NULL ); Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 1439) +++ /trunk/psLib/src/dataManip/psStats.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -54,6 +54,6 @@ #define MAX_ITERATIONS 10 -void p_psVectorRobustStats(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats); +void p_psVectorRobustStats(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats); /** Preprocessor macro to generate error on an incorrect type */ @@ -116,5 +116,5 @@ /*****************************************************************************/ -bool p_psGetStatValue(const psStats * stats, double *value) +bool p_psGetStatValue(const psStats* stats, double *value) { @@ -175,5 +175,5 @@ *****************************************************************************/ -void p_psVectorPrint(psVector * myVector, psVector * maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorPrint(psVector* myVector, psVector* maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable. @@ -218,6 +218,6 @@ *****************************************************************************/ -void p_psVectorSampleMean(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorSampleMean(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -282,6 +282,6 @@ NULL *****************************************************************************/ -void p_psVectorMax(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorMax(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -343,6 +343,6 @@ NULL *****************************************************************************/ -void p_psVectorMin(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorMin(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -404,6 +404,6 @@ NULL *****************************************************************************/ -int p_psVectorNValues(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +int p_psVectorNValues(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -456,9 +456,9 @@ NULL *****************************************************************************/ -void p_psVectorSampleMedian(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) -{ - psVector *unsortedVector = NULL; // Temporary vector - psVector *sortedVector = NULL; // Temporary vector +void p_psVectorSampleMedian(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int 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? @@ -565,5 +565,5 @@ XXX: use a static variable for gaussianCoefs[] and compute them once. *****************************************************************************/ -psVector *p_psVectorsmoothHistGaussian(psHistogram * robustHistogram, float sigma) +psVector* p_psVectorsmoothHistGaussian(psHistogram* robustHistogram, float sigma) { int i = 0; // Loop index variable @@ -572,5 +572,5 @@ float expo = 0.0; // Temporary variable float gaussianCoefs[1 + (2 * GAUSS_WIDTH)]; // The Gaussian Coefficients - psVector *smooth = psVectorAlloc(robustHistogram->nums->n, PS_TYPE_F32); + psVector* smooth = psVectorAlloc(robustHistogram->nums->n, PS_TYPE_F32); for (i = 0; i < (1 + (2 * GAUSS_WIDTH)); i++) { @@ -628,9 +628,9 @@ NULL *****************************************************************************/ -void p_psVectorSampleQuartiles(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) -{ - psVector *unsortedVector = NULL; // Temporary vector - psVector *sortedVector = NULL; // Temporary vector +void p_psVectorSampleQuartiles(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int 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? @@ -710,6 +710,6 @@ *****************************************************************************/ -void p_psVectorSampleStdev(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorSampleStdev(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -795,6 +795,6 @@ NULL *****************************************************************************/ -void p_psVectorClippedStats(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorClippedStats(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -804,5 +804,5 @@ float oldStanMean = 0.0; // Temporary variable float oldStanStdev = 0.0; // Temporary variable - psVector *tmpMask = NULL; // Temporary vector + psVector* tmpMask = NULL; // Temporary vector // Endure that stats->clipIter is within the proper range. @@ -884,5 +884,5 @@ elements of a vector to a range between 0.0 and 1.0. *****************************************************************************/ -void p_psNormalizeVector(psVector * myData) +void p_psNormalizeVector(psVector* myData) { float min = (float)HUGE; @@ -911,5 +911,5 @@ specified data point. *****************************************************************************/ -float p_psGaussian(const psVector * restrict myData, const psVector * restrict myParams) +float p_psGaussian(const psVector* restrict myData, const psVector* restrict myParams) { float x = myData->data.F32[0]; @@ -928,5 +928,5 @@ calculates the specified partial derivative of the above Gaussian function. *****************************************************************************/ -float p_psGaussianDeriv(const psVector * restrict myData, const psVector * restrict myParams, int whichParam) +float p_psGaussianDeriv(const psVector* restrict myData, const psVector* restrict myParams, int whichParam) { float x = myData->data.F32[0]; @@ -954,5 +954,5 @@ specified data point. *****************************************************************************/ -float p_psQuadratic(const psVector * restrict myParams, const psVector * restrict myCoords) +float p_psQuadratic(const psVector* restrict myParams, const psVector* restrict myCoords) { float x = myCoords->data.F32[0]; @@ -970,6 +970,6 @@ calculates the specified partial derivative of the above quadratic function. *****************************************************************************/ -float p_psQuadraticDeriv(const psVector * restrict myParams, - const psVector * restrict myCoords, int whichParamDeriv) +float p_psQuadraticDeriv(const psVector* restrict myParams, + const psVector* restrict myCoords, int whichParamDeriv) { float x = myCoords->data.F32[0]; @@ -996,5 +996,5 @@ decreasing within that range. *****************************************************************************/ -float p_ps1DPolyMedian(psPolynomial1D * myPoly, float rangeLow, float rangeHigh, float getThisValue) +float p_ps1DPolyMedian(psPolynomial1D* myPoly, float rangeLow, float rangeHigh, float getThisValue) { int numIterations = 0; @@ -1036,10 +1036,10 @@ XXX: This function is currently not being used. *****************************************************************************/ -float p_psFitQuadratic(psHistogram * histogram, psVector * cumulativeSums, int binNum, float fitFloat) -{ - psVector *x = psVectorAlloc(3, PS_TYPE_F64); - psVector *y = psVectorAlloc(3, PS_TYPE_F64); - psVector *yErr = psVectorAlloc(3, PS_TYPE_F64); - psPolynomial1D *myPoly = psPolynomial1DAlloc(2); +float p_psFitQuadratic(psHistogram* histogram, psVector* cumulativeSums, int binNum, float fitFloat) +{ + psVector* x = psVectorAlloc(3, PS_TYPE_F64); + psVector* y = psVectorAlloc(3, PS_TYPE_F64); + psVector* yErr = psVectorAlloc(3, PS_TYPE_F64); + psPolynomial1D* myPoly = psPolynomial1DAlloc(2); if ((binNum > 0) && (binNum < (histogram->nums->n + 1))) { @@ -1100,9 +1100,9 @@ NULL *****************************************************************************/ -void p_psVectorRobustStats(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) -{ - psHistogram *robustHistogram = NULL; - psVector *robustHistogramVector = NULL; +void p_psVectorRobustStats(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) +{ + psHistogram* robustHistogram = NULL; + psVector* robustHistogramVector = NULL; float binSize = 0.0; // Size of the histogram bins int LQBinNum = -1; // Bin num for lower quartile @@ -1113,11 +1113,11 @@ float dL = 0.0; int numBins = 0; - psStats *tmpStats = psStatsAlloc(PS_STAT_CLIPPED_STDEV | PS_STAT_CLIPPED_MEAN); - - // psImage *domain; - // psVector *errors; - // psVector *data; - // psVector *initialGuess; - // psVector *theParams; + psStats* tmpStats = psStatsAlloc(PS_STAT_CLIPPED_STDEV | PS_STAT_CLIPPED_MEAN); + + // psImage* domain; + // psVector* errors; + // psVector* data; + // psVector* initialGuess; + // psVector* theParams; // float chiSq=0.0; // float max = -HUGE; @@ -1129,10 +1129,10 @@ float sumSquares = 0.0; float sumDiffs = 0.0; - psVector *x = psVectorAlloc(3, PS_TYPE_F64); - psVector *y = psVectorAlloc(3, PS_TYPE_F64); - psVector *yErr = psVectorAlloc(3, PS_TYPE_F64); - psPolynomial1D *myPoly = psPolynomial1DAlloc(2); - psVector *cumulativeRobustSumsFullRange = NULL; - psVector *cumulativeRobustSumsDlRange = NULL; + psVector* x = psVectorAlloc(3, PS_TYPE_F64); + psVector* y = psVectorAlloc(3, PS_TYPE_F64); + psVector* yErr = psVectorAlloc(3, PS_TYPE_F64); + psPolynomial1D* myPoly = psPolynomial1DAlloc(2); + psVector* cumulativeRobustSumsFullRange = NULL; + psVector* cumulativeRobustSumsDlRange = NULL; float sumRobust = 0.0; float sumN50 = 0.0; @@ -1500,14 +1500,14 @@ /*****************************************************************************/ -static void histogramFree(psHistogram * myHist); +static void histogramFree(psHistogram* myHist); /****************************************************************************** psStatsAlloc(): This routine must create a new psStats data structure. *****************************************************************************/ -psStats *psStatsAlloc(psStatsOptions options) -{ - psStats *newStruct = NULL; - - newStruct = (psStats *) psAlloc(sizeof(psStats)); +psStats* psStatsAlloc(psStatsOptions options) +{ + psStats* newStruct = NULL; + + newStruct = (psStats* ) psAlloc(sizeof(psStats)); newStruct->sampleMean = NAN; newStruct->sampleMedian = NAN; @@ -1548,8 +1548,8 @@ The histogram structure *****************************************************************************/ -psHistogram *psHistogramAlloc(float lower, float upper, int n) +psHistogram* psHistogramAlloc(float lower, float upper, int n) { int i = 0; // Loop index variable - psHistogram *newHist = NULL; // The new histogram structure + psHistogram* newHist = NULL; // The new histogram structure float binSize = 0.0; // The histogram bin size @@ -1567,5 +1567,5 @@ // Allocate memory for the new histogram structure. If there are N // bins, then there are N+1 bounds to those bins. - newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); + newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); @@ -1605,7 +1605,7 @@ The histogram structure *****************************************************************************/ -psHistogram *psHistogramAllocGeneric(const psVector * restrict bounds) -{ - psHistogram *newHist = NULL; // The new histogram structure +psHistogram* psHistogramAllocGeneric(const psVector* restrict bounds) +{ + psHistogram* newHist = NULL; // The new histogram structure int i; // Loop index variable @@ -1626,5 +1626,5 @@ } // Allocate memory for the new histogram structure. - newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); + newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); @@ -1650,5 +1650,5 @@ } -static void histogramFree(psHistogram * myHist) +static void histogramFree(psHistogram* myHist) { psFree(myHist->bounds); @@ -1670,7 +1670,7 @@ The histogram structure "out". *****************************************************************************/ -psHistogram *psVectorHistogram(psHistogram * out, - const psVector * restrict in, - const psVector * restrict mask, unsigned int maskVal) +psHistogram* psVectorHistogram(psHistogram* out, + const psVector* restrict in, + const psVector* restrict mask, unsigned int maskVal) { int i = 0; // Loop index variable @@ -1767,8 +1767,8 @@ the various stat functions. *****************************************************************************/ -psVector *p_psConvertToF32(psStats * stats, psVector * in, psVector * mask, unsigned int maskVal) +psVector* p_psConvertToF32(psStats* stats, psVector* in, psVector* mask, unsigned int maskVal) { int i = 0; - psVector *tmp = NULL; + psVector* tmp = NULL; if (in->type.type == PS_TYPE_S32) { @@ -1812,7 +1812,7 @@ macro-ize everything and add PS_TYPE_U16 and PS_TYPE_F64. *****************************************************************************/ -psStats *psVectorStats(psStats * stats, psVector * in, psVector * mask, unsigned int maskVal) -{ - psVector *inF32; +psStats* psVectorStats(psStats* stats, psVector* in, psVector* mask, unsigned int maskVal) +{ + psVector* inF32; int mustFreeTmp = 1; Index: /trunk/psLib/src/dataManip/psStats.h =================================================================== --- /trunk/psLib/src/dataManip/psStats.h (revision 1439) +++ /trunk/psLib/src/dataManip/psStats.h (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,7 +77,7 @@ /** Do Statistics on an array. Returns a status value. \ingroup MathGroup */ -psStats *psVectorStats(psStats * stats, ///< stats structure defines stats to be calculated and how - psVector * in, ///< Vector to be analysed: must be F32 - psVector * mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT +psStats* psVectorStats(psStats* stats, ///< stats structure defines stats to be calculated and how + 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 @@ -86,5 +86,5 @@ /** A constructor for the stats structure.*/ -psStats *psStatsAlloc(psStatsOptions options); ///< Statistics to measure +psStats* psStatsAlloc(psStatsOptions options); ///< Statistics to measure /****************************************************************************** @@ -95,6 +95,6 @@ typedef struct { - psVector *bounds; ///< Bounds for the bins (type F32) - psVector *nums; ///< Number in each of the bins (INT) + 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 @@ -104,18 +104,18 @@ /** Constructor \ingroup MathGroup */ -psHistogram *psHistogramAlloc(float lower, ///< Lower limit for the bins +psHistogram* psHistogramAlloc(float lower, ///< Lower limit for the bins float upper, ///< Upper limit for the bins int n); ///< Number of bins /** Generic constructor \ingroup MathGroup */ -psHistogram *psHistogramAllocGeneric(const psVector * restrict bounds); ///< Bounds for the bins +psHistogram* psHistogramAllocGeneric(const psVector* restrict bounds); ///< Bounds for the bins /** Calculate a histogram \ingroup MathGroup **/ -psHistogram *psVectorHistogram(psHistogram * out, ///< Histogram data - const psVector * restrict in, ///< Vector to analyse - const psVector * restrict mask, ///< Mask dat for input vector +psHistogram* psVectorHistogram(psHistogram* out, ///< Histogram data + const psVector* restrict in, ///< Vector to analyse + const psVector* restrict mask, ///< Mask dat for input vector unsigned int maskVal); ///< Mask value -bool p_psGetStatValue(const psStats * stats, double *value); +bool p_psGetStatValue(const psStats* stats, double *value); /// @} Index: /trunk/psLib/src/dataManip/psVectorFFT.c =================================================================== --- /trunk/psLib/src/dataManip/psVectorFFT.c (revision 1439) +++ /trunk/psLib/src/dataManip/psVectorFFT.c (revision 1440) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ static bool p_fftwWisdomImported = false; -psImage *psImageFFT(psImage * out, const psImage * in, psFftDirection direction) +psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction) { unsigned int numCols; @@ -93,5 +93,5 @@ } -psImage *psImageReal(psImage * out, const psImage * in) +psImage* psImageReal(psImage* out, const psImage* in) { psElemType type; @@ -117,6 +117,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); @@ -130,6 +130,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); @@ -151,5 +151,5 @@ } -psImage *psImageImaginary(psImage * out, const psImage * in) +psImage* psImageImaginary(psImage* out, const psImage* in) { psElemType type; @@ -177,6 +177,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); @@ -190,6 +190,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); @@ -211,5 +211,5 @@ } -psImage *psImageComplex(psImage * out, psImage * real, const psImage * imag) +psImage* psImageComplex(psImage* out, psImage* real, const psImage* imag) { psElemType type; @@ -251,7 +251,7 @@ if (type == PS_TYPE_F32) { - psC32 *outRow; - psF32 *realRow; - psF32 *imagRow; + psC32* outRow; + psF32* realRow; + psF32* imagRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); @@ -267,7 +267,7 @@ } } else if (type == PS_TYPE_F64) { - psC64 *outRow; - psF64 *realRow; - psF64 *imagRow; + psC64* outRow; + psF64* realRow; + psF64* imagRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); @@ -290,5 +290,5 @@ } -psImage *psImageConjugate(psImage * out, const psImage * in) +psImage* psImageConjugate(psImage* out, const psImage* in) { psElemType type; @@ -314,6 +314,6 @@ if (type == PS_TYPE_C32) { - psC32 *outRow; - psC32 *inRow; + psC32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); @@ -327,6 +327,6 @@ } } else if (type == PS_TYPE_C64) { - psC64 *outRow; - psC64 *inRow; + psC64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); @@ -348,5 +348,5 @@ } -psImage *psImagePowerSpectrum(psImage * out, const psImage * in) +psImage* psImagePowerSpectrum(psImage* out, const psImage* in) { psElemType type; @@ -373,6 +373,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; psF32 real; psF32 imag; @@ -390,6 +390,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; psF64 real; psF64 imag; @@ -418,5 +418,5 @@ /************************************** Vector Functions ***************************************/ -psVector *psVectorFFT(psVector * out, const psVector * in, psFftDirection direction) +psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction) { unsigned int numElements; @@ -464,6 +464,6 @@ if (type == PS_TYPE_F32) { // need to convert to complex - psC32 *outVec = out->data.C32; - psF32 *inVec = in->data.F32; + psC32* outVec = out->data.C32; + psF32* inVec = in->data.F32; for (unsigned int i = 0; i < numElements; i++) { @@ -471,6 +471,6 @@ } } else { - psC32 *outVec = out->data.C32; - psC32 *inVec = in->data.C32; + psC32* outVec = out->data.C32; + psC32* inVec = in->data.C32; for (unsigned int i = 0; i < numElements; i++) { @@ -498,5 +498,5 @@ } -psVector *psVectorReal(psVector * out, const psVector * in) +psVector* psVectorReal(psVector* out, const psVector* in) { psElemType type; @@ -523,6 +523,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_F32); @@ -542,5 +542,5 @@ } -psVector *psVectorImaginary(psVector * out, const psVector * in) +psVector* psVectorImaginary(psVector* out, const psVector* in) { psElemType type; @@ -567,6 +567,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_F32); @@ -586,5 +586,5 @@ } -psVector *psVectorComplex(psVector * out, psVector * real, const psVector * imag) +psVector* psVectorComplex(psVector* out, psVector* real, const psVector* imag) { psElemType type; @@ -616,7 +616,7 @@ if (type == PS_TYPE_F32) { - psC32 *outVec; - psF32 *realVec = real->data.F32; - psF32 *imagVec = imag->data.F32; + psC32* outVec; + psF32* realVec = real->data.F32; + psF32* imagVec = imag->data.F32; out = psVectorRecycle(out, numElements, PS_TYPE_C32); @@ -636,5 +636,5 @@ } -psVector *psVectorConjugate(psVector * out, const psVector * in) +psVector* psVectorConjugate(psVector* out, const psVector* in) { psElemType type; @@ -662,6 +662,6 @@ if (type == PS_TYPE_C32) { - psC32 *outVec; - psC32 *inVec = in->data.C32; + psC32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_C32); @@ -681,5 +681,5 @@ } -psVector *psVectorPowerSpectrum(psVector * out, const psVector * in) +psVector* psVectorPowerSpectrum(psVector* out, const psVector* in) { psElemType type; @@ -708,6 +708,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; psF32 inAbs1; psF32 inAbs2; Index: /trunk/psLib/src/dataManip/psVectorFFT.h =================================================================== --- /trunk/psLib/src/dataManip/psVectorFFT.h (revision 1439) +++ /trunk/psLib/src/dataManip/psVectorFFT.h (revision 1440) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,17 +33,17 @@ } psFftDirection; -psImage *psImageFFT(psImage * out, const psImage * in, psFftDirection direction); -psImage *psImageReal(psImage * out, const psImage * in); -psImage *psImageImaginary(psImage * out, const psImage * in); -psImage *psImageComplex(psImage * out, psImage * real, const psImage * imag); -psImage *psImageConjugate(psImage * out, const psImage * in); -psImage *psImagePowerSpectrum(psImage * out, const psImage * in); +psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction); +psImage* psImageReal(psImage* out, const psImage* in); +psImage* psImageImaginary(psImage* out, const psImage* in); +psImage* psImageComplex(psImage* out, psImage* real, const psImage* imag); +psImage* psImageConjugate(psImage* out, const psImage* in); +psImage* psImagePowerSpectrum(psImage* out, const psImage* in); -psVector *psVectorFFT(psVector * out, const psVector * in, psFftDirection direction); -psVector *psVectorReal(psVector * out, const psVector * in); -psVector *psVectorImaginary(psVector * out, const psVector * in); -psVector *psVectorComplex(psVector * out, psVector * real, const psVector * imag); -psVector *psVectorConjugate(psVector * out, const psVector * in); -psVector *psVectorPowerSpectrum(psVector * out, const psVector * in); +psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction); +psVector* psVectorReal(psVector* out, const psVector* in); +psVector* psVectorImaginary(psVector* out, const psVector* in); +psVector* psVectorComplex(psVector* out, psVector* real, const psVector* imag); +psVector* psVectorConjugate(psVector* out, const psVector* in); +psVector* psVectorPowerSpectrum(psVector* out, const psVector* in); /// @} Index: /trunk/psLib/src/fft/psVectorFFT.c =================================================================== --- /trunk/psLib/src/fft/psVectorFFT.c (revision 1439) +++ /trunk/psLib/src/fft/psVectorFFT.c (revision 1440) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,5 +28,5 @@ static bool p_fftwWisdomImported = false; -psImage *psImageFFT(psImage * out, const psImage * in, psFftDirection direction) +psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction) { unsigned int numCols; @@ -93,5 +93,5 @@ } -psImage *psImageReal(psImage * out, const psImage * in) +psImage* psImageReal(psImage* out, const psImage* in) { psElemType type; @@ -117,6 +117,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); @@ -130,6 +130,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); @@ -151,5 +151,5 @@ } -psImage *psImageImaginary(psImage * out, const psImage * in) +psImage* psImageImaginary(psImage* out, const psImage* in) { psElemType type; @@ -177,6 +177,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32); @@ -190,6 +190,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64); @@ -211,5 +211,5 @@ } -psImage *psImageComplex(psImage * out, psImage * real, const psImage * imag) +psImage* psImageComplex(psImage* out, psImage* real, const psImage* imag) { psElemType type; @@ -251,7 +251,7 @@ if (type == PS_TYPE_F32) { - psC32 *outRow; - psF32 *realRow; - psF32 *imagRow; + psC32* outRow; + psF32* realRow; + psF32* imagRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); @@ -267,7 +267,7 @@ } } else if (type == PS_TYPE_F64) { - psC64 *outRow; - psF64 *realRow; - psF64 *imagRow; + psC64* outRow; + psF64* realRow; + psF64* imagRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); @@ -290,5 +290,5 @@ } -psImage *psImageConjugate(psImage * out, const psImage * in) +psImage* psImageConjugate(psImage* out, const psImage* in) { psElemType type; @@ -314,6 +314,6 @@ if (type == PS_TYPE_C32) { - psC32 *outRow; - psC32 *inRow; + psC32* outRow; + psC32* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C32); @@ -327,6 +327,6 @@ } } else if (type == PS_TYPE_C64) { - psC64 *outRow; - psC64 *inRow; + psC64* outRow; + psC64* inRow; out = psImageRecycle(out, numCols, numRows, PS_TYPE_C64); @@ -348,5 +348,5 @@ } -psImage *psImagePowerSpectrum(psImage * out, const psImage * in) +psImage* psImagePowerSpectrum(psImage* out, const psImage* in) { psElemType type; @@ -373,6 +373,6 @@ if (type == PS_TYPE_C32) { - psF32 *outRow; - psC32 *inRow; + psF32* outRow; + psC32* inRow; psF32 real; psF32 imag; @@ -390,6 +390,6 @@ } } else if (type == PS_TYPE_C64) { - psF64 *outRow; - psC64 *inRow; + psF64* outRow; + psC64* inRow; psF64 real; psF64 imag; @@ -418,5 +418,5 @@ /************************************** Vector Functions ***************************************/ -psVector *psVectorFFT(psVector * out, const psVector * in, psFftDirection direction) +psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction) { unsigned int numElements; @@ -464,6 +464,6 @@ if (type == PS_TYPE_F32) { // need to convert to complex - psC32 *outVec = out->data.C32; - psF32 *inVec = in->data.F32; + psC32* outVec = out->data.C32; + psF32* inVec = in->data.F32; for (unsigned int i = 0; i < numElements; i++) { @@ -471,6 +471,6 @@ } } else { - psC32 *outVec = out->data.C32; - psC32 *inVec = in->data.C32; + psC32* outVec = out->data.C32; + psC32* inVec = in->data.C32; for (unsigned int i = 0; i < numElements; i++) { @@ -498,5 +498,5 @@ } -psVector *psVectorReal(psVector * out, const psVector * in) +psVector* psVectorReal(psVector* out, const psVector* in) { psElemType type; @@ -523,6 +523,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_F32); @@ -542,5 +542,5 @@ } -psVector *psVectorImaginary(psVector * out, const psVector * in) +psVector* psVectorImaginary(psVector* out, const psVector* in) { psElemType type; @@ -567,6 +567,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_F32); @@ -586,5 +586,5 @@ } -psVector *psVectorComplex(psVector * out, psVector * real, const psVector * imag) +psVector* psVectorComplex(psVector* out, psVector* real, const psVector* imag) { psElemType type; @@ -616,7 +616,7 @@ if (type == PS_TYPE_F32) { - psC32 *outVec; - psF32 *realVec = real->data.F32; - psF32 *imagVec = imag->data.F32; + psC32* outVec; + psF32* realVec = real->data.F32; + psF32* imagVec = imag->data.F32; out = psVectorRecycle(out, numElements, PS_TYPE_C32); @@ -636,5 +636,5 @@ } -psVector *psVectorConjugate(psVector * out, const psVector * in) +psVector* psVectorConjugate(psVector* out, const psVector* in) { psElemType type; @@ -662,6 +662,6 @@ if (type == PS_TYPE_C32) { - psC32 *outVec; - psC32 *inVec = in->data.C32; + psC32* outVec; + psC32* inVec = in->data.C32; out = psVectorRecycle(out, numElements, PS_TYPE_C32); @@ -681,5 +681,5 @@ } -psVector *psVectorPowerSpectrum(psVector * out, const psVector * in) +psVector* psVectorPowerSpectrum(psVector* out, const psVector* in) { psElemType type; @@ -708,6 +708,6 @@ if (type == PS_TYPE_C32) { - psF32 *outVec; - psC32 *inVec = in->data.C32; + psF32* outVec; + psC32* inVec = in->data.C32; psF32 inAbs1; psF32 inAbs2; Index: /trunk/psLib/src/fft/psVectorFFT.h =================================================================== --- /trunk/psLib/src/fft/psVectorFFT.h (revision 1439) +++ /trunk/psLib/src/fft/psVectorFFT.h (revision 1440) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,17 +33,17 @@ } psFftDirection; -psImage *psImageFFT(psImage * out, const psImage * in, psFftDirection direction); -psImage *psImageReal(psImage * out, const psImage * in); -psImage *psImageImaginary(psImage * out, const psImage * in); -psImage *psImageComplex(psImage * out, psImage * real, const psImage * imag); -psImage *psImageConjugate(psImage * out, const psImage * in); -psImage *psImagePowerSpectrum(psImage * out, const psImage * in); +psImage* psImageFFT(psImage* out, const psImage* in, psFftDirection direction); +psImage* psImageReal(psImage* out, const psImage* in); +psImage* psImageImaginary(psImage* out, const psImage* in); +psImage* psImageComplex(psImage* out, psImage* real, const psImage* imag); +psImage* psImageConjugate(psImage* out, const psImage* in); +psImage* psImagePowerSpectrum(psImage* out, const psImage* in); -psVector *psVectorFFT(psVector * out, const psVector * in, psFftDirection direction); -psVector *psVectorReal(psVector * out, const psVector * in); -psVector *psVectorImaginary(psVector * out, const psVector * in); -psVector *psVectorComplex(psVector * out, psVector * real, const psVector * imag); -psVector *psVectorConjugate(psVector * out, const psVector * in); -psVector *psVectorPowerSpectrum(psVector * out, const psVector * in); +psVector* psVectorFFT(psVector* out, const psVector* in, psFftDirection direction); +psVector* psVectorReal(psVector* out, const psVector* in); +psVector* psVectorImaginary(psVector* out, const psVector* in); +psVector* psVectorComplex(psVector* out, psVector* real, const psVector* imag); +psVector* psVectorConjugate(psVector* out, const psVector* in); +psVector* psVectorPowerSpectrum(psVector* out, const psVector* in); /// @} Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 1439) +++ /trunk/psLib/src/image/psImage.c (revision 1440) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ #include "psImage.h" -static void imageFree(psImage * image); +static void imageFree(psImage* image); /*****************************************************************************/ @@ -40,5 +40,5 @@ /*****************************************************************************/ -psImage *psImageAlloc(unsigned int numCols, unsigned int numRows, const psElemType type) +psImage* psImageAlloc(unsigned int numCols, unsigned int numRows, const psElemType type) { int area = 0; @@ -61,5 +61,5 @@ } - psImage *image = (psImage *) psAlloc(sizeof(psImage)); + psImage* image = (psImage* ) psAlloc(sizeof(psImage)); if (image == NULL) { @@ -87,6 +87,6 @@ *(unsigned int *)&image->numCols = numCols; *(unsigned int *)&image->numRows = numRows; - *(psDimen *) & image->type.dimen = PS_DIMEN_IMAGE; - *(psElemType *) & image->type.type = type; + *(psDimen* ) & image->type.dimen = PS_DIMEN_IMAGE; + *(psElemType* ) & image->type.type = type; image->parent = NULL; image->nChildren = 0; @@ -96,5 +96,5 @@ } -static void imageFree(psImage * image) +static void imageFree(psImage* image) { if (image == NULL) { @@ -107,5 +107,5 @@ unsigned int oldNumRows = image->numRows; unsigned int oldNumCols = image->numCols; - psPTR *rowPtr; + psPTR* rowPtr; for (unsigned int row = 0; row < oldNumRows; row++) { @@ -124,5 +124,5 @@ } -psImage *psImageRecycle(psImage * old, unsigned int numCols, unsigned int numRows, const psElemType type) +psImage* psImageRecycle(psImage* old, unsigned int numCols, unsigned int numRows, const psElemType type) { int elementSize = PSELEMTYPE_SIZEOF(type); // element @@ -151,5 +151,5 @@ unsigned int oldNumRows = old->numRows; unsigned int oldNumCols = old->numCols; - psPTR *rowPtr; + psPTR* rowPtr; for (unsigned int row = 0; row < oldNumRows; row++) { @@ -177,14 +177,14 @@ *(unsigned int *)&old->numCols = numCols; *(unsigned int *)&old->numRows = numRows; - *(psElemType *) & old->type.type = type; + *(psElemType* ) & old->type.type = type; return old; } -int psImageFreeChildren(psImage * image) +int psImageFreeChildren(psImage* image) { int i = 0; int nChildren = 0; - psImage **children = NULL; + psImage* *children = NULL; int numFreed = 0; @@ -216,5 +216,5 @@ linear interpolation is performed on the image. *****************************************************************************/ -psF32 psImagePixelInterpolate(const psImage * input, +psF32 psImagePixelInterpolate(const psImage* input, float x, float y, psF32 unexposedValue, psImageInterpolateMode mode) { @@ -259,5 +259,5 @@ #define PSIMAGE_PIXEL_INTERPOLATE_FLAT(TYPE) \ -inline psF64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage *input, \ +inline psF64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage* input, \ float x, \ float y, \ @@ -280,5 +280,5 @@ #define PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(TYPE) \ -inline psC64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage *input, \ +inline psC64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage* input, \ float x, \ float y, \ @@ -313,5 +313,5 @@ PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(C64) #define PSIMAGE_PIXEL_INTERPOLATE_BILINEAR(TYPE) \ -inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage *input, \ +inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage* input, \ float x, \ float y, \ @@ -368,5 +368,5 @@ } #define PSIMAGE_PIXEL_INTERPOLATE_BILINEAR_COMPLEX(TYPE) \ -inline psC64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage *input, \ +inline psC64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage* input, \ float x, \ float y, \ Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 1439) +++ /trunk/psLib/src/image/psImage.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,22 +50,22 @@ union { - psU8 **U8; ///< Unsigned 8-bit integer data. - psU16 **U16; ///< Unsigned 16-bit integer data. - psU32 **U32; ///< Unsigned 32-bit integer data. - psU64 **U64; ///< Unsigned 64-bit integer data. - psS8 **S8; ///< Signed 8-bit integer data. - psS16 **S16; ///< Signed 16-bit integer data. - psS32 **S32; ///< Signed 32-bit integer data. - psS64 **S64; ///< Signed 64-bit integer data. - psF32 **F32; ///< Single-precision float data. - psF64 **F64; ///< Double-precision float data. - psC32 **C32; ///< Single-precision complex data. - psC64 **C64; ///< Double-precision complex data. - psPTR **PTR; ///< Void pointers. - psPTR *V; ///< Pointer to data. + psU8* *U8; ///< Unsigned 8-bit integer data. + psU16* *U16; ///< Unsigned 16-bit integer data. + psU32* *U32; ///< Unsigned 32-bit integer data. + psU64* *U64; ///< Unsigned 64-bit integer data. + psS8* *S8; ///< Signed 8-bit integer data. + psS16* *S16; ///< Signed 16-bit integer data. + psS32* *S32; ///< Signed 32-bit integer data. + psS64* *S64; ///< Signed 64-bit integer data. + psF32* *F32; ///< Single-precision float data. + psF64* *F64; ///< Double-precision float data. + psC32* *C32; ///< Single-precision complex data. + psC64* *C64; ///< Double-precision complex data. + psPTR* *PTR; ///< Void pointers. + psPTR* V; ///< Pointer to data. } data; ///< Union for data types. - const struct psImage *parent; ///< Parent, if a subimage. + const struct psImage* parent; ///< Parent, if a subimage. int nChildren; ///< Number of subimages. - struct psImage **children; ///< Children of this region. + struct psImage* *children; ///< Children of this region. } psImage; @@ -82,8 +82,8 @@ * specified size and type. * - * @return psImage*: Pointer to psImage. + * @return psImage* : Pointer to psImage. * */ -psImage *psImageAlloc(unsigned int numCols, ///< Number of rows in image. +psImage* psImageAlloc(unsigned int numCols, ///< Number of rows in image. unsigned int numRows, ///< Number of columns in image. const psElemType type ///< Type of data for image. @@ -95,5 +95,5 @@ * */ -psImage *psImageRecycle(psImage * old, ///< the psImage to recycle by resizing image buffer +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 @@ -106,15 +106,15 @@ * */ -int psImageFreeChildren(psImage * image +int psImageFreeChildren(psImage* image /**< psImage in which all children shall be deallocated */ ); -psF32 psImagePixelInterpolate(const psImage * input, +psF32 psImagePixelInterpolate(const psImage* input, float x, float y, psF32 unexposedValue, psImageInterpolateMode mode); # define p_psImagePixelInterpolateFcns(TYPE) \ inline psF64 p_psImagePixelInterpolateFLAT_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ @@ -122,5 +122,5 @@ ); \ inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ @@ -130,5 +130,5 @@ # define p_psImagePixelInterpolateComplexFcns(TYPE) \ inline psC64 p_psImagePixelInterpolateFLAT_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ @@ -136,5 +136,5 @@ ); \ inline psC64 p_psImagePixelInterpolateBILINEAR_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ Index: /trunk/psLib/src/image/psImageExtraction.c =================================================================== --- /trunk/psLib/src/image/psImageExtraction.c (revision 1439) +++ /trunk/psLib/src/image/psImageExtraction.c (revision 1440) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -23,6 +23,6 @@ #include "psError.h" -psImage *psImageSubset(psImage * out, - psImage * image, +psImage* psImageSubset(psImage* out, + psImage* image, unsigned int numCols, unsigned int numRows, unsigned int col0, unsigned int row0) { @@ -83,10 +83,10 @@ *(int *)&out->row0 = row0; *(int *)&out->col0 = col0; - *(psImage **) & out->parent = (psImage *) image; + *(psImage* *) & out->parent = (psImage* ) image; // add output image as a child of the input // image. image->nChildren++; - image->children = (psImage **) psRealloc(image->children, image->nChildren * sizeof(psImage *)); + image->children = (psImage* *) psRealloc(image->children, image->nChildren * sizeof(psImage* )); image->children[image->nChildren - 1] = out; @@ -101,5 +101,5 @@ } -psImage *psImageCopy(psImage * restrict output, const psImage * input, psElemType type) +psImage* psImageCopy(psImage* restrict output, const psImage* input, psElemType type) { psElemType inDatatype; @@ -242,21 +242,21 @@ } -psVector *psImageSlice(psVector * out, - psVector * slicePositions, - const psImage * restrict in, - const psImage * restrict mask, +psVector* psImageSlice(psVector* out, + psVector* slicePositions, + const psImage* restrict in, + const psImage* restrict mask, unsigned int maskVal, unsigned int col, unsigned int row, unsigned int numCols, - unsigned int numRows, psImageCutDirection direction, const psStats * stats) + unsigned int numRows, psImageCutDirection direction, const psStats* stats) { double statVal; - psStats *myStats; + psStats* myStats; psElemType type; int inRows; int inCols; int delta = 1; - psF64 *outData; + psF64* outData; if (in == NULL || in->data.V == NULL) { @@ -328,8 +328,8 @@ if (direction == PS_CUT_X_POS || direction == PS_CUT_X_NEG) { - psVector *imgVec = psVectorAlloc(numRows, type); - psVector *maskVec = NULL; - psMaskType *maskData = NULL; - psU32 *outPosition = NULL; + psVector* imgVec = psVectorAlloc(numRows, type); + psVector* maskVec = NULL; + psMaskType* maskData = NULL; + psU32* outPosition = NULL; // recycle output to make a proper @@ -362,5 +362,5 @@ if (maskVec != NULL) { \ maskVecData = maskVec->data.V; \ - maskData = (psMaskType*)(mask->data.V[row]) + col + c; \ + maskData = (psMaskType* )(mask->data.V[row]) + col + c; \ } \ for (int r=0;rdata.U8[inRowNumber]; // to + psU8* inRow = in->data.U8[inRowNumber]; // to // allow @@ -542,5 +542,5 @@ // but for all types - psU8 *outRow = out->data.U8[row]; + psU8* outRow = out->data.U8[row]; memcpy(outRow, inRow + segment2Size, segment1Size); @@ -551,6 +551,6 @@ } -psImage *psImageRotate(psImage * out, - const psImage * in, float angle, float unexposedValue, psImageInterpolateMode mode) +psImage* psImageRotate(psImage* out, + const psImage* in, float angle, float unexposedValue, psImageInterpolateMode mode) { if (in == NULL) { @@ -803,6 +803,6 @@ } -psImage *psImageShift(psImage * out, - const psImage * in, +psImage* psImageShift(psImage* out, + const psImage* in, float dx, float dy, psF64 unexposedValue, psImageInterpolateMode mode) { Index: /trunk/psLib/src/image/psImageManip.h =================================================================== --- /trunk/psLib/src/image/psImageManip.h (revision 1439) +++ /trunk/psLib/src/image/psImageManip.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ * @return int The number of clipped pixels */ -int psImageClip(psImage * input, ///< the image to clip +int psImageClip(psImage* input, ///< the image to clip psF64 min, ///< the minimum image value allowed psF64 vmin, ///< the value pixels < min are set to @@ -48,5 +48,5 @@ * @return int The number of clipped pixels */ -int psImageClipComplexRegion(psImage * input, ///< the image to clip +int psImageClipComplexRegion(psImage* input, ///< the image to clip psC64 min, ///< the minimum image value allowed psC64 vmin, ///< the value pixels < min are set to @@ -62,5 +62,5 @@ * @return int The number of clipped pixels */ -int psImageClipNaN(psImage * input, ///< the image to clip +int psImageClipNaN(psImage* input, ///< the image to clip psF64 value ///< the value to set all NaN/Inf values to ); @@ -77,6 +77,6 @@ * @return int 0 if success, non-zero if failed. */ -int psImageOverlaySection(psImage * image, ///< target image - const psImage * overlay, ///< the overlay image +int psImageOverlaySection(psImage* image, ///< target image + const psImage* overlay, ///< the overlay image int col0, ///< the column to start overlay int row0, ///< the row to start overlay @@ -94,21 +94,21 @@ * @return psImage new image formed by rebinning input image. */ -psImage *psImageRebin(psImage * out, ///< an psImage to recycle. If NULL, a new image is created - const psImage * in, ///< input image +psImage* psImageRebin(psImage* out, ///< an psImage to recycle. If NULL, a new image is created + const psImage* in, ///< input image unsigned int scale, ///< the scale to rebin for each dimension - const psStats * stats ///< the statistic to perform when rebinning. Only one + const psStats* stats ///< the statistic to perform when rebinning. Only one // method should be set. ); -psImage *psImageResample(psImage * out, ///< an psImage to recycle. If NULL, a new image is created - const psImage * in, ///< input image +psImage* psImageResample(psImage* out, ///< an psImage to recycle. If NULL, a new image is created + const psImage* in, ///< input image int scale, psImageInterpolateMode mode); -psImage *psImageRotate(psImage * out, ///< an psImage to recycle. If NULL, a new image is created - const psImage * in, ///< input image +psImage* psImageRotate(psImage* out, ///< an psImage to recycle. If NULL, a new image is created + const psImage* in, ///< input image float angle, float unexposedValue, psImageInterpolateMode mode); -psImage *psImageShift(psImage * out, ///< an psImage to recycle. If NULL, a new image is created - const psImage * in, ///< input image +psImage* psImageShift(psImage* out, ///< an psImage to recycle. If NULL, a new image is created + const psImage* in, ///< input image float dx, float dy, float unexposedValue, psImageInterpolateMode mode); @@ -119,8 +119,8 @@ * defined for psU8, psS8, psS16, psF32, psF64, psC32, and psC64. * - * @return psImage* the rolled version of the input image. + * @return psImage* the rolled version of the input image. */ -psImage *psImageRoll(psImage * out, ///< an psImage to recycle. If NULL, a new image is created - const psImage * in, ///< input image +psImage* psImageRoll(psImage* out, ///< an psImage to recycle. If NULL, a new image is created + const psImage* in, ///< input image int dx, ///< number of pixels to roll in the x-dimension int dy ///< number of pixels to roll in the y-dimension Index: /trunk/psLib/src/image/psImageStats.c =================================================================== --- /trunk/psLib/src/image/psImageStats.c (revision 1439) +++ /trunk/psLib/src/image/psImageStats.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -37,8 +37,8 @@ NOTE: verify that image/mask have the correct types, and sizes. *****************************************************************************/ -psStats *psImageStats(psStats * stats, psImage * in, psImage * mask, int maskVal) -{ - psVector *junkData = NULL; - psVector *junkMask = NULL; +psStats* psImageStats(psStats* stats, psImage* in, psImage* mask, int maskVal) +{ + psVector* junkData = NULL; + psVector* junkMask = NULL; if (stats == NULL) { @@ -95,8 +95,8 @@ NOTE: verify that image/mask have the, correct types and sizes. *****************************************************************************/ -psHistogram *psImageHistogram(psHistogram * out, psImage * in, psImage * mask, unsigned int maskVal) -{ - psVector *junkData = NULL; - psVector *junkMask = NULL; +psHistogram* psImageHistogram(psHistogram* out, psImage* in, psImage* mask, unsigned int maskVal) +{ + psVector* junkData = NULL; + psVector* junkMask = NULL; // NOTE: Verify this action. @@ -183,11 +183,11 @@ } -psPolynomial1D **p_psCreateChebyshevPolys(int maxChebyPoly) -{ - psPolynomial1D **chebPolys = NULL; +psPolynomial1D* *p_psCreateChebyshevPolys(int maxChebyPoly) +{ + psPolynomial1D* *chebPolys = NULL; int i = 0; int j = 0; - chebPolys = (psPolynomial1D **) psAlloc(maxChebyPoly * sizeof(psPolynomial1D *)); + chebPolys = (psPolynomial1D* *) psAlloc(maxChebyPoly * sizeof(psPolynomial1D* )); for (i = 0; i < maxChebyPoly; i++) { chebPolys[i] = psPolynomial1DAlloc(i + 1); @@ -224,5 +224,5 @@ over all pixels (x,y) in the image. *****************************************************************************/ -psPolynomial2D *psImageFitPolynomial(const psImage * input, psPolynomial2D * coeffs) +psPolynomial2D* psImageFitPolynomial(const psImage* input, psPolynomial2D* coeffs) { int x = 0; @@ -231,5 +231,5 @@ int j = 0; float **sums = NULL; - psPolynomial1D **chebPolys = NULL; + psPolynomial1D* *chebPolys = NULL; int maxChebyPoly = 0; float *cScalingFactors = NULL; @@ -327,5 +327,5 @@ *****************************************************************************/ -int psImageEvalPolynomial(const psImage * input, const psPolynomial2D * coeffs) +int psImageEvalPolynomial(const psImage* input, const psPolynomial2D* coeffs) { int x = 0; @@ -334,5 +334,5 @@ int j = 0; float **sums = NULL; - psPolynomial1D **chebPolys = NULL; + psPolynomial1D* *chebPolys = NULL; int maxChebyPoly = 0; float *cScalingFactors = NULL; Index: /trunk/psLib/src/image/psImageStats.h =================================================================== --- /trunk/psLib/src/image/psImageStats.h (revision 1439) +++ /trunk/psLib/src/image/psImageStats.h (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,23 +28,23 @@ /// This routine must determine the various statistics for the image. -psStats *psImageStats(psStats * stats, ///< defines statistics to be calculated - psImage * in, ///< image (or subimage) to calculate stats - psImage * mask, ///< mask data for image (NULL ok) +psStats* psImageStats(psStats* stats, ///< defines statistics to be calculated + psImage* in, ///< image (or subimage) to calculate stats + psImage* mask, ///< mask data for image (NULL ok) int maskVal); ///< mask Mask for mask -psHistogram *psImageHistogram(psHistogram * out, ///< input histogram description & target - psImage * in, ///< Image data to be histogramed. - psImage * mask, ///< mask data for image (NULL ok) +psHistogram* psImageHistogram(psHistogram* out, ///< input histogram description & target + psImage* in, ///< Image data to be histogramed. + psImage* mask, ///< mask data for image (NULL ok) unsigned int maskVal); ///< mask Mask for mask /// Fit a 2-D polynomial surface to an image. -psPolynomial2D *psImageFitPolynomial(const psImage * input, ///< image to fit - psPolynomial2D * coeffs ///< coefficient structure carries in +psPolynomial2D* psImageFitPolynomial(const psImage* input, ///< image to fit + psPolynomial2D* coeffs ///< coefficient structure carries in // desired terms & target ); /// Evaluate a 2-D polynomial surface to image pixels. -int psImageEvalPolynomial(const psImage * input, ///< image to fit - const psPolynomial2D * coeffs ///< coefficient structure carries in desired terms +int psImageEvalPolynomial(const psImage* input, ///< image to fit + const psPolynomial2D* coeffs ///< coefficient structure carries in desired terms ); Index: /trunk/psLib/src/imageops/psImageStats.c =================================================================== --- /trunk/psLib/src/imageops/psImageStats.c (revision 1439) +++ /trunk/psLib/src/imageops/psImageStats.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -37,8 +37,8 @@ NOTE: verify that image/mask have the correct types, and sizes. *****************************************************************************/ -psStats *psImageStats(psStats * stats, psImage * in, psImage * mask, int maskVal) -{ - psVector *junkData = NULL; - psVector *junkMask = NULL; +psStats* psImageStats(psStats* stats, psImage* in, psImage* mask, int maskVal) +{ + psVector* junkData = NULL; + psVector* junkMask = NULL; if (stats == NULL) { @@ -95,8 +95,8 @@ NOTE: verify that image/mask have the, correct types and sizes. *****************************************************************************/ -psHistogram *psImageHistogram(psHistogram * out, psImage * in, psImage * mask, unsigned int maskVal) -{ - psVector *junkData = NULL; - psVector *junkMask = NULL; +psHistogram* psImageHistogram(psHistogram* out, psImage* in, psImage* mask, unsigned int maskVal) +{ + psVector* junkData = NULL; + psVector* junkMask = NULL; // NOTE: Verify this action. @@ -183,11 +183,11 @@ } -psPolynomial1D **p_psCreateChebyshevPolys(int maxChebyPoly) -{ - psPolynomial1D **chebPolys = NULL; +psPolynomial1D* *p_psCreateChebyshevPolys(int maxChebyPoly) +{ + psPolynomial1D* *chebPolys = NULL; int i = 0; int j = 0; - chebPolys = (psPolynomial1D **) psAlloc(maxChebyPoly * sizeof(psPolynomial1D *)); + chebPolys = (psPolynomial1D* *) psAlloc(maxChebyPoly * sizeof(psPolynomial1D* )); for (i = 0; i < maxChebyPoly; i++) { chebPolys[i] = psPolynomial1DAlloc(i + 1); @@ -224,5 +224,5 @@ over all pixels (x,y) in the image. *****************************************************************************/ -psPolynomial2D *psImageFitPolynomial(const psImage * input, psPolynomial2D * coeffs) +psPolynomial2D* psImageFitPolynomial(const psImage* input, psPolynomial2D* coeffs) { int x = 0; @@ -231,5 +231,5 @@ int j = 0; float **sums = NULL; - psPolynomial1D **chebPolys = NULL; + psPolynomial1D* *chebPolys = NULL; int maxChebyPoly = 0; float *cScalingFactors = NULL; @@ -327,5 +327,5 @@ *****************************************************************************/ -int psImageEvalPolynomial(const psImage * input, const psPolynomial2D * coeffs) +int psImageEvalPolynomial(const psImage* input, const psPolynomial2D* coeffs) { int x = 0; @@ -334,5 +334,5 @@ int j = 0; float **sums = NULL; - psPolynomial1D **chebPolys = NULL; + psPolynomial1D* *chebPolys = NULL; int maxChebyPoly = 0; float *cScalingFactors = NULL; Index: /trunk/psLib/src/imageops/psImageStats.h =================================================================== --- /trunk/psLib/src/imageops/psImageStats.h (revision 1439) +++ /trunk/psLib/src/imageops/psImageStats.h (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -28,23 +28,23 @@ /// This routine must determine the various statistics for the image. -psStats *psImageStats(psStats * stats, ///< defines statistics to be calculated - psImage * in, ///< image (or subimage) to calculate stats - psImage * mask, ///< mask data for image (NULL ok) +psStats* psImageStats(psStats* stats, ///< defines statistics to be calculated + psImage* in, ///< image (or subimage) to calculate stats + psImage* mask, ///< mask data for image (NULL ok) int maskVal); ///< mask Mask for mask -psHistogram *psImageHistogram(psHistogram * out, ///< input histogram description & target - psImage * in, ///< Image data to be histogramed. - psImage * mask, ///< mask data for image (NULL ok) +psHistogram* psImageHistogram(psHistogram* out, ///< input histogram description & target + psImage* in, ///< Image data to be histogramed. + psImage* mask, ///< mask data for image (NULL ok) unsigned int maskVal); ///< mask Mask for mask /// Fit a 2-D polynomial surface to an image. -psPolynomial2D *psImageFitPolynomial(const psImage * input, ///< image to fit - psPolynomial2D * coeffs ///< coefficient structure carries in +psPolynomial2D* psImageFitPolynomial(const psImage* input, ///< image to fit + psPolynomial2D* coeffs ///< coefficient structure carries in // desired terms & target ); /// Evaluate a 2-D polynomial surface to image pixels. -int psImageEvalPolynomial(const psImage * input, ///< image to fit - const psPolynomial2D * coeffs ///< coefficient structure carries in desired terms +int psImageEvalPolynomial(const psImage* input, ///< image to fit + const psPolynomial2D* coeffs ///< coefficient structure carries in desired terms ); Index: /trunk/psLib/src/math/psMatrix.c =================================================================== --- /trunk/psLib/src/math/psMatrix.c (revision 1439) +++ /trunk/psLib/src/math/psMatrix.c (revision 1440) @@ -21,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -160,5 +160,5 @@ /*****************************************************************************/ -psImage *psMatrixLUD(psImage * outImage, psVector * outPerm, psImage * inImage) +psImage* psMatrixLUD(psImage* outImage, psVector* outPerm, psImage* inImage) { int signum = 0; @@ -205,6 +205,6 @@ } -psVector *psMatrixLUSolve(psVector * outVector, const psImage * inImage, const psVector * inVector, const - psVector * inPerm) +psVector* psMatrixLUSolve(psVector* outVector, const psImage* inImage, const psVector* inVector, const + psVector* inPerm) { int arraySize = 0; @@ -258,5 +258,5 @@ } -psImage *psMatrixInvert(psImage * outImage, const psImage * inImage, float *restrict det) +psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *restrict det) { int signum = 0; @@ -312,5 +312,5 @@ } -float *psMatrixDeterminant(const psImage * restrict inImage) +float *psMatrixDeterminant(const psImage* restrict inImage) { int signum = 0; @@ -354,5 +354,5 @@ } -psImage *psMatrixMultiply(psImage * outImage, psImage * inImage1, psImage * inImage2) +psImage* psMatrixMultiply(psImage* outImage, psImage* inImage1, psImage* inImage2) { int arraySize = 0; @@ -396,5 +396,5 @@ } -psImage *psMatrixTranspose(psImage * outImage, const psImage * inImage) +psImage* psMatrixTranspose(psImage* outImage, const psImage* inImage) { int arraySize = 0; @@ -433,5 +433,5 @@ } -psImage *psMatrixEigenvectors(psImage * outImage, psImage * inImage) +psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage) { int numRows = 0; @@ -477,5 +477,5 @@ } -psVector *psMatrixToVector(psVector * outVector, psImage * inImage) +psVector* psMatrixToVector(psVector* outVector, psImage* inImage) { int size = 0; @@ -536,5 +536,5 @@ } -psImage *psVectorToMatrix(psImage * outImage, psVector * inVector) +psImage* psVectorToMatrix(psImage* outImage, psVector* inVector) { int size = 0; Index: /trunk/psLib/src/math/psMatrix.h =================================================================== --- /trunk/psLib/src/math/psMatrix.h (revision 1439) +++ /trunk/psLib/src/math/psMatrix.h (revision 1440) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -41,9 +41,9 @@ * the same. GSL indexes the top row as the zero row, not the bottom. * - * @return psImage*: Pointer to LU decomposed psImage. + * @return psImage* : Pointer to LU decomposed psImage. */ -psImage *psMatrixLUD(psImage * outImage, ///< Image to return, or NULL. - psVector * outPerm, ///< Output permutation vector used by psMatrixLUSolve. - psImage * inImage ///< Image to decompose. +psImage* psMatrixLUD(psImage* outImage, ///< Image to return, or NULL. + psVector* outPerm, ///< Output permutation vector used by psMatrixLUSolve. + psImage* inImage ///< Image to decompose. ); @@ -55,10 +55,10 @@ * the top row as the zero row, not the bottom. * - * @return psVector*: Pointer to psVector solution of matrix equation. + * @return psVector* : Pointer to psVector solution of matrix equation. */ -psVector *psMatrixLUSolve(psVector * outVector, ///< Vector to return, or NULL. - const psImage * luImage, ///< LU-decomposed matrix. - const psVector * inVector, ///< Vector right-hand-side of equation. - const psVector * inPerm ///< Permutation vector resulting from psMatrixLUD +psVector* psMatrixLUSolve(psVector* outVector, ///< Vector to return, or NULL. + const psImage* luImage, ///< LU-decomposed matrix. + const psVector* inVector, ///< Vector right-hand-side of equation. + const psVector* inPerm ///< Permutation vector resulting from psMatrixLUD // function. ); @@ -71,8 +71,8 @@ * the same. GSL indexes the top row as the zero row, not the bottom. * - * @return psImage*: Pointer to inverted psImage. + * @return psImage* : Pointer to inverted psImage. */ -psImage *psMatrixInvert(psImage * outImage, ///< Image to return, or NULL for in-place substitution. - const psImage * inImage, ///< Image to be inverted +psImage* psMatrixInvert(psImage* outImage, ///< Image to return, or NULL for in-place substitution. + const psImage* inImage, ///< Image to be inverted float *restrict det ///< Determinant to return, or NULL ); @@ -86,5 +86,5 @@ * @return float: Determinant from psImage. */ -float *psMatrixDeterminant(const psImage * restrict inMatrix ///< Image used to calculate determinant. +float *psMatrixDeterminant(const psImage* restrict inMatrix ///< Image used to calculate determinant. ); @@ -96,9 +96,9 @@ * zero row, not the bottom. * - * @return psImage*: Pointer to resulting psImage. + * @return psImage* : Pointer to resulting psImage. */ -psImage *psMatrixMultiply(psImage * outImage, ///< Matrix to return, or NULL. - psImage * inImage1, ///< First input image. - psImage * inImage2 ///< Second input image. +psImage* psMatrixMultiply(psImage* outImage, ///< Matrix to return, or NULL. + psImage* inImage1, ///< First input image. + psImage* inImage2 ///< Second input image. ); @@ -110,8 +110,8 @@ * row, not the bottom. * - * @return psImage*: Pointer to transposed psImage. + * @return psImage* : Pointer to transposed psImage. */ -psImage *psMatrixTranspose(psImage * outImage, ///< Image to return, or NULL - const psImage * inImage ///< Image to transpose +psImage* psMatrixTranspose(psImage* outImage, ///< Image to return, or NULL + const psImage* inImage ///< Image to transpose ); @@ -122,8 +122,8 @@ * only with the psF64 data type. GSL indexes the top row as the zero row, not the bottom. * - * @return psImage*: Pointer to matrix of Eigenvectors. + * @return psImage* : Pointer to matrix of Eigenvectors. */ -psImage *psMatrixEigenvectors(psImage * outImage, ///< Eigenvectors to return, or NULL. - psImage * inImage ///< Input image. +psImage* psMatrixEigenvectors(psImage* outImage, ///< Eigenvectors to return, or NULL. + psImage* inImage ///< Input image. ); @@ -135,8 +135,8 @@ * input matrix must be 1. This function operates only with the psF64 data type. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. */ -psVector *psMatrixToVector(psVector * outVector, ///< Vector to return, or NULL. - psImage * inImage ///< Image to convert. +psVector* psMatrixToVector(psVector* outVector, ///< Vector to return, or NULL. + psImage* inImage ///< Image to convert. ); @@ -148,8 +148,8 @@ * automatically be created. This function operates only with the psF64 data type. * - * @return psVector*: Pointer to psIamge. + * @return psVector* : Pointer to psIamge. */ -psImage *psVectorToMatrix(psImage * outImage, ///< Matrix to return, or NULL. - psVector * inVector ///< Vector to convert. +psImage* psVectorToMatrix(psImage* outImage, ///< Matrix to return, or NULL. + psVector* inVector ///< Vector to convert. ); Index: /trunk/psLib/src/math/psMinimize.c =================================================================== --- /trunk/psLib/src/math/psMinimize.c (revision 1439) +++ /trunk/psLib/src/math/psMinimize.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -99,11 +99,11 @@ size_t n; // Number of data points points in domain. int paramCount; // Number of non-masked parameters. - psVector *restrict initialGuess; - const psImage *restrict domain; - const psVector *restrict data; - const psVector *restrict errors; - const psVector *restrict paramMask; - float (*evalModel) (const psVector *, const psVector *); - float (*d_evalModel) (const psVector *, const psVector *, int); + psVector* restrict initialGuess; + const psImage* restrict domain; + const psVector* restrict data; + const psVector* restrict errors; + const psVector* restrict paramMask; + float (*evalModel) (const psVector* , const psVector* ); + float (*d_evalModel) (const psVector* , const psVector* , int); } psMinChi2Data; @@ -112,9 +112,9 @@ { int paramCount; // Number of non-masked parameters. - psVector *restrict initialGuess; - const psVector *restrict coord; - const psVector *restrict paramMask; - float (*evalModel) (const psVector *, const psVector *); - float (*d_evalModel) (const psVector *, const psVector *, int); + psVector* restrict initialGuess; + const psVector* restrict coord; + const psVector* restrict paramMask; + float (*evalModel) (const psVector* , const psVector* ); + float (*d_evalModel) (const psVector* , const psVector* , int); } psMinimizeData; @@ -162,9 +162,9 @@ int j; // Loop index variable. float tmpf; // Temporary floating point variable. - const psVector *restrict coord = ((psMinimizeData *) funcData)->coord; - const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess; - float (*evalModel) (const psVector *, const psVector *) = ((psMinimizeData *) funcData)->evalModel; - psVector *inputParameterList = NULL; + const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord; + const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess; + float (*evalModel) (const psVector* , const psVector* ) = ((psMinimizeData* ) funcData)->evalModel; + psVector* inputParameterList = NULL; // The GSL routines will call this function with the masked parameters @@ -216,10 +216,10 @@ int j; // Loop index variable. float tmpf; // Temporary floating point variable. - const psVector *restrict coord = ((psMinimizeData *) funcData)->coord; - const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess; - float (*d_evalModel) (const psVector *, const psVector *, int) = - ((psMinimizeData *) funcData)->d_evalModel; - psVector *inputParameterList = NULL; + const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord; + const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess; + float (*d_evalModel) (const psVector* , const psVector* , int) = + ((psMinimizeData* ) funcData)->d_evalModel; + psVector* inputParameterList = NULL; // The GSL routines will call this function with the masked parameters @@ -293,12 +293,12 @@ int j; // Loop index variable. float tmpf; // Temporary floating point variable. - const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain; - const psVector *restrict data = ((psMinChi2Data *) funcData)->data; - const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors; - const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess; - float (*evalModel) (const psVector *, const psVector *) = ((psMinChi2Data *) funcData)->evalModel; - psVector *inputParameterList = NULL; - psVector *tmpVecPtr = NULL; + const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain; + const psVector* restrict data = ((psMinChi2Data* ) funcData)->data; + const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors; + const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess; + float (*evalModel) (const psVector* , const psVector* ) = ((psMinChi2Data* ) funcData)->evalModel; + psVector* inputParameterList = NULL; + psVector* tmpVecPtr = NULL; tmpVecPtr = psVectorAlloc(domain->numCols, PS_TYPE_F32); @@ -360,12 +360,12 @@ int p_psMinChi2FuncDeriv(const gsl_vector * params, void *funcData, gsl_matrix * J) { - const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain; - const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors; - const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask; - psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess; - psVector *inputParameterList = NULL; - psVector *tmpVecPtr = NULL; - float (*d_evalModel) (const psVector *, const psVector *, int) = - ((psMinChi2Data *) funcData)->d_evalModel; + const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain; + const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors; + const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask; + psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess; + psVector* inputParameterList = NULL; + psVector* tmpVecPtr = NULL; + float (*d_evalModel) (const psVector* , const psVector* , int) = + ((psMinChi2Data* ) funcData)->d_evalModel; size_t i; @@ -426,5 +426,5 @@ returned as a psVector sums. *****************************************************************************/ -void p_psBuildSums1D(double x, int polyOrder, psVector * sums) +void p_psBuildSums1D(double x, int polyOrder, psVector* sums) { int i = 0; @@ -442,8 +442,8 @@ values of the vector will be scaled uniformly between -1.0 and 1.0. *****************************************************************************/ -psVector *psBuildImageScalingFactors(int x) +psVector* psBuildImageScalingFactors(int x) { int i = 0; // loop index variable. - psVector *imageScalingFactors = NULL; + psVector* imageScalingFactors = NULL; imageScalingFactors = psVectorAlloc(x, PS_TYPE_F32); @@ -556,8 +556,8 @@ parameters of that function such that the ... *****************************************************************************/ -psVector *psMinimize(psVector * restrict initialGuess, - float (*myFunction) (const psVector * restrict, const psVector * restrict), - float (*myFunctionDeriv) (const psVector * restrict, const psVector * restrict, int), - const psVector * restrict coord, const psVector * restrict paramMask) +psVector* psMinimize(psVector* restrict initialGuess, + float (*myFunction) (const psVector* restrict, const psVector* restrict), + float (*myFunctionDeriv) (const psVector* restrict, const psVector* restrict, int), + const psVector* restrict coord, const psVector* restrict paramMask) { int status; @@ -664,10 +664,10 @@ such that they best fit the supplied data points. *****************************************************************************/ -psVector *psMinimizeChi2(float (*evalModel) (const psVector * restrict, const psVector * restrict), - float (*DevalModel) (const psVector * restrict, const psVector * restrict, int), - const psImage * restrict domain, - const psVector * restrict data, - const psVector * restrict errors, - psVector * restrict initialGuess, const psVector * restrict paramMask, float *chiSq) +psVector* psMinimizeChi2(float (*evalModel) (const psVector* restrict, const psVector* restrict), + float (*DevalModel) (const psVector* restrict, const psVector* restrict, int), + const psImage* restrict domain, + const psVector* restrict data, + const psVector* restrict errors, + psVector* restrict initialGuess, const psVector* restrict paramMask, float *chiSq) { int numData = domain->numRows; // Number of data points @@ -847,19 +847,19 @@ NOTE: yErr is currently ignored. *****************************************************************************/ -psPolynomial1D *psVectorFitPolynomial1D(psPolynomial1D * myPoly, - const psVector * restrict x, - const psVector * restrict y, const psVector * restrict yErr) +psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly, + const psVector* restrict x, + const psVector* restrict y, const psVector* restrict yErr) { int polyOrder = myPoly->n; - psImage *A = NULL; - psImage *ALUD = NULL; - psVector *B = NULL; - psVector *outPerm = NULL; - psVector *X = NULL; // NOTE: do we need this? - psVector *coeffs = NULL; + psImage* A = NULL; + psImage* ALUD = NULL; + psVector* B = NULL; + psVector* outPerm = NULL; + psVector* X = NULL; // NOTE: do we need this? + psVector* coeffs = NULL; int i = 0; int j = 0; int k = 0; - psVector *xSums = NULL; + psVector* xSums = NULL; // printf("psVectorFitPolynomial1D()\n"); Index: /trunk/psLib/src/math/psMinimize.h =================================================================== --- /trunk/psLib/src/math/psMinimize.h (revision 1439) +++ /trunk/psLib/src/math/psMinimize.h (revision 1440) @@ -16,11 +16,11 @@ /** This routine must minimize a non-linear function */ -psVector *psMinimize(psVector * restrict initialGuess, - float (*myFunction) (const psVector * restrict, const psVector * restrict), - float (*myFunctionDeriv) (const psVector * restrict, const psVector * restrict, int), - const psVector * restrict coord, const psVector * restrict paramMask); +psVector* psMinimize(psVector* restrict initialGuess, + float (*myFunction) (const psVector* restrict, const psVector* restrict), + float (*myFunctionDeriv) (const psVector* restrict, const psVector* restrict, int), + const psVector* restrict coord, const psVector* restrict paramMask); /** Minimize chi^2 for input data */ -psVector *psMinimizeChi2(float (*evalModel) (const psVector * restrict, const psVector * restrict), ///< +psVector* psMinimizeChi2(float (*evalModel) (const psVector* restrict, const psVector* restrict), ///< // Model // to @@ -29,5 +29,5 @@ // and // params) - float (*DevalModel) (const psVector * restrict, const psVector * restrict, int), ///< + float (*DevalModel) (const psVector* restrict, const psVector* restrict, int), ///< // Derivative // of @@ -38,19 +38,19 @@ // and // params) - const psImage * restrict domain, ///< The domain values for the corresponding + const psImage* restrict domain, ///< The domain values for the corresponding // measurements - const psVector * restrict data, ///< Data to fit - const psVector * restrict errors, ///< Errors in the data - psVector * restrict initialGuess, ///< Initial guess - const psVector * restrict paramMask, ///< 1 = fit for parameter, 0 = hold + const psVector* restrict data, ///< Data to fit + const psVector* restrict errors, ///< Errors in the data + psVector* restrict initialGuess, ///< Initial guess + const psVector* restrict paramMask, ///< 1 = fit for parameter, 0 = hold // parameter constant float *chiSq); /** Derive a polynomial fit by chi^2 minimisation (analytically) */ -psPolynomial1D *psVectorFitPolynomial1D(psPolynomial1D * myPoly, ///< Polynomial to fit - const psVector * restrict x, ///< Ordinates (or NULL to just use +psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly, ///< Polynomial to fit + const psVector* restrict x, ///< Ordinates (or NULL to just use // the indices) - const psVector * restrict y, ///< Coordinates - const psVector * restrict yErr ///< Errors in coordinates, or NULL + const psVector* restrict y, ///< Coordinates + const psVector* restrict yErr ///< Errors in coordinates, or NULL ); Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 1439) +++ /trunk/psLib/src/math/psPolynomial.c (revision 1440) @@ -8,6 +8,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -49,12 +49,12 @@ /*****************************************************************************/ -static void polynomial1DFree(psPolynomial1D * myPoly); -static void polynomial2DFree(psPolynomial2D * myPoly); -static void polynomial3DFree(psPolynomial3D * myPoly); -static void polynomial4DFree(psPolynomial4D * myPoly); -static void dPolynomial1DFree(psDPolynomial1D * myPoly); -static void dPolynomial2DFree(psDPolynomial2D * myPoly); -static void dPolynomial3DFree(psDPolynomial3D * myPoly); -static void dPolynomial4DFree(psDPolynomial4D * myPoly); +static void polynomial1DFree(psPolynomial1D* myPoly); +static void polynomial2DFree(psPolynomial2D* myPoly); +static void polynomial3DFree(psPolynomial3D* myPoly); +static void polynomial4DFree(psPolynomial4D* myPoly); +static void dPolynomial1DFree(psDPolynomial1D* myPoly); +static void dPolynomial2DFree(psDPolynomial2D* myPoly); +static void dPolynomial3DFree(psDPolynomial3D* myPoly); +static void dPolynomial4DFree(psDPolynomial4D* myPoly); /*****************************************************************************/ @@ -120,7 +120,7 @@ NOTE: There is no way to seed the random generator. *****************************************************************************/ -psVector *psGaussianDev(float mean, float sigma, int Npts) -{ - psVector *gauss = NULL; +psVector* psGaussianDev(float mean, float sigma, int Npts) +{ + psVector* gauss = NULL; const gsl_rng_type *T = NULL; gsl_rng *r = NULL; @@ -144,10 +144,10 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D *psPolynomial1DAlloc(int n) +psPolynomial1D* psPolynomial1DAlloc(int n) { int i = 0; - psPolynomial1D *newPoly = NULL; - - newPoly = (psPolynomial1D *) psAlloc(sizeof(psPolynomial1D)); + psPolynomial1D* newPoly = NULL; + + newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); newPoly->n = n; @@ -164,11 +164,11 @@ } -psPolynomial2D *psPolynomial2DAlloc(int nX, int nY) -{ - int x = 0; - int y = 0; - psPolynomial2D *newPoly = NULL; - - newPoly = (psPolynomial2D *) psAlloc(sizeof(psPolynomial2D)); +psPolynomial2D* psPolynomial2DAlloc(int nX, int nY) +{ + int x = 0; + int y = 0; + psPolynomial2D* newPoly = NULL; + + newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); newPoly->nX = nX; @@ -194,12 +194,12 @@ } -psPolynomial3D *psPolynomial3DAlloc(int nX, int nY, int nZ) +psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ) { int x = 0; int y = 0; int z = 0; - psPolynomial3D *newPoly = NULL; - - newPoly = (psPolynomial3D *) psAlloc(sizeof(psPolynomial3D)); + psPolynomial3D* newPoly = NULL; + + newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); newPoly->nX = nX; @@ -233,5 +233,5 @@ } -psPolynomial4D *psPolynomial4DAlloc(int nW, int nX, int nY, int nZ) +psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ) { int w = 0; @@ -239,7 +239,7 @@ int y = 0; int z = 0; - psPolynomial4D *newPoly = NULL; - - newPoly = (psPolynomial4D *) psAlloc(sizeof(psPolynomial4D)); + psPolynomial4D* newPoly = NULL; + + newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); newPoly->nW = nW; @@ -281,5 +281,5 @@ } -static void polynomial1DFree(psPolynomial1D * myPoly) +static void polynomial1DFree(psPolynomial1D* myPoly) { psFree(myPoly->coeff); @@ -288,5 +288,5 @@ } -static void polynomial2DFree(psPolynomial2D * myPoly) +static void polynomial2DFree(psPolynomial2D* myPoly) { int x = 0; @@ -302,5 +302,5 @@ } -static void polynomial3DFree(psPolynomial3D * myPoly) +static void polynomial3DFree(psPolynomial3D* myPoly) { int x = 0; @@ -323,5 +323,5 @@ } -static void polynomial4DFree(psPolynomial4D * myPoly) +static void polynomial4DFree(psPolynomial4D* myPoly) { int w = 0; @@ -353,5 +353,5 @@ Polynomial coefficients will be accessed in [w][x][y][z] fashion. *****************************************************************************/ -float psPolynomial1DEval(float x, const psPolynomial1D * myPoly) +float psPolynomial1DEval(float x, const psPolynomial1D* myPoly) { int loop_x = 0; @@ -380,5 +380,5 @@ } -float psPolynomial2DEval(float x, float y, const psPolynomial2D * myPoly) +float psPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { int loop_x = 0; @@ -400,5 +400,5 @@ } -float psPolynomial3DEval(float x, float y, float z, const psPolynomial3D * myPoly) +float psPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { int loop_x = 0; @@ -426,5 +426,5 @@ } -float psPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D * myPoly) +float psPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { int loop_w = 0; @@ -458,10 +458,10 @@ } -psDPolynomial1D *psDPolynomial1DAlloc(int n) +psDPolynomial1D* psDPolynomial1DAlloc(int n) { int i = 0; - psDPolynomial1D *newPoly = NULL; - - newPoly = (psDPolynomial1D *) psAlloc(sizeof(psDPolynomial1D)); + psDPolynomial1D* newPoly = NULL; + + newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); newPoly->n = n; @@ -478,11 +478,11 @@ } -psDPolynomial2D *psDPolynomial2DAlloc(int nX, int nY) -{ - int x = 0; - int y = 0; - psDPolynomial2D *newPoly = NULL; - - newPoly = (psDPolynomial2D *) psAlloc(sizeof(psDPolynomial2D)); +psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY) +{ + int x = 0; + int y = 0; + psDPolynomial2D* newPoly = NULL; + + newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); newPoly->nX = nX; @@ -508,12 +508,12 @@ } -psDPolynomial3D *psDPolynomial3DAlloc(int nX, int nY, int nZ) +psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ) { int x = 0; int y = 0; int z = 0; - psDPolynomial3D *newPoly = NULL; - - newPoly = (psDPolynomial3D *) psAlloc(sizeof(psDPolynomial3D)); + psDPolynomial3D* newPoly = NULL; + + newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); newPoly->nX = nX; @@ -547,5 +547,5 @@ } -psDPolynomial4D *psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ) +psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ) { int w = 0; @@ -553,7 +553,7 @@ int y = 0; int z = 0; - psDPolynomial4D *newPoly = NULL; - - newPoly = (psDPolynomial4D *) psAlloc(sizeof(psDPolynomial4D)); + psDPolynomial4D* newPoly = NULL; + + newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); newPoly->nW = nW; @@ -595,5 +595,5 @@ } -static void dPolynomial1DFree(psDPolynomial1D * myPoly) +static void dPolynomial1DFree(psDPolynomial1D* myPoly) { psFree(myPoly->coeff); @@ -602,5 +602,5 @@ } -static void dPolynomial2DFree(psDPolynomial2D * myPoly) +static void dPolynomial2DFree(psDPolynomial2D* myPoly) { int x = 0; @@ -616,5 +616,5 @@ } -static void dPolynomial3DFree(psDPolynomial3D * myPoly) +static void dPolynomial3DFree(psDPolynomial3D* myPoly) { int x = 0; @@ -637,5 +637,5 @@ } -static void dPolynomial4DFree(psDPolynomial4D * myPoly) +static void dPolynomial4DFree(psDPolynomial4D* myPoly) { int w = 0; @@ -667,5 +667,5 @@ Polynomial coefficients will be accessed in [w][x][y][z] fashion. *****************************************************************************/ -double psDPolynomial1DEval(double x, const psDPolynomial1D * myPoly) +double psDPolynomial1DEval(double x, const psDPolynomial1D* myPoly) { int loop_x = 0; @@ -686,5 +686,5 @@ } -double psDPolynomial2DEval(double x, double y, const psDPolynomial2D * myPoly) +double psDPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { int loop_x = 0; @@ -706,5 +706,5 @@ } -double psDPolynomial3DEval(double x, double y, double z, const psDPolynomial3D * myPoly) +double psDPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { int loop_x = 0; @@ -732,5 +732,5 @@ } -double psDPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D * myPoly) +double psDPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { int loop_w = 0; Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 1439) +++ /trunk/psLib/src/math/psPolynomial.h (revision 1440) @@ -13,6 +13,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,5 @@ /** Produce a vector of random numbers from a Gaussian distribution with the specified mean and sigma */ -psVector *psGaussianDev(float mean, ///< The mean of the Gaussian +psVector* psGaussianDev(float mean, ///< The mean of the Gaussian float sigma, ///< The sigma of the Gaussian int Npts); ///< The size of the vector @@ -95,17 +95,17 @@ /** Constructor */ -psPolynomial1D *psPolynomial1DAlloc(int n ///< Number of terms - ); - -/** Constructor */ -psPolynomial2D *psPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y - ); - -/** Constructor */ -psPolynomial3D *psPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z - ); - -/** Constructor */ -psPolynomial4D *psPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and +psPolynomial1D* psPolynomial1DAlloc(int n ///< Number of terms + ); + +/** Constructor */ +psPolynomial2D* psPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y + ); + +/** Constructor */ +psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z + ); + +/** Constructor */ +psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and // z ); @@ -113,5 +113,5 @@ /** Evaluate 1D polynomial */ float psPolynomial1DEval(float x, ///< Value at which to evaluate - const psPolynomial1D * myPoly ///< Coefficients for the polynomial + const psPolynomial1D* myPoly ///< Coefficients for the polynomial ); @@ -119,5 +119,5 @@ float psPolynomial2DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate - const psPolynomial2D * myPoly ///< Coefficients for the polynomial + const psPolynomial2D* myPoly ///< Coefficients for the polynomial ); @@ -126,5 +126,5 @@ float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate - const psPolynomial3D * myPoly ///< Coefficients for the polynomial + const psPolynomial3D* myPoly ///< Coefficients for the polynomial ); @@ -134,5 +134,5 @@ float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate - const psPolynomial4D * myPoly ///< Coefficients for the polynomial + const psPolynomial4D* myPoly ///< Coefficients for the polynomial ); @@ -188,17 +188,17 @@ /** Constructor */ -psDPolynomial1D *psDPolynomial1DAlloc(int n ///< Number of terms - ); - -/** Constructor */ -psDPolynomial2D *psDPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y - ); - -/** Constructor */ -psDPolynomial3D *psDPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z - ); - -/** Constructor */ -psDPolynomial4D *psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and +psDPolynomial1D* psDPolynomial1DAlloc(int n ///< Number of terms + ); + +/** Constructor */ +psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y + ); + +/** Constructor */ +psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z + ); + +/** Constructor */ +psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and // z ); @@ -206,5 +206,5 @@ /** Evaluate 1D polynomial (double precision) */ double psDPolynomial1DEval(double x, ///< Value at which to evaluate - const psDPolynomial1D * myPoly ///< Coefficients for the polynomial + const psDPolynomial1D* myPoly ///< Coefficients for the polynomial ); @@ -212,5 +212,5 @@ double psDPolynomial2DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate - const psDPolynomial2D * myPoly ///< Coefficients for the polynomial + const psDPolynomial2D* myPoly ///< Coefficients for the polynomial ); @@ -219,5 +219,5 @@ double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate - const psDPolynomial3D * myPoly ///< Coefficients for the polynomial + const psDPolynomial3D* myPoly ///< Coefficients for the polynomial ); @@ -227,5 +227,5 @@ double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate - const psDPolynomial4D * myPoly ///< Coefficients for the polynomial + const psDPolynomial4D* myPoly ///< Coefficients for the polynomial ); Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 1439) +++ /trunk/psLib/src/math/psSpline.c (revision 1440) @@ -8,6 +8,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -49,12 +49,12 @@ /*****************************************************************************/ -static void polynomial1DFree(psPolynomial1D * myPoly); -static void polynomial2DFree(psPolynomial2D * myPoly); -static void polynomial3DFree(psPolynomial3D * myPoly); -static void polynomial4DFree(psPolynomial4D * myPoly); -static void dPolynomial1DFree(psDPolynomial1D * myPoly); -static void dPolynomial2DFree(psDPolynomial2D * myPoly); -static void dPolynomial3DFree(psDPolynomial3D * myPoly); -static void dPolynomial4DFree(psDPolynomial4D * myPoly); +static void polynomial1DFree(psPolynomial1D* myPoly); +static void polynomial2DFree(psPolynomial2D* myPoly); +static void polynomial3DFree(psPolynomial3D* myPoly); +static void polynomial4DFree(psPolynomial4D* myPoly); +static void dPolynomial1DFree(psDPolynomial1D* myPoly); +static void dPolynomial2DFree(psDPolynomial2D* myPoly); +static void dPolynomial3DFree(psDPolynomial3D* myPoly); +static void dPolynomial4DFree(psDPolynomial4D* myPoly); /*****************************************************************************/ @@ -120,7 +120,7 @@ NOTE: There is no way to seed the random generator. *****************************************************************************/ -psVector *psGaussianDev(float mean, float sigma, int Npts) -{ - psVector *gauss = NULL; +psVector* psGaussianDev(float mean, float sigma, int Npts) +{ + psVector* gauss = NULL; const gsl_rng_type *T = NULL; gsl_rng *r = NULL; @@ -144,10 +144,10 @@ This routine must allocate memory for the polynomial structures. *****************************************************************************/ -psPolynomial1D *psPolynomial1DAlloc(int n) +psPolynomial1D* psPolynomial1DAlloc(int n) { int i = 0; - psPolynomial1D *newPoly = NULL; - - newPoly = (psPolynomial1D *) psAlloc(sizeof(psPolynomial1D)); + psPolynomial1D* newPoly = NULL; + + newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); newPoly->n = n; @@ -164,11 +164,11 @@ } -psPolynomial2D *psPolynomial2DAlloc(int nX, int nY) -{ - int x = 0; - int y = 0; - psPolynomial2D *newPoly = NULL; - - newPoly = (psPolynomial2D *) psAlloc(sizeof(psPolynomial2D)); +psPolynomial2D* psPolynomial2DAlloc(int nX, int nY) +{ + int x = 0; + int y = 0; + psPolynomial2D* newPoly = NULL; + + newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); newPoly->nX = nX; @@ -194,12 +194,12 @@ } -psPolynomial3D *psPolynomial3DAlloc(int nX, int nY, int nZ) +psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ) { int x = 0; int y = 0; int z = 0; - psPolynomial3D *newPoly = NULL; - - newPoly = (psPolynomial3D *) psAlloc(sizeof(psPolynomial3D)); + psPolynomial3D* newPoly = NULL; + + newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); newPoly->nX = nX; @@ -233,5 +233,5 @@ } -psPolynomial4D *psPolynomial4DAlloc(int nW, int nX, int nY, int nZ) +psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ) { int w = 0; @@ -239,7 +239,7 @@ int y = 0; int z = 0; - psPolynomial4D *newPoly = NULL; - - newPoly = (psPolynomial4D *) psAlloc(sizeof(psPolynomial4D)); + psPolynomial4D* newPoly = NULL; + + newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); newPoly->nW = nW; @@ -281,5 +281,5 @@ } -static void polynomial1DFree(psPolynomial1D * myPoly) +static void polynomial1DFree(psPolynomial1D* myPoly) { psFree(myPoly->coeff); @@ -288,5 +288,5 @@ } -static void polynomial2DFree(psPolynomial2D * myPoly) +static void polynomial2DFree(psPolynomial2D* myPoly) { int x = 0; @@ -302,5 +302,5 @@ } -static void polynomial3DFree(psPolynomial3D * myPoly) +static void polynomial3DFree(psPolynomial3D* myPoly) { int x = 0; @@ -323,5 +323,5 @@ } -static void polynomial4DFree(psPolynomial4D * myPoly) +static void polynomial4DFree(psPolynomial4D* myPoly) { int w = 0; @@ -353,5 +353,5 @@ Polynomial coefficients will be accessed in [w][x][y][z] fashion. *****************************************************************************/ -float psPolynomial1DEval(float x, const psPolynomial1D * myPoly) +float psPolynomial1DEval(float x, const psPolynomial1D* myPoly) { int loop_x = 0; @@ -380,5 +380,5 @@ } -float psPolynomial2DEval(float x, float y, const psPolynomial2D * myPoly) +float psPolynomial2DEval(float x, float y, const psPolynomial2D* myPoly) { int loop_x = 0; @@ -400,5 +400,5 @@ } -float psPolynomial3DEval(float x, float y, float z, const psPolynomial3D * myPoly) +float psPolynomial3DEval(float x, float y, float z, const psPolynomial3D* myPoly) { int loop_x = 0; @@ -426,5 +426,5 @@ } -float psPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D * myPoly) +float psPolynomial4DEval(float w, float x, float y, float z, const psPolynomial4D* myPoly) { int loop_w = 0; @@ -458,10 +458,10 @@ } -psDPolynomial1D *psDPolynomial1DAlloc(int n) +psDPolynomial1D* psDPolynomial1DAlloc(int n) { int i = 0; - psDPolynomial1D *newPoly = NULL; - - newPoly = (psDPolynomial1D *) psAlloc(sizeof(psDPolynomial1D)); + psDPolynomial1D* newPoly = NULL; + + newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); newPoly->n = n; @@ -478,11 +478,11 @@ } -psDPolynomial2D *psDPolynomial2DAlloc(int nX, int nY) -{ - int x = 0; - int y = 0; - psDPolynomial2D *newPoly = NULL; - - newPoly = (psDPolynomial2D *) psAlloc(sizeof(psDPolynomial2D)); +psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY) +{ + int x = 0; + int y = 0; + psDPolynomial2D* newPoly = NULL; + + newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); newPoly->nX = nX; @@ -508,12 +508,12 @@ } -psDPolynomial3D *psDPolynomial3DAlloc(int nX, int nY, int nZ) +psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ) { int x = 0; int y = 0; int z = 0; - psDPolynomial3D *newPoly = NULL; - - newPoly = (psDPolynomial3D *) psAlloc(sizeof(psDPolynomial3D)); + psDPolynomial3D* newPoly = NULL; + + newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); newPoly->nX = nX; @@ -547,5 +547,5 @@ } -psDPolynomial4D *psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ) +psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ) { int w = 0; @@ -553,7 +553,7 @@ int y = 0; int z = 0; - psDPolynomial4D *newPoly = NULL; - - newPoly = (psDPolynomial4D *) psAlloc(sizeof(psDPolynomial4D)); + psDPolynomial4D* newPoly = NULL; + + newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); newPoly->nW = nW; @@ -595,5 +595,5 @@ } -static void dPolynomial1DFree(psDPolynomial1D * myPoly) +static void dPolynomial1DFree(psDPolynomial1D* myPoly) { psFree(myPoly->coeff); @@ -602,5 +602,5 @@ } -static void dPolynomial2DFree(psDPolynomial2D * myPoly) +static void dPolynomial2DFree(psDPolynomial2D* myPoly) { int x = 0; @@ -616,5 +616,5 @@ } -static void dPolynomial3DFree(psDPolynomial3D * myPoly) +static void dPolynomial3DFree(psDPolynomial3D* myPoly) { int x = 0; @@ -637,5 +637,5 @@ } -static void dPolynomial4DFree(psDPolynomial4D * myPoly) +static void dPolynomial4DFree(psDPolynomial4D* myPoly) { int w = 0; @@ -667,5 +667,5 @@ Polynomial coefficients will be accessed in [w][x][y][z] fashion. *****************************************************************************/ -double psDPolynomial1DEval(double x, const psDPolynomial1D * myPoly) +double psDPolynomial1DEval(double x, const psDPolynomial1D* myPoly) { int loop_x = 0; @@ -686,5 +686,5 @@ } -double psDPolynomial2DEval(double x, double y, const psDPolynomial2D * myPoly) +double psDPolynomial2DEval(double x, double y, const psDPolynomial2D* myPoly) { int loop_x = 0; @@ -706,5 +706,5 @@ } -double psDPolynomial3DEval(double x, double y, double z, const psDPolynomial3D * myPoly) +double psDPolynomial3DEval(double x, double y, double z, const psDPolynomial3D* myPoly) { int loop_x = 0; @@ -732,5 +732,5 @@ } -double psDPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D * myPoly) +double psDPolynomial4DEval(double w, double x, double y, double z, const psDPolynomial4D* myPoly) { int loop_w = 0; Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 1439) +++ /trunk/psLib/src/math/psSpline.h (revision 1440) @@ -13,6 +13,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,5 @@ /** Produce a vector of random numbers from a Gaussian distribution with the specified mean and sigma */ -psVector *psGaussianDev(float mean, ///< The mean of the Gaussian +psVector* psGaussianDev(float mean, ///< The mean of the Gaussian float sigma, ///< The sigma of the Gaussian int Npts); ///< The size of the vector @@ -95,17 +95,17 @@ /** Constructor */ -psPolynomial1D *psPolynomial1DAlloc(int n ///< Number of terms - ); - -/** Constructor */ -psPolynomial2D *psPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y - ); - -/** Constructor */ -psPolynomial3D *psPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z - ); - -/** Constructor */ -psPolynomial4D *psPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and +psPolynomial1D* psPolynomial1DAlloc(int n ///< Number of terms + ); + +/** Constructor */ +psPolynomial2D* psPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y + ); + +/** Constructor */ +psPolynomial3D* psPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z + ); + +/** Constructor */ +psPolynomial4D* psPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and // z ); @@ -113,5 +113,5 @@ /** Evaluate 1D polynomial */ float psPolynomial1DEval(float x, ///< Value at which to evaluate - const psPolynomial1D * myPoly ///< Coefficients for the polynomial + const psPolynomial1D* myPoly ///< Coefficients for the polynomial ); @@ -119,5 +119,5 @@ float psPolynomial2DEval(float x, ///< Value x at which to evaluate float y, ///< Value y at which to evaluate - const psPolynomial2D * myPoly ///< Coefficients for the polynomial + const psPolynomial2D* myPoly ///< Coefficients for the polynomial ); @@ -126,5 +126,5 @@ float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate - const psPolynomial3D * myPoly ///< Coefficients for the polynomial + const psPolynomial3D* myPoly ///< Coefficients for the polynomial ); @@ -134,5 +134,5 @@ float y, ///< Value y at which to evaluate float z, ///< Value z at which to evaluate - const psPolynomial4D * myPoly ///< Coefficients for the polynomial + const psPolynomial4D* myPoly ///< Coefficients for the polynomial ); @@ -188,17 +188,17 @@ /** Constructor */ -psDPolynomial1D *psDPolynomial1DAlloc(int n ///< Number of terms - ); - -/** Constructor */ -psDPolynomial2D *psDPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y - ); - -/** Constructor */ -psDPolynomial3D *psDPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z - ); - -/** Constructor */ -psDPolynomial4D *psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and +psDPolynomial1D* psDPolynomial1DAlloc(int n ///< Number of terms + ); + +/** Constructor */ +psDPolynomial2D* psDPolynomial2DAlloc(int nX, int nY ///< Number of terms in x and y + ); + +/** Constructor */ +psDPolynomial3D* psDPolynomial3DAlloc(int nX, int nY, int nZ ///< Number of terms in x, y and z + ); + +/** Constructor */ +psDPolynomial4D* psDPolynomial4DAlloc(int nW, int nX, int nY, int nZ ///< Number of terms in w, x, y and // z ); @@ -206,5 +206,5 @@ /** Evaluate 1D polynomial (double precision) */ double psDPolynomial1DEval(double x, ///< Value at which to evaluate - const psDPolynomial1D * myPoly ///< Coefficients for the polynomial + const psDPolynomial1D* myPoly ///< Coefficients for the polynomial ); @@ -212,5 +212,5 @@ double psDPolynomial2DEval(double x, ///< Value x at which to evaluate double y, ///< Value y at which to evaluate - const psDPolynomial2D * myPoly ///< Coefficients for the polynomial + const psDPolynomial2D* myPoly ///< Coefficients for the polynomial ); @@ -219,5 +219,5 @@ double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate - const psDPolynomial3D * myPoly ///< Coefficients for the polynomial + const psDPolynomial3D* myPoly ///< Coefficients for the polynomial ); @@ -227,5 +227,5 @@ double y, ///< Value y at which to evaluate double z, ///< Value z at which to evaluate - const psDPolynomial4D * myPoly ///< Coefficients for the polynomial + const psDPolynomial4D* myPoly ///< Coefficients for the polynomial ); Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 1439) +++ /trunk/psLib/src/math/psStats.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -54,6 +54,6 @@ #define MAX_ITERATIONS 10 -void p_psVectorRobustStats(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats); +void p_psVectorRobustStats(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats); /** Preprocessor macro to generate error on an incorrect type */ @@ -116,5 +116,5 @@ /*****************************************************************************/ -bool p_psGetStatValue(const psStats * stats, double *value) +bool p_psGetStatValue(const psStats* stats, double *value) { @@ -175,5 +175,5 @@ *****************************************************************************/ -void p_psVectorPrint(psVector * myVector, psVector * maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorPrint(psVector* myVector, psVector* maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable. @@ -218,6 +218,6 @@ *****************************************************************************/ -void p_psVectorSampleMean(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorSampleMean(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -282,6 +282,6 @@ NULL *****************************************************************************/ -void p_psVectorMax(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorMax(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -343,6 +343,6 @@ NULL *****************************************************************************/ -void p_psVectorMin(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorMin(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -404,6 +404,6 @@ NULL *****************************************************************************/ -int p_psVectorNValues(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +int p_psVectorNValues(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -456,9 +456,9 @@ NULL *****************************************************************************/ -void p_psVectorSampleMedian(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) -{ - psVector *unsortedVector = NULL; // Temporary vector - psVector *sortedVector = NULL; // Temporary vector +void p_psVectorSampleMedian(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int 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? @@ -565,5 +565,5 @@ XXX: use a static variable for gaussianCoefs[] and compute them once. *****************************************************************************/ -psVector *p_psVectorsmoothHistGaussian(psHistogram * robustHistogram, float sigma) +psVector* p_psVectorsmoothHistGaussian(psHistogram* robustHistogram, float sigma) { int i = 0; // Loop index variable @@ -572,5 +572,5 @@ float expo = 0.0; // Temporary variable float gaussianCoefs[1 + (2 * GAUSS_WIDTH)]; // The Gaussian Coefficients - psVector *smooth = psVectorAlloc(robustHistogram->nums->n, PS_TYPE_F32); + psVector* smooth = psVectorAlloc(robustHistogram->nums->n, PS_TYPE_F32); for (i = 0; i < (1 + (2 * GAUSS_WIDTH)); i++) { @@ -628,9 +628,9 @@ NULL *****************************************************************************/ -void p_psVectorSampleQuartiles(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) -{ - psVector *unsortedVector = NULL; // Temporary vector - psVector *sortedVector = NULL; // Temporary vector +void p_psVectorSampleQuartiles(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int 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? @@ -710,6 +710,6 @@ *****************************************************************************/ -void p_psVectorSampleStdev(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorSampleStdev(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -795,6 +795,6 @@ NULL *****************************************************************************/ -void p_psVectorClippedStats(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) +void p_psVectorClippedStats(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) { int i = 0; // Loop index variable @@ -804,5 +804,5 @@ float oldStanMean = 0.0; // Temporary variable float oldStanStdev = 0.0; // Temporary variable - psVector *tmpMask = NULL; // Temporary vector + psVector* tmpMask = NULL; // Temporary vector // Endure that stats->clipIter is within the proper range. @@ -884,5 +884,5 @@ elements of a vector to a range between 0.0 and 1.0. *****************************************************************************/ -void p_psNormalizeVector(psVector * myData) +void p_psNormalizeVector(psVector* myData) { float min = (float)HUGE; @@ -911,5 +911,5 @@ specified data point. *****************************************************************************/ -float p_psGaussian(const psVector * restrict myData, const psVector * restrict myParams) +float p_psGaussian(const psVector* restrict myData, const psVector* restrict myParams) { float x = myData->data.F32[0]; @@ -928,5 +928,5 @@ calculates the specified partial derivative of the above Gaussian function. *****************************************************************************/ -float p_psGaussianDeriv(const psVector * restrict myData, const psVector * restrict myParams, int whichParam) +float p_psGaussianDeriv(const psVector* restrict myData, const psVector* restrict myParams, int whichParam) { float x = myData->data.F32[0]; @@ -954,5 +954,5 @@ specified data point. *****************************************************************************/ -float p_psQuadratic(const psVector * restrict myParams, const psVector * restrict myCoords) +float p_psQuadratic(const psVector* restrict myParams, const psVector* restrict myCoords) { float x = myCoords->data.F32[0]; @@ -970,6 +970,6 @@ calculates the specified partial derivative of the above quadratic function. *****************************************************************************/ -float p_psQuadraticDeriv(const psVector * restrict myParams, - const psVector * restrict myCoords, int whichParamDeriv) +float p_psQuadraticDeriv(const psVector* restrict myParams, + const psVector* restrict myCoords, int whichParamDeriv) { float x = myCoords->data.F32[0]; @@ -996,5 +996,5 @@ decreasing within that range. *****************************************************************************/ -float p_ps1DPolyMedian(psPolynomial1D * myPoly, float rangeLow, float rangeHigh, float getThisValue) +float p_ps1DPolyMedian(psPolynomial1D* myPoly, float rangeLow, float rangeHigh, float getThisValue) { int numIterations = 0; @@ -1036,10 +1036,10 @@ XXX: This function is currently not being used. *****************************************************************************/ -float p_psFitQuadratic(psHistogram * histogram, psVector * cumulativeSums, int binNum, float fitFloat) -{ - psVector *x = psVectorAlloc(3, PS_TYPE_F64); - psVector *y = psVectorAlloc(3, PS_TYPE_F64); - psVector *yErr = psVectorAlloc(3, PS_TYPE_F64); - psPolynomial1D *myPoly = psPolynomial1DAlloc(2); +float p_psFitQuadratic(psHistogram* histogram, psVector* cumulativeSums, int binNum, float fitFloat) +{ + psVector* x = psVectorAlloc(3, PS_TYPE_F64); + psVector* y = psVectorAlloc(3, PS_TYPE_F64); + psVector* yErr = psVectorAlloc(3, PS_TYPE_F64); + psPolynomial1D* myPoly = psPolynomial1DAlloc(2); if ((binNum > 0) && (binNum < (histogram->nums->n + 1))) { @@ -1100,9 +1100,9 @@ NULL *****************************************************************************/ -void p_psVectorRobustStats(const psVector * restrict myVector, - const psVector * restrict maskVector, unsigned int maskVal, psStats * stats) -{ - psHistogram *robustHistogram = NULL; - psVector *robustHistogramVector = NULL; +void p_psVectorRobustStats(const psVector* restrict myVector, + const psVector* restrict maskVector, unsigned int maskVal, psStats* stats) +{ + psHistogram* robustHistogram = NULL; + psVector* robustHistogramVector = NULL; float binSize = 0.0; // Size of the histogram bins int LQBinNum = -1; // Bin num for lower quartile @@ -1113,11 +1113,11 @@ float dL = 0.0; int numBins = 0; - psStats *tmpStats = psStatsAlloc(PS_STAT_CLIPPED_STDEV | PS_STAT_CLIPPED_MEAN); - - // psImage *domain; - // psVector *errors; - // psVector *data; - // psVector *initialGuess; - // psVector *theParams; + psStats* tmpStats = psStatsAlloc(PS_STAT_CLIPPED_STDEV | PS_STAT_CLIPPED_MEAN); + + // psImage* domain; + // psVector* errors; + // psVector* data; + // psVector* initialGuess; + // psVector* theParams; // float chiSq=0.0; // float max = -HUGE; @@ -1129,10 +1129,10 @@ float sumSquares = 0.0; float sumDiffs = 0.0; - psVector *x = psVectorAlloc(3, PS_TYPE_F64); - psVector *y = psVectorAlloc(3, PS_TYPE_F64); - psVector *yErr = psVectorAlloc(3, PS_TYPE_F64); - psPolynomial1D *myPoly = psPolynomial1DAlloc(2); - psVector *cumulativeRobustSumsFullRange = NULL; - psVector *cumulativeRobustSumsDlRange = NULL; + psVector* x = psVectorAlloc(3, PS_TYPE_F64); + psVector* y = psVectorAlloc(3, PS_TYPE_F64); + psVector* yErr = psVectorAlloc(3, PS_TYPE_F64); + psPolynomial1D* myPoly = psPolynomial1DAlloc(2); + psVector* cumulativeRobustSumsFullRange = NULL; + psVector* cumulativeRobustSumsDlRange = NULL; float sumRobust = 0.0; float sumN50 = 0.0; @@ -1500,14 +1500,14 @@ /*****************************************************************************/ -static void histogramFree(psHistogram * myHist); +static void histogramFree(psHistogram* myHist); /****************************************************************************** psStatsAlloc(): This routine must create a new psStats data structure. *****************************************************************************/ -psStats *psStatsAlloc(psStatsOptions options) -{ - psStats *newStruct = NULL; - - newStruct = (psStats *) psAlloc(sizeof(psStats)); +psStats* psStatsAlloc(psStatsOptions options) +{ + psStats* newStruct = NULL; + + newStruct = (psStats* ) psAlloc(sizeof(psStats)); newStruct->sampleMean = NAN; newStruct->sampleMedian = NAN; @@ -1548,8 +1548,8 @@ The histogram structure *****************************************************************************/ -psHistogram *psHistogramAlloc(float lower, float upper, int n) +psHistogram* psHistogramAlloc(float lower, float upper, int n) { int i = 0; // Loop index variable - psHistogram *newHist = NULL; // The new histogram structure + psHistogram* newHist = NULL; // The new histogram structure float binSize = 0.0; // The histogram bin size @@ -1567,5 +1567,5 @@ // Allocate memory for the new histogram structure. If there are N // bins, then there are N+1 bounds to those bins. - newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); + newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); @@ -1605,7 +1605,7 @@ The histogram structure *****************************************************************************/ -psHistogram *psHistogramAllocGeneric(const psVector * restrict bounds) -{ - psHistogram *newHist = NULL; // The new histogram structure +psHistogram* psHistogramAllocGeneric(const psVector* restrict bounds) +{ + psHistogram* newHist = NULL; // The new histogram structure int i; // Loop index variable @@ -1626,5 +1626,5 @@ } // Allocate memory for the new histogram structure. - newHist = (psHistogram *) psAlloc(sizeof(psHistogram)); + newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); @@ -1650,5 +1650,5 @@ } -static void histogramFree(psHistogram * myHist) +static void histogramFree(psHistogram* myHist) { psFree(myHist->bounds); @@ -1670,7 +1670,7 @@ The histogram structure "out". *****************************************************************************/ -psHistogram *psVectorHistogram(psHistogram * out, - const psVector * restrict in, - const psVector * restrict mask, unsigned int maskVal) +psHistogram* psVectorHistogram(psHistogram* out, + const psVector* restrict in, + const psVector* restrict mask, unsigned int maskVal) { int i = 0; // Loop index variable @@ -1767,8 +1767,8 @@ the various stat functions. *****************************************************************************/ -psVector *p_psConvertToF32(psStats * stats, psVector * in, psVector * mask, unsigned int maskVal) +psVector* p_psConvertToF32(psStats* stats, psVector* in, psVector* mask, unsigned int maskVal) { int i = 0; - psVector *tmp = NULL; + psVector* tmp = NULL; if (in->type.type == PS_TYPE_S32) { @@ -1812,7 +1812,7 @@ macro-ize everything and add PS_TYPE_U16 and PS_TYPE_F64. *****************************************************************************/ -psStats *psVectorStats(psStats * stats, psVector * in, psVector * mask, unsigned int maskVal) -{ - psVector *inF32; +psStats* psVectorStats(psStats* stats, psVector* in, psVector* mask, unsigned int maskVal) +{ + psVector* inF32; int mustFreeTmp = 1; Index: /trunk/psLib/src/math/psStats.h =================================================================== --- /trunk/psLib/src/math/psStats.h (revision 1439) +++ /trunk/psLib/src/math/psStats.h (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,7 +77,7 @@ /** Do Statistics on an array. Returns a status value. \ingroup MathGroup */ -psStats *psVectorStats(psStats * stats, ///< stats structure defines stats to be calculated and how - psVector * in, ///< Vector to be analysed: must be F32 - psVector * mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT +psStats* psVectorStats(psStats* stats, ///< stats structure defines stats to be calculated and how + 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 @@ -86,5 +86,5 @@ /** A constructor for the stats structure.*/ -psStats *psStatsAlloc(psStatsOptions options); ///< Statistics to measure +psStats* psStatsAlloc(psStatsOptions options); ///< Statistics to measure /****************************************************************************** @@ -95,6 +95,6 @@ typedef struct { - psVector *bounds; ///< Bounds for the bins (type F32) - psVector *nums; ///< Number in each of the bins (INT) + 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 @@ -104,18 +104,18 @@ /** Constructor \ingroup MathGroup */ -psHistogram *psHistogramAlloc(float lower, ///< Lower limit for the bins +psHistogram* psHistogramAlloc(float lower, ///< Lower limit for the bins float upper, ///< Upper limit for the bins int n); ///< Number of bins /** Generic constructor \ingroup MathGroup */ -psHistogram *psHistogramAllocGeneric(const psVector * restrict bounds); ///< Bounds for the bins +psHistogram* psHistogramAllocGeneric(const psVector* restrict bounds); ///< Bounds for the bins /** Calculate a histogram \ingroup MathGroup **/ -psHistogram *psVectorHistogram(psHistogram * out, ///< Histogram data - const psVector * restrict in, ///< Vector to analyse - const psVector * restrict mask, ///< Mask dat for input vector +psHistogram* psVectorHistogram(psHistogram* out, ///< Histogram data + const psVector* restrict in, ///< Vector to analyse + const psVector* restrict mask, ///< Mask dat for input vector unsigned int maskVal); ///< Mask value -bool p_psGetStatValue(const psStats * stats, double *value); +bool p_psGetStatValue(const psStats* stats, double *value); /// @} Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 1439) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 1440) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ #include "psImage.h" -static void imageFree(psImage * image); +static void imageFree(psImage* image); /*****************************************************************************/ @@ -40,5 +40,5 @@ /*****************************************************************************/ -psImage *psImageAlloc(unsigned int numCols, unsigned int numRows, const psElemType type) +psImage* psImageAlloc(unsigned int numCols, unsigned int numRows, const psElemType type) { int area = 0; @@ -61,5 +61,5 @@ } - psImage *image = (psImage *) psAlloc(sizeof(psImage)); + psImage* image = (psImage* ) psAlloc(sizeof(psImage)); if (image == NULL) { @@ -87,6 +87,6 @@ *(unsigned int *)&image->numCols = numCols; *(unsigned int *)&image->numRows = numRows; - *(psDimen *) & image->type.dimen = PS_DIMEN_IMAGE; - *(psElemType *) & image->type.type = type; + *(psDimen* ) & image->type.dimen = PS_DIMEN_IMAGE; + *(psElemType* ) & image->type.type = type; image->parent = NULL; image->nChildren = 0; @@ -96,5 +96,5 @@ } -static void imageFree(psImage * image) +static void imageFree(psImage* image) { if (image == NULL) { @@ -107,5 +107,5 @@ unsigned int oldNumRows = image->numRows; unsigned int oldNumCols = image->numCols; - psPTR *rowPtr; + psPTR* rowPtr; for (unsigned int row = 0; row < oldNumRows; row++) { @@ -124,5 +124,5 @@ } -psImage *psImageRecycle(psImage * old, unsigned int numCols, unsigned int numRows, const psElemType type) +psImage* psImageRecycle(psImage* old, unsigned int numCols, unsigned int numRows, const psElemType type) { int elementSize = PSELEMTYPE_SIZEOF(type); // element @@ -151,5 +151,5 @@ unsigned int oldNumRows = old->numRows; unsigned int oldNumCols = old->numCols; - psPTR *rowPtr; + psPTR* rowPtr; for (unsigned int row = 0; row < oldNumRows; row++) { @@ -177,14 +177,14 @@ *(unsigned int *)&old->numCols = numCols; *(unsigned int *)&old->numRows = numRows; - *(psElemType *) & old->type.type = type; + *(psElemType* ) & old->type.type = type; return old; } -int psImageFreeChildren(psImage * image) +int psImageFreeChildren(psImage* image) { int i = 0; int nChildren = 0; - psImage **children = NULL; + psImage* *children = NULL; int numFreed = 0; @@ -216,5 +216,5 @@ linear interpolation is performed on the image. *****************************************************************************/ -psF32 psImagePixelInterpolate(const psImage * input, +psF32 psImagePixelInterpolate(const psImage* input, float x, float y, psF32 unexposedValue, psImageInterpolateMode mode) { @@ -259,5 +259,5 @@ #define PSIMAGE_PIXEL_INTERPOLATE_FLAT(TYPE) \ -inline psF64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage *input, \ +inline psF64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage* input, \ float x, \ float y, \ @@ -280,5 +280,5 @@ #define PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(TYPE) \ -inline psC64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage *input, \ +inline psC64 p_psImagePixelInterpolateFLAT_##TYPE(const psImage* input, \ float x, \ float y, \ @@ -313,5 +313,5 @@ PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(C64) #define PSIMAGE_PIXEL_INTERPOLATE_BILINEAR(TYPE) \ -inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage *input, \ +inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage* input, \ float x, \ float y, \ @@ -368,5 +368,5 @@ } #define PSIMAGE_PIXEL_INTERPOLATE_BILINEAR_COMPLEX(TYPE) \ -inline psC64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage *input, \ +inline psC64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage* input, \ float x, \ float y, \ Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 1439) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,22 +50,22 @@ union { - psU8 **U8; ///< Unsigned 8-bit integer data. - psU16 **U16; ///< Unsigned 16-bit integer data. - psU32 **U32; ///< Unsigned 32-bit integer data. - psU64 **U64; ///< Unsigned 64-bit integer data. - psS8 **S8; ///< Signed 8-bit integer data. - psS16 **S16; ///< Signed 16-bit integer data. - psS32 **S32; ///< Signed 32-bit integer data. - psS64 **S64; ///< Signed 64-bit integer data. - psF32 **F32; ///< Single-precision float data. - psF64 **F64; ///< Double-precision float data. - psC32 **C32; ///< Single-precision complex data. - psC64 **C64; ///< Double-precision complex data. - psPTR **PTR; ///< Void pointers. - psPTR *V; ///< Pointer to data. + psU8* *U8; ///< Unsigned 8-bit integer data. + psU16* *U16; ///< Unsigned 16-bit integer data. + psU32* *U32; ///< Unsigned 32-bit integer data. + psU64* *U64; ///< Unsigned 64-bit integer data. + psS8* *S8; ///< Signed 8-bit integer data. + psS16* *S16; ///< Signed 16-bit integer data. + psS32* *S32; ///< Signed 32-bit integer data. + psS64* *S64; ///< Signed 64-bit integer data. + psF32* *F32; ///< Single-precision float data. + psF64* *F64; ///< Double-precision float data. + psC32* *C32; ///< Single-precision complex data. + psC64* *C64; ///< Double-precision complex data. + psPTR* *PTR; ///< Void pointers. + psPTR* V; ///< Pointer to data. } data; ///< Union for data types. - const struct psImage *parent; ///< Parent, if a subimage. + const struct psImage* parent; ///< Parent, if a subimage. int nChildren; ///< Number of subimages. - struct psImage **children; ///< Children of this region. + struct psImage* *children; ///< Children of this region. } psImage; @@ -82,8 +82,8 @@ * specified size and type. * - * @return psImage*: Pointer to psImage. + * @return psImage* : Pointer to psImage. * */ -psImage *psImageAlloc(unsigned int numCols, ///< Number of rows in image. +psImage* psImageAlloc(unsigned int numCols, ///< Number of rows in image. unsigned int numRows, ///< Number of columns in image. const psElemType type ///< Type of data for image. @@ -95,5 +95,5 @@ * */ -psImage *psImageRecycle(psImage * old, ///< the psImage to recycle by resizing image buffer +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 @@ -106,15 +106,15 @@ * */ -int psImageFreeChildren(psImage * image +int psImageFreeChildren(psImage* image /**< psImage in which all children shall be deallocated */ ); -psF32 psImagePixelInterpolate(const psImage * input, +psF32 psImagePixelInterpolate(const psImage* input, float x, float y, psF32 unexposedValue, psImageInterpolateMode mode); # define p_psImagePixelInterpolateFcns(TYPE) \ inline psF64 p_psImagePixelInterpolateFLAT_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ @@ -122,5 +122,5 @@ ); \ inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ @@ -130,5 +130,5 @@ # define p_psImagePixelInterpolateComplexFcns(TYPE) \ inline psC64 p_psImagePixelInterpolateFLAT_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ @@ -136,5 +136,5 @@ ); \ inline psC64 p_psImagePixelInterpolateBILINEAR_##TYPE( \ - const psImage *input, \ + const psImage* input, \ float x, \ float y, \ Index: /trunk/psLib/src/mathtypes/psScalar.c =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.c (revision 1439) +++ /trunk/psLib/src/mathtypes/psScalar.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -71,10 +71,10 @@ /*****************************************************************************/ -psScalar *psScalarAlloc(psC64 value, psElemType dataType) +psScalar* psScalarAlloc(psC64 value, psElemType dataType) { - psScalar *scalar = NULL; + psScalar* scalar = NULL; // Create scalar - scalar = (psScalar *) psAlloc(sizeof(psScalar)); + scalar = (psScalar* ) psAlloc(sizeof(psScalar)); if (scalar == NULL) { psAbort(__func__, " : Line %d - Failed to allocate memory", __LINE__); @@ -128,5 +128,5 @@ } -void psScalarFree(psScalar * restrict scalar) +void psScalarFree(psScalar* restrict scalar) { if (scalar == NULL) { Index: /trunk/psLib/src/mathtypes/psScalar.h =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.h (revision 1439) +++ /trunk/psLib/src/mathtypes/psScalar.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -62,8 +62,8 @@ * Accepts a complex 64 bit float for input value, as max size, but resizes according to * correct type. - * @return psScalar*: Pointer to psScalar. + * @return psScalar* : Pointer to psScalar. * */ -psScalar *psScalarAlloc(psC64 value, ///< Data to be put into psScalar. +psScalar* psScalarAlloc(psC64 value, ///< Data to be put into psScalar. psElemType dataType ///< Type of data to be held by psScalar. ); @@ -76,5 +76,5 @@ * */ -void psScalarFree(psScalar * restrict scalar ///< Scalar to free. +void psScalarFree(psScalar* restrict scalar ///< Scalar to free. ); Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 1439) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ /*****************************************************************************/ -static void vectorFree(psVector * restrict psVec); +static void vectorFree(psVector* restrict psVec); /*****************************************************************************/ @@ -74,7 +74,7 @@ /*****************************************************************************/ -psVector *psVectorAlloc(unsigned int nalloc, psElemType elemType) -{ - psVector *psVec = NULL; +psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType) +{ + psVector* psVec = NULL; int elementSize = 0; @@ -88,5 +88,5 @@ // Create vector struct - psVec = (psVector *) psAlloc(sizeof(psVector)); + psVec = (psVector* ) psAlloc(sizeof(psVector)); p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); @@ -102,5 +102,5 @@ } -psVector *psVectorRealloc(unsigned int nalloc, psVector * restrict in) +psVector* psVectorRealloc(unsigned int nalloc, psVector* restrict in) { int elementSize = 0; @@ -130,5 +130,5 @@ } -psVector *psVectorRecycle(psVector * restrict in, unsigned int nalloc, psElemType type) +psVector* psVectorRecycle(psVector* restrict in, unsigned int nalloc, psElemType type) { psElemType elemType; @@ -160,5 +160,5 @@ } -psVector *psVectorSort(psVector * restrict outVector, const psVector * restrict inVector) +psVector* psVectorSort(psVector* restrict outVector, const psVector* restrict inVector) { int inN = 0; @@ -261,5 +261,5 @@ } -psVector *psVectorSortIndex(psVector * restrict outVector, const psVector * restrict inVector) +psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector) { int inN = 0; @@ -270,5 +270,5 @@ int *outVec = NULL; double diff = 0.0f; - psVector *tmpVector = NULL; + psVector* tmpVector = NULL; psElemType inType = 0; @@ -348,5 +348,5 @@ } -static void vectorFree(psVector * restrict psVec) +static void vectorFree(psVector* restrict psVec) { if (psVec == NULL) { Index: /trunk/psLib/src/mathtypes/psVector.h =================================================================== --- /trunk/psLib/src/mathtypes/psVector.h (revision 1439) +++ /trunk/psLib/src/mathtypes/psVector.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,16 +38,16 @@ union { - psU8 *U8; ///< Unsigned 8-bit integer data. - psU16 *U16; ///< Unsigned 16-bit integer data. - psU32 *U32; ///< Unsigned 32-bit integer data. - psU64 *U64; ///< Unsigned 64-bit integer data. - psS8 *S8; ///< Signed 8-bit integer data. - psS16 *S16; ///< Signed 16-bit integer data. - psS32 *S32; ///< Signed 32-bit integer data. - psS64 *S64; ///< Signed 64-bit integer data. - psF32 *F32; ///< Single-precision float data. - psF64 *F64; ///< Double-precision float data. - psC32 *C32; ///< Single-precision complex data. - psC64 *C64; ///< Double-precision complex data. + psU8* U8; ///< Unsigned 8-bit integer data. + psU16* U16; ///< Unsigned 16-bit integer data. + psU32* U32; ///< Unsigned 32-bit integer data. + psU64* U64; ///< Unsigned 64-bit integer data. + psS8* S8; ///< Signed 8-bit integer data. + psS16* S16; ///< Signed 16-bit integer data. + psS32* S32; ///< Signed 32-bit integer data. + psS64* S64; ///< Signed 64-bit integer data. + psF32* F32; ///< Single-precision float data. + psF64* F64; ///< Double-precision float data. + psC32* C32; ///< Single-precision complex data. + psC64* C64; ///< Double-precision complex data. psPTR V; ///< Pointer to data. } data; ///< Union for data types. @@ -65,8 +65,8 @@ * Uses psLib memory allocation functions to create a vector collection of data as defined by the psType type. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorAlloc(unsigned int nalloc, ///< Total number of elements to make available. +psVector* psVectorAlloc(unsigned int nalloc, ///< Total number of elements to make available. psElemType dataType ///< Type of data to be held by vector. ); @@ -77,9 +77,9 @@ * according to the psType type member contained within the vector. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorRealloc(unsigned int nalloc, ///< Total number of elements to make available. - psVector * restrict psVec ///< Vector to reallocate. +psVector* psVectorRealloc(unsigned int nalloc, ///< Total number of elements to make available. + psVector* restrict psVec ///< Vector to reallocate. ); @@ -89,8 +89,8 @@ * according to the psElemType type parameter. * - * @return psVector*: Pointer to psVector. + * @return psVector* : Pointer to psVector. * */ -psVector *psVectorRecycle(psVector * restrict psVec, +psVector* psVectorRecycle(psVector* restrict psVec, ///< Vector to recycle. If NULL, a new vector is created. No effort taken to // preserve the values. @@ -104,10 +104,10 @@ * all non-complex data types. * - * @return psFloatArray*: Pointer to sorted psFloatArray. + * @return psFloatArray* : Pointer to sorted psFloatArray. */ -psVector *psVectorSort(psVector * restrict outVector, ///< the output vector to recycle, or NULL if new +psVector* psVectorSort(psVector* restrict outVector, ///< the output vector to recycle, or NULL if new // vector desired. - const psVector * restrict inVector ///< the vector to sort. + const psVector* restrict inVector ///< the vector to sort. ); @@ -117,8 +117,8 @@ * sorted float values based on pre-sort index positions. * - * @return psIntArray*: Pointer to psIntArray of sorted indices. + * @return psIntArray* : Pointer to psIntArray of sorted indices. */ -psVector *psVectorSortIndex(psVector * restrict outVector, const psVector * restrict inVector); +psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector); /// @} Index: /trunk/psLib/src/sys/psMemory.c =================================================================== --- /trunk/psLib/src/sys/psMemory.c (revision 1439) +++ /trunk/psLib/src/sys/psMemory.c (revision 1440) @@ -9,6 +9,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,6 +31,6 @@ #define P_PS_LARGE_BLOCK_SIZE 65536 // size where under, we try to recycle -static int checkMemBlock(const psMemBlock * m, const char *funcName); -static psMemBlock *lastMemBlockAllocated = NULL; +static int checkMemBlock(const psMemBlock* m, const char *funcName); +static psMemBlock* lastMemBlockAllocated = NULL; static pthread_mutex_t memBlockListMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t memIdMutex = PTHREAD_MUTEX_INITIALIZER; @@ -44,10 +44,10 @@ // N.B. recycleBinSize should be terminated by P_PS_LARGE_BLOCK_SIZE (simplifies search loops) -static psMemBlock *recycleMemBlockList[13] = { +static psMemBlock* recycleMemBlockList[13] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; #ifdef PS_MEM_DEBUG -static psMemBlock *deadBlockList; // a place to put dead memBlocks in debug mode. +static psMemBlock* deadBlockList; // a place to put dead memBlocks in debug mode. #endif @@ -69,5 +69,5 @@ while (level >= 0 && ptr == NULL) { while (recycleMemBlockList[level] != NULL && ptr == NULL) { - psMemBlock *old = recycleMemBlockList[level]; + psMemBlock* old = recycleMemBlockList[level]; recycleMemBlockList[level] = recycleMemBlockList[level]->nextBlock; @@ -97,5 +97,5 @@ } -static void memProblemCallbackDefault(const psMemBlock * ptr, const char *file, int lineno) +static void memProblemCallbackDefault(const psMemBlock* ptr, const char *file, int lineno) { if (ptr->refCounter < 1) { @@ -156,5 +156,5 @@ * isn't resignalled) */ -static psMemoryId memAllocateCallbackDefault(const psMemBlock * ptr) +static psMemoryId memAllocateCallbackDefault(const psMemBlock* ptr) { static psMemoryId incr = 0; // "p_psMemAllocateID += incr" @@ -163,5 +163,5 @@ } -static psMemoryId memFreeCallbackDefault(const psMemBlock * ptr) +static psMemoryId memFreeCallbackDefault(const psMemBlock* ptr) { static psMemoryId incr = 0; // "p_psMemFreeID += incr" @@ -222,5 +222,5 @@ */ -static int checkMemBlock(const psMemBlock * m, const char *funcName) +static int checkMemBlock(const psMemBlock* m, const char *funcName) { // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked, @@ -257,5 +257,5 @@ pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) { if (checkMemBlock(iter, __func__)) { nbad++; @@ -280,5 +280,5 @@ { - psMemBlock *ptr = NULL; + psMemBlock* ptr = NULL; // memory is of the size I want to bother recycling? @@ -327,5 +327,5 @@ // increment the memory id safely. pthread_mutex_lock(&memBlockListMutex); - *(psMemoryId *) & ptr->id = ++memid; + *(psMemoryId* ) & ptr->id = ++memid; pthread_mutex_unlock(&memBlockListMutex); @@ -363,5 +363,5 @@ return p_psAlloc(size, file, lineno); } else { - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; bool isBlockLast = false; @@ -376,5 +376,5 @@ isBlockLast = (ptr == lastMemBlockAllocated); - ptr = (psMemBlock *) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); + ptr = (psMemBlock* ) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); if (ptr == NULL) { @@ -415,13 +415,13 @@ * Check for memory leaks. */ -int psMemCheckLeaks(psMemoryId id0, psMemBlock *** arr, FILE * fd) +int psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd) { int nleak = 0; int j = 0; - psMemBlock *topBlock = lastMemBlockAllocated; + psMemBlock* topBlock = lastMemBlockAllocated; pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = topBlock; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) { if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) { nleak++; @@ -446,5 +446,5 @@ pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = topBlock; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) { if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) { (*arr)[j++] = iter; @@ -466,5 +466,5 @@ psReferenceCount psMemGetRefCounter(void *vptr) { - psMemBlock *ptr; + psMemBlock* ptr; unsigned int refCount; @@ -473,5 +473,5 @@ } - ptr = ((psMemBlock *) vptr) - 1; + ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -489,5 +489,5 @@ void *p_psMemIncrRefCounter(void *vptr, const char *file, int lineno) { - psMemBlock *ptr; + psMemBlock* ptr; if (vptr == NULL) { @@ -495,5 +495,5 @@ } - ptr = ((psMemBlock *) vptr) - 1; + ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__)) { @@ -515,5 +515,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -607,5 +607,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -622,5 +622,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 1439) +++ /trunk/psLib/src/sys/psMemory.h (revision 1440) @@ -15,6 +15,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -64,6 +64,6 @@ { const void *startblock; ///< initialised to p_psMEMMAGIC - struct psMemBlock *previousBlock; ///< previous block in allocation list - struct psMemBlock *nextBlock; ///< next block allocation list + struct psMemBlock* previousBlock; ///< previous block in allocation list + struct psMemBlock* nextBlock; ///< next block allocation list psFreeFcn freeFcn; ///< deallocator. If NULL, use generic deallocation. size_t userMemorySize; ///< the size of the user-portion of the memory block @@ -82,5 +82,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock * ptr ///< the psMemBlock just allocated +typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock* ptr ///< the psMemBlock just allocated ); @@ -90,5 +90,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemFreeCallback) (const psMemBlock * ptr ///< the psMemBlock being freed +typedef psMemoryId(*psMemFreeCallback) (const psMemBlock* ptr ///< the psMemBlock being freed ); @@ -100,5 +100,5 @@ * @ingroup memCallback */ -typedef void (*psMemProblemCallback) (const psMemBlock * ptr, ///< the pointer to the problematic memory +typedef void (*psMemProblemCallback) (const psMemBlock* ptr, ///< the pointer to the problematic memory // block. const char *file, ///< the file in which the problem originated @@ -195,5 +195,5 @@ */ int psMemCheckLeaks(psMemoryId id0, ///< don't list blocks with id < id0 - psMemBlock *** arr, ///< pointer to array of pointers to leaked blocks, or NULL + psMemBlock* ** arr, ///< pointer to array of pointers to leaked blocks, or NULL FILE * fd ///< print list of leaks to fd (or NULL) ); Index: /trunk/psLib/src/sys/psTrace.c =================================================================== --- /trunk/psLib/src/sys/psTrace.c (revision 1439) +++ /trunk/psLib/src/sys/psTrace.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -45,16 +45,16 @@ # include "psError.h" -static p_psComponent *p_psCroot = NULL; // The root of the trace component +static p_psComponent* p_psCroot = NULL; // The root of the trace component static FILE *p_psTraceFP = NULL; // File destination for messages. -static void componentFree(p_psComponent * comp); -static p_psComponent *componentAlloc(const char *name, int level); +static void componentFree(p_psComponent* comp); +static p_psComponent* componentAlloc(const char *name, int level); /***************************************************************************** componentAlloc(): allocate memory for a new node, and initialize members. *****************************************************************************/ -static p_psComponent *componentAlloc(const char *name, int level) -{ - p_psComponent *comp = psAlloc(sizeof(p_psComponent)); +static p_psComponent* componentAlloc(const char *name, int level) +{ + p_psComponent* comp = psAlloc(sizeof(p_psComponent)); p_psMemSetDeallocator(comp, (psFreeFcn) componentFree); @@ -70,5 +70,5 @@ nodes as well. *****************************************************************************/ -static void componentFree(p_psComponent * comp) +static void componentFree(p_psComponent* comp) { if (comp == NULL) { @@ -99,5 +99,5 @@ Set all trace levels to zero. *****************************************************************************/ -void p_psTraceReset(p_psComponent * currentNode) +void p_psTraceReset(p_psComponent* currentNode) { int i = 0; @@ -147,5 +147,5 @@ char *pname = name; char *firstComponent = NULL; // first component of name - p_psComponent *currentNode = p_psCroot; + p_psComponent* currentNode = p_psCroot; int nodeExists = 0; @@ -182,5 +182,5 @@ if (nodeExists == 0) { currentNode->subcomp = psRealloc(currentNode->subcomp, - (currentNode->n + 1) * sizeof(p_psComponent *)); + (currentNode->n + 1) * sizeof(p_psComponent* )); currentNode->n = (currentNode->n) + 1; @@ -234,5 +234,5 @@ char *pname = name; char *firstComponent = NULL; // first component of name - p_psComponent *currentNode = p_psCroot; + p_psComponent* currentNode = p_psCroot; int i = 0; @@ -303,5 +303,5 @@ null *****************************************************************************/ -static void doPrintTraceLevels(const p_psComponent * comp, int depth) +static void doPrintTraceLevels(const p_psComponent* comp, int depth) { int i = 0; Index: /trunk/psLib/src/sys/psTrace.h =================================================================== --- /trunk/psLib/src/sys/psTrace.h (revision 1439) +++ /trunk/psLib/src/sys/psTrace.h (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -53,5 +53,5 @@ int level; // trace level for this component int n; // number of subcomponents - struct p_psComponent **subcomp; // next level of subcomponents + struct p_psComponent* *subcomp; // next level of subcomponents } p_psComponent; Index: /trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.c (revision 1439) +++ /trunk/psLib/src/sysUtils/psMemory.c (revision 1440) @@ -9,6 +9,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,6 +31,6 @@ #define P_PS_LARGE_BLOCK_SIZE 65536 // size where under, we try to recycle -static int checkMemBlock(const psMemBlock * m, const char *funcName); -static psMemBlock *lastMemBlockAllocated = NULL; +static int checkMemBlock(const psMemBlock* m, const char *funcName); +static psMemBlock* lastMemBlockAllocated = NULL; static pthread_mutex_t memBlockListMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t memIdMutex = PTHREAD_MUTEX_INITIALIZER; @@ -44,10 +44,10 @@ // N.B. recycleBinSize should be terminated by P_PS_LARGE_BLOCK_SIZE (simplifies search loops) -static psMemBlock *recycleMemBlockList[13] = { +static psMemBlock* recycleMemBlockList[13] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; #ifdef PS_MEM_DEBUG -static psMemBlock *deadBlockList; // a place to put dead memBlocks in debug mode. +static psMemBlock* deadBlockList; // a place to put dead memBlocks in debug mode. #endif @@ -69,5 +69,5 @@ while (level >= 0 && ptr == NULL) { while (recycleMemBlockList[level] != NULL && ptr == NULL) { - psMemBlock *old = recycleMemBlockList[level]; + psMemBlock* old = recycleMemBlockList[level]; recycleMemBlockList[level] = recycleMemBlockList[level]->nextBlock; @@ -97,5 +97,5 @@ } -static void memProblemCallbackDefault(const psMemBlock * ptr, const char *file, int lineno) +static void memProblemCallbackDefault(const psMemBlock* ptr, const char *file, int lineno) { if (ptr->refCounter < 1) { @@ -156,5 +156,5 @@ * isn't resignalled) */ -static psMemoryId memAllocateCallbackDefault(const psMemBlock * ptr) +static psMemoryId memAllocateCallbackDefault(const psMemBlock* ptr) { static psMemoryId incr = 0; // "p_psMemAllocateID += incr" @@ -163,5 +163,5 @@ } -static psMemoryId memFreeCallbackDefault(const psMemBlock * ptr) +static psMemoryId memFreeCallbackDefault(const psMemBlock* ptr) { static psMemoryId incr = 0; // "p_psMemFreeID += incr" @@ -222,5 +222,5 @@ */ -static int checkMemBlock(const psMemBlock * m, const char *funcName) +static int checkMemBlock(const psMemBlock* m, const char *funcName) { // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked, @@ -257,5 +257,5 @@ pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = lastMemBlockAllocated; iter != NULL; iter = iter->nextBlock) { if (checkMemBlock(iter, __func__)) { nbad++; @@ -280,5 +280,5 @@ { - psMemBlock *ptr = NULL; + psMemBlock* ptr = NULL; // memory is of the size I want to bother recycling? @@ -327,5 +327,5 @@ // increment the memory id safely. pthread_mutex_lock(&memBlockListMutex); - *(psMemoryId *) & ptr->id = ++memid; + *(psMemoryId* ) & ptr->id = ++memid; pthread_mutex_unlock(&memBlockListMutex); @@ -363,5 +363,5 @@ return p_psAlloc(size, file, lineno); } else { - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; bool isBlockLast = false; @@ -376,5 +376,5 @@ isBlockLast = (ptr == lastMemBlockAllocated); - ptr = (psMemBlock *) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); + ptr = (psMemBlock* ) realloc(ptr, sizeof(psMemBlock) + size + sizeof(void *)); if (ptr == NULL) { @@ -415,13 +415,13 @@ * Check for memory leaks. */ -int psMemCheckLeaks(psMemoryId id0, psMemBlock *** arr, FILE * fd) +int psMemCheckLeaks(psMemoryId id0, psMemBlock* ** arr, FILE * fd) { int nleak = 0; int j = 0; - psMemBlock *topBlock = lastMemBlockAllocated; + psMemBlock* topBlock = lastMemBlockAllocated; pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = topBlock; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) { if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) { nleak++; @@ -446,5 +446,5 @@ pthread_mutex_lock(&memBlockListMutex); - for (psMemBlock * iter = topBlock; iter != NULL; iter = iter->nextBlock) { + for (psMemBlock* iter = topBlock; iter != NULL; iter = iter->nextBlock) { if ((psMemGetRefCounter(iter + 1) > 0) && (iter->id >= id0)) { (*arr)[j++] = iter; @@ -466,5 +466,5 @@ psReferenceCount psMemGetRefCounter(void *vptr) { - psMemBlock *ptr; + psMemBlock* ptr; unsigned int refCount; @@ -473,5 +473,5 @@ } - ptr = ((psMemBlock *) vptr) - 1; + ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -489,5 +489,5 @@ void *p_psMemIncrRefCounter(void *vptr, const char *file, int lineno) { - psMemBlock *ptr; + psMemBlock* ptr; if (vptr == NULL) { @@ -495,5 +495,5 @@ } - ptr = ((psMemBlock *) vptr) - 1; + ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__)) { @@ -515,5 +515,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -607,5 +607,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { @@ -622,5 +622,5 @@ } - psMemBlock *ptr = ((psMemBlock *) vptr) - 1; + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; if (checkMemBlock(ptr, __func__) != 0) { Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 1439) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 1440) @@ -15,6 +15,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -64,6 +64,6 @@ { const void *startblock; ///< initialised to p_psMEMMAGIC - struct psMemBlock *previousBlock; ///< previous block in allocation list - struct psMemBlock *nextBlock; ///< next block allocation list + struct psMemBlock* previousBlock; ///< previous block in allocation list + struct psMemBlock* nextBlock; ///< next block allocation list psFreeFcn freeFcn; ///< deallocator. If NULL, use generic deallocation. size_t userMemorySize; ///< the size of the user-portion of the memory block @@ -82,5 +82,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock * ptr ///< the psMemBlock just allocated +typedef psMemoryId(*psMemAllocateCallback) (const psMemBlock* ptr ///< the psMemBlock just allocated ); @@ -90,5 +90,5 @@ * @ingroup memCallback */ -typedef psMemoryId(*psMemFreeCallback) (const psMemBlock * ptr ///< the psMemBlock being freed +typedef psMemoryId(*psMemFreeCallback) (const psMemBlock* ptr ///< the psMemBlock being freed ); @@ -100,5 +100,5 @@ * @ingroup memCallback */ -typedef void (*psMemProblemCallback) (const psMemBlock * ptr, ///< the pointer to the problematic memory +typedef void (*psMemProblemCallback) (const psMemBlock* ptr, ///< the pointer to the problematic memory // block. const char *file, ///< the file in which the problem originated @@ -195,5 +195,5 @@ */ int psMemCheckLeaks(psMemoryId id0, ///< don't list blocks with id < id0 - psMemBlock *** arr, ///< pointer to array of pointers to leaked blocks, or NULL + psMemBlock* ** arr, ///< pointer to array of pointers to leaked blocks, or NULL FILE * fd ///< print list of leaks to fd (or NULL) ); Index: /trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.c (revision 1439) +++ /trunk/psLib/src/sysUtils/psTrace.c (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -45,16 +45,16 @@ # include "psError.h" -static p_psComponent *p_psCroot = NULL; // The root of the trace component +static p_psComponent* p_psCroot = NULL; // The root of the trace component static FILE *p_psTraceFP = NULL; // File destination for messages. -static void componentFree(p_psComponent * comp); -static p_psComponent *componentAlloc(const char *name, int level); +static void componentFree(p_psComponent* comp); +static p_psComponent* componentAlloc(const char *name, int level); /***************************************************************************** componentAlloc(): allocate memory for a new node, and initialize members. *****************************************************************************/ -static p_psComponent *componentAlloc(const char *name, int level) -{ - p_psComponent *comp = psAlloc(sizeof(p_psComponent)); +static p_psComponent* componentAlloc(const char *name, int level) +{ + p_psComponent* comp = psAlloc(sizeof(p_psComponent)); p_psMemSetDeallocator(comp, (psFreeFcn) componentFree); @@ -70,5 +70,5 @@ nodes as well. *****************************************************************************/ -static void componentFree(p_psComponent * comp) +static void componentFree(p_psComponent* comp) { if (comp == NULL) { @@ -99,5 +99,5 @@ Set all trace levels to zero. *****************************************************************************/ -void p_psTraceReset(p_psComponent * currentNode) +void p_psTraceReset(p_psComponent* currentNode) { int i = 0; @@ -147,5 +147,5 @@ char *pname = name; char *firstComponent = NULL; // first component of name - p_psComponent *currentNode = p_psCroot; + p_psComponent* currentNode = p_psCroot; int nodeExists = 0; @@ -182,5 +182,5 @@ if (nodeExists == 0) { currentNode->subcomp = psRealloc(currentNode->subcomp, - (currentNode->n + 1) * sizeof(p_psComponent *)); + (currentNode->n + 1) * sizeof(p_psComponent* )); currentNode->n = (currentNode->n) + 1; @@ -234,5 +234,5 @@ char *pname = name; char *firstComponent = NULL; // first component of name - p_psComponent *currentNode = p_psCroot; + p_psComponent* currentNode = p_psCroot; int i = 0; @@ -303,5 +303,5 @@ null *****************************************************************************/ -static void doPrintTraceLevels(const p_psComponent * comp, int depth) +static void doPrintTraceLevels(const p_psComponent* comp, int depth) { int i = 0; Index: /trunk/psLib/src/sysUtils/psTrace.h =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.h (revision 1439) +++ /trunk/psLib/src/sysUtils/psTrace.h (revision 1440) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:58 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -53,5 +53,5 @@ int level; // trace level for this component int n; // number of subcomponents - struct p_psComponent **subcomp; // next level of subcomponents + struct p_psComponent* *subcomp; // next level of subcomponents } p_psComponent; Index: /trunk/psLib/src/types/psArray.c =================================================================== --- /trunk/psLib/src/types/psArray.c (revision 1439) +++ /trunk/psLib/src/types/psArray.c (revision 1440) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,5 +32,5 @@ /*****************************************************************************/ -static void arrayFree(psArray * restrict psArr); +static void arrayFree(psArray* restrict psArr); /*****************************************************************************/ @@ -39,7 +39,7 @@ /*****************************************************************************/ -psArray *psArrayAlloc(unsigned int nalloc) +psArray* psArrayAlloc(unsigned int nalloc) { - psArray *psArr = NULL; + psArray* psArr = NULL; // Invalid nalloc @@ -49,5 +49,5 @@ } // Create vector struct - psArr = (psArray *) psAlloc(sizeof(psArray)); + psArr = (psArray* ) psAlloc(sizeof(psArray)); p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); @@ -61,5 +61,5 @@ } -psArray *psArrayRealloc(unsigned int nalloc, psArray * restrict in) +psArray* psArrayRealloc(unsigned int nalloc, psArray* restrict in) { // Invalid nalloc @@ -87,5 +87,5 @@ } -static void arrayFree(psArray * restrict psArr) +static void arrayFree(psArray* restrict psArr) { if (psArr == NULL) { @@ -98,5 +98,5 @@ } -void psArrayElementFree(psArray * restrict psArr) +void psArrayElementFree(psArray* restrict psArr) { @@ -111,5 +111,5 @@ } -psArray *psArraySort(psArray * in, psComparePtrFcn compare) +psArray* psArraySort(psArray* in, psComparePtrFcn compare) { if (in == NULL) { Index: /trunk/psLib/src/types/psArray.h =================================================================== --- /trunk/psLib/src/types/psArray.h (revision 1439) +++ /trunk/psLib/src/types/psArray.h (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -36,5 +36,5 @@ unsigned int nalloc; ///< Total number of elements available. unsigned int n; ///< Number of elements in use. - psPTR *data; ///< An Array of pointer elements + psPTR* data; ///< An Array of pointer elements } psArray; @@ -51,8 +51,8 @@ * data * - * @return psArray*: Pointer to psArray. + * @return psArray* : Pointer to psArray. * */ -psArray *psArrayAlloc(unsigned int nalloc ///< Total number of elements to make available. +psArray* psArrayAlloc(unsigned int nalloc ///< Total number of elements to make available. ); @@ -62,9 +62,9 @@ * of data. * - * @return psArray*: Pointer to psArray. + * @return psArray* : Pointer to psArray. * */ -psArray *psArrayRealloc(unsigned int nalloc, ///< Total number of elements to make available. - psArray * restrict psArr ///< array to reallocate. +psArray* psArrayRealloc(unsigned int nalloc, ///< Total number of elements to make available. + psArray* restrict psArr ///< array to reallocate. ); @@ -76,5 +76,5 @@ * */ -void psArrayElementFree(psArray * restrict psArr ///< Void pointer array to destroy. +void psArrayElementFree(psArray* restrict psArr ///< Void pointer array to destroy. ); @@ -84,7 +84,7 @@ * to specify how the objects on the array should be sorted. * - * @return psArray* The sorted array. + * @return psArray* The sorted array. */ -psArray *psArraySort(psArray * in, psComparePtrFcn compare); +psArray* psArraySort(psArray* in, psComparePtrFcn compare); /// @} Index: /trunk/psLib/src/types/psBitSet.c =================================================================== --- /trunk/psLib/src/types/psBitSet.c (revision 1439) +++ /trunk/psLib/src/types/psBitSet.c (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -70,5 +70,5 @@ /*****************************************************************************/ -static void psBitSetFree(psBitSet * restrict inBitSet); +static void psBitSetFree(psBitSet* restrict inBitSet); /** Private function to create a mask. @@ -95,8 +95,8 @@ /*****************************************************************************/ -psBitSet *psBitSetAlloc(int n) +psBitSet* psBitSetAlloc(int n) { int numBytes = 0; - psBitSet *newObj = NULL; + psBitSet* newObj = NULL; if (n <= 0) { @@ -125,5 +125,5 @@ } -static void psBitSetFree(psBitSet * restrict inBitSet) +static void psBitSetFree(psBitSet* restrict inBitSet) { if (inBitSet == NULL) { @@ -134,5 +134,5 @@ } -psBitSet *psBitSetSet(psBitSet * inBitSet, int bit) +psBitSet* psBitSetSet(psBitSet* inBitSet, int bit) { char *byte = NULL; @@ -155,5 +155,5 @@ } -bool psBitSetTest(const psBitSet * inBitSet, int bit) +bool psBitSetTest(const psBitSet* inBitSet, int bit) { char *byte = NULL; @@ -178,6 +178,6 @@ } -psBitSet *psBitSetOp(psBitSet * outBitSet, const psBitSet * restrict inBitSet1, char *operator, - const psBitSet * restrict inBitSet2) +psBitSet* psBitSetOp(psBitSet* outBitSet, const psBitSet* restrict inBitSet1, char *operator, + const psBitSet* restrict inBitSet2) { int i = 0; @@ -241,5 +241,5 @@ } -psBitSet *psBitSetNot(psBitSet * outBitSet, const psBitSet * restrict inBitSet) +psBitSet* psBitSetNot(psBitSet* outBitSet, const psBitSet* restrict inBitSet) { int i = 0; @@ -278,5 +278,5 @@ } -char *psBitSetToString(const psBitSet * restrict inBitSet) +char *psBitSetToString(const psBitSet* restrict inBitSet) { int i = 0; Index: /trunk/psLib/src/types/psBitSet.h =================================================================== --- /trunk/psLib/src/types/psBitSet.h (revision 1439) +++ /trunk/psLib/src/types/psBitSet.h (revision 1440) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -56,10 +56,10 @@ * allocation. * - * @return psBitSet*: Pointer to struct containing array of bits and size of array. + * @return psBitSet* : Pointer to struct containing array of bits and size of array. */ /*@null@*/ -psBitSet *psBitSetAlloc(int n +psBitSet* psBitSetAlloc(int n /**< Number of bits in psBitSet array */ ); @@ -71,9 +71,9 @@ * an array with two elements would result in an psBitSet that looks like 00000000 00001000. * - * @return psBitSet*: Pointer to struct containing psBitSet. + * @return psBitSet* : Pointer to struct containing psBitSet. */ -psBitSet *psBitSetSet( +psBitSet* psBitSetSet( - /* @returned@ */ psBitSet * restrict inMask, + /* @returned@ */ psBitSet* restrict inMask, /**< Pointer to psBitSet to be set. */ @@ -91,5 +91,5 @@ */ -bool psBitSetTest(const psBitSet * restrict inMask, +bool psBitSetTest(const psBitSet* restrict inMask, /**< Pointer psBitSet to be tested. */ @@ -102,17 +102,17 @@ * be performed and an error message will be logged. * - * @return psBitSet*: Pointer to struct containing result of binary operation. + * @return psBitSet* : Pointer to struct containing result of binary operation. */ -psBitSet *psBitSetOp( +psBitSet* psBitSetOp( - /* @returned@ */ psBitSet * restrict outMask, + /* @returned@ */ psBitSet* restrict outMask, /**< Resulting psBitSet from binary operation */ - const psBitSet * restrict inMask1, + const psBitSet* restrict inMask1, /**< First psBitSet on which to operate */ char *operator, /**< Bit operation */ - const psBitSet * restrict inMask2 + const psBitSet* restrict inMask2 /**< First psBitSet on which to operate */ ); @@ -122,11 +122,11 @@ * Toggles bits in a psBitset. All zero bits are set to one and all one bits are set to zero. * - * @return psBitSet*: Pointer to struct containing result of operation. + * @return psBitSet* : Pointer to struct containing result of operation. */ -psBitSet *psBitSetNot(psBitSet * outBitSet, +psBitSet* psBitSetNot(psBitSet* outBitSet, /**< Resulting psBitSet from operation */ - const psBitSet * restrict inBitSet + const psBitSet* restrict inBitSet /**< Input psBitSet */ ); @@ -140,5 +140,5 @@ */ -char *psBitSetToString(const psBitSet * restrict inMask +char *psBitSetToString(const psBitSet* restrict inMask /**< psBitSet to convert */ ); Index: /trunk/psLib/src/types/psHash.c =================================================================== --- /trunk/psLib/src/types/psHash.c (revision 1439) +++ /trunk/psLib/src/types/psHash.c (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 20:29:43 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -26,9 +26,9 @@ #include "psAbort.h" -static psHashBucket *hashBucketAlloc(const char *key, void *data, psHashBucket * next); -static void hashBucketFree(psHashBucket * bucket); -static void *doHashWork(psHash * table, const char *key, void *data, bool remove +static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next); +static void hashBucketFree(psHashBucket* bucket); +static void *doHashWork(psHash* table, const char *key, void *data, bool remove ); -static void hashFree(psHash * table); +static void hashFree(psHash* table); /****************************************************************************** @@ -40,9 +40,9 @@ The linked list *****************************************************************************/ -psList *psHashKeyList(psHash * table) +psList* psHashKeyList(psHash* table) { int i = 0; // Loop index variable - psList *myLinkList = NULL; // The output data structure - psHashBucket *ptr = NULL; // Used to step thru linked list. + psList* myLinkList = NULL; // The output data structure + psHashBucket* ptr = NULL; // Used to step thru linked list. if (table == NULL) { @@ -81,5 +81,5 @@ the new hash bucket. *****************************************************************************/ -static psHashBucket *hashBucketAlloc(const char *key, void *data, psHashBucket * next) +static psHashBucket* hashBucketAlloc(const char *key, void *data, psHashBucket* next) { if (key == NULL) { @@ -87,5 +87,5 @@ } // Allocate memory for the new hash bucket. - psHashBucket *bucket = psAlloc(sizeof(psHashBucket)); + psHashBucket* bucket = psAlloc(sizeof(psHashBucket)); p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); @@ -114,5 +114,5 @@ NONE *****************************************************************************/ -static void hashBucketFree(psHashBucket * bucket) +static void hashBucketFree(psHashBucket* bucket) { if (bucket == NULL) { @@ -133,15 +133,15 @@ The new hash table. *****************************************************************************/ -psHash *psHashAlloc(int nbucket) // initial number of buckets +psHash* psHashAlloc(int nbucket) // initial number of buckets { int i = 0; // loop index variable // Create the new hash table. - psHash *table = psAlloc(sizeof(psHash)); + psHash* table = psAlloc(sizeof(psHash)); p_psMemSetDeallocator(table, (psFreeFcn) hashFree); // Allocate memory for the buckets. - table->buckets = psAlloc(nbucket * sizeof(psHashBucket *)); + table->buckets = psAlloc(nbucket * sizeof(psHashBucket* )); table->nbucket = nbucket; @@ -168,5 +168,5 @@ NONE *****************************************************************************/ -static void hashFree(psHash * table) +static void hashFree(psHash* table) { int i = 0; // Loop index variable. @@ -210,5 +210,5 @@ there is little common code between those functions. *****************************************************************************/ -static void *doHashWork(psHash * table, const char *key, void *data, bool remove +static void *doHashWork(psHash* table, const char *key, void *data, bool remove ) { @@ -217,6 +217,6 @@ // "hashed" from the key. char *tmpchar = NULL; // Used in computing the hash function. - psHashBucket *ptr = NULL; // Used to retrieve the hash bucket. - psHashBucket *optr = NULL; // "original pointer": used to step + psHashBucket* ptr = NULL; // Used to retrieve the hash bucket. + psHashBucket* optr = NULL; // "original pointer": used to step // thru the linked list for a bucket. @@ -338,5 +338,5 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashAdd(psHash * table, const char *key, void *data) +bool psHashAdd(psHash* table, const char *key, void *data) { if (table == NULL) { @@ -364,5 +364,5 @@ The data associated with that key. *****************************************************************************/ -void *psHashLookup(psHash * table, // table to lookup key in +void *psHashLookup(psHash* table, // table to lookup key in const char *key) // key to lookup { @@ -387,5 +387,5 @@ boolean value defining success or failure *****************************************************************************/ -bool psHashRemove(psHash * table, const char *key) +bool psHashRemove(psHash* table, const char *key) { void *data = NULL; Index: /trunk/psLib/src/types/psHash.h =================================================================== --- /trunk/psLib/src/types/psHash.h (revision 1439) +++ /trunk/psLib/src/types/psHash.h (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ char *key; ///< key for this item of data void *data; ///< the data itself - struct psHashBucket *next; ///< list of other possible keys + struct psHashBucket* next; ///< list of other possible keys } psHashBucket; @@ -41,14 +41,14 @@ { int nbucket; ///< Number of buckets in hash table. - psHashBucket **buckets; ///< The bucket data. + psHashBucket* *buckets; ///< The bucket data. } psHash; /// Allocate hash buckets in table. -psHash *psHashAlloc(int nbucket ///< The number of buckets to allocate. +psHash* psHashAlloc(int nbucket ///< The number of buckets to allocate. ); /// Insert entry into table. -bool psHashAdd(psHash * table, ///< table to insert in +bool psHashAdd(psHash* table, ///< table to insert in const char *key, ///< key to use void *data ///< data to insert @@ -56,15 +56,15 @@ /// Lookup key in table. -void *psHashLookup(psHash * table, ///< table to lookup key in +void *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 +bool psHashRemove(psHash* table, ///< table to lookup key in const char *key ///< key to lookup ); /// List all keys in table. -psList *psHashKeyList(psHash * table ///< table to list keys from. +psList* psHashKeyList(psHash* table ///< table to list keys from. ); Index: /trunk/psLib/src/types/psList.c =================================================================== --- /trunk/psLib/src/types/psList.c (revision 1439) +++ /trunk/psLib/src/types/psList.c (revision 1440) @@ -7,6 +7,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-07 00:06:06 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,12 +29,12 @@ // private functions. -static psListElem *listGetIterator(psList * list); -static int listGetIteratorIndex(psList * list); -static void listSetIterator(psList * list, int where, bool lockList); -static void listFree(psList * list); - -psList *psListAlloc(void *data) -{ - psList *list = psAlloc(sizeof(psList)); +static psListElem* listGetIterator(psList* list); +static int listGetIteratorIndex(psList* list); +static void listSetIterator(psList* list, int where, bool lockList); +static void listFree(psList* list); + +psList* psListAlloc(void *data) +{ + psList* list = psAlloc(sizeof(psList)); p_psMemSetDeallocator(list, (psFreeFcn) listFree); @@ -55,5 +55,5 @@ } -static void listFree(psList * list) +static void listFree(psList* list) { if (list == NULL) { @@ -64,6 +64,6 @@ ; - for (psListElem * ptr = list->head; ptr != NULL;) { - psListElem *next = ptr->next; + for (psListElem* ptr = list->head; ptr != NULL;) { + psListElem* next = ptr->next; psFree(ptr->data); @@ -81,8 +81,8 @@ } -bool psListAdd(psList * list, void *data, int where) -{ - psListElem *position; - psListElem *elem; +bool psListAdd(psList* list, void *data, int where) +{ + psListElem* position; + psListElem* elem; int cursorIndex = 0; @@ -168,7 +168,7 @@ * Remove an element from a list */ -bool psListRemove(psList * list, void *data, int which) -{ - psListElem *elem = NULL; // element to remove +bool psListRemove(psList* list, void *data, int which) +{ + psListElem* elem = NULL; // element to remove int cursorIndex = 0; @@ -186,5 +186,5 @@ int i = 0; // index - for (psListElem * ptr = list->head; ptr != NULL; ptr = ptr->next) { + for (psListElem* ptr = list->head; ptr != NULL; ptr = ptr->next) { if (ptr->data == data) { which = i; @@ -243,12 +243,12 @@ } -void psListSetIterator(psList * list, int where) +void psListSetIterator(psList* list, int where) { listSetIterator(list, where, true); } -void listSetIterator(psList * list, int where, bool lockList) -{ - psListElem *cursor; +void listSetIterator(psList* list, int where, bool lockList) +{ + psListElem* cursor; int position; @@ -340,5 +340,5 @@ } -psListElem *listGetIterator(psList * list) +psListElem* listGetIterator(psList* list) { if (list == NULL) { @@ -355,5 +355,5 @@ } -int listGetIteratorIndex(psList * list) +int listGetIteratorIndex(psList* list) { if (list->iter == ITER_INIT_HEAD) { @@ -366,7 +366,7 @@ } -void *psListGet(psList * list, int which) -{ - psListElem *element; +void *psListGet(psList* list, int which) +{ + psListElem* element; psListSetIterator(list, which); @@ -383,15 +383,15 @@ * and now return the previous/next element of the list */ -void *psListGetNext(psList * list) +void *psListGetNext(psList* list) { return psListGet(list, PS_LIST_NEXT); } -void *psListGetPrevious(psList * list) +void *psListGetPrevious(psList* list) { return psListGet(list, PS_LIST_PREVIOUS); } -void *psListGetCurrent(psList * list) +void *psListGetCurrent(psList* list) { return psListGet(list, PS_LIST_CURRENT); @@ -401,9 +401,9 @@ * Convert a psList to/from a psVoidPtrArray */ -psArray *psListToArray(psList * restrict list) -{ - psListElem *ptr; +psArray* psListToArray(psList* restrict list) +{ + psListElem* ptr; unsigned int n; - psArray *restrict arr; + psArray* restrict arr; if (list == NULL) { @@ -429,8 +429,8 @@ } -psList *psArrayToList(psArray * arr) +psList* psArrayToList(psArray* arr) { unsigned int n; - psList *list; // list of elements + psList* list; // list of elements if (arr == NULL) { @@ -447,7 +447,7 @@ } -psList *psListSort(psList * list, psComparePtrFcn compare) -{ - psArray *arr; +psList* psListSort(psList* list, psComparePtrFcn compare) +{ + psArray* arr; if (list == NULL) { Index: /trunk/psLib/src/types/psList.h =================================================================== --- /trunk/psLib/src/types/psList.h (revision 1439) +++ /trunk/psLib/src/types/psList.h (revision 1440) @@ -10,6 +10,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-09 22:44:25 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -44,6 +44,6 @@ typedef struct psListElem { - struct psListElem *prev; ///< previous link in list - struct psListElem *next; ///< next link in list + struct psListElem* prev; ///< previous link in list + struct psListElem* next; ///< next link in list void *data; ///< real data item } @@ -58,7 +58,7 @@ { unsigned int 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 + 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 pthread_mutex_t lock; ///< mutex to lock a node during changes @@ -68,7 +68,7 @@ /** Creates a psList linked list object. * - * @return psList* A new psList object. + * @return psList* A new psList object. */ -psList *psListAlloc(void *data +psList* psListAlloc(void *data ///< initial data item; may be NULL if no an empty psList is desired ) @@ -77,8 +77,8 @@ /** Adds an element to a psList at position given. * - * @return psList* The psList with added data item. If list parameter is + * @return psList* The psList with added data item. If list parameter is * NULL, the return value will also be NULL. */ -bool psListAdd(psList * restrict list, ///< list to add to (if NULL, nothing is done) +bool psListAdd(psList* restrict list, ///< list to add to (if NULL, nothing is done) void *data, ///< data item to add. If NULL, list is not modified. int where ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. @@ -89,5 +89,5 @@ * @return bool TRUE if element is successfully removed, otherwise FALSE. */ -bool psListRemove(psList * restrict list, +bool psListRemove(psList* restrict list, ///< list to remove element from void *data, @@ -104,5 +104,5 @@ * NULL is returned. */ -void *psListGet(psList * restrict list, ///< list to retrieve element from +void *psListGet(psList* restrict list, ///< list to retrieve element from int which ///< index number, or PS_LIST_NEXT, PS_LIST_PREV, PS_LIST_UNKNOWN ); @@ -112,5 +112,5 @@ * */ -void psListSetIterator(psList * restrict list, ///< list to retrieve element from +void psListSetIterator(psList* restrict list, ///< list to retrieve element from int where ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -123,5 +123,5 @@ * parameter was NULL. */ -void *psListGetNext(psList * restrict list ///< list to retrieve element from +void *psListGetNext(psList* restrict list ///< list to retrieve element from ); @@ -133,5 +133,5 @@ * iterator is not valid or list parameter was NULL. */ -void *psListGetCurrent(psList * restrict list ///< list to retrieve element from +void *psListGetCurrent(psList* restrict list ///< list to retrieve element from ); @@ -143,24 +143,24 @@ * parameter was NULL. */ -void *psListGetPrevious(psList * restrict list ///< list to retrieve element from +void *psListGetPrevious(psList* restrict list ///< list to retrieve element from ); /** Convert a linked list to an array * - * @return psArray* A new psArray populated with elements from the list, + * @return psArray* A new psArray populated with elements from the list, * or NULL if the given dlist parameter is NULL. */ -psArray *psListToArray(psList * dlist ///< List to convert +psArray* psListToArray(psList* dlist ///< List to convert ); /** Convert array to a doubly-linked list * - * @return psList* A new psList populated with elements formt the psArray, + * @return psList* A new psList populated with elements formt the psArray, * or NULL is the given arr parameter is NULL. */ -psList *psArrayToList(psArray * arr ///< vector to convert +psList* psArrayToList(psArray* arr ///< vector to convert ); -psList *psListSort(psList * list, psComparePtrFcn compare); +psList* psListSort(psList* list, psComparePtrFcn compare); /// @} End of DataGroup Functions Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 1439) +++ /trunk/psLib/src/types/psMetadata.c (revision 1440) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 23:06:10 $ +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -88,5 +88,5 @@ /*****************************************************************************/ -static void metadataItemFree(psMetadataItem * metadataItem) +static void metadataItemFree(psMetadataItem* metadataItem) { psMetadataType type; @@ -109,5 +109,5 @@ } -static void metadataFree(psMetadata * metadata) +static void metadataFree(psMetadata* metadata) { if (metadata == NULL) { @@ -124,8 +124,8 @@ /*****************************************************************************/ -psMetadataItem *psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) +psMetadataItem* psMetadataItemAlloc(const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; // Get the variable list parameters to pass to allocation function @@ -141,8 +141,8 @@ } -psMetadataItem *psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, +psMetadataItem* psMetadataItemAllocV(const char *name, psMetadataType type, const char *comment, va_list argPtr) { - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; if (name == NULL) { @@ -151,5 +151,5 @@ } // Allocate metadata item - metadataItem = (psMetadataItem *) psAlloc(sizeof(psMetadataItem)); + metadataItem = (psMetadataItem* ) psAlloc(sizeof(psMetadataItem)); if (metadataItem == NULL) { psAbort(__func__, "Failed to allocate memory"); @@ -211,12 +211,12 @@ } -psMetadata *psMetadataAlloc(void) -{ - psList *list = NULL; - psHash *table = NULL; - psMetadata *metadata = NULL; +psMetadata* psMetadataAlloc(void) +{ + psList* list = NULL; + psHash* table = NULL; + psMetadata* metadata = NULL; // Allocate metadata - metadata = (psMetadata *) psAlloc(sizeof(psMetadata)); + metadata = (psMetadata* ) psAlloc(sizeof(psMetadata)); if (metadata == NULL) { psAbort(__func__, "Failed to allocate metadata"); @@ -226,10 +226,10 @@ // Allocate metadata's internal containers - list = (psList *) psListAlloc(NULL); + list = (psList* ) psListAlloc(NULL); if (list == NULL) { psAbort(__func__, "Failed to allocate list"); } - table = (psHash *) psHashAlloc(10); + table = (psHash* ) psHashAlloc(10); if (table == NULL) { psAbort(__func__, "Failed to allocate table"); @@ -242,10 +242,10 @@ } -bool psMetadataAddItem(psMetadata * restrict md, int where, psMetadataItem * restrict metadataItem) +bool psMetadataAddItem(psMetadata* restrict md, int where, psMetadataItem* restrict metadataItem) { char *key = NULL; - psHash *mdTable = NULL; - psList *mdList = NULL; - psMetadataItem *value = NULL; + psHash* mdTable = NULL; + psList* mdList = NULL; + psMetadataItem* value = NULL; psMetadataType type = PS_META_ITEM_SET; @@ -280,5 +280,5 @@ } // Check if key is already in table - value = (psMetadataItem *) psHashLookup(mdTable, key); + value = (psMetadataItem* ) psHashLookup(mdTable, key); if (value != NULL && type != PS_META_ITEM_SET) { @@ -316,9 +316,9 @@ } -bool psMetadataAdd(psMetadata * restrict md, int where, const char *name, psMetadataType type, +bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, const char *comment, ...) { va_list argPtr; - psMetadataItem *metadataItem = NULL; + psMetadataItem* metadataItem = NULL; va_start(argPtr, comment); @@ -339,11 +339,11 @@ } -bool psMetadataRemove(psMetadata * restrict md, int where, const char *restrict key) +bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) { int numChildren = 0; - psList *mdList = NULL; - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; - psMetadataItem *entryChild = NULL; + psList* mdList = NULL; + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; + psMetadataItem* entryChild = NULL; @@ -368,5 +368,5 @@ // Remove by key name - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Couldn't find metadata item. Name: %s", key); @@ -419,8 +419,8 @@ } -psMetadataItem *psMetadataLookup(psMetadata * restrict md, const char *restrict key) -{ - psHash *mdTable = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataLookup(psMetadata* restrict md, const char *restrict key) +{ + psHash* mdTable = NULL; + psMetadataItem* entry = NULL; @@ -441,5 +441,5 @@ } - entry = (psMetadataItem *) psHashLookup(mdTable, key); + entry = (psMetadataItem* ) psHashLookup(mdTable, key); if (entry == NULL) { psError(__func__, "Could not find metadata item. Key: %s", key); @@ -450,8 +450,8 @@ } -psMetadataItem *psMetadataGet(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; @@ -467,5 +467,5 @@ } - entry = (psMetadataItem *) psListGet(mdList, where); + entry = (psMetadataItem* ) psListGet(mdList, where); if (entry == NULL) { psError(__func__, "Couldn't find metadata item with given index. Index: %d", where); @@ -476,7 +476,7 @@ } -bool psMetadataSetIterator(psMetadata * restrict md, int where) -{ - psList *mdList = NULL; +bool psMetadataSetIterator(psMetadata* restrict md, int where) +{ + psList* mdList = NULL; if (md == NULL) { @@ -496,8 +496,8 @@ } -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -532,8 +532,8 @@ } -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, const char *restrict match, int which) -{ - psList *mdList = NULL; - psMetadataItem *entry = NULL; +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +{ + psList* mdList = NULL; + psMetadataItem* entry = NULL; mdList = md->list; @@ -568,5 +568,5 @@ } -void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem * restrict metadataItem) +void psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* restrict metadataItem) { psMetadataType type; @@ -616,5 +616,5 @@ } -psMetadata *psMetadataFReadHeader(psMetadata * output, char *extName, int extNum, fitsfile * fd) +psMetadata* psMetadataFReadHeader(psMetadata* output, char *extName, int extNum, fitsfile * fd) { bool tempBool; Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 1439) +++ /trunk/psLib/src/types/psMetadata.h (revision 1440) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). - psList *restrict items; ///< List of psMetadataItems with same name. + psList* restrict items; ///< List of psMetadataItems with same name. } psMetadataItem; @@ -78,6 +78,6 @@ typedef struct psMetadata { - psList *restrict list; - psHash *restrict table; + psList* restrict list; + psHash* restrict table; } psMetadata; @@ -100,7 +100,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAlloc(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAlloc(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -119,7 +119,7 @@ * specified size and type. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataItemAllocV(const char *name, ///< Name of metadata item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataItemAllocV(const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. const char *comment, ///< Comment for metadata item. @@ -132,7 +132,7 @@ * Returns an empty metadata container with fully allocated internal metadata containers. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataAlloc(void ///< Void. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataAlloc(void ///< Void. ); @@ -143,7 +143,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAddItem(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. - psMetadataItem * restrict item ///< Metadata item to be added. + psMetadataItem* restrict item ///< Metadata item to be added. ); @@ -154,5 +154,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataAdd(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be added. const char *name, ///< Name of metadata item. @@ -171,5 +171,5 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove(psMetadata * restrict md, ///< Metadata collection to insert metadat item. +bool psMetadataRemove(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. @@ -181,7 +181,7 @@ * returned. If the item is not found, null is returned. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataLookup(psMetadata * restrict md, ///< Metadata collection to insert metadat + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataLookup(psMetadata* restrict md, ///< Metadata collection to insert metadat // item. const char *restrict key ///< Name of metadata key. @@ -192,7 +192,7 @@ * Items may be found in the metadata by their entry position in the list container. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGet(psMetadata * restrict md, ///< Metadata collection to insert metadat item. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGet(psMetadata* restrict md, ///< Metadata collection to insert metadat item. int where ///< Location to be retrieved. ); @@ -204,5 +204,5 @@ * @return void: void. */ -bool psMetadataSetIterator(psMetadata * restrict md, ///< Metadata collection to iterate. +bool psMetadataSetIterator(psMetadata* restrict md, ///< Metadata collection to iterate. int where ///< Location of iterator. ); @@ -212,7 +212,7 @@ * Get next metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetNext(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -223,7 +223,7 @@ * Get previous metadata item in iterator list. * - * @return psMetadataItem*: Pointer metadata item. - */ -psMetadataItem *psMetadataGetPrevious(psMetadata * restrict md, ///< Metadata collection to iterate. + * @return psMetadataItem* : Pointer metadata item. + */ +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. @@ -238,9 +238,9 @@ * metadata type is any other data type, printing is not allowed. * - * @return psMetadataItem*: Pointer metadata item. + * @return psMetadataItem* : Pointer metadata item. */ void psMetadataItemPrint(FILE * fd, ///< Pointer to file to write metadata item. const char *format, ///< Format to print metadata item. - const psMetadataItem * restrict metadataItem ///< Metadata item to print. + const psMetadataItem* restrict metadataItem ///< Metadata item to print. ); @@ -250,7 +250,7 @@ * unimplemented. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extname, ///< File name extension string. int extnum, ///< File name extension number. Starts at 1. @@ -262,7 +262,7 @@ * Read a metadata header from file. If the file is not found, an error is reported. * - * @return psMetadata*: Pointer metadata. - */ -psMetadata *psMetadataFReadHeader(psMetadata * output, ///< Resulting metadata from read. + * @return psMetadata* : Pointer metadata. + */ +psMetadata* psMetadataFReadHeader(psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. int extNum, ///< File name extension number.