Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 4329) +++ /trunk/psLib/pslib.kdevses (revision 4330) @@ -2,17 +2,14 @@ - - - + + + - - + + - - + + - - - Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 4329) +++ /trunk/psLib/src/astro/psCoord.c (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.75 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-20 22:42:29 $ +* @version $Revision: 1.76 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -221,5 +221,5 @@ } -psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2) +psPlaneTransform* psPlaneTransformAlloc(int n1, int n2) { PS_ASSERT_INT_NONNEGATIVE(n1, NULL); @@ -290,6 +290,6 @@ const psPlaneDistort* transform, const psPlane* coords, - float color, - float magnitude) + float mag, + float color) { PS_ASSERT_PTR_NON_NULL(transform, NULL); @@ -305,6 +305,6 @@ coords->x, coords->y, - color, - magnitude + mag, + color ); out->y = psDPolynomial4DEval( @@ -312,6 +312,6 @@ coords->x, coords->y, - color, - magnitude + mag, + color ); return (out); @@ -481,8 +481,8 @@ psProjection* psProjectionAlloc( - psF64 R, - psF64 D, - psF64 Xs, - psF64 Ys, + double R, + double D, + double Xs, + double Ys, psProjectionType type) { Index: /trunk/psLib/src/astro/psCoord.h =================================================================== --- /trunk/psLib/src/astro/psCoord.h (revision 4329) +++ /trunk/psLib/src/astro/psCoord.h (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-20 22:42:29 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -188,6 +188,6 @@ psPlaneTransform* psPlaneTransformAlloc( - psS32 n1, ///< The order of the x term in the transform. - psS32 n2 ///< The order of the y term in the transform. + int n1, ///< The order of the x term in the transform. + int n2 ///< The order of the y term in the transform. ); @@ -223,6 +223,6 @@ 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 + float mag, ///< third term -- maybe magnitude + float color ///< forth term -- maybe color ); @@ -283,8 +283,8 @@ */ psProjection* psProjectionAlloc( - psF64 R, ///< Right-ascension of projection center. - psF64 D, ///< Declination of projection center. - psF64 Xs, ///< Scale in x-dimension - psF64 Ys, ///< Scale in y-dimension + double R, ///< Right-ascension of projection center. + double D, ///< Declination of projection center. + double Xs, ///< Scale in x-dimension + double Ys, ///< Scale in y-dimension psProjectionType type ); Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 4329) +++ /trunk/psLib/src/astro/psTime.c (revision 4330) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-10 18:09:12 $ + * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -731,5 +731,5 @@ } -psF64 psTimeToLMST(psTime *time, psF64 longitude) +double psTimeToLMST(psTime *time, double longitude) { psF64 jdTdtDays = 0.0; @@ -804,5 +804,5 @@ } -psF64 psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin) +double psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin) { psU32 nTables = 2; @@ -1081,5 +1081,5 @@ } -psS64 psTimeLeapSecondDelta(const psTime *time1, const psTime *time2) +long psTimeLeapSecondDelta(const psTime *time1, const psTime *time2) { psS64 diff = 0; @@ -1095,5 +1095,5 @@ } -psBool psTimeIsLeapSecond(const psTime* utc) +bool psTimeIsLeapSecond(const psTime* utc) { psTime* prevUtc = NULL; @@ -1126,5 +1126,5 @@ } -psF64 psTimeToJD(const psTime *time) +double psTimeToJD(const psTime *time) { psF64 jd = NAN; @@ -1146,5 +1146,5 @@ } -psF64 psTimeToMJD(const psTime *time) +double psTimeToMJD(const psTime *time) { psF64 mjd = NAN; @@ -1302,5 +1302,5 @@ */ -psTime* psTimeFromJD(psF64 time) +psTime* psTimeFromJD(double jd) { psF64 days = 0.0; @@ -1312,5 +1312,5 @@ // Julian date conversion courtesy of Eugene Magnier - days = time - 2440587.5; + days = jd - 2440587.5; seconds = days * SEC_PER_DAY; if(seconds < 0.0) { @@ -1327,5 +1327,5 @@ } -psTime* psTimeFromMJD(psF64 time) +psTime* psTimeFromMJD(double mjd) { psF64 days = 0.0; @@ -1337,5 +1337,5 @@ // Modified Julian date conversion courtesy of Eugene Magnier - days = time - 40587.0; + days = mjd - 40587.0; seconds = days * SEC_PER_DAY; @@ -1406,5 +1406,5 @@ } -psTime* psTimeFromUTC(psS64 sec, psU32 nsec, psBool leapsecond) +psTime* psTimeFromUTC(psS64 sec, psU32 nsec, bool leapsecond) { psTime* outTime = NULL; @@ -1510,5 +1510,5 @@ } -psTime* psTimeMath(const psTime *time, psF64 delta) +psTime* psTimeMath(const psTime *time, double delta) { psF64 sec = 0.0; @@ -1551,5 +1551,5 @@ } -psF64 psTimeDelta(const psTime *time1, const psTime *time2) +double psTimeDelta(const psTime *time1, const psTime *time2) { psF64 out = 0.0; Index: /trunk/psLib/src/astro/psTime.h =================================================================== --- /trunk/psLib/src/astro/psTime.h (revision 4329) +++ /trunk/psLib/src/astro/psTime.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 00:10:59 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -127,9 +127,9 @@ * in UTC format, then it is converted. * - * @return psF64: LST Time. - */ -psF64 psTimeToLMST( - psTime *time, ///< psTime to be converted. - psF64 longitude ///< Longitude. + * @return double: LST Time. + */ +double psTimeToLMST( + psTime *time, ///< psTime to be converted. + double longitude ///< Longitude. ); @@ -138,7 +138,7 @@ * This function is necessary to for various SLALIB functions. * - * @return psF64: Time difference. - */ -psF64 psTimeGetUT1Delta( + * @return double: Time difference. + */ +double psTimeGetUT1Delta( const psTime *time, ///< psTime to be looked up. psTimeBulletin bulletin ///< IERS bulletin to use @@ -169,9 +169,9 @@ * Calculates the number of leapseconds between two times. * - * @return psS64: leapseconds added between given times - */ -psS64 psTimeLeapSecondDelta( - const psTime* time1, ///< First input time. - const psTime* time2 ///< Second input time. + * @return long: leapseconds added between given times + */ +long psTimeLeapSecondDelta( + const psTime* time1, ///< First input time. + const psTime* time2 ///< Second input time. ); @@ -180,7 +180,7 @@ * Determines if the specified UTC time is a valid leapsecond. * - * @return psBool: valid leap second - */ -psBool psTimeIsLeapSecond( + * @return bool: valid leap second + */ +bool psTimeIsLeapSecond( const psTime* utc ///< UTC to verify if leap second ); @@ -191,8 +191,8 @@ * subtract leapseconds. * - * @return psF64: Julian Date (JD) time. - */ -psF64 psTimeToJD( - const psTime* time ///< Input time to be converted. + * @return double: Julian Date (JD) time. + */ +double psTimeToJD( + const psTime* time ///< Input time to be converted. ); /** Convert psTime to modified Julian date time. @@ -201,7 +201,7 @@ * add or subtract leapseconds. * - * @return psF64: Modified Julian Days (MJD) time. - */ -psF64 psTimeToMJD( + * @return double: Modified Julian Days (MJD) time. + */ +double psTimeToMJD( const psTime* time ///< Input time to be converted. ); @@ -248,5 +248,5 @@ */ psTime* psTimeFromJD( - psF64 time ///< Input time to be converted. + double jd ///< Input time to be converted. ); @@ -258,5 +258,5 @@ */ psTime* psTimeFromMJD( - psF64 time ///< Input time to be converted. + double mjd ///< Input time to be converted. ); @@ -268,5 +268,5 @@ */ psTime* psTimeFromISO( - const char* time ///< Input time to be converted. + const char* time ///< Input time to be converted. ); @@ -278,5 +278,5 @@ */ psTime* psTimeFromTimeval( - const struct timeval *time ///< Input time to be converted. + const struct timeval *time ///< Input time to be converted. ); @@ -288,6 +288,6 @@ */ psTime* psTimeFromTT( - psS64 sec, ///< Input terrestrial time in seconds - psU32 nsec ///< Input terrestrial time fraction of seconds (nanoseconds) + psS64 sec, ///< Input terrestrial time in seconds + psU32 nsec ///< Input terrestrial time fraction of seconds (nanoseconds) ); @@ -299,7 +299,7 @@ */ psTime* psTimeFromUTC( - psS64 sec, ///< Input time in seconds - psU32 nsec, ///< Input time fraction of seconds (nanoseconds) - psBool leapsecond ///< Input time is a leapsecond + psS64 sec, ///< Input time in seconds + psU32 nsec, ///< Input time fraction of seconds (nanoseconds) + bool leapsecond ///< Input time is a leapsecond ); @@ -313,5 +313,5 @@ */ psTime* p_psTimeFromTM( - const struct tm *time ///< Input time to be converted. + const struct tm *time ///< Input time to be converted. ); @@ -323,6 +323,6 @@ */ psTime* psTimeMath( - const psTime *time, ///< Time. - psF64 delta ///< Time delta. + const psTime *time, ///< Time. + double delta ///< Time delta. ); @@ -331,9 +331,9 @@ * Determine difference between two times. Input times are converted to TAI format if necessary. * - * @return psF64: Time difference. - */ -psF64 psTimeDelta( - const psTime *time1, ///< First time. - const psTime *time2 ///< Second time. + * @return double: Time difference. + */ +double psTimeDelta( + const psTime *time1, ///< First time. + const psTime *time2 ///< Second time. ); Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 4329) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.75 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-20 22:42:29 $ +* @version $Revision: 1.76 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -221,5 +221,5 @@ } -psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2) +psPlaneTransform* psPlaneTransformAlloc(int n1, int n2) { PS_ASSERT_INT_NONNEGATIVE(n1, NULL); @@ -290,6 +290,6 @@ const psPlaneDistort* transform, const psPlane* coords, - float color, - float magnitude) + float mag, + float color) { PS_ASSERT_PTR_NON_NULL(transform, NULL); @@ -305,6 +305,6 @@ coords->x, coords->y, - color, - magnitude + mag, + color ); out->y = psDPolynomial4DEval( @@ -312,6 +312,6 @@ coords->x, coords->y, - color, - magnitude + mag, + color ); return (out); @@ -481,8 +481,8 @@ psProjection* psProjectionAlloc( - psF64 R, - psF64 D, - psF64 Xs, - psF64 Ys, + double R, + double D, + double Xs, + double Ys, psProjectionType type) { Index: /trunk/psLib/src/astronomy/psCoord.h =================================================================== --- /trunk/psLib/src/astronomy/psCoord.h (revision 4329) +++ /trunk/psLib/src/astronomy/psCoord.h (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-20 22:42:29 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -188,6 +188,6 @@ psPlaneTransform* psPlaneTransformAlloc( - psS32 n1, ///< The order of the x term in the transform. - psS32 n2 ///< The order of the y term in the transform. + int n1, ///< The order of the x term in the transform. + int n2 ///< The order of the y term in the transform. ); @@ -223,6 +223,6 @@ 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 + float mag, ///< third term -- maybe magnitude + float color ///< forth term -- maybe color ); @@ -283,8 +283,8 @@ */ psProjection* psProjectionAlloc( - psF64 R, ///< Right-ascension of projection center. - psF64 D, ///< Declination of projection center. - psF64 Xs, ///< Scale in x-dimension - psF64 Ys, ///< Scale in y-dimension + double R, ///< Right-ascension of projection center. + double D, ///< Declination of projection center. + double Xs, ///< Scale in x-dimension + double Ys, ///< Scale in y-dimension psProjectionType type ); Index: /trunk/psLib/src/astronomy/psTime.c =================================================================== --- /trunk/psLib/src/astronomy/psTime.c (revision 4329) +++ /trunk/psLib/src/astronomy/psTime.c (revision 4330) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-10 18:09:12 $ + * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -731,5 +731,5 @@ } -psF64 psTimeToLMST(psTime *time, psF64 longitude) +double psTimeToLMST(psTime *time, double longitude) { psF64 jdTdtDays = 0.0; @@ -804,5 +804,5 @@ } -psF64 psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin) +double psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin) { psU32 nTables = 2; @@ -1081,5 +1081,5 @@ } -psS64 psTimeLeapSecondDelta(const psTime *time1, const psTime *time2) +long psTimeLeapSecondDelta(const psTime *time1, const psTime *time2) { psS64 diff = 0; @@ -1095,5 +1095,5 @@ } -psBool psTimeIsLeapSecond(const psTime* utc) +bool psTimeIsLeapSecond(const psTime* utc) { psTime* prevUtc = NULL; @@ -1126,5 +1126,5 @@ } -psF64 psTimeToJD(const psTime *time) +double psTimeToJD(const psTime *time) { psF64 jd = NAN; @@ -1146,5 +1146,5 @@ } -psF64 psTimeToMJD(const psTime *time) +double psTimeToMJD(const psTime *time) { psF64 mjd = NAN; @@ -1302,5 +1302,5 @@ */ -psTime* psTimeFromJD(psF64 time) +psTime* psTimeFromJD(double jd) { psF64 days = 0.0; @@ -1312,5 +1312,5 @@ // Julian date conversion courtesy of Eugene Magnier - days = time - 2440587.5; + days = jd - 2440587.5; seconds = days * SEC_PER_DAY; if(seconds < 0.0) { @@ -1327,5 +1327,5 @@ } -psTime* psTimeFromMJD(psF64 time) +psTime* psTimeFromMJD(double mjd) { psF64 days = 0.0; @@ -1337,5 +1337,5 @@ // Modified Julian date conversion courtesy of Eugene Magnier - days = time - 40587.0; + days = mjd - 40587.0; seconds = days * SEC_PER_DAY; @@ -1406,5 +1406,5 @@ } -psTime* psTimeFromUTC(psS64 sec, psU32 nsec, psBool leapsecond) +psTime* psTimeFromUTC(psS64 sec, psU32 nsec, bool leapsecond) { psTime* outTime = NULL; @@ -1510,5 +1510,5 @@ } -psTime* psTimeMath(const psTime *time, psF64 delta) +psTime* psTimeMath(const psTime *time, double delta) { psF64 sec = 0.0; @@ -1551,5 +1551,5 @@ } -psF64 psTimeDelta(const psTime *time1, const psTime *time2) +double psTimeDelta(const psTime *time1, const psTime *time2) { psF64 out = 0.0; Index: /trunk/psLib/src/astronomy/psTime.h =================================================================== --- /trunk/psLib/src/astronomy/psTime.h (revision 4329) +++ /trunk/psLib/src/astronomy/psTime.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 00:10:59 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -127,9 +127,9 @@ * in UTC format, then it is converted. * - * @return psF64: LST Time. - */ -psF64 psTimeToLMST( - psTime *time, ///< psTime to be converted. - psF64 longitude ///< Longitude. + * @return double: LST Time. + */ +double psTimeToLMST( + psTime *time, ///< psTime to be converted. + double longitude ///< Longitude. ); @@ -138,7 +138,7 @@ * This function is necessary to for various SLALIB functions. * - * @return psF64: Time difference. - */ -psF64 psTimeGetUT1Delta( + * @return double: Time difference. + */ +double psTimeGetUT1Delta( const psTime *time, ///< psTime to be looked up. psTimeBulletin bulletin ///< IERS bulletin to use @@ -169,9 +169,9 @@ * Calculates the number of leapseconds between two times. * - * @return psS64: leapseconds added between given times - */ -psS64 psTimeLeapSecondDelta( - const psTime* time1, ///< First input time. - const psTime* time2 ///< Second input time. + * @return long: leapseconds added between given times + */ +long psTimeLeapSecondDelta( + const psTime* time1, ///< First input time. + const psTime* time2 ///< Second input time. ); @@ -180,7 +180,7 @@ * Determines if the specified UTC time is a valid leapsecond. * - * @return psBool: valid leap second - */ -psBool psTimeIsLeapSecond( + * @return bool: valid leap second + */ +bool psTimeIsLeapSecond( const psTime* utc ///< UTC to verify if leap second ); @@ -191,8 +191,8 @@ * subtract leapseconds. * - * @return psF64: Julian Date (JD) time. - */ -psF64 psTimeToJD( - const psTime* time ///< Input time to be converted. + * @return double: Julian Date (JD) time. + */ +double psTimeToJD( + const psTime* time ///< Input time to be converted. ); /** Convert psTime to modified Julian date time. @@ -201,7 +201,7 @@ * add or subtract leapseconds. * - * @return psF64: Modified Julian Days (MJD) time. - */ -psF64 psTimeToMJD( + * @return double: Modified Julian Days (MJD) time. + */ +double psTimeToMJD( const psTime* time ///< Input time to be converted. ); @@ -248,5 +248,5 @@ */ psTime* psTimeFromJD( - psF64 time ///< Input time to be converted. + double jd ///< Input time to be converted. ); @@ -258,5 +258,5 @@ */ psTime* psTimeFromMJD( - psF64 time ///< Input time to be converted. + double mjd ///< Input time to be converted. ); @@ -268,5 +268,5 @@ */ psTime* psTimeFromISO( - const char* time ///< Input time to be converted. + const char* time ///< Input time to be converted. ); @@ -278,5 +278,5 @@ */ psTime* psTimeFromTimeval( - const struct timeval *time ///< Input time to be converted. + const struct timeval *time ///< Input time to be converted. ); @@ -288,6 +288,6 @@ */ psTime* psTimeFromTT( - psS64 sec, ///< Input terrestrial time in seconds - psU32 nsec ///< Input terrestrial time fraction of seconds (nanoseconds) + psS64 sec, ///< Input terrestrial time in seconds + psU32 nsec ///< Input terrestrial time fraction of seconds (nanoseconds) ); @@ -299,7 +299,7 @@ */ psTime* psTimeFromUTC( - psS64 sec, ///< Input time in seconds - psU32 nsec, ///< Input time fraction of seconds (nanoseconds) - psBool leapsecond ///< Input time is a leapsecond + psS64 sec, ///< Input time in seconds + psU32 nsec, ///< Input time fraction of seconds (nanoseconds) + bool leapsecond ///< Input time is a leapsecond ); @@ -313,5 +313,5 @@ */ psTime* p_psTimeFromTM( - const struct tm *time ///< Input time to be converted. + const struct tm *time ///< Input time to be converted. ); @@ -323,6 +323,6 @@ */ psTime* psTimeMath( - const psTime *time, ///< Time. - psF64 delta ///< Time delta. + const psTime *time, ///< Time. + double delta ///< Time delta. ); @@ -331,9 +331,9 @@ * Determine difference between two times. Input times are converted to TAI format if necessary. * - * @return psF64: Time difference. - */ -psF64 psTimeDelta( - const psTime *time1, ///< First time. - const psTime *time2 ///< Second time. + * @return double: Time difference. + */ +double psTimeDelta( + const psTime *time1, ///< First time. + const psTime *time2 ///< Second time. ); Index: /trunk/psLib/src/collections/psList.h =================================================================== --- /trunk/psLib/src/collections/psList.h (revision 4329) +++ /trunk/psLib/src/collections/psList.h (revision 4330) @@ -7,6 +7,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -107,5 +107,5 @@ * iterator position is not changed. * - * @return psBool TRUE if iterator successfully set, otherwise FALSE. + * @return bool TRUE if iterator successfully set, otherwise FALSE. */ bool psListIteratorSet( @@ -116,5 +116,5 @@ /** Adds an element to a psList at position given. * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAdd( @@ -126,5 +126,5 @@ /** Adds an data item to a psList at position just after the list position given * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAddAfter( @@ -135,5 +135,5 @@ /** Adds an data item to a psList at position just before the list position given * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAddBefore( @@ -144,5 +144,5 @@ /** Remove an item at the specified location from a list. * - * @return psBool TRUE if element is successfully removed, otherwise FALSE. + * @return bool TRUE if element is successfully removed, otherwise FALSE. */ bool psListRemove( @@ -153,5 +153,5 @@ /** Remove an item from a list. * - * @return psBool TRUE if element is successfully removed, otherwise FALSE. + * @return bool TRUE if element is successfully removed, otherwise FALSE. */ bool psListRemoveData( Index: /trunk/psLib/src/collections/psMetadata.h =================================================================== --- /trunk/psLib/src/collections/psMetadata.h (revision 4329) +++ /trunk/psLib/src/collections/psMetadata.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-20 22:42:29 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -274,5 +274,5 @@ int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char *name, ///< Name of metadata item. - int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) + int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) const char *comment, ///< Comment for metadata item. ... ///< Arguments for name formatting and metadata item data. @@ -298,5 +298,5 @@ /** Add a psS32 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddS32( @@ -310,5 +310,5 @@ /** Add a psF32 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddF32( @@ -322,5 +322,5 @@ /** Add a psF64 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddF64( @@ -346,5 +346,5 @@ /** Add a string to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddStr( @@ -505,7 +505,7 @@ * returned. * - * @return psBool : Value of metadata item. - */ -psBool psMetadataLookupBool( + * @return bool : Value of metadata item. + */ +bool psMetadataLookupBool( bool *status, ///< Status of lookup. const psMetadata *md, ///< Metadata collection to lookup metadata item. @@ -558,5 +558,5 @@ * invalid the iterator position is not changed. * - * @return psBool TRUE if iterator successfully set, otherwise FALSE. + * @return bool TRUE if iterator successfully set, otherwise FALSE. */ bool psMetadataIteratorSet( Index: /trunk/psLib/src/collections/psScalar.c =================================================================== --- /trunk/psLib/src/collections/psScalar.c (revision 4329) +++ /trunk/psLib/src/collections/psScalar.c (revision 4330) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -80,10 +80,10 @@ } -psScalar* psScalarCopy(psScalar *scalar) +psScalar* psScalarCopy(const psScalar *value) { psElemType dataType; psScalar *newScalar = NULL; - if (scalar == NULL) { + if (value == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psScalar_COPY_NULL); @@ -91,41 +91,41 @@ } - dataType = scalar->type.type; + dataType = value->type.type; switch (dataType) { case PS_TYPE_S8: - newScalar = psScalarAlloc(scalar->data.S8, dataType); + newScalar = psScalarAlloc(value->data.S8, dataType); break; case PS_TYPE_U8: - newScalar = psScalarAlloc(scalar->data.U8, dataType); + newScalar = psScalarAlloc(value->data.U8, dataType); break; case PS_TYPE_S16: - newScalar = psScalarAlloc(scalar->data.S16, dataType); + newScalar = psScalarAlloc(value->data.S16, dataType); break; case PS_TYPE_U16: - newScalar = psScalarAlloc(scalar->data.U16, dataType); + newScalar = psScalarAlloc(value->data.U16, dataType); break; case PS_TYPE_S32: - newScalar = psScalarAlloc(scalar->data.S32, dataType); + newScalar = psScalarAlloc(value->data.S32, dataType); break; case PS_TYPE_U32: - newScalar = psScalarAlloc(scalar->data.U32, dataType); + newScalar = psScalarAlloc(value->data.U32, dataType); break; case PS_TYPE_S64: - newScalar = psScalarAlloc(scalar->data.S64, dataType); + newScalar = psScalarAlloc(value->data.S64, dataType); break; case PS_TYPE_U64: - newScalar = psScalarAlloc(scalar->data.U64, dataType); + newScalar = psScalarAlloc(value->data.U64, dataType); break; case PS_TYPE_F32: - newScalar = psScalarAlloc(scalar->data.F32, dataType); + newScalar = psScalarAlloc(value->data.F32, dataType); break; case PS_TYPE_F64: - newScalar = psScalarAlloc(scalar->data.F64, dataType); + newScalar = psScalarAlloc(value->data.F64, dataType); break; case PS_TYPE_C32: - newScalar = psScalarAlloc(scalar->data.C32, dataType); + newScalar = psScalarAlloc(value->data.C32, dataType); break; case PS_TYPE_C64: - newScalar = psScalarAlloc(scalar->data.C64, dataType); + newScalar = psScalarAlloc(value->data.C64, dataType); break; default: Index: /trunk/psLib/src/collections/psScalar.h =================================================================== --- /trunk/psLib/src/collections/psScalar.h (revision 4329) +++ /trunk/psLib/src/collections/psScalar.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,5 @@ */ psScalar* psScalarCopy( - psScalar *scalar ///< Scalar to copy. + const psScalar *value ///< Scalar to copy. ); Index: /trunk/psLib/src/collections/psVector.c =================================================================== --- /trunk/psLib/src/collections/psVector.c (revision 4329) +++ /trunk/psLib/src/collections/psVector.c (revision 4330) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-10 21:46:46 $ +* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -129,5 +129,5 @@ } -psVector *psVectorExtend(psVector *vector, int delta, int nExtend) +psVector *psVectorExtend(psVector *vector, long delta, long nExtend) { // can't handle a NULL vector (don't know the data type to allocate) @@ -166,20 +166,20 @@ } -psVector* psVectorCopy(psVector* out, const psVector* in, psElemType type) -{ - if (in == NULL) { +psVector* psVectorCopy(psVector* output, const psVector* input, psElemType type) +{ + if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_SORT_NULL); - psFree(out); - return NULL; - } - - psS32 nElements = in->n; - - out = psVectorRecycle(out, nElements, type); + psFree(output); + return NULL; + } + + psS32 nElements = input->n; + + output = psVectorRecycle(output, nElements, type); #define PSVECTOR_COPY(INTYPE,OUTTYPE) { \ - ps##INTYPE *inVec = in->data.INTYPE; \ - ps##OUTTYPE *outVec = out->data.OUTTYPE; \ + ps##INTYPE *inVec = input->data.INTYPE; \ + ps##OUTTYPE *outVec = output->data.OUTTYPE; \ for (psS32 col=0;coltype.type) { \ + switch (input->type.type) { \ case PS_TYPE_S8: \ PSVECTOR_COPY(S8,OUTTYPE); \ @@ -232,5 +232,5 @@ PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, \ typeStr); \ - psFree(out); \ + psFree(output); \ } \ } \ @@ -257,10 +257,10 @@ PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, typeStr); - psFree(out); + psFree(output); break; } } - return out; + return output; Index: /trunk/psLib/src/collections/psVector.h =================================================================== --- /trunk/psLib/src/collections/psVector.h (revision 4329) +++ /trunk/psLib/src/collections/psVector.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-10 21:46:46 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -101,6 +101,6 @@ psVector *psVectorExtend( psVector *vector, ///< Vector to extend - int delta, ///< Amount to expand allocation, if necessary - int nExtend ///< Number of elements to add to vector length + long delta, ///< Amount to expand allocation, if necessary + long nExtend ///< Number of elements to add to vector length ); @@ -132,6 +132,6 @@ */ psVector* psVectorCopy( - psVector* out, ///< if non-NULL, a psVector to recycle - const psVector* in, ///< the vector to copy. + psVector* output, ///< if non-NULL, a psVector to recycle + const psVector* input, ///< the vector to copy. psElemType type ///< the data type of the resulting psVector ); Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 4329) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 4330) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.110 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1822,8 +1822,8 @@ XXX: What should be the defualty type for knots be? psF32 is assumed. *****************************************************************************/ -psSpline1D *psSpline1DAlloc(psS32 numSplines, - psS32 order, - psF32 min, - psF32 max) +psSpline1D *psSpline1DAlloc(int numSplines, + int order, + float min, + float max) { PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); @@ -1867,5 +1867,5 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - psS32 order) + int order) { PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); @@ -2125,7 +2125,7 @@ psF64. *****************************************************************************/ -psF32 psSpline1DEval( +float psSpline1DEval( const psSpline1D *spline, - psF32 x + float x ) { Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 4329) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 4330) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,5 +39,5 @@ * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * - * @return psF32 value on the gaussian curve given the input parameters + * @return float value on the gaussian curve given the input parameters */ float psGaussian( @@ -218,5 +218,5 @@ */ psVector *psPolynomial2DEvalVector( - const psPolynomial2D *myPoly, ///< Coefficients for the polynomial + const psPolynomial2D *poly, ///< Coefficients for the polynomial const psVector *x, ///< x locations at which to evaluate const psVector *y ///< y locations at which to evaluate @@ -444,8 +444,8 @@ * @return psSpline1D* new 1-D spline struct */ -psSpline1D *psSpline1DAlloc(psS32 n, ///< Number of spline polynomials - psS32 order, ///< Order of spline polynomials - psF32 min, ///< Lower boundary value of spline polynomials - psF32 max); ///< Upper boundary value of spline polynomials +psSpline1D *psSpline1DAlloc(int n, ///< Number of spline polynomials + int order, ///< Order of spline polynomials + float min, ///< Lower boundary value of spline polynomials + float max); ///< Upper boundary value of spline polynomials /** Allocates a psSpline1D structure @@ -456,13 +456,13 @@ */ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, ///< Bounds for spline polynomials - psS32 order); ///< Order of spline polynomials + int order); ///< Order of spline polynomials /** Evaluates 1-D spline polynomials at a specific coordinate. * - * @return psF32 result of spline polynomials evaluated at given location - */ -psF32 psSpline1DEval( + * @return float result of spline polynomials evaluated at given location + */ +float psSpline1DEval( const psSpline1D *spline, ///< Coefficients for spline polynomials - psF32 x ///< location at which to evaluate + float x ///< location at which to evaluate ); Index: /trunk/psLib/src/dataManip/psMinimize.h =================================================================== --- /trunk/psLib/src/dataManip/psMinimize.h (revision 4329) +++ /trunk/psLib/src/dataManip/psMinimize.h (revision 4330) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:30 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -109,5 +109,5 @@ /** Minimizes a specified function based on the Levenberg-Marquardt method. * - * @return psBool: True if successful. + * @return bool: True if successful. */ bool psMinimizeLMChi2( @@ -165,5 +165,5 @@ /** Minimizes a specified function based on the Powell method. * - * @return psBool: True if successful. + * @return bool: True if successful. */ bool psMinimizePowell( @@ -209,5 +209,5 @@ /** Minimizes a specified function based on the Powell chi-squared method. * - * @return psBool: True is successful. + * @return bool: True is successful. */ bool psMinimizeChi2Powell( Index: /trunk/psLib/src/dataManip/psRandom.c =================================================================== --- /trunk/psLib/src/dataManip/psRandom.c (revision 4329) +++ /trunk/psLib/src/dataManip/psRandom.c (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-01 23:51:25 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,5 +57,5 @@ psRandom *psRandomAlloc(psRandomType type, - psU64 seed) + unsigned long seed) { gsl_rng *r = NULL; @@ -86,5 +86,5 @@ void psRandomReset(psRandom *rand, - psU64 seed) + unsigned long seed) { // Check null psRandom @@ -103,5 +103,5 @@ } -psF64 psRandomUniform(const psRandom *r) +double psRandomUniform(const psRandom *r) { // Check null psRandom variable @@ -116,5 +116,5 @@ } -psF64 psRandomGaussian(const psRandom *r) +double psRandomGaussian(const psRandom *r) { // Check null psRandom variable @@ -130,5 +130,5 @@ } -psF64 psRandomPoisson(const psRandom *r, psF64 mean) +double psRandomPoisson(const psRandom *r, double mean) { // Check null psRandom variable Index: /trunk/psLib/src/dataManip/psRandom.h =================================================================== --- /trunk/psLib/src/dataManip/psRandom.h (revision 4329) +++ /trunk/psLib/src/dataManip/psRandom.h (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-17 00:11:05 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -54,5 +54,5 @@ psRandom *psRandomAlloc( psRandomType type, ///< The type of RNG - psU64 seed ///< Known value with which to seed the RNG + unsigned long seed ///< Known value with which to seed the RNG ); @@ -63,5 +63,5 @@ void psRandomReset( psRandom *rand, ///< Existing psRandom struct to reset - psU64 seed ///< Known value with which to seed the RNG + unsigned long seed ///< Known value with which to seed the RNG ); @@ -69,7 +69,7 @@ * Uses gsl_rng_uniform. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomUniform( +double psRandomUniform( const psRandom *r ///< psRandom struct for RNG ); @@ -78,7 +78,7 @@ * Uses gsl_ran_gaussian. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomGaussian( +double psRandomGaussian( const psRandom *r ///< psRandom struct for RNG ); @@ -87,9 +87,9 @@ * Uses gsl_ran_poisson. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomPoisson( +double psRandomPoisson( const psRandom *r, ///< psRandom struct for RNG - psF64 mean ///< Mean value + double mean ///< Mean value ); Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 4329) +++ /trunk/psLib/src/image/psImage.c (revision 4330) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -106,5 +106,5 @@ } -psRegion psRegionFromString(char* region) +psRegion psRegionFromString(const char* region) { psS32 col0; Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 4329) +++ /trunk/psLib/src/image/psImage.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -127,5 +127,5 @@ */ psRegion psRegionFromString( - char* region ///< image rectangular region in the form '[x0:x1,y0:y1]' + const char* region ///< image rectangular region in the form '[x0:x1,y0:y1]' ); @@ -163,5 +163,5 @@ /** Frees all children of a psImage. * - * @return psS32 Number of children freed. + * @return int Number of children freed. * */ Index: /trunk/psLib/src/image/psImagePixelManip.h =================================================================== --- /trunk/psLib/src/image/psImagePixelManip.h (revision 4329) +++ /trunk/psLib/src/image/psImagePixelManip.h (revision 4330) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ * defined for psU8, psU16, psS8, psS16, psF32, psF64, psC32, and psC64. * - * @return psS32 The number of clipped pixels + * @return int The number of clipped pixels */ int psImageClip( @@ -62,5 +62,5 @@ * function is defined for psF32, psF64, psC32, and psC64. * - * @return psS32 The number of clipped pixels + * @return int The number of clipped pixels */ int psImageClipNaN( Index: /trunk/psLib/src/imageops/psImagePixelManip.h =================================================================== --- /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4329) +++ /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4330) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ * defined for psU8, psU16, psS8, psS16, psF32, psF64, psC32, and psC64. * - * @return psS32 The number of clipped pixels + * @return int The number of clipped pixels */ int psImageClip( @@ -62,5 +62,5 @@ * function is defined for psF32, psF64, psC32, and psC64. * - * @return psS32 The number of clipped pixels + * @return int The number of clipped pixels */ int psImageClipNaN( Index: /trunk/psLib/src/math/psMinimize.h =================================================================== --- /trunk/psLib/src/math/psMinimize.h (revision 4329) +++ /trunk/psLib/src/math/psMinimize.h (revision 4330) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:30 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -109,5 +109,5 @@ /** Minimizes a specified function based on the Levenberg-Marquardt method. * - * @return psBool: True if successful. + * @return bool: True if successful. */ bool psMinimizeLMChi2( @@ -165,5 +165,5 @@ /** Minimizes a specified function based on the Powell method. * - * @return psBool: True if successful. + * @return bool: True if successful. */ bool psMinimizePowell( @@ -209,5 +209,5 @@ /** Minimizes a specified function based on the Powell chi-squared method. * - * @return psBool: True is successful. + * @return bool: True is successful. */ bool psMinimizeChi2Powell( Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 4329) +++ /trunk/psLib/src/math/psPolynomial.c (revision 4330) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.110 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1822,8 +1822,8 @@ XXX: What should be the defualty type for knots be? psF32 is assumed. *****************************************************************************/ -psSpline1D *psSpline1DAlloc(psS32 numSplines, - psS32 order, - psF32 min, - psF32 max) +psSpline1D *psSpline1DAlloc(int numSplines, + int order, + float min, + float max) { PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); @@ -1867,5 +1867,5 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - psS32 order) + int order) { PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); @@ -2125,7 +2125,7 @@ psF64. *****************************************************************************/ -psF32 psSpline1DEval( +float psSpline1DEval( const psSpline1D *spline, - psF32 x + float x ) { Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 4329) +++ /trunk/psLib/src/math/psPolynomial.h (revision 4330) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,5 +39,5 @@ * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * - * @return psF32 value on the gaussian curve given the input parameters + * @return float value on the gaussian curve given the input parameters */ float psGaussian( @@ -218,5 +218,5 @@ */ psVector *psPolynomial2DEvalVector( - const psPolynomial2D *myPoly, ///< Coefficients for the polynomial + const psPolynomial2D *poly, ///< Coefficients for the polynomial const psVector *x, ///< x locations at which to evaluate const psVector *y ///< y locations at which to evaluate @@ -444,8 +444,8 @@ * @return psSpline1D* new 1-D spline struct */ -psSpline1D *psSpline1DAlloc(psS32 n, ///< Number of spline polynomials - psS32 order, ///< Order of spline polynomials - psF32 min, ///< Lower boundary value of spline polynomials - psF32 max); ///< Upper boundary value of spline polynomials +psSpline1D *psSpline1DAlloc(int n, ///< Number of spline polynomials + int order, ///< Order of spline polynomials + float min, ///< Lower boundary value of spline polynomials + float max); ///< Upper boundary value of spline polynomials /** Allocates a psSpline1D structure @@ -456,13 +456,13 @@ */ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, ///< Bounds for spline polynomials - psS32 order); ///< Order of spline polynomials + int order); ///< Order of spline polynomials /** Evaluates 1-D spline polynomials at a specific coordinate. * - * @return psF32 result of spline polynomials evaluated at given location - */ -psF32 psSpline1DEval( + * @return float result of spline polynomials evaluated at given location + */ +float psSpline1DEval( const psSpline1D *spline, ///< Coefficients for spline polynomials - psF32 x ///< location at which to evaluate + float x ///< location at which to evaluate ); Index: /trunk/psLib/src/math/psRandom.c =================================================================== --- /trunk/psLib/src/math/psRandom.c (revision 4329) +++ /trunk/psLib/src/math/psRandom.c (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-01 23:51:25 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,5 +57,5 @@ psRandom *psRandomAlloc(psRandomType type, - psU64 seed) + unsigned long seed) { gsl_rng *r = NULL; @@ -86,5 +86,5 @@ void psRandomReset(psRandom *rand, - psU64 seed) + unsigned long seed) { // Check null psRandom @@ -103,5 +103,5 @@ } -psF64 psRandomUniform(const psRandom *r) +double psRandomUniform(const psRandom *r) { // Check null psRandom variable @@ -116,5 +116,5 @@ } -psF64 psRandomGaussian(const psRandom *r) +double psRandomGaussian(const psRandom *r) { // Check null psRandom variable @@ -130,5 +130,5 @@ } -psF64 psRandomPoisson(const psRandom *r, psF64 mean) +double psRandomPoisson(const psRandom *r, double mean) { // Check null psRandom variable Index: /trunk/psLib/src/math/psRandom.h =================================================================== --- /trunk/psLib/src/math/psRandom.h (revision 4329) +++ /trunk/psLib/src/math/psRandom.h (revision 4330) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-17 00:11:05 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -54,5 +54,5 @@ psRandom *psRandomAlloc( psRandomType type, ///< The type of RNG - psU64 seed ///< Known value with which to seed the RNG + unsigned long seed ///< Known value with which to seed the RNG ); @@ -63,5 +63,5 @@ void psRandomReset( psRandom *rand, ///< Existing psRandom struct to reset - psU64 seed ///< Known value with which to seed the RNG + unsigned long seed ///< Known value with which to seed the RNG ); @@ -69,7 +69,7 @@ * Uses gsl_rng_uniform. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomUniform( +double psRandomUniform( const psRandom *r ///< psRandom struct for RNG ); @@ -78,7 +78,7 @@ * Uses gsl_ran_gaussian. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomGaussian( +double psRandomGaussian( const psRandom *r ///< psRandom struct for RNG ); @@ -87,9 +87,9 @@ * Uses gsl_ran_poisson. * - * @return psF64: Random number. + * @return double: Random number. */ -psF64 psRandomPoisson( +double psRandomPoisson( const psRandom *r, ///< psRandom struct for RNG - psF64 mean ///< Mean value + double mean ///< Mean value ); Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 4329) +++ /trunk/psLib/src/math/psSpline.c (revision 4330) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.110 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1822,8 +1822,8 @@ XXX: What should be the defualty type for knots be? psF32 is assumed. *****************************************************************************/ -psSpline1D *psSpline1DAlloc(psS32 numSplines, - psS32 order, - psF32 min, - psF32 max) +psSpline1D *psSpline1DAlloc(int numSplines, + int order, + float min, + float max) { PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL); @@ -1867,5 +1867,5 @@ *****************************************************************************/ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, - psS32 order) + int order) { PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); @@ -2125,7 +2125,7 @@ psF64. *****************************************************************************/ -psF32 psSpline1DEval( +float psSpline1DEval( const psSpline1D *spline, - psF32 x + float x ) { Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 4329) +++ /trunk/psLib/src/math/psSpline.h (revision 4330) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,5 +39,5 @@ * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * - * @return psF32 value on the gaussian curve given the input parameters + * @return float value on the gaussian curve given the input parameters */ float psGaussian( @@ -218,5 +218,5 @@ */ psVector *psPolynomial2DEvalVector( - const psPolynomial2D *myPoly, ///< Coefficients for the polynomial + const psPolynomial2D *poly, ///< Coefficients for the polynomial const psVector *x, ///< x locations at which to evaluate const psVector *y ///< y locations at which to evaluate @@ -444,8 +444,8 @@ * @return psSpline1D* new 1-D spline struct */ -psSpline1D *psSpline1DAlloc(psS32 n, ///< Number of spline polynomials - psS32 order, ///< Order of spline polynomials - psF32 min, ///< Lower boundary value of spline polynomials - psF32 max); ///< Upper boundary value of spline polynomials +psSpline1D *psSpline1DAlloc(int n, ///< Number of spline polynomials + int order, ///< Order of spline polynomials + float min, ///< Lower boundary value of spline polynomials + float max); ///< Upper boundary value of spline polynomials /** Allocates a psSpline1D structure @@ -456,13 +456,13 @@ */ psSpline1D *psSpline1DAllocGeneric(const psVector *bounds, ///< Bounds for spline polynomials - psS32 order); ///< Order of spline polynomials + int order); ///< Order of spline polynomials /** Evaluates 1-D spline polynomials at a specific coordinate. * - * @return psF32 result of spline polynomials evaluated at given location - */ -psF32 psSpline1DEval( + * @return float result of spline polynomials evaluated at given location + */ +float psSpline1DEval( const psSpline1D *spline, ///< Coefficients for spline polynomials - psF32 x ///< location at which to evaluate + float x ///< location at which to evaluate ); Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 4329) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 4330) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.70 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -106,5 +106,5 @@ } -psRegion psRegionFromString(char* region) +psRegion psRegionFromString(const char* region) { psS32 col0; Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 4329) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -127,5 +127,5 @@ */ psRegion psRegionFromString( - char* region ///< image rectangular region in the form '[x0:x1,y0:y1]' + const char* region ///< image rectangular region in the form '[x0:x1,y0:y1]' ); @@ -163,5 +163,5 @@ /** Frees all children of a psImage. * - * @return psS32 Number of children freed. + * @return int Number of children freed. * */ Index: /trunk/psLib/src/mathtypes/psScalar.c =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.c (revision 4329) +++ /trunk/psLib/src/mathtypes/psScalar.c (revision 4330) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -80,10 +80,10 @@ } -psScalar* psScalarCopy(psScalar *scalar) +psScalar* psScalarCopy(const psScalar *value) { psElemType dataType; psScalar *newScalar = NULL; - if (scalar == NULL) { + if (value == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psScalar_COPY_NULL); @@ -91,41 +91,41 @@ } - dataType = scalar->type.type; + dataType = value->type.type; switch (dataType) { case PS_TYPE_S8: - newScalar = psScalarAlloc(scalar->data.S8, dataType); + newScalar = psScalarAlloc(value->data.S8, dataType); break; case PS_TYPE_U8: - newScalar = psScalarAlloc(scalar->data.U8, dataType); + newScalar = psScalarAlloc(value->data.U8, dataType); break; case PS_TYPE_S16: - newScalar = psScalarAlloc(scalar->data.S16, dataType); + newScalar = psScalarAlloc(value->data.S16, dataType); break; case PS_TYPE_U16: - newScalar = psScalarAlloc(scalar->data.U16, dataType); + newScalar = psScalarAlloc(value->data.U16, dataType); break; case PS_TYPE_S32: - newScalar = psScalarAlloc(scalar->data.S32, dataType); + newScalar = psScalarAlloc(value->data.S32, dataType); break; case PS_TYPE_U32: - newScalar = psScalarAlloc(scalar->data.U32, dataType); + newScalar = psScalarAlloc(value->data.U32, dataType); break; case PS_TYPE_S64: - newScalar = psScalarAlloc(scalar->data.S64, dataType); + newScalar = psScalarAlloc(value->data.S64, dataType); break; case PS_TYPE_U64: - newScalar = psScalarAlloc(scalar->data.U64, dataType); + newScalar = psScalarAlloc(value->data.U64, dataType); break; case PS_TYPE_F32: - newScalar = psScalarAlloc(scalar->data.F32, dataType); + newScalar = psScalarAlloc(value->data.F32, dataType); break; case PS_TYPE_F64: - newScalar = psScalarAlloc(scalar->data.F64, dataType); + newScalar = psScalarAlloc(value->data.F64, dataType); break; case PS_TYPE_C32: - newScalar = psScalarAlloc(scalar->data.C32, dataType); + newScalar = psScalarAlloc(value->data.C32, dataType); break; case PS_TYPE_C64: - newScalar = psScalarAlloc(scalar->data.C64, dataType); + newScalar = psScalarAlloc(value->data.C64, dataType); break; default: Index: /trunk/psLib/src/mathtypes/psScalar.h =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.h (revision 4329) +++ /trunk/psLib/src/mathtypes/psScalar.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,5 @@ */ psScalar* psScalarCopy( - psScalar *scalar ///< Scalar to copy. + const psScalar *value ///< Scalar to copy. ); Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 4329) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 4330) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-10 21:46:46 $ +* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -129,5 +129,5 @@ } -psVector *psVectorExtend(psVector *vector, int delta, int nExtend) +psVector *psVectorExtend(psVector *vector, long delta, long nExtend) { // can't handle a NULL vector (don't know the data type to allocate) @@ -166,20 +166,20 @@ } -psVector* psVectorCopy(psVector* out, const psVector* in, psElemType type) -{ - if (in == NULL) { +psVector* psVectorCopy(psVector* output, const psVector* input, psElemType type) +{ + if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_SORT_NULL); - psFree(out); - return NULL; - } - - psS32 nElements = in->n; - - out = psVectorRecycle(out, nElements, type); + psFree(output); + return NULL; + } + + psS32 nElements = input->n; + + output = psVectorRecycle(output, nElements, type); #define PSVECTOR_COPY(INTYPE,OUTTYPE) { \ - ps##INTYPE *inVec = in->data.INTYPE; \ - ps##OUTTYPE *outVec = out->data.OUTTYPE; \ + ps##INTYPE *inVec = input->data.INTYPE; \ + ps##OUTTYPE *outVec = output->data.OUTTYPE; \ for (psS32 col=0;coltype.type) { \ + switch (input->type.type) { \ case PS_TYPE_S8: \ PSVECTOR_COPY(S8,OUTTYPE); \ @@ -232,5 +232,5 @@ PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, \ typeStr); \ - psFree(out); \ + psFree(output); \ } \ } \ @@ -257,10 +257,10 @@ PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, typeStr); - psFree(out); + psFree(output); break; } } - return out; + return output; Index: /trunk/psLib/src/mathtypes/psVector.h =================================================================== --- /trunk/psLib/src/mathtypes/psVector.h (revision 4329) +++ /trunk/psLib/src/mathtypes/psVector.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-10 21:46:46 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -101,6 +101,6 @@ psVector *psVectorExtend( psVector *vector, ///< Vector to extend - int delta, ///< Amount to expand allocation, if necessary - int nExtend ///< Number of elements to add to vector length + long delta, ///< Amount to expand allocation, if necessary + long nExtend ///< Number of elements to add to vector length ); @@ -132,6 +132,6 @@ */ psVector* psVectorCopy( - psVector* out, ///< if non-NULL, a psVector to recycle - const psVector* in, ///< the vector to copy. + psVector* output, ///< if non-NULL, a psVector to recycle + const psVector* input, ///< the vector to copy. psElemType type ///< the data type of the resulting psVector ); Index: /trunk/psLib/src/sys/psLogMsg.h =================================================================== --- /trunk/psLib/src/sys/psLogMsg.h (revision 4329) +++ /trunk/psLib/src/sys/psLogMsg.h (revision 4330) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:30 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,5 @@ * be displayed. The old log level will be returned. * - * @return psS32 old logging level + * @return int old logging level */ int psLogSetLevel( Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 4329) +++ /trunk/psLib/src/sys/psMemory.h (revision 4330) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:30 $ + * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -190,5 +190,5 @@ * Memory marked as persistent is excluded from memory leak checks. * - * @return psBool true if memory is marked persistent, otherwise false. + * @return bool true if memory is marked persistent, otherwise false. */ bool p_psMemGetPersistent( Index: /trunk/psLib/src/sys/psTrace.c =================================================================== --- /trunk/psLib/src/sys/psTrace.c (revision 4329) +++ /trunk/psLib/src/sys/psTrace.c (revision 4330) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -377,5 +377,5 @@ The level of "name" in the root component tree. *****************************************************************************/ -psS32 psTraceGetLevel(const char *name) +int psTraceGetLevel(const char *name) { char *compName = NULL; Index: /trunk/psLib/src/sys/psTrace.h =================================================================== --- /trunk/psLib/src/sys/psTrace.h (revision 4329) +++ /trunk/psLib/src/sys/psTrace.h (revision 4330) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-28 23:46:29 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -83,6 +83,7 @@ /// Get the trace level -psS32 psTraceGetLevel(const char *facil) ///< facilty of interest -; +int psTraceGetLevel( + const char *facil ///< facilty of interest +); /// Set all trace levels to zero (do not free nodes in the component tree). Index: /trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.h (revision 4329) +++ /trunk/psLib/src/sysUtils/psLogMsg.h (revision 4330) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:30 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,5 @@ * be displayed. The old log level will be returned. * - * @return psS32 old logging level + * @return int old logging level */ int psLogSetLevel( Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 4329) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 4330) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:30 $ + * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -190,5 +190,5 @@ * Memory marked as persistent is excluded from memory leak checks. * - * @return psBool true if memory is marked persistent, otherwise false. + * @return bool true if memory is marked persistent, otherwise false. */ bool p_psMemGetPersistent( Index: /trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.c (revision 4329) +++ /trunk/psLib/src/sysUtils/psTrace.c (revision 4330) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -377,5 +377,5 @@ The level of "name" in the root component tree. *****************************************************************************/ -psS32 psTraceGetLevel(const char *name) +int psTraceGetLevel(const char *name) { char *compName = NULL; Index: /trunk/psLib/src/sysUtils/psTrace.h =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.h (revision 4329) +++ /trunk/psLib/src/sysUtils/psTrace.h (revision 4330) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-28 23:46:29 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -83,6 +83,7 @@ /// Get the trace level -psS32 psTraceGetLevel(const char *facil) ///< facilty of interest -; +int psTraceGetLevel( + const char *facil ///< facilty of interest +); /// Set all trace levels to zero (do not free nodes in the component tree). Index: /trunk/psLib/src/types/psList.h =================================================================== --- /trunk/psLib/src/types/psList.h (revision 4329) +++ /trunk/psLib/src/types/psList.h (revision 4330) @@ -7,6 +7,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 03:13:02 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -107,5 +107,5 @@ * iterator position is not changed. * - * @return psBool TRUE if iterator successfully set, otherwise FALSE. + * @return bool TRUE if iterator successfully set, otherwise FALSE. */ bool psListIteratorSet( @@ -116,5 +116,5 @@ /** Adds an element to a psList at position given. * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAdd( @@ -126,5 +126,5 @@ /** Adds an data item to a psList at position just after the list position given * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAddAfter( @@ -135,5 +135,5 @@ /** Adds an data item to a psList at position just before the list position given * - * @return psBool TRUE if item was successfully added, otherwise FALSE. + * @return bool TRUE if item was successfully added, otherwise FALSE. */ bool psListAddBefore( @@ -144,5 +144,5 @@ /** Remove an item at the specified location from a list. * - * @return psBool TRUE if element is successfully removed, otherwise FALSE. + * @return bool TRUE if element is successfully removed, otherwise FALSE. */ bool psListRemove( @@ -153,5 +153,5 @@ /** Remove an item from a list. * - * @return psBool TRUE if element is successfully removed, otherwise FALSE. + * @return bool TRUE if element is successfully removed, otherwise FALSE. */ bool psListRemoveData( Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 4329) +++ /trunk/psLib/src/types/psMetadata.h (revision 4330) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-20 22:42:29 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-21 03:01:37 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -274,5 +274,5 @@ int location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char *name, ///< Name of metadata item. - int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) + int format, ///< Type of metadata item (psMetadataType) and options (psMetadataFlags) const char *comment, ///< Comment for metadata item. ... ///< Arguments for name formatting and metadata item data. @@ -298,5 +298,5 @@ /** Add a psS32 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddS32( @@ -310,5 +310,5 @@ /** Add a psF32 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddF32( @@ -322,5 +322,5 @@ /** Add a psF64 value to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddF64( @@ -346,5 +346,5 @@ /** Add a string to metadata collection. * - * @return psBool: True for success, False for failure. + * @return bool: True for success, False for failure. */ bool psMetadataAddStr( @@ -505,7 +505,7 @@ * returned. * - * @return psBool : Value of metadata item. - */ -psBool psMetadataLookupBool( + * @return bool : Value of metadata item. + */ +bool psMetadataLookupBool( bool *status, ///< Status of lookup. const psMetadata *md, ///< Metadata collection to lookup metadata item. @@ -558,5 +558,5 @@ * invalid the iterator position is not changed. * - * @return psBool TRUE if iterator successfully set, otherwise FALSE. + * @return bool TRUE if iterator successfully set, otherwise FALSE. */ bool psMetadataIteratorSet(