Index: trunk/psLib/src/astro/psCoord.h =================================================================== --- trunk/psLib/src/astro/psCoord.h (revision 4160) +++ trunk/psLib/src/astro/psCoord.h (revision 4162) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-07 02:08:26 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -357,5 +357,5 @@ /** Takes a given transform and inverts it linearly if possible. * - * @return psPlaneTransform + * @return psPlaneTransform * the linearly inverted transform */ @@ -367,5 +367,5 @@ /** Takes a transform and tests whether or not it is a linear projection. * - * @return psS32 + * @return psS32 * the order of the projection */ @@ -446,3 +446,3 @@ /// @} -#endif +#endif // #ifndef PS_COORD_H Index: trunk/psLib/src/astro/psTime.h =================================================================== --- trunk/psLib/src/astro/psTime.h (revision 4160) +++ trunk/psLib/src/astro/psTime.h (revision 4162) @@ -1,16 +1,16 @@ /** @file psTime.h * - * @brief Definitions for time, time utilities, and conversion functions for use + * @brief Definitions for time, time utilities, and conversion functions for use * with psLib astronomy functions. * - * A collection of functions are required by psLib to manipulate time data. These - * functions primarily consist of conversions between specific time formats. They - * use the UNIX timeval time system as the base upon which International Atomic + * A collection of functions are required by psLib to manipulate time data. These + * functions primarily consist of conversions between specific time formats. They + * use the UNIX timeval time system as the base upon which International Atomic * Time (TAI) and Universal Time Coordinated (UTC) are calculated. * * @author Ross Harman, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-31 21:47:46 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -88,6 +88,6 @@ /** Allocate time struct. * - * Allocates an empty time struct. User must specify the psTimeType - * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members + * Allocates an empty time struct. User must specify the psTimeType + * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members * of the struct are set to zero. * @@ -100,5 +100,5 @@ /** Get current time. * - * Gets current time from the system clock. User must specify the psTimeType + * Gets current time from the system clock. User must specify the psTimeType * (PS_TIME_TAI or PS_TIME_UTC) in the argument. * @@ -122,5 +122,5 @@ /** Convert psTime to Local Mean Sidereal Time (LMST). * - * Converts psTime at the given longitude to LMST time. If the input time is not + * Converts psTime at the given longitude to LMST time. If the input time is not * in UTC format, then it is converted. * @@ -186,5 +186,5 @@ /** Convert psTime to Julian date time. * - * Converts psTime to Julian date (JD) time. This function does not add or + * Converts psTime to Julian date (JD) time. This function does not add or * subtract leapseconds. * @@ -196,5 +196,5 @@ /** Convert psTime to modified Julian date time. * - * Converts psTime to modified Julian date (MJD) time. This function does not + * Converts psTime to modified Julian date (MJD) time. This function does not * add or subtract leapseconds. * @@ -207,5 +207,5 @@ /** Convert psTime to ISO8601 formatted string. * - * Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss. + * Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss. * This function does not add or subtract leapseconds. * @@ -229,6 +229,6 @@ * Convert psTime to tm time. * - * Converts psTime to tm time. This function is based on a Perl algorithm availble - * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function + * Converts psTime to tm time. This function is based on a Perl algorithm availble + * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function * does not add or subtract leapseconds. * @@ -304,6 +304,6 @@ /** Convert tm time to psTime. * - * Converts tm time to psTime. This function is based on a Perl algorithm availble - * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function + * Converts tm time to psTime. This function is based on a Perl algorithm availble + * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function * does not add or subtract leapseconds. * @@ -346,3 +346,3 @@ /// @} -#endif +#endif // #ifndef PSTIME_H Index: trunk/psLib/src/astronomy/psAstrometry.h =================================================================== --- trunk/psLib/src/astronomy/psAstrometry.h (revision 4160) +++ trunk/psLib/src/astronomy/psAstrometry.h (revision 4162) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-08 00:26:01 $ +* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -532,3 +532,3 @@ -#endif +#endif // #ifndef PS_ASTROMETRY_H Index: trunk/psLib/src/astronomy/psAstronomyErrors.h =================================================================== --- trunk/psLib/src/astronomy/psAstronomyErrors.h (revision 4160) +++ trunk/psLib/src/astronomy/psAstronomyErrors.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-17 21:12:42 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -87,3 +87,3 @@ //~End -#endif +#endif // #ifndef PS_ASTRONOMY_ERRORS_H Index: trunk/psLib/src/astronomy/psCoord.h =================================================================== --- trunk/psLib/src/astronomy/psCoord.h (revision 4160) +++ trunk/psLib/src/astronomy/psCoord.h (revision 4162) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-07 02:08:26 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -357,5 +357,5 @@ /** Takes a given transform and inverts it linearly if possible. * - * @return psPlaneTransform + * @return psPlaneTransform * the linearly inverted transform */ @@ -367,5 +367,5 @@ /** Takes a transform and tests whether or not it is a linear projection. * - * @return psS32 + * @return psS32 * the order of the projection */ @@ -446,3 +446,3 @@ /// @} -#endif +#endif // #ifndef PS_COORD_H Index: trunk/psLib/src/astronomy/psPhotometry.h =================================================================== --- trunk/psLib/src/astronomy/psPhotometry.h (revision 4160) +++ trunk/psLib/src/astronomy/psPhotometry.h (revision 4162) @@ -12,6 +12,6 @@ * incorporate it into psAstrometry.h * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-07 22:27:28 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,11 +29,11 @@ /** The photometric system description * - * The photometric system is defined by the psPhotSystem structure. A - * photometric system is identified by a human-readable name (ie, SDSS.g, - * Landolt92.B, GPC1.OTA32.r). Each photometric system is given a unique - * identifier ID. Observations taken with a specific camera, detector, and - * filter represent their own photometric system, and it may be necessary to - * perform transformations between these systems. Photometric systems - * associated with observations from a specific camera/ detector/filter + * The photometric system is defined by the psPhotSystem structure. A + * photometric system is identified by a human-readable name (ie, SDSS.g, + * Landolt92.B, GPC1.OTA32.r). Each photometric system is given a unique + * identifier ID. Observations taken with a specific camera, detector, and + * filter represent their own photometric system, and it may be necessary to + * perform transformations between these systems. Photometric systems + * associated with observations from a specific camera/ detector/filter * combination can be associated with those components. * @@ -72,3 +72,3 @@ /// @} -#endif +#endif // #ifndef PS_PHOTOMETRIC_H Index: trunk/psLib/src/astronomy/psTime.h =================================================================== --- trunk/psLib/src/astronomy/psTime.h (revision 4160) +++ trunk/psLib/src/astronomy/psTime.h (revision 4162) @@ -1,16 +1,16 @@ /** @file psTime.h * - * @brief Definitions for time, time utilities, and conversion functions for use + * @brief Definitions for time, time utilities, and conversion functions for use * with psLib astronomy functions. * - * A collection of functions are required by psLib to manipulate time data. These - * functions primarily consist of conversions between specific time formats. They - * use the UNIX timeval time system as the base upon which International Atomic + * A collection of functions are required by psLib to manipulate time data. These + * functions primarily consist of conversions between specific time formats. They + * use the UNIX timeval time system as the base upon which International Atomic * Time (TAI) and Universal Time Coordinated (UTC) are calculated. * * @author Ross Harman, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-31 21:47:46 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -88,6 +88,6 @@ /** Allocate time struct. * - * Allocates an empty time struct. User must specify the psTimeType - * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members + * Allocates an empty time struct. User must specify the psTimeType + * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members * of the struct are set to zero. * @@ -100,5 +100,5 @@ /** Get current time. * - * Gets current time from the system clock. User must specify the psTimeType + * Gets current time from the system clock. User must specify the psTimeType * (PS_TIME_TAI or PS_TIME_UTC) in the argument. * @@ -122,5 +122,5 @@ /** Convert psTime to Local Mean Sidereal Time (LMST). * - * Converts psTime at the given longitude to LMST time. If the input time is not + * Converts psTime at the given longitude to LMST time. If the input time is not * in UTC format, then it is converted. * @@ -186,5 +186,5 @@ /** Convert psTime to Julian date time. * - * Converts psTime to Julian date (JD) time. This function does not add or + * Converts psTime to Julian date (JD) time. This function does not add or * subtract leapseconds. * @@ -196,5 +196,5 @@ /** Convert psTime to modified Julian date time. * - * Converts psTime to modified Julian date (MJD) time. This function does not + * Converts psTime to modified Julian date (MJD) time. This function does not * add or subtract leapseconds. * @@ -207,5 +207,5 @@ /** Convert psTime to ISO8601 formatted string. * - * Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss. + * Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss. * This function does not add or subtract leapseconds. * @@ -229,6 +229,6 @@ * Convert psTime to tm time. * - * Converts psTime to tm time. This function is based on a Perl algorithm availble - * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function + * Converts psTime to tm time. This function is based on a Perl algorithm availble + * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function * does not add or subtract leapseconds. * @@ -304,6 +304,6 @@ /** Convert tm time to psTime. * - * Converts tm time to psTime. This function is based on a Perl algorithm availble - * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function + * Converts tm time to psTime. This function is based on a Perl algorithm availble + * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function * does not add or subtract leapseconds. * @@ -346,3 +346,3 @@ /// @} -#endif +#endif // #ifndef PSTIME_H Index: trunk/psLib/src/collections/psArray.h =================================================================== --- trunk/psLib/src/collections/psArray.h (revision 4160) +++ trunk/psLib/src/collections/psArray.h (revision 4162) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -48,5 +48,5 @@ /** Allocate an array. * - * Uses psLib memory allocation functions to create an array collection of + * Uses psLib memory allocation functions to create an array collection of * data * @@ -60,6 +60,6 @@ /** Reallocate an array. * - * Uses psLib memory allocation functions to reallocate an array collection - * of data. + * Uses psLib memory allocation functions to reallocate an array collection + * of data. * * @return psArray* : Pointer to psArray. @@ -85,7 +85,7 @@ /** Remove an element from the array * - * Finds and removes the specified data pointer from the list. + * Finds and removes the specified data pointer from the list. * - * @return bool: TRUE if the specified data pointer was found and removed, + * @return bool: TRUE if the specified data pointer was found and removed, * otherwise FALSE. * @@ -98,5 +98,5 @@ /** Deallocate/Dereference elements of an array. * - * Uses psLib memory allocation functions to deallocate/dereference elements + * Uses psLib memory allocation functions to deallocate/dereference elements * of a array of void pointers. The array psArr is not freed, and its elements * will all be set to NULL. @@ -112,9 +112,9 @@ * to specify how the objects on the array should be sorted. * - * The comparison function must return an integer less than, equal to, or - * greater than zero if the first argument is considered to be respectively - * less than, equal to, or greater than the second. + * The comparison function must return an integer less than, equal to, or + * greater than zero if the first argument is considered to be respectively + * less than, equal to, or greater than the second. * - * If two members compare as equal, their order in the sorted array is + * If two members compare as equal, their order in the sorted array is * undefined. * @@ -148,3 +148,3 @@ /// @} -#endif +#endif // #ifndef PS_ARRAY_H Index: trunk/psLib/src/collections/psBitSet.h =================================================================== --- trunk/psLib/src/collections/psBitSet.h (revision 4160) +++ trunk/psLib/src/collections/psBitSet.h (revision 4162) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -75,7 +75,7 @@ /** Clear a bit. * - * Clear a bit at a given bit location. The bit is cleared based on a zero - * index with the first bit set in the zero bit slot of the zero element of - * the byte array. + * Clear a bit at a given bit location. The bit is cleared based on a zero + * index with the first bit set in the zero bit slot of the zero element of + * the byte array. * * @return psBitSet* : Pointer to struct containing psBitSet. @@ -143,3 +143,3 @@ /// @} -#endif +#endif // #ifndef PSBITSET_H Index: trunk/psLib/src/collections/psCollectionsErrors.h =================================================================== --- trunk/psLib/src/collections/psCollectionsErrors.h (revision 4160) +++ trunk/psLib/src/collections/psCollectionsErrors.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-18 21:38:19 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -23,5 +23,5 @@ * $2 The error text (rest of the line in psCollectionsErrors.dat) * $n The order of the source line in psCollecitonsErrors.dat (comments excluded) - * + * * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ @@ -67,3 +67,3 @@ //~End -#endif +#endif // #ifndef PS_COLLECTIONS_ERRORS_H Index: trunk/psLib/src/collections/psCompare.h =================================================================== --- trunk/psLib/src/collections/psCompare.h (revision 4160) +++ trunk/psLib/src/collections/psCompare.h (revision 4162) @@ -6,11 +6,11 @@ * @ingroup Compare * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_COMPARE_H) +#ifndef PS_COMPARE_H #define PS_COMPARE_H @@ -24,7 +24,7 @@ * e.g., for psList of pointers to numeric values. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ typedef int (*psComparePtrFcn) ( @@ -35,7 +35,7 @@ /** A comparison function for sorting. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ typedef int (*psCompareFcn) ( @@ -46,7 +46,7 @@ /** Compare function of psS8 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS8Ptr( @@ -57,7 +57,7 @@ /** Compare function of psS16 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS16Ptr( @@ -68,7 +68,7 @@ /** Compare function of psS32 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS32Ptr( @@ -79,7 +79,7 @@ /** Compare function of psS64 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS64Ptr( @@ -90,7 +90,7 @@ /** Compare function of psU8 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU8Ptr( @@ -101,7 +101,7 @@ /** Compare function of psU16 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU16Ptr( @@ -112,7 +112,7 @@ /** Compare function of psU32 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU32Ptr( @@ -123,7 +123,7 @@ /** Compare function of psU64 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU64Ptr( @@ -134,7 +134,7 @@ /** Compare function of psF32 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF32Ptr( @@ -145,7 +145,7 @@ /** Compare function of psF64 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF64Ptr( @@ -156,7 +156,7 @@ /** Compare function of psS8 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS8Ptr( @@ -167,7 +167,7 @@ /** Compare function of psS16 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS16Ptr( @@ -178,7 +178,7 @@ /** Compare function of psS32 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS32Ptr( @@ -189,7 +189,7 @@ /** Compare function of psS64 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS64Ptr( @@ -200,7 +200,7 @@ /** Compare function of psU8 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU8Ptr( @@ -211,7 +211,7 @@ /** Compare function of psU16 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU16Ptr( @@ -222,7 +222,7 @@ /** Compare function of psU32 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingU32Ptr( @@ -233,7 +233,7 @@ /** Compare function of psU64 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingU64Ptr( @@ -244,7 +244,7 @@ /** Compare function of psF32 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingF32Ptr( @@ -255,7 +255,7 @@ /** Compare function of psF64 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingF64Ptr( @@ -266,7 +266,7 @@ /** Compare function of psS8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS8( @@ -278,7 +278,7 @@ /** Compare function of psS16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS16( @@ -290,7 +290,7 @@ /** Compare function of psS32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS32( @@ -302,7 +302,7 @@ /** Compare function of psS64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS64( @@ -314,7 +314,7 @@ /** Compare function of psU8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU8( @@ -326,7 +326,7 @@ /** Compare function of psU16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU16( @@ -338,7 +338,7 @@ /** Compare function of psU32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU32( @@ -350,7 +350,7 @@ /** Compare function of psU64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU64( @@ -362,7 +362,7 @@ /** Compare function of psF32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF32( @@ -374,7 +374,7 @@ /** Compare function of psF64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF64( @@ -386,7 +386,7 @@ /** Compare function of psS8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS8( @@ -398,7 +398,7 @@ /** Compare function of psS16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS16( @@ -410,7 +410,7 @@ /** Compare function of psS32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS32( @@ -422,7 +422,7 @@ /** Compare function of psS64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS64( @@ -434,7 +434,7 @@ /** Compare function of psU8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU8( @@ -446,7 +446,7 @@ /** Compare function of psU16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU16( @@ -458,7 +458,7 @@ /** Compare function of psU32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU32( @@ -470,7 +470,7 @@ /** Compare function of psU64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU64( @@ -482,7 +482,7 @@ /** Compare function of psF32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingF32( @@ -494,7 +494,7 @@ /** Compare function of psF64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingF64( @@ -506,3 +506,3 @@ /// @} -#endif +#endif // #ifndef PS_COMPARE_H Index: trunk/psLib/src/collections/psHash.h =================================================================== --- trunk/psLib/src/collections/psHash.h (revision 4160) +++ trunk/psLib/src/collections/psHash.h (revision 4162) @@ -11,10 +11,11 @@ * @author GLG, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 22:36:48 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_HASH_H) + +#ifndef PS_HASH_H #define PS_HASH_H @@ -83,3 +84,3 @@ /* \} */// End of DataGroup Functions -#endif +#endif // #ifndef PS_HASH_H Index: trunk/psLib/src/collections/psList.h =================================================================== --- trunk/psLib/src/collections/psList.h (revision 4160) +++ trunk/psLib/src/collections/psList.h (revision 4162) @@ -1,5 +1,2 @@ -#if !defined(PS_LIST_H) -#define PS_LIST_H - /** @file psList.h * @brief Support for doubly linked lists @@ -10,9 +7,12 @@ * @ingroup LinkedList * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-11 23:17:46 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ + +#ifndef PS_LIST_H +#define PS_LIST_H #include // we need a mutex to make this stuff thread safe. @@ -210,9 +210,9 @@ /** Sort a list via a comparison function. * - * The comparison function must return an integer less than, equal to, or - * greater than zero if the first argument is considered to be respectively - * less than, equal to, or greater than the second. - * - * If two members compare as equal, their order in the sorted array is + * The comparison function must return an integer less than, equal to, or + * greater than zero if the first argument is considered to be respectively + * less than, equal to, or greater than the second. + * + * If two members compare as equal, their order in the sorted array is * undefined. * @@ -226,3 +226,4 @@ /// @} End of DataGroup Functions -#endif +#endif // #ifndef PS_LIST_H + Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 4160) +++ trunk/psLib/src/collections/psMetadata.h (revision 4162) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-07 19:59:39 $ +* @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -70,5 +70,5 @@ * * Enumeration for the modification of the behaviour in psMetadataAddItem. - * + * * @see psMetadataAddItem */ @@ -239,5 +239,5 @@ va_list list ///< Arguments for name formatting and metadata item data. ); -#endif +#endif // #ifndef SWIG /** Create a metadata collection. @@ -294,5 +294,5 @@ va_list list ///< Arguments for name formatting and metadata item data. ); -#endif +#endif // #ifndef SWIG psBool psMetadataAddS32(psMetadata* md, psS32 location, const char* name, @@ -479,3 +479,3 @@ /// @} -#endif +#endif // #ifndef PS_METADATA_H Index: trunk/psLib/src/collections/psMetadataIO.h =================================================================== --- trunk/psLib/src/collections/psMetadataIO.h (revision 4160) +++ trunk/psLib/src/collections/psMetadataIO.h (revision 4162) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-16 19:43:53 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -94,3 +94,3 @@ /// @} -#endif +#endif // #ifndef PS_METADATAIO_H Index: trunk/psLib/src/collections/psPixels.h =================================================================== --- trunk/psLib/src/collections/psPixels.h (revision 4160) +++ trunk/psLib/src/collections/psPixels.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:36 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -132,3 +132,3 @@ ); -#endif +#endif // #ifndef PS_PIXELS_H Index: trunk/psLib/src/collections/psScalar.h =================================================================== --- trunk/psLib/src/collections/psScalar.h (revision 4160) +++ trunk/psLib/src/collections/psScalar.h (revision 4162) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -82,3 +82,3 @@ /// @} -#endif +#endif // #ifndef PS_SCALAR_H Index: trunk/psLib/src/collections/psVector.h =================================================================== --- trunk/psLib/src/collections/psVector.h (revision 4160) +++ trunk/psLib/src/collections/psVector.h (revision 4162) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-29 02:25:09 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -176,3 +176,3 @@ /// @} -#endif +#endif // #ifndef PS_VECTOR_H Index: trunk/psLib/src/dataIO/psFileUtilsErrors.h =================================================================== --- trunk/psLib/src/dataIO/psFileUtilsErrors.h (revision 4160) +++ trunk/psLib/src/dataIO/psFileUtilsErrors.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-08 17:58:57 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -23,5 +23,5 @@ * $2 The error text (rest of the line in psAstronomyErrors.dat) * $n The order of the source line in psAstronomyErrors.dat (comments excluded) - * + * * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ @@ -78,3 +78,3 @@ //~End -#endif +#endif // #ifndef PS_FILEUTIL_ERRORS_H Index: trunk/psLib/src/dataIO/psFits.h =================================================================== --- trunk/psLib/src/dataIO/psFits.h (revision 4160) +++ trunk/psLib/src/dataIO/psFits.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 21:07:59 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -265,3 +265,3 @@ /// @} -#endif +#endif // #ifndef PS_FITS_H Index: trunk/psLib/src/dataIO/psLookupTable.c =================================================================== --- trunk/psLib/src/dataIO/psLookupTable.c (revision 4160) +++ trunk/psLib/src/dataIO/psLookupTable.c (revision 4162) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-31 21:46:56 $ +* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -15,13 +15,6 @@ #include #include -//#ifdef DARWIN -#undef __STRICT_ANSI__ -//#endif #include -//#ifdef DARWIN -#define __STRICT_ANSI__ -//#endif #include -#include #include "psMemory.h" Index: trunk/psLib/src/dataIO/psLookupTable.h =================================================================== --- trunk/psLib/src/dataIO/psLookupTable.h (revision 4160) +++ trunk/psLib/src/dataIO/psLookupTable.h (revision 4162) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-31 21:46:56 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -131,3 +131,3 @@ ); -#endif +#endif // #ifndef PS_LOOKUPTABLE_H Index: trunk/psLib/src/dataManip/psBinaryOp.h =================================================================== --- trunk/psLib/src/dataManip/psBinaryOp.h (revision 4160) +++ trunk/psLib/src/dataManip/psBinaryOp.h (revision 4162) @@ -1,3 +1,2 @@ - /** @file psBinaryOp.h * @@ -31,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-10 02:36:41 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -65,3 +64,3 @@ /// @} -#endif +#endif // #ifndef PSBINARY_OP_H Index: trunk/psLib/src/dataManip/psConstants.h =================================================================== --- trunk/psLib/src/dataManip/psConstants.h (revision 4160) +++ trunk/psLib/src/dataManip/psConstants.h (revision 4162) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.72 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-04 00:49:48 $ + * @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -45,6 +45,5 @@ #define M_1_PI 0.3183098861837906715377675267450287 /* 1/pi */ #define M_2_PI 0.6366197723675813430755350534900574 /* 2/pi */ -#endif -#define PS_PI 3.1415926535897932384626433832795029 /* pi */ +#endif // #ifndef M_PI #define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0) @@ -699,15 +698,9 @@ *****************************************************************************/ #define PS_MAX(A, B) \ -(((A) > (B)) ? (A) : (B)) \ +(((A) > (B)) ? (A) : (B)) #define PS_MIN(A, B) \ -(((A) < (B)) ? (A) : (B)) \ +(((A) < (B)) ? (A) : (B)) #define PS_SQR(A) \ -((A) * (A)) \ - -#ifdef DARWIN -#define PS_SQRT_F32(A) ((float) sqrt(A)) -#else -#define PS_SQRT_F32(A) (sqrtf(A)) -#endif +((A) * (A)) Index: trunk/psLib/src/dataManip/psDataManipErrors.h =================================================================== --- trunk/psLib/src/dataManip/psDataManipErrors.h (revision 4160) +++ trunk/psLib/src/dataManip/psDataManipErrors.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -69,3 +69,3 @@ //~End -#endif +#endif // #ifndef PS_DATAMANIP_ERRORS_H Index: trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- trunk/psLib/src/dataManip/psFunctions.c (revision 4160) +++ trunk/psLib/src/dataManip/psFunctions.c (revision 4162) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.105 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1024,5 +1024,5 @@ if (normal == true) { - tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma)); + tmp = 1.0 / sqrtf(2.0 * M_PI * (sigma * sigma)); } Index: trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- trunk/psLib/src/dataManip/psFunctions.h (revision 4160) +++ trunk/psLib/src/dataManip/psFunctions.h (revision 4162) @@ -12,11 +12,11 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_FUNCTIONS_H) +#ifndef PS_FUNCTIONS_H #define PS_FUNCTIONS_H @@ -34,8 +34,8 @@ /** Evaluate a non-normalized Gaussian with the given mean and sigma at the - * given coordianate. - * - * Note that this is not a Gaussian deviate. The evaluated Gaussian is: - * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] + * given coordianate. + * + * Note that this is not a Gaussian deviate. The evaluated Gaussian is: + * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * * @return psF32 value on the gaussian curve given the input parameters @@ -49,8 +49,8 @@ /** Produce a vector of random numbers from a Gaussian distribution with - * the specified mean and sigma - * + * the specified mean and sigma + * * @return psVector* vector of random numbers - * + * */ psVector* p_psGaussianDev( @@ -433,8 +433,8 @@ const psVector* y, psF32 X); -#endif - -/* \} */// End of MathGroup Functions - -#endif - +#endif // #if 0 + +/** \} */ // End of MathGroup Functions + +#endif // #ifndef PS_FUNCTIONS_H + Index: trunk/psLib/src/dataManip/psMatrix.h =================================================================== --- trunk/psLib/src/dataManip/psMatrix.h (revision 4160) +++ trunk/psLib/src/dataManip/psMatrix.h (revision 4162) @@ -1,3 +1,2 @@ - /** @file psMatrix.h * @@ -22,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -164,3 +163,3 @@ /// @} -#endif +#endif // #ifndef PSMATRIX_H Index: trunk/psLib/src/dataManip/psMinimize.h =================================================================== --- trunk/psLib/src/dataManip/psMinimize.h (revision 4160) +++ trunk/psLib/src/dataManip/psMinimize.h (revision 4162) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-05 22:23:29 $ + * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -15,5 +15,5 @@ */ -#if !defined(PS_MINIMIZE_H) +#ifndef PS_MINIMIZE_H #define PS_MINIMIZE_H @@ -53,11 +53,11 @@ /** Derive a polynomial fit. * - * psVectorFitPolynomial1d returns the polynomial that best fits the - * observations. The input parameters are a polynomial that specifies the - * fit order, myPoly, which will be altered and returned with the best-fit - * coefficients; and the observations, x, y and yErr. The independent - * variable list, x may be NULL, in which case the vector index is used. - * The dependent variable error, yErr may be null, in which case the solution - * is determined in the assumption that all data errors are equal. This + * psVectorFitPolynomial1d returns the polynomial that best fits the + * observations. The input parameters are a polynomial that specifies the + * fit order, myPoly, which will be altered and returned with the best-fit + * coefficients; and the observations, x, y and yErr. The independent + * variable list, x may be NULL, in which case the vector index is used. + * The dependent variable error, yErr may be null, in which case the solution + * is determined in the assumption that all data errors are equal. This * function must be valid only for types psF32, psF64. * @@ -142,4 +142,4 @@ /* \} */// End of MathGroup Functions -#endif +#endif // #ifndef PS_MINIMIZE_H Index: trunk/psLib/src/dataManip/psRandom.h =================================================================== --- trunk/psLib/src/dataManip/psRandom.h (revision 4160) +++ trunk/psLib/src/dataManip/psRandom.h (revision 4162) @@ -10,11 +10,11 @@ * @author GLG, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:23 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_RANDOM_H) +#ifndef PS_RANDOM_H #define PS_RANDOM_H @@ -56,4 +56,3 @@ /* \} */// End of MathGroup Functions -#endif - +#endif // #ifndef PS_RANDOM_H Index: trunk/psLib/src/dataManip/psStats.c =================================================================== --- trunk/psLib/src/dataManip/psStats.c (revision 4160) +++ trunk/psLib/src/dataManip/psStats.c (revision 4162) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.131 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 23:11:54 $ + * @version $Revision: 1.132 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -878,5 +878,5 @@ } else { countFloat = (psF32)countInt; - stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); + stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); } } @@ -992,8 +992,8 @@ // data ranges are used correctly. if (errors != NULL) { - stats->sampleStdev = (1.0 / PS_SQRT_F32(errorDivisor)); + stats->sampleStdev = (1.0 / sqrtf(errorDivisor)); } else { countFloat = (psF32)countInt; - stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); + stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); } @@ -1627,5 +1627,5 @@ } } - myStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); + myStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); p_psNormalizeVectorRangeF32(robustHistogramVector, 0.0, 1.0); @@ -1657,5 +1657,5 @@ "WARNING: failed fit a 1D polynomial.\n"); } - psF32 polyFitSigma = PS_SQRT_F32(-0.5 / tmpPoly->coeff[2]); + psF32 polyFitSigma = sqrtf(-0.5 / tmpPoly->coeff[2]); psF32 polyFitMean = tmpPoly->coeff[1] * PS_SQR(polyFitSigma); // psF32 polyFitNorm = exp(tmpPoly->coedd[0] + PS_SQR(polyFitMean) / (2.0 * PS_SQR(polyFitSigma))); Index: trunk/psLib/src/dataManip/psStats.h =================================================================== --- trunk/psLib/src/dataManip/psStats.h (revision 4160) +++ trunk/psLib/src/dataManip/psStats.h (revision 4162) @@ -14,10 +14,10 @@ * @author GLG, MHPCC * - * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 23:11:54 $ + * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_STATS_H) +#ifndef PS_STATS_H #define PS_STATS_H @@ -112,9 +112,9 @@ /** The basic histogram structure which contains bounds and bins. * - * In this structure, the vector bounds specifies the boundaries of the - * histogram bins, and must of type psF32, while nums specifies the number - * of entries in the bin, and must of type psU32. The value of bounds.n must - * therefore be 1 greater than than nums.n. The two values minNum and maxNum - * are the number of data values which fell below the lower limit bound or + * In this structure, the vector bounds specifies the boundaries of the + * histogram bins, and must of type psF32, while nums specifies the number + * of entries in the bin, and must of type psU32. The value of bounds.n must + * therefore be 1 greater than than nums.n. The two values minNum and maxNum + * are the number of data values which fell below the lower limit bound or * above the upper limit bound, respectively. */ @@ -130,6 +130,6 @@ /** Allocator for psHistogram where the bounds of the bins are implicitly - * specified through simply specifying an upper and lower limit along with - * the size of the bins. + * specified through simply specifying an upper and lower limit along with + * the size of the bins. * * @return psHistogram* Newly allocated psHistogram @@ -142,5 +142,5 @@ /** Allocator for psHistogram where the bounds of the bins are explicitly - * specified. + * specified. * * @return psHistogram* Newly allocated psHistogram @@ -152,5 +152,5 @@ /** Calculate a histogram * - * The following function populates the histogram bins from the specified + * The following function populates the histogram bins from the specified * vector (in). It alters and returns the histogram out structure. The input * vector may be of types psU8, psU16, psF32, psF64. @@ -169,5 +169,5 @@ * * @return psBool If more than one statistic result is set in stats->options, - * false is returned and the value parameter is not set, + * false is returned and the value parameter is not set, * otherwise true is returned. */ @@ -193,3 +193,3 @@ /// @} -#endif +#endif // #ifndef PS_STATS_H Index: trunk/psLib/src/dataManip/psUnaryOp.h =================================================================== --- trunk/psLib/src/dataManip/psUnaryOp.h (revision 4160) +++ trunk/psLib/src/dataManip/psUnaryOp.h (revision 4162) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-10 02:36:41 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,3 +67,3 @@ /// @} -#endif +#endif // #ifndef PSUNARY_OP_H Index: trunk/psLib/src/dataManip/psVectorFFT.h =================================================================== --- trunk/psLib/src/dataManip/psVectorFFT.h (revision 4160) +++ trunk/psLib/src/dataManip/psVectorFFT.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -36,9 +36,9 @@ /** Forward and reverse FFT calculations. * - * This takes as input the vector of interest (in) and the direction + * This takes as input the vector of interest (in) and the direction * (direction), which is specified by an enumerated type psFftDirection. - * The input vector may be of type psF32 or psC32, the result is always - * psC32. If the input vector is psF32, the direction must be forward. - * + * The input vector may be of type psF32 or psC32, the result is always + * psC32. If the input vector is psF32, the direction must be forward. + * * @return psVector* the FFT transformation result */ @@ -50,5 +50,5 @@ /** extract the real portion of a complex vector - * + * * @return psVector* real portion of the input vector. */ @@ -59,5 +59,5 @@ /** extract the imaginary portion of a complex vector - * + * * @return psVector* imaginary portion of the input vector. */ @@ -68,5 +68,5 @@ /** creates a complex vector from separate real and imaginary vectors - * + * * @return psVector* resulting complex vector */ @@ -78,5 +78,5 @@ /** computes the complex conjugate of a vector - * + * * @return psVector* the complex conjugate of the 'in' vector */ @@ -87,5 +87,5 @@ /** computes the power spectrum of a vector - * + * * @return psVector* the power spectrum of the 'in' vector */ @@ -97,3 +97,3 @@ /// @} -#endif +#endif // #ifndef PS_VECTOR_FFT_H Index: trunk/psLib/src/fft/psImageFFT.h =================================================================== --- trunk/psLib/src/fft/psImageFFT.h (revision 4160) +++ trunk/psLib/src/fft/psImageFFT.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -24,9 +24,9 @@ /** Forward and reverse FFT calculations. * - * This takes as input the image of interest (in) and the direction + * This takes as input the image of interest (in) and the direction * (direction), which is specified by an enumerated type psFftDirection. - * The input image may be of type psF32 or psC32, the result is always - * psC32. If the input vector is psF32, the direction must be forward. - * + * The input image may be of type psF32 or psC32, the result is always + * psC32. If the input vector is psF32, the direction must be forward. + * * @return psImage* the FFT transformation result */ @@ -38,5 +38,5 @@ /** extract the real portion of a complex image - * + * * @return psImage* real portion of the input image. */ @@ -47,5 +47,5 @@ /** extract the imaginary portion of a complex image - * + * * @return psImage* imaginary portion of the input image. */ @@ -56,5 +56,5 @@ /** creates a complex image from separate real and imaginary plane images - * + * * @return psImage* resulting complex image */ @@ -66,5 +66,5 @@ /** computes the complex conjugate of an image - * + * * @return psImage* the complex conjugate of the 'in' image */ @@ -75,5 +75,5 @@ /** computes the power spectrum of an image - * + * * @return psImage* the power spectrum of the 'in' image */ @@ -85,3 +85,3 @@ /// @} -#endif +#endif // #ifndef PS_IMAGE_FFT_H Index: trunk/psLib/src/fft/psVectorFFT.h =================================================================== --- trunk/psLib/src/fft/psVectorFFT.h (revision 4160) +++ trunk/psLib/src/fft/psVectorFFT.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -36,9 +36,9 @@ /** Forward and reverse FFT calculations. * - * This takes as input the vector of interest (in) and the direction + * This takes as input the vector of interest (in) and the direction * (direction), which is specified by an enumerated type psFftDirection. - * The input vector may be of type psF32 or psC32, the result is always - * psC32. If the input vector is psF32, the direction must be forward. - * + * The input vector may be of type psF32 or psC32, the result is always + * psC32. If the input vector is psF32, the direction must be forward. + * * @return psVector* the FFT transformation result */ @@ -50,5 +50,5 @@ /** extract the real portion of a complex vector - * + * * @return psVector* real portion of the input vector. */ @@ -59,5 +59,5 @@ /** extract the imaginary portion of a complex vector - * + * * @return psVector* imaginary portion of the input vector. */ @@ -68,5 +68,5 @@ /** creates a complex vector from separate real and imaginary vectors - * + * * @return psVector* resulting complex vector */ @@ -78,5 +78,5 @@ /** computes the complex conjugate of a vector - * + * * @return psVector* the complex conjugate of the 'in' vector */ @@ -87,5 +87,5 @@ /** computes the power spectrum of a vector - * + * * @return psVector* the power spectrum of the 'in' vector */ @@ -97,3 +97,3 @@ /// @} -#endif +#endif // #ifndef PS_VECTOR_FFT_H Index: trunk/psLib/src/fits/psFits.h =================================================================== --- trunk/psLib/src/fits/psFits.h (revision 4160) +++ trunk/psLib/src/fits/psFits.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 21:07:59 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -265,3 +265,3 @@ /// @} -#endif +#endif // #ifndef PS_FITS_H Index: trunk/psLib/src/image/psImageConvolve.h =================================================================== --- trunk/psLib/src/image/psImageConvolve.h (revision 4160) +++ trunk/psLib/src/image/psImageConvolve.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -41,24 +41,24 @@ /** Allocates a convolution kernel of the given range * - * In order to perform a convolution, we need to define the convolution - * kernel. We need a more general object than a psImage so that we can - * incorporate the offset from the (0, 0) pixel to the (0, 0) value of the - * kernel. It might be convenient to allow both positive and negative - * indices to convey the positive and negative shifts. One might consider - * setting the x0 and y0 members of a psImage to the appropriate offsets, - * but this is not the purpose of these members, and doing so may affect the + * In order to perform a convolution, we need to define the convolution + * kernel. We need a more general object than a psImage so that we can + * incorporate the offset from the (0, 0) pixel to the (0, 0) value of the + * kernel. It might be convenient to allow both positive and negative + * indices to convey the positive and negative shifts. One might consider + * setting the x0 and y0 members of a psImage to the appropriate offsets, + * but this is not the purpose of these members, and doing so may affect the * behavior of other psImage operations. * - * This construction allows the kernel member to use negative indices, while + * This construction allows the kernel member to use negative indices, while * preserving the location of psMemBlocks relative to allocated memory. * - * The maximum extent of the kernel shifts shall be defined by the xMin, - * xMax, yMin and yMax members. Note that xMin and yMin, under normal - * circumstances, should be negative numbers. That is, - * myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or + * The maximum extent of the kernel shifts shall be defined by the xMin, + * xMax, yMin and yMax members. Note that xMin and yMin, under normal + * circumstances, should be negative numbers. That is, + * myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or * more negative than -3 and -2, respectively. * - * In the event that one of the minimum values is greater than the - * corresponding maximum value, the function shall generate a warning, and + * In the event that one of the minimum values is greater than the + * corresponding maximum value, the function shall generate a warning, and * the offending values shall be exchanged. * @@ -74,14 +74,14 @@ /** Generates a kernel given a list of shift values * - * Given a list of values (e.g., shifts made in the course of OT guiding), - * psKernelGenerate shall return the appropriate kernel. The vectors xShifts - * and yShifts, which are a list of shifts relative to some starting point, - * will be supplied by the user. The elements of the vectors should be of an - * integer type; otherwise the values shall be truncated to integers. The - * output kernel shall be normalized such that the sum over the kernel is - * unity. + * Given a list of values (e.g., shifts made in the course of OT guiding), + * psKernelGenerate shall return the appropriate kernel. The vectors xShifts + * and yShifts, which are a list of shifts relative to some starting point, + * will be supplied by the user. The elements of the vectors should be of an + * integer type; otherwise the values shall be truncated to integers. The + * output kernel shall be normalized such that the sum over the kernel is + * unity. * - * If the vectors are not of the same number of elements, then the function - * shall generate a warning shall be generated, following which, the longer + * If the vectors are not of the same number of elements, then the function + * shall generate a warning shall be generated, following which, the longer * vector trimmed to the length of the shorter, and the function shall continue. * @@ -97,18 +97,18 @@ /** convolve an image with a kernel * - * Given an input image and the convolution kernel, psImageConvolve shall - * convolve the input image, in, with the kernel, kernel and return the + * Given an input image and the convolution kernel, psImageConvolve shall + * convolve the input image, in, with the kernel, kernel and return the * convolved image, out. - * - * Two methods shall be available for the convolution: if direct is true, - * then the convolution shall be performed in real space (appropriate for - * small kernels); otherwise, the convolution shall be performed using Fast - * Fourier Transforms (FFTs; appropriate for larger kernels). The latter - * option involves padding the input image, copying the kernel into an image - * of the same size as the padded input image, performing an FFT on each, - * multiplying the FFTs, and performing an inverse FFT before trimming the + * + * Two methods shall be available for the convolution: if direct is true, + * then the convolution shall be performed in real space (appropriate for + * small kernels); otherwise, the convolution shall be performed using Fast + * Fourier Transforms (FFTs; appropriate for larger kernels). The latter + * option involves padding the input image, copying the kernel into an image + * of the same size as the padded input image, performing an FFT on each, + * multiplying the FFTs, and performing an inverse FFT before trimming the * image back to the original size. * - * @return psImage* resulting image + * @return psImage* resulting image */ psImage* psImageConvolve( @@ -119,3 +119,3 @@ ); -#endif +#endif // #ifndef PS_IMAGE_CONVOLVE_H Index: trunk/psLib/src/image/psImageErrors.h =================================================================== --- trunk/psLib/src/image/psImageErrors.h (revision 4160) +++ trunk/psLib/src/image/psImageErrors.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -23,5 +23,5 @@ * $2 The error text (rest of the line in psImageErrors.dat) * $n The order of the source line in psImageErrors.dat (comments excluded) - * + * * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ @@ -99,3 +99,3 @@ //~End -#endif +#endif // #ifndef PS_IMAGE_ERRORS_H Index: trunk/psLib/src/image/psImageFFT.h =================================================================== --- trunk/psLib/src/image/psImageFFT.h (revision 4160) +++ trunk/psLib/src/image/psImageFFT.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -24,9 +24,9 @@ /** Forward and reverse FFT calculations. * - * This takes as input the image of interest (in) and the direction + * This takes as input the image of interest (in) and the direction * (direction), which is specified by an enumerated type psFftDirection. - * The input image may be of type psF32 or psC32, the result is always - * psC32. If the input vector is psF32, the direction must be forward. - * + * The input image may be of type psF32 or psC32, the result is always + * psC32. If the input vector is psF32, the direction must be forward. + * * @return psImage* the FFT transformation result */ @@ -38,5 +38,5 @@ /** extract the real portion of a complex image - * + * * @return psImage* real portion of the input image. */ @@ -47,5 +47,5 @@ /** extract the imaginary portion of a complex image - * + * * @return psImage* imaginary portion of the input image. */ @@ -56,5 +56,5 @@ /** creates a complex image from separate real and imaginary plane images - * + * * @return psImage* resulting complex image */ @@ -66,5 +66,5 @@ /** computes the complex conjugate of an image - * + * * @return psImage* the complex conjugate of the 'in' image */ @@ -75,5 +75,5 @@ /** computes the power spectrum of an image - * + * * @return psImage* the power spectrum of the 'in' image */ @@ -85,3 +85,3 @@ /// @} -#endif +#endif // #ifndef PS_IMAGE_FFT_H Index: trunk/psLib/src/image/psImageGeomManip.h =================================================================== --- trunk/psLib/src/image/psImageGeomManip.h (revision 4160) +++ trunk/psLib/src/image/psImageGeomManip.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 02:08:21 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -155,3 +155,3 @@ ); -#endif +#endif // #ifndef PS_IMAGE_GEOM_MANIP_H Index: trunk/psLib/src/image/psImagePixelExtract.h =================================================================== --- trunk/psLib/src/image/psImagePixelExtract.h (revision 4160) +++ trunk/psLib/src/image/psImagePixelExtract.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 02:08:21 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -130,3 +130,3 @@ /// @} -#endif +#endif // #ifndef PSIMAGE_PIXEL_EXTRACT_H Index: trunk/psLib/src/image/psImagePixelManip.h =================================================================== --- trunk/psLib/src/image/psImagePixelManip.h (revision 4160) +++ trunk/psLib/src/image/psImagePixelManip.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 02:08:21 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -88,3 +88,3 @@ ); -#endif +#endif // #ifndef PS_IMAGE_PIXEL_MANIP_H Index: trunk/psLib/src/image/psImageStats.h =================================================================== --- trunk/psLib/src/image/psImageStats.h (revision 4160) +++ trunk/psLib/src/image/psImageStats.h (revision 4162) @@ -9,10 +9,10 @@ * @author GLG, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-24 19:39:53 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_IMAGE_STATS_H) +#ifndef PS_IMAGE_STATS_H #define PS_IMAGE_STATS_H @@ -28,8 +28,8 @@ /** This routine must determine the various statistics for the image. * - * Determine statistics for image (or subimage). The statistics to be - * determined are specified by stats. The mask allows pixels to be excluded - * if their corresponding mask pixel value matches the value of maskVal. - * This function must be defined for the following types: psS8, psU16, psF32, + * Determine statistics for image (or subimage). The statistics to be + * determined are specified by stats. The mask allows pixels to be excluded + * if their corresponding mask pixel value matches the value of maskVal. + * This function must be defined for the following types: psS8, psU16, psF32, * psF64. * @@ -45,6 +45,6 @@ /** Construct a histogram from an image (or subimage). * - * The histogram to generate is specified by psHistogram hist (see section - * 4.3.2 in SDRS). This function must be defined for the following types: + * The histogram to generate is specified by psHistogram hist (see section + * 4.3.2 in SDRS). This function must be defined for the following types: * psS8, psU16, psF32, psF64. * @@ -60,6 +60,6 @@ /** Fit a 2-D polynomial surface to an image. * - * The input structure coeffs contains the desired order and terms of - * interest. This function must be defined for the following types: psS8, + * The input structure coeffs contains the desired order and terms of + * interest. This function must be defined for the following types: psS8, * psU16, psF32, psF64. * @@ -74,6 +74,6 @@ /** Evaluate a 2-D polynomial surface for the image pixels. * - * Given the input polynomial coefficients, set the image pixel values on the - * basis of the polynomial function. This function must be defined for the + * Given the input polynomial coefficients, set the image pixel values on the + * basis of the polynomial function. This function must be defined for the * following types: psS8, psU16, psF32, psF64. * @@ -87,3 +87,3 @@ /// @} -#endif +#endif // #ifndef PS_IMAGE_STATS_H Index: trunk/psLib/src/image/psImageStructManip.h =================================================================== --- trunk/psLib/src/image/psImageStructManip.h (revision 4160) +++ trunk/psLib/src/image/psImageStructManip.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 05:18:20 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -82,3 +82,3 @@ /// @} -#endif +#endif // #ifndef PSIMAGE_STRUCT_MANIP_H Index: trunk/psLib/src/imageops/psImageConvolve.h =================================================================== --- trunk/psLib/src/imageops/psImageConvolve.h (revision 4160) +++ trunk/psLib/src/imageops/psImageConvolve.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -41,24 +41,24 @@ /** Allocates a convolution kernel of the given range * - * In order to perform a convolution, we need to define the convolution - * kernel. We need a more general object than a psImage so that we can - * incorporate the offset from the (0, 0) pixel to the (0, 0) value of the - * kernel. It might be convenient to allow both positive and negative - * indices to convey the positive and negative shifts. One might consider - * setting the x0 and y0 members of a psImage to the appropriate offsets, - * but this is not the purpose of these members, and doing so may affect the + * In order to perform a convolution, we need to define the convolution + * kernel. We need a more general object than a psImage so that we can + * incorporate the offset from the (0, 0) pixel to the (0, 0) value of the + * kernel. It might be convenient to allow both positive and negative + * indices to convey the positive and negative shifts. One might consider + * setting the x0 and y0 members of a psImage to the appropriate offsets, + * but this is not the purpose of these members, and doing so may affect the * behavior of other psImage operations. * - * This construction allows the kernel member to use negative indices, while + * This construction allows the kernel member to use negative indices, while * preserving the location of psMemBlocks relative to allocated memory. * - * The maximum extent of the kernel shifts shall be defined by the xMin, - * xMax, yMin and yMax members. Note that xMin and yMin, under normal - * circumstances, should be negative numbers. That is, - * myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or + * The maximum extent of the kernel shifts shall be defined by the xMin, + * xMax, yMin and yMax members. Note that xMin and yMin, under normal + * circumstances, should be negative numbers. That is, + * myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or * more negative than -3 and -2, respectively. * - * In the event that one of the minimum values is greater than the - * corresponding maximum value, the function shall generate a warning, and + * In the event that one of the minimum values is greater than the + * corresponding maximum value, the function shall generate a warning, and * the offending values shall be exchanged. * @@ -74,14 +74,14 @@ /** Generates a kernel given a list of shift values * - * Given a list of values (e.g., shifts made in the course of OT guiding), - * psKernelGenerate shall return the appropriate kernel. The vectors xShifts - * and yShifts, which are a list of shifts relative to some starting point, - * will be supplied by the user. The elements of the vectors should be of an - * integer type; otherwise the values shall be truncated to integers. The - * output kernel shall be normalized such that the sum over the kernel is - * unity. + * Given a list of values (e.g., shifts made in the course of OT guiding), + * psKernelGenerate shall return the appropriate kernel. The vectors xShifts + * and yShifts, which are a list of shifts relative to some starting point, + * will be supplied by the user. The elements of the vectors should be of an + * integer type; otherwise the values shall be truncated to integers. The + * output kernel shall be normalized such that the sum over the kernel is + * unity. * - * If the vectors are not of the same number of elements, then the function - * shall generate a warning shall be generated, following which, the longer + * If the vectors are not of the same number of elements, then the function + * shall generate a warning shall be generated, following which, the longer * vector trimmed to the length of the shorter, and the function shall continue. * @@ -97,18 +97,18 @@ /** convolve an image with a kernel * - * Given an input image and the convolution kernel, psImageConvolve shall - * convolve the input image, in, with the kernel, kernel and return the + * Given an input image and the convolution kernel, psImageConvolve shall + * convolve the input image, in, with the kernel, kernel and return the * convolved image, out. - * - * Two methods shall be available for the convolution: if direct is true, - * then the convolution shall be performed in real space (appropriate for - * small kernels); otherwise, the convolution shall be performed using Fast - * Fourier Transforms (FFTs; appropriate for larger kernels). The latter - * option involves padding the input image, copying the kernel into an image - * of the same size as the padded input image, performing an FFT on each, - * multiplying the FFTs, and performing an inverse FFT before trimming the + * + * Two methods shall be available for the convolution: if direct is true, + * then the convolution shall be performed in real space (appropriate for + * small kernels); otherwise, the convolution shall be performed using Fast + * Fourier Transforms (FFTs; appropriate for larger kernels). The latter + * option involves padding the input image, copying the kernel into an image + * of the same size as the padded input image, performing an FFT on each, + * multiplying the FFTs, and performing an inverse FFT before trimming the * image back to the original size. * - * @return psImage* resulting image + * @return psImage* resulting image */ psImage* psImageConvolve( @@ -119,3 +119,3 @@ ); -#endif +#endif // #ifndef PS_IMAGE_CONVOLVE_H Index: trunk/psLib/src/imageops/psImageGeomManip.h =================================================================== --- trunk/psLib/src/imageops/psImageGeomManip.h (revision 4160) +++ trunk/psLib/src/imageops/psImageGeomManip.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 02:08:21 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -155,3 +155,3 @@ ); -#endif +#endif // #ifndef PS_IMAGE_GEOM_MANIP_H Index: trunk/psLib/src/imageops/psImagePixelExtract.h =================================================================== --- trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4160) +++ trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 02:08:21 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -130,3 +130,3 @@ /// @} -#endif +#endif // #ifndef PSIMAGE_PIXEL_EXTRACT_H Index: trunk/psLib/src/imageops/psImagePixelManip.h =================================================================== --- trunk/psLib/src/imageops/psImagePixelManip.h (revision 4160) +++ trunk/psLib/src/imageops/psImagePixelManip.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 02:08:21 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -88,3 +88,3 @@ ); -#endif +#endif // #ifndef PS_IMAGE_PIXEL_MANIP_H Index: trunk/psLib/src/imageops/psImageStats.h =================================================================== --- trunk/psLib/src/imageops/psImageStats.h (revision 4160) +++ trunk/psLib/src/imageops/psImageStats.h (revision 4162) @@ -9,10 +9,10 @@ * @author GLG, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-24 19:39:53 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_IMAGE_STATS_H) +#ifndef PS_IMAGE_STATS_H #define PS_IMAGE_STATS_H @@ -28,8 +28,8 @@ /** This routine must determine the various statistics for the image. * - * Determine statistics for image (or subimage). The statistics to be - * determined are specified by stats. The mask allows pixels to be excluded - * if their corresponding mask pixel value matches the value of maskVal. - * This function must be defined for the following types: psS8, psU16, psF32, + * Determine statistics for image (or subimage). The statistics to be + * determined are specified by stats. The mask allows pixels to be excluded + * if their corresponding mask pixel value matches the value of maskVal. + * This function must be defined for the following types: psS8, psU16, psF32, * psF64. * @@ -45,6 +45,6 @@ /** Construct a histogram from an image (or subimage). * - * The histogram to generate is specified by psHistogram hist (see section - * 4.3.2 in SDRS). This function must be defined for the following types: + * The histogram to generate is specified by psHistogram hist (see section + * 4.3.2 in SDRS). This function must be defined for the following types: * psS8, psU16, psF32, psF64. * @@ -60,6 +60,6 @@ /** Fit a 2-D polynomial surface to an image. * - * The input structure coeffs contains the desired order and terms of - * interest. This function must be defined for the following types: psS8, + * The input structure coeffs contains the desired order and terms of + * interest. This function must be defined for the following types: psS8, * psU16, psF32, psF64. * @@ -74,6 +74,6 @@ /** Evaluate a 2-D polynomial surface for the image pixels. * - * Given the input polynomial coefficients, set the image pixel values on the - * basis of the polynomial function. This function must be defined for the + * Given the input polynomial coefficients, set the image pixel values on the + * basis of the polynomial function. This function must be defined for the * following types: psS8, psU16, psF32, psF64. * @@ -87,3 +87,3 @@ /// @} -#endif +#endif // #ifndef PS_IMAGE_STATS_H Index: trunk/psLib/src/imageops/psImageStructManip.h =================================================================== --- trunk/psLib/src/imageops/psImageStructManip.h (revision 4160) +++ trunk/psLib/src/imageops/psImageStructManip.h (revision 4162) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-19 05:18:20 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -82,3 +82,3 @@ /// @} -#endif +#endif // #ifndef PSIMAGE_STRUCT_MANIP_H Index: trunk/psLib/src/math/psBinaryOp.h =================================================================== --- trunk/psLib/src/math/psBinaryOp.h (revision 4160) +++ trunk/psLib/src/math/psBinaryOp.h (revision 4162) @@ -1,3 +1,2 @@ - /** @file psBinaryOp.h * @@ -31,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-10 02:36:41 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -65,3 +64,3 @@ /// @} -#endif +#endif // #ifndef PSBINARY_OP_H Index: trunk/psLib/src/math/psCompare.h =================================================================== --- trunk/psLib/src/math/psCompare.h (revision 4160) +++ trunk/psLib/src/math/psCompare.h (revision 4162) @@ -6,11 +6,11 @@ * @ingroup Compare * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_COMPARE_H) +#ifndef PS_COMPARE_H #define PS_COMPARE_H @@ -24,7 +24,7 @@ * e.g., for psList of pointers to numeric values. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ typedef int (*psComparePtrFcn) ( @@ -35,7 +35,7 @@ /** A comparison function for sorting. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ typedef int (*psCompareFcn) ( @@ -46,7 +46,7 @@ /** Compare function of psS8 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS8Ptr( @@ -57,7 +57,7 @@ /** Compare function of psS16 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS16Ptr( @@ -68,7 +68,7 @@ /** Compare function of psS32 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS32Ptr( @@ -79,7 +79,7 @@ /** Compare function of psS64 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS64Ptr( @@ -90,7 +90,7 @@ /** Compare function of psU8 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU8Ptr( @@ -101,7 +101,7 @@ /** Compare function of psU16 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU16Ptr( @@ -112,7 +112,7 @@ /** Compare function of psU32 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU32Ptr( @@ -123,7 +123,7 @@ /** Compare function of psU64 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU64Ptr( @@ -134,7 +134,7 @@ /** Compare function of psF32 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF32Ptr( @@ -145,7 +145,7 @@ /** Compare function of psF64 data. For use with psListSort. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF64Ptr( @@ -156,7 +156,7 @@ /** Compare function of psS8 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS8Ptr( @@ -167,7 +167,7 @@ /** Compare function of psS16 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS16Ptr( @@ -178,7 +178,7 @@ /** Compare function of psS32 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS32Ptr( @@ -189,7 +189,7 @@ /** Compare function of psS64 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS64Ptr( @@ -200,7 +200,7 @@ /** Compare function of psU8 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU8Ptr( @@ -211,7 +211,7 @@ /** Compare function of psU16 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU16Ptr( @@ -222,7 +222,7 @@ /** Compare function of psU32 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingU32Ptr( @@ -233,7 +233,7 @@ /** Compare function of psU64 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingU64Ptr( @@ -244,7 +244,7 @@ /** Compare function of psF32 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingF32Ptr( @@ -255,7 +255,7 @@ /** Compare function of psF64 data. For use with psListSort for descending ordering. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or lessg than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or lessg than the second. */ int psCompareDescendingF64Ptr( @@ -266,7 +266,7 @@ /** Compare function of psS8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS8( @@ -278,7 +278,7 @@ /** Compare function of psS16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS16( @@ -290,7 +290,7 @@ /** Compare function of psS32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS32( @@ -302,7 +302,7 @@ /** Compare function of psS64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareS64( @@ -314,7 +314,7 @@ /** Compare function of psU8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU8( @@ -326,7 +326,7 @@ /** Compare function of psU16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU16( @@ -338,7 +338,7 @@ /** Compare function of psU32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU32( @@ -350,7 +350,7 @@ /** Compare function of psU64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareU64( @@ -362,7 +362,7 @@ /** Compare function of psF32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF32( @@ -374,7 +374,7 @@ /** Compare function of psF64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively less - * than, equal to, or greater than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively less + * than, equal to, or greater than the second. */ int psCompareF64( @@ -386,7 +386,7 @@ /** Compare function of psS8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS8( @@ -398,7 +398,7 @@ /** Compare function of psS16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS16( @@ -410,7 +410,7 @@ /** Compare function of psS32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS32( @@ -422,7 +422,7 @@ /** Compare function of psS64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingS64( @@ -434,7 +434,7 @@ /** Compare function of psU8 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU8( @@ -446,7 +446,7 @@ /** Compare function of psU16 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU16( @@ -458,7 +458,7 @@ /** Compare function of psU32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU32( @@ -470,7 +470,7 @@ /** Compare function of psU64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingU64( @@ -482,7 +482,7 @@ /** Compare function of psF32 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingF32( @@ -494,7 +494,7 @@ /** Compare function of psF64 data. * - * @return int an integer less than, equal to, or greater than zero if - * the first argument is considered to be respectively greater - * than, equal to, or less than the second. + * @return int an integer less than, equal to, or greater than zero if + * the first argument is considered to be respectively greater + * than, equal to, or less than the second. */ int psCompareDescendingF64( @@ -506,3 +506,3 @@ /// @} -#endif +#endif // #ifndef PS_COMPARE_H Index: trunk/psLib/src/math/psConstants.h =================================================================== --- trunk/psLib/src/math/psConstants.h (revision 4160) +++ trunk/psLib/src/math/psConstants.h (revision 4162) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.72 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-04 00:49:48 $ + * @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -45,6 +45,5 @@ #define M_1_PI 0.3183098861837906715377675267450287 /* 1/pi */ #define M_2_PI 0.6366197723675813430755350534900574 /* 2/pi */ -#endif -#define PS_PI 3.1415926535897932384626433832795029 /* pi */ +#endif // #ifndef M_PI #define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0) @@ -699,15 +698,9 @@ *****************************************************************************/ #define PS_MAX(A, B) \ -(((A) > (B)) ? (A) : (B)) \ +(((A) > (B)) ? (A) : (B)) #define PS_MIN(A, B) \ -(((A) < (B)) ? (A) : (B)) \ +(((A) < (B)) ? (A) : (B)) #define PS_SQR(A) \ -((A) * (A)) \ - -#ifdef DARWIN -#define PS_SQRT_F32(A) ((float) sqrt(A)) -#else -#define PS_SQRT_F32(A) (sqrtf(A)) -#endif +((A) * (A)) Index: trunk/psLib/src/math/psMatrix.h =================================================================== --- trunk/psLib/src/math/psMatrix.h (revision 4160) +++ trunk/psLib/src/math/psMatrix.h (revision 4162) @@ -1,3 +1,2 @@ - /** @file psMatrix.h * @@ -22,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -164,3 +163,3 @@ /// @} -#endif +#endif // #ifndef PSMATRIX_H Index: trunk/psLib/src/math/psMinimize.h =================================================================== --- trunk/psLib/src/math/psMinimize.h (revision 4160) +++ trunk/psLib/src/math/psMinimize.h (revision 4162) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-05 22:23:29 $ + * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -15,5 +15,5 @@ */ -#if !defined(PS_MINIMIZE_H) +#ifndef PS_MINIMIZE_H #define PS_MINIMIZE_H @@ -53,11 +53,11 @@ /** Derive a polynomial fit. * - * psVectorFitPolynomial1d returns the polynomial that best fits the - * observations. The input parameters are a polynomial that specifies the - * fit order, myPoly, which will be altered and returned with the best-fit - * coefficients; and the observations, x, y and yErr. The independent - * variable list, x may be NULL, in which case the vector index is used. - * The dependent variable error, yErr may be null, in which case the solution - * is determined in the assumption that all data errors are equal. This + * psVectorFitPolynomial1d returns the polynomial that best fits the + * observations. The input parameters are a polynomial that specifies the + * fit order, myPoly, which will be altered and returned with the best-fit + * coefficients; and the observations, x, y and yErr. The independent + * variable list, x may be NULL, in which case the vector index is used. + * The dependent variable error, yErr may be null, in which case the solution + * is determined in the assumption that all data errors are equal. This * function must be valid only for types psF32, psF64. * @@ -142,4 +142,4 @@ /* \} */// End of MathGroup Functions -#endif +#endif // #ifndef PS_MINIMIZE_H Index: trunk/psLib/src/math/psPolynomial.c =================================================================== --- trunk/psLib/src/math/psPolynomial.c (revision 4160) +++ trunk/psLib/src/math/psPolynomial.c (revision 4162) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.105 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1024,5 +1024,5 @@ if (normal == true) { - tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma)); + tmp = 1.0 / sqrtf(2.0 * M_PI * (sigma * sigma)); } Index: trunk/psLib/src/math/psPolynomial.h =================================================================== --- trunk/psLib/src/math/psPolynomial.h (revision 4160) +++ trunk/psLib/src/math/psPolynomial.h (revision 4162) @@ -12,11 +12,11 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_FUNCTIONS_H) +#ifndef PS_FUNCTIONS_H #define PS_FUNCTIONS_H @@ -34,8 +34,8 @@ /** Evaluate a non-normalized Gaussian with the given mean and sigma at the - * given coordianate. - * - * Note that this is not a Gaussian deviate. The evaluated Gaussian is: - * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] + * given coordianate. + * + * Note that this is not a Gaussian deviate. The evaluated Gaussian is: + * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * * @return psF32 value on the gaussian curve given the input parameters @@ -49,8 +49,8 @@ /** Produce a vector of random numbers from a Gaussian distribution with - * the specified mean and sigma - * + * the specified mean and sigma + * * @return psVector* vector of random numbers - * + * */ psVector* p_psGaussianDev( @@ -433,8 +433,8 @@ const psVector* y, psF32 X); -#endif - -/* \} */// End of MathGroup Functions - -#endif - +#endif // #if 0 + +/** \} */ // End of MathGroup Functions + +#endif // #ifndef PS_FUNCTIONS_H + Index: trunk/psLib/src/math/psRandom.h =================================================================== --- trunk/psLib/src/math/psRandom.h (revision 4160) +++ trunk/psLib/src/math/psRandom.h (revision 4162) @@ -10,11 +10,11 @@ * @author GLG, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:23 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_RANDOM_H) +#ifndef PS_RANDOM_H #define PS_RANDOM_H @@ -56,4 +56,3 @@ /* \} */// End of MathGroup Functions -#endif - +#endif // #ifndef PS_RANDOM_H Index: trunk/psLib/src/math/psSpline.c =================================================================== --- trunk/psLib/src/math/psSpline.c (revision 4160) +++ trunk/psLib/src/math/psSpline.c (revision 4162) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.105 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1024,5 +1024,5 @@ if (normal == true) { - tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma)); + tmp = 1.0 / sqrtf(2.0 * M_PI * (sigma * sigma)); } Index: trunk/psLib/src/math/psSpline.h =================================================================== --- trunk/psLib/src/math/psSpline.h (revision 4160) +++ trunk/psLib/src/math/psSpline.h (revision 4162) @@ -12,11 +12,11 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_FUNCTIONS_H) +#ifndef PS_FUNCTIONS_H #define PS_FUNCTIONS_H @@ -34,8 +34,8 @@ /** Evaluate a non-normalized Gaussian with the given mean and sigma at the - * given coordianate. - * - * Note that this is not a Gaussian deviate. The evaluated Gaussian is: - * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] + * given coordianate. + * + * Note that this is not a Gaussian deviate. The evaluated Gaussian is: + * \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] * * @return psF32 value on the gaussian curve given the input parameters @@ -49,8 +49,8 @@ /** Produce a vector of random numbers from a Gaussian distribution with - * the specified mean and sigma - * + * the specified mean and sigma + * * @return psVector* vector of random numbers - * + * */ psVector* p_psGaussianDev( @@ -433,8 +433,8 @@ const psVector* y, psF32 X); -#endif - -/* \} */// End of MathGroup Functions - -#endif - +#endif // #if 0 + +/** \} */ // End of MathGroup Functions + +#endif // #ifndef PS_FUNCTIONS_H + Index: trunk/psLib/src/math/psStats.c =================================================================== --- trunk/psLib/src/math/psStats.c (revision 4160) +++ trunk/psLib/src/math/psStats.c (revision 4162) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.131 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 23:11:54 $ + * @version $Revision: 1.132 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -878,5 +878,5 @@ } else { countFloat = (psF32)countInt; - stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); + stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); } } @@ -992,8 +992,8 @@ // data ranges are used correctly. if (errors != NULL) { - stats->sampleStdev = (1.0 / PS_SQRT_F32(errorDivisor)); + stats->sampleStdev = (1.0 / sqrtf(errorDivisor)); } else { countFloat = (psF32)countInt; - stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); + stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); } @@ -1627,5 +1627,5 @@ } } - myStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); + myStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1)); p_psNormalizeVectorRangeF32(robustHistogramVector, 0.0, 1.0); @@ -1657,5 +1657,5 @@ "WARNING: failed fit a 1D polynomial.\n"); } - psF32 polyFitSigma = PS_SQRT_F32(-0.5 / tmpPoly->coeff[2]); + psF32 polyFitSigma = sqrtf(-0.5 / tmpPoly->coeff[2]); psF32 polyFitMean = tmpPoly->coeff[1] * PS_SQR(polyFitSigma); // psF32 polyFitNorm = exp(tmpPoly->coedd[0] + PS_SQR(polyFitMean) / (2.0 * PS_SQR(polyFitSigma))); Index: trunk/psLib/src/math/psStats.h =================================================================== --- trunk/psLib/src/math/psStats.h (revision 4160) +++ trunk/psLib/src/math/psStats.h (revision 4162) @@ -14,10 +14,10 @@ * @author GLG, MHPCC * - * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 23:11:54 $ + * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_STATS_H) +#ifndef PS_STATS_H #define PS_STATS_H @@ -112,9 +112,9 @@ /** The basic histogram structure which contains bounds and bins. * - * In this structure, the vector bounds specifies the boundaries of the - * histogram bins, and must of type psF32, while nums specifies the number - * of entries in the bin, and must of type psU32. The value of bounds.n must - * therefore be 1 greater than than nums.n. The two values minNum and maxNum - * are the number of data values which fell below the lower limit bound or + * In this structure, the vector bounds specifies the boundaries of the + * histogram bins, and must of type psF32, while nums specifies the number + * of entries in the bin, and must of type psU32. The value of bounds.n must + * therefore be 1 greater than than nums.n. The two values minNum and maxNum + * are the number of data values which fell below the lower limit bound or * above the upper limit bound, respectively. */ @@ -130,6 +130,6 @@ /** Allocator for psHistogram where the bounds of the bins are implicitly - * specified through simply specifying an upper and lower limit along with - * the size of the bins. + * specified through simply specifying an upper and lower limit along with + * the size of the bins. * * @return psHistogram* Newly allocated psHistogram @@ -142,5 +142,5 @@ /** Allocator for psHistogram where the bounds of the bins are explicitly - * specified. + * specified. * * @return psHistogram* Newly allocated psHistogram @@ -152,5 +152,5 @@ /** Calculate a histogram * - * The following function populates the histogram bins from the specified + * The following function populates the histogram bins from the specified * vector (in). It alters and returns the histogram out structure. The input * vector may be of types psU8, psU16, psF32, psF64. @@ -169,5 +169,5 @@ * * @return psBool If more than one statistic result is set in stats->options, - * false is returned and the value parameter is not set, + * false is returned and the value parameter is not set, * otherwise true is returned. */ @@ -193,3 +193,3 @@ /// @} -#endif +#endif // #ifndef PS_STATS_H Index: trunk/psLib/src/math/psUnaryOp.h =================================================================== --- trunk/psLib/src/math/psUnaryOp.h (revision 4160) +++ trunk/psLib/src/math/psUnaryOp.h (revision 4162) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-10 02:36:41 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,3 +67,3 @@ /// @} -#endif +#endif // #ifndef PSUNARY_OP_H Index: trunk/psLib/src/mathtypes/psScalar.h =================================================================== --- trunk/psLib/src/mathtypes/psScalar.h (revision 4160) +++ trunk/psLib/src/mathtypes/psScalar.h (revision 4162) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -82,3 +82,3 @@ /// @} -#endif +#endif // #ifndef PS_SCALAR_H Index: trunk/psLib/src/mathtypes/psVector.h =================================================================== --- trunk/psLib/src/mathtypes/psVector.h (revision 4160) +++ trunk/psLib/src/mathtypes/psVector.h (revision 4162) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-29 02:25:09 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -176,3 +176,3 @@ /// @} -#endif +#endif // #ifndef PS_VECTOR_H Index: trunk/psLib/src/psTest.h =================================================================== --- trunk/psLib/src/psTest.h (revision 4160) +++ trunk/psLib/src/psTest.h (revision 4162) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -93,3 +93,3 @@ ); -#endif +#endif // #ifndef PSTEST_H Index: trunk/psLib/src/pslib.h =================================================================== --- trunk/psLib/src/pslib.h (revision 4160) +++ trunk/psLib/src/pslib.h (revision 4162) @@ -8,6 +8,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -19,3 +19,3 @@ #include "pslib_strict.h" -#endif +#endif // #ifndef PS_LIB_H Index: trunk/psLib/src/pslib_strict.h =================================================================== --- trunk/psLib/src/pslib_strict.h (revision 4160) +++ trunk/psLib/src/pslib_strict.h (revision 4162) @@ -9,6 +9,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-07 02:29:44 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,8 +21,8 @@ #ifndef PS_ALLOW_MALLOC #define PS_ALLOW_MALLOC -#endif +#endif // #ifndef PS_ALLOW_MALLOC #else #undef PS_ALLOW_MALLOC /* don't allow code to not poison malloc, i.e., strict poisioning */ -#endif +#endif // #else // // System Utilities @@ -183,3 +183,3 @@ /// @} -#endif +#endif // #ifndef PS_LIB_STRICT_H Index: trunk/psLib/src/sys/psAbort.h =================================================================== --- trunk/psLib/src/sys/psAbort.h (revision 4160) +++ trunk/psLib/src/sys/psAbort.h (revision 4162) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,7 +29,7 @@ /** Reports an abort message to logging facility * - * This function will invoke the psLogMsg function with a level of + * This function will invoke the psLogMsg function with a level of * PS_LOG_ABORT and pass the parameters name and fmt to generate a proper - * log message. After logging, this function will call system abort + * log message. After logging, this function will call system abort * function to abnormally terminate the program. * @@ -43,5 +43,5 @@ ); -/* @} */// Doxygen - End of SystemGroup Functions +/** @} */ // Doxygen - End of SystemGroup Functions -#endif +#endif // #ifndef PS_ABORT_H Index: trunk/psLib/src/sys/psConfigure.h =================================================================== --- trunk/psLib/src/sys/psConfigure.h (revision 4160) +++ trunk/psLib/src/sys/psConfigure.h (revision 4162) @@ -13,6 +13,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 22:53:40 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -38,5 +38,5 @@ /** Initializes persistent memory. * - * Creates persistant memory items used throughout psLib. Items created + * Creates persistant memory items used throughout psLib. Items created * within this method should be freed with the psLibFinalize function. * current, a non-NULL psErr is returned with code PS_ERR_NONE. @@ -61,5 +61,5 @@ -/* @} */ +/** @} */ -#endif +#endif // #ifndef PS_CONFIGURE_H Index: trunk/psLib/src/sys/psError.h =================================================================== --- trunk/psLib/src/sys/psError.h (revision 4160) +++ trunk/psLib/src/sys/psError.h (revision 4162) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ va_list va ///< any parameters required in fmt ); -#endif +#endif // #ifndef SWIG #ifdef DOXYGEN @@ -135,5 +135,5 @@ ... ); -#else +#else // #ifdef DOXYGEN psErrorCode p_psError( const char* file, @@ -157,7 +157,7 @@ #define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__) #define psWarning(...) p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__) -#endif +#endif // #ifndef SWIG -#endif +#endif // ! DOXYGEN /** Create a new psErr struct Index: trunk/psLib/src/sys/psErrorCodes.h =================================================================== --- trunk/psLib/src/sys/psErrorCodes.h (revision 4160) +++ trunk/psLib/src/sys/psErrorCodes.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,5 +25,5 @@ * $2 The error description (rest of the line in psErrorCodes.dat) * $n The order of the source line in psErrorCodes.dat (comments excluded) - * + * * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ @@ -78,5 +78,5 @@ /** Retrieves the description of an error code. * - * The routine psErrorCodeString returns the string associated with an error + * The routine psErrorCodeString returns the string associated with an error * code. * @@ -90,5 +90,5 @@ * * Any project needed to use psLib must define the necessary error codes and - * associated message strings. This function registers an array of error + * associated message strings. This function registers an array of error * codes with the error handling subsystem. * @@ -109,3 +109,3 @@ /// @} -#endif +#endif // #ifndef PS_ERROR_CODES_H Index: trunk/psLib/src/sys/psLogMsg.c =================================================================== --- trunk/psLib/src/sys/psLogMsg.c (revision 4160) +++ trunk/psLib/src/sys/psLogMsg.c (revision 4162) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -227,7 +227,7 @@ } -#if !defined(HOST_NAME_MAX) // should be in limits.h +#ifndef HOST_NAME_MAX // should be in limits.h #define HOST_NAME_MAX 256 -#endif +#endif // #ifndef HOST_NAME_MAX /***************************************************************************** Index: trunk/psLib/src/sys/psLogMsg.h =================================================================== --- trunk/psLib/src/sys/psLogMsg.h (revision 4160) +++ trunk/psLib/src/sys/psLogMsg.h (revision 4162) @@ -11,10 +11,10 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_LOG_MSG_H) +#ifndef PS_LOG_MSG_H #define PS_LOG_MSG_H #include @@ -85,5 +85,5 @@ va_list ap ///< varargs argument list ); -#endif +#endif // #ifndef SWIG ///< Status codes for log messages @@ -104,3 +104,3 @@ /// @} -#endif +#endif // #ifndef PS_LOG_MSG_H Index: trunk/psLib/src/sys/psMemory.c =================================================================== --- trunk/psLib/src/sys/psMemory.c (revision 4160) +++ trunk/psLib/src/sys/psMemory.c (revision 4162) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-29 00:39:22 $ +* @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ #ifdef PS_MEM_DEBUG static psMemBlock* deadBlockList; // a place to put dead memBlocks in debug mode. -#endif +#endif // #ifdef PS_MEM_DEBUG /** @@ -626,9 +626,9 @@ } deadBlockList = ptr; - #else + #else // #ifdef PS_MEM_DEBUG pthread_mutex_destroy(&ptr->refCounterMutex); free(ptr); - #endif + #endif // #else - #ifdef PS_MEM_DEBUG } Index: trunk/psLib/src/sys/psMemory.h =================================================================== --- trunk/psLib/src/sys/psMemory.h (revision 4160) +++ trunk/psLib/src/sys/psMemory.h (revision 4162) @@ -12,11 +12,11 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_MEMORY_H) +#ifndef PS_MEMORY_H #define PS_MEMORY_H @@ -125,10 +125,10 @@ * * @return psPtr pointer to the allocated buffer. This will not be NULL. - * @see psFree + * @see psFree */ #ifdef DOXYGEN psPtr psAlloc(size_t size ///< Size required ); -#else +#else // #ifdef DOXYGEN psPtr p_psAlloc(size_t size, ///< Size required const char *file, ///< File of call @@ -139,11 +139,11 @@ #ifndef SWIG #define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__) -#endif - -#endif +#endif // ! SWIG + +#endif // ! DOXYGEN /** Set the deallocator routine * - * A deallocator routine can optionally be assigned to a memory block to + * A deallocator routine can optionally be assigned to a memory block to * ensure that associated memory blocks also get freed, e.g., memory buffers * referenced within a struct. @@ -157,8 +157,8 @@ /** Get the deallocator routine * - * This function returns the deallocator for a memory block. A deallocator - * routine can optionally be assigned to a memory block to ensure that - * associated memory blocks also get freed, e.g., memory buffers referenced - * within a struct. + * This function returns the deallocator for a memory block. A deallocator + * routine can optionally be assigned to a memory block to ensure that + * associated memory blocks also get freed, e.g., memory buffers referenced + * within a struct. * * @return psFreeFcn the routine to be called at deallocation. @@ -170,5 +170,5 @@ /** Set the memory as persistent so that it is ignored when detecting memory leaks. * - * Used to mark a memory block as persistent data within the library, + * Used to mark a memory block as persistent data within the library, * i.e., non user-level data used to hold psLib's state or cache data. Such * examples of this class of memory is psTrace's trace-levels and dynamic @@ -185,5 +185,5 @@ /** Get the memory's persistent flag. * - * Checks if a memory block has been marked as persistent by + * Checks if a memory block has been marked as persistent by * p_psMemSetPresistent. * @@ -207,5 +207,5 @@ size_t size ///< Size required ); -#else +#else // #ifdef DOXYGEN psPtr p_psRealloc( psPtr ptr, ///< Pointer to re-allocate @@ -218,7 +218,7 @@ #ifndef SWIG #define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__) -#endif - -#endif +#endif // ! SWIG + +#endif // ! DOXYGEN /** Free memory. This operates much like free(). @@ -230,5 +230,5 @@ psPtr ptr ///< Pointer to free, if NULL, function returns immediately. ); -#else +#else // #ifdef DOXYGEN void p_psFree( psPtr ptr, ///< Pointer to free @@ -240,7 +240,7 @@ #ifndef SWIG #define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__) -#endif - -#endif +#endif // ! SWIG + +#endif // ! DOXYGEN /** Check for memory leaks. This scans for allocated memory buffers not freed with an ID not less than id0. @@ -299,7 +299,7 @@ #ifndef SWIG #define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__) -#endif - -#endif +#endif // !SWIG + +#endif // !DOXYGEN /** Decrement reference counter and return the pointer @@ -307,5 +307,5 @@ * @ingroup memRefCount * - * @return psPtr the pointer deremented in refCount, or NULL if pointer is + * @return psPtr the pointer deremented in refCount, or NULL if pointer is * fully dereferenced. */ @@ -314,5 +314,5 @@ psPtr vptr ///< Pointer to decrement refCounter, and return ); -#else +#else // DOXYGEN psPtr p_psMemDecrRefCounter( psPtr vptr, ///< Pointer to decrement refCounter, and return @@ -323,11 +323,11 @@ #ifndef SWIG #define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__) -#endif - -#endif +#endif // !SWIG + +#endif // !DOXYGEN /** Set callback for problems. * - * At various occasions, the memory manager can check the state of the memory + * At various occasions, the memory manager can check the state of the memory * stack. If any of these checks discover that the memory stack is corrupted, * the psMemProblemCallback is called. @@ -343,11 +343,11 @@ /** Set callback for out-of-memory. * - * If not enough memory is available to satisfy a request by psAlloc or - * psRealloc, these functions attempt to find an alternative solution by - * calling the psMemExhaustedCallback, a function which may be set by the - * programmer in appropriate circumstances, rather than immediately fail. - * The typical use of such a feature may be when a program needs a large - * chunk of memory to do an operation, but the exact size is not critical. - * This feature gives the programmer the opportunity to make a smaller + * If not enough memory is available to satisfy a request by psAlloc or + * psRealloc, these functions attempt to find an alternative solution by + * calling the psMemExhaustedCallback, a function which may be set by the + * programmer in appropriate circumstances, rather than immediately fail. + * The typical use of such a feature may be when a program needs a large + * chunk of memory to do an operation, but the exact size is not critical. + * This feature gives the programmer the opportunity to make a smaller * request and try again, limiting the size of the operating buffer. * @@ -362,7 +362,7 @@ /** Set call back for when a particular memory block is allocated * - * A private variable, p_psMemAllocateID, can be used to trace the allocation - * and freeing of specific memory blocks. If p_psMemAllocateID is set and a - * memory block with that ID is allocated, psMemAllocateCallback is called + * A private variable, p_psMemAllocateID, can be used to trace the allocation + * and freeing of specific memory blocks. If p_psMemAllocateID is set and a + * memory block with that ID is allocated, psMemAllocateCallback is called * just before memory is returned to the calling function. * @@ -377,6 +377,6 @@ /** Set call back for when a particular memory block is freed * - * A private variable, p_psMemFreeID, can be used to trace the freeing of - * specific memory blocks. If p_psMemFreeID is set and the memory block with + * A private variable, p_psMemFreeID, can be used to trace the freeing of + * specific memory blocks. If p_psMemFreeID is set and the memory block with * the ID is about to be freed, the psMemFreeCallback callback is called just * before the memory block is freed. @@ -400,14 +400,14 @@ /** set p_psMemAllocateID to specific id * - * A private variable, p_psMemAllocateID, can be used to trace the allocation - * and freeing of specific memory blocks. If p_psMemAllocateID is set and a - * memory block with that ID is allocated, psMemAllocateCallback is called + * A private variable, p_psMemAllocateID, can be used to trace the allocation + * and freeing of specific memory blocks. If p_psMemAllocateID is set and a + * memory block with that ID is allocated, psMemAllocateCallback is called * just before memory is returned to the calling function. * * @ingroup memCallback * - * @return psMemoryId - * - * @see psMemAllocateCallbackSet + * @return psMemoryId + * + * @see psMemAllocateCallbackSet */ psMemoryId psMemAllocateCallbackSetID( @@ -417,6 +417,6 @@ /** set p_psMemFreeID to id * - * A private variable, p_psMemFreeID, can be used to trace the freeing of - * specific memory blocks. If p_psMemFreeID is set and the memory block with + * A private variable, p_psMemFreeID, can be used to trace the freeing of + * specific memory blocks. If p_psMemFreeID is set and the memory block with * the ID is about to be freed, the psMemFreeCallback callback is called just * before the memory block is freed. @@ -442,14 +442,13 @@ #ifdef __GNUC__ #pragma GCC poison malloc realloc calloc free -#else +#else // __GNUC__ #define malloc(S) _Pragma("error Use of malloc is not allowed. Use psAlloc instead.") #define realloc(P,S) _Pragma("error Use of realloc is not allowed. Use psRealloc instead.") #define calloc(S) _Pragma("error Use of calloc is not allowed. Use psAlloc instead.") #define free(P) _Pragma("error Use of free is not allowed. Use psFree instead.") -#endif -#endif - -#endif -// doxygen skip - -#endif // end of header file +#endif // ! __GNUC__ +#endif // #ifndef PS_ALLOW_MALLOC + +#endif // #ifndef DOXYGEN + +#endif // #ifndef PS_MEMORY_H Index: trunk/psLib/src/sys/psString.h =================================================================== --- trunk/psLib/src/sys/psString.h (revision 4160) +++ trunk/psLib/src/sys/psString.h (revision 4162) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-20 01:41:57 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -99,5 +99,5 @@ ); -/* @} */// Doxygen - End of SystemGroup Functions +/** @} */// Doxygen - End of SystemGroup Functions -#endif +#endif // #ifndef PS_STRING_H Index: trunk/psLib/src/sys/psTrace.c =================================================================== --- trunk/psLib/src/sys/psTrace.c (revision 4160) +++ trunk/psLib/src/sys/psTrace.c (revision 4162) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-05 21:24:50 $ + * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -555,3 +555,3 @@ } -#endif +#endif // #ifndef PS_NO_TRACE Index: trunk/psLib/src/sys/psType.h =================================================================== --- trunk/psLib/src/sys/psType.h (revision 4160) +++ trunk/psLib/src/sys/psType.h (revision 4162) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-06 01:12:58 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -62,8 +62,8 @@ } psC64; -#else +#else // SWIG typedef float _Complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers typedef double _Complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers -#endif +#endif // !SWIG typedef void* psPtr; ///< void pointer @@ -243,3 +243,3 @@ /// @} -#endif +#endif // #ifndef PS_TYPE_H Index: trunk/psLib/src/sysUtils/psAbort.h =================================================================== --- trunk/psLib/src/sysUtils/psAbort.h (revision 4160) +++ trunk/psLib/src/sysUtils/psAbort.h (revision 4162) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,7 +29,7 @@ /** Reports an abort message to logging facility * - * This function will invoke the psLogMsg function with a level of + * This function will invoke the psLogMsg function with a level of * PS_LOG_ABORT and pass the parameters name and fmt to generate a proper - * log message. After logging, this function will call system abort + * log message. After logging, this function will call system abort * function to abnormally terminate the program. * @@ -43,5 +43,5 @@ ); -/* @} */// Doxygen - End of SystemGroup Functions +/** @} */ // Doxygen - End of SystemGroup Functions -#endif +#endif // #ifndef PS_ABORT_H Index: trunk/psLib/src/sysUtils/psConfigure.h =================================================================== --- trunk/psLib/src/sysUtils/psConfigure.h (revision 4160) +++ trunk/psLib/src/sysUtils/psConfigure.h (revision 4162) @@ -13,6 +13,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 22:53:40 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -38,5 +38,5 @@ /** Initializes persistent memory. * - * Creates persistant memory items used throughout psLib. Items created + * Creates persistant memory items used throughout psLib. Items created * within this method should be freed with the psLibFinalize function. * current, a non-NULL psErr is returned with code PS_ERR_NONE. @@ -61,5 +61,5 @@ -/* @} */ +/** @} */ -#endif +#endif // #ifndef PS_CONFIGURE_H Index: trunk/psLib/src/sysUtils/psError.h =================================================================== --- trunk/psLib/src/sysUtils/psError.h (revision 4160) +++ trunk/psLib/src/sysUtils/psError.h (revision 4162) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ va_list va ///< any parameters required in fmt ); -#endif +#endif // #ifndef SWIG #ifdef DOXYGEN @@ -135,5 +135,5 @@ ... ); -#else +#else // #ifdef DOXYGEN psErrorCode p_psError( const char* file, @@ -157,7 +157,7 @@ #define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__) #define psWarning(...) p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__) -#endif +#endif // #ifndef SWIG -#endif +#endif // ! DOXYGEN /** Create a new psErr struct Index: trunk/psLib/src/sysUtils/psErrorCodes.h =================================================================== --- trunk/psLib/src/sysUtils/psErrorCodes.h (revision 4160) +++ trunk/psLib/src/sysUtils/psErrorCodes.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,5 +25,5 @@ * $2 The error description (rest of the line in psErrorCodes.dat) * $n The order of the source line in psErrorCodes.dat (comments excluded) - * + * * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ @@ -78,5 +78,5 @@ /** Retrieves the description of an error code. * - * The routine psErrorCodeString returns the string associated with an error + * The routine psErrorCodeString returns the string associated with an error * code. * @@ -90,5 +90,5 @@ * * Any project needed to use psLib must define the necessary error codes and - * associated message strings. This function registers an array of error + * associated message strings. This function registers an array of error * codes with the error handling subsystem. * @@ -109,3 +109,3 @@ /// @} -#endif +#endif // #ifndef PS_ERROR_CODES_H Index: trunk/psLib/src/sysUtils/psLogMsg.c =================================================================== --- trunk/psLib/src/sysUtils/psLogMsg.c (revision 4160) +++ trunk/psLib/src/sysUtils/psLogMsg.c (revision 4162) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -227,7 +227,7 @@ } -#if !defined(HOST_NAME_MAX) // should be in limits.h +#ifndef HOST_NAME_MAX // should be in limits.h #define HOST_NAME_MAX 256 -#endif +#endif // #ifndef HOST_NAME_MAX /***************************************************************************** Index: trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- trunk/psLib/src/sysUtils/psLogMsg.h (revision 4160) +++ trunk/psLib/src/sysUtils/psLogMsg.h (revision 4162) @@ -11,10 +11,10 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_LOG_MSG_H) +#ifndef PS_LOG_MSG_H #define PS_LOG_MSG_H #include @@ -85,5 +85,5 @@ va_list ap ///< varargs argument list ); -#endif +#endif // #ifndef SWIG ///< Status codes for log messages @@ -104,3 +104,3 @@ /// @} -#endif +#endif // #ifndef PS_LOG_MSG_H Index: trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- trunk/psLib/src/sysUtils/psMemory.c (revision 4160) +++ trunk/psLib/src/sysUtils/psMemory.c (revision 4162) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-29 00:39:22 $ +* @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ #ifdef PS_MEM_DEBUG static psMemBlock* deadBlockList; // a place to put dead memBlocks in debug mode. -#endif +#endif // #ifdef PS_MEM_DEBUG /** @@ -626,9 +626,9 @@ } deadBlockList = ptr; - #else + #else // #ifdef PS_MEM_DEBUG pthread_mutex_destroy(&ptr->refCounterMutex); free(ptr); - #endif + #endif // #else - #ifdef PS_MEM_DEBUG } Index: trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- trunk/psLib/src/sysUtils/psMemory.h (revision 4160) +++ trunk/psLib/src/sysUtils/psMemory.h (revision 4162) @@ -12,11 +12,11 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_MEMORY_H) +#ifndef PS_MEMORY_H #define PS_MEMORY_H @@ -125,10 +125,10 @@ * * @return psPtr pointer to the allocated buffer. This will not be NULL. - * @see psFree + * @see psFree */ #ifdef DOXYGEN psPtr psAlloc(size_t size ///< Size required ); -#else +#else // #ifdef DOXYGEN psPtr p_psAlloc(size_t size, ///< Size required const char *file, ///< File of call @@ -139,11 +139,11 @@ #ifndef SWIG #define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__) -#endif - -#endif +#endif // ! SWIG + +#endif // ! DOXYGEN /** Set the deallocator routine * - * A deallocator routine can optionally be assigned to a memory block to + * A deallocator routine can optionally be assigned to a memory block to * ensure that associated memory blocks also get freed, e.g., memory buffers * referenced within a struct. @@ -157,8 +157,8 @@ /** Get the deallocator routine * - * This function returns the deallocator for a memory block. A deallocator - * routine can optionally be assigned to a memory block to ensure that - * associated memory blocks also get freed, e.g., memory buffers referenced - * within a struct. + * This function returns the deallocator for a memory block. A deallocator + * routine can optionally be assigned to a memory block to ensure that + * associated memory blocks also get freed, e.g., memory buffers referenced + * within a struct. * * @return psFreeFcn the routine to be called at deallocation. @@ -170,5 +170,5 @@ /** Set the memory as persistent so that it is ignored when detecting memory leaks. * - * Used to mark a memory block as persistent data within the library, + * Used to mark a memory block as persistent data within the library, * i.e., non user-level data used to hold psLib's state or cache data. Such * examples of this class of memory is psTrace's trace-levels and dynamic @@ -185,5 +185,5 @@ /** Get the memory's persistent flag. * - * Checks if a memory block has been marked as persistent by + * Checks if a memory block has been marked as persistent by * p_psMemSetPresistent. * @@ -207,5 +207,5 @@ size_t size ///< Size required ); -#else +#else // #ifdef DOXYGEN psPtr p_psRealloc( psPtr ptr, ///< Pointer to re-allocate @@ -218,7 +218,7 @@ #ifndef SWIG #define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__) -#endif - -#endif +#endif // ! SWIG + +#endif // ! DOXYGEN /** Free memory. This operates much like free(). @@ -230,5 +230,5 @@ psPtr ptr ///< Pointer to free, if NULL, function returns immediately. ); -#else +#else // #ifdef DOXYGEN void p_psFree( psPtr ptr, ///< Pointer to free @@ -240,7 +240,7 @@ #ifndef SWIG #define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__) -#endif - -#endif +#endif // ! SWIG + +#endif // ! DOXYGEN /** Check for memory leaks. This scans for allocated memory buffers not freed with an ID not less than id0. @@ -299,7 +299,7 @@ #ifndef SWIG #define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__) -#endif - -#endif +#endif // !SWIG + +#endif // !DOXYGEN /** Decrement reference counter and return the pointer @@ -307,5 +307,5 @@ * @ingroup memRefCount * - * @return psPtr the pointer deremented in refCount, or NULL if pointer is + * @return psPtr the pointer deremented in refCount, or NULL if pointer is * fully dereferenced. */ @@ -314,5 +314,5 @@ psPtr vptr ///< Pointer to decrement refCounter, and return ); -#else +#else // DOXYGEN psPtr p_psMemDecrRefCounter( psPtr vptr, ///< Pointer to decrement refCounter, and return @@ -323,11 +323,11 @@ #ifndef SWIG #define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__) -#endif - -#endif +#endif // !SWIG + +#endif // !DOXYGEN /** Set callback for problems. * - * At various occasions, the memory manager can check the state of the memory + * At various occasions, the memory manager can check the state of the memory * stack. If any of these checks discover that the memory stack is corrupted, * the psMemProblemCallback is called. @@ -343,11 +343,11 @@ /** Set callback for out-of-memory. * - * If not enough memory is available to satisfy a request by psAlloc or - * psRealloc, these functions attempt to find an alternative solution by - * calling the psMemExhaustedCallback, a function which may be set by the - * programmer in appropriate circumstances, rather than immediately fail. - * The typical use of such a feature may be when a program needs a large - * chunk of memory to do an operation, but the exact size is not critical. - * This feature gives the programmer the opportunity to make a smaller + * If not enough memory is available to satisfy a request by psAlloc or + * psRealloc, these functions attempt to find an alternative solution by + * calling the psMemExhaustedCallback, a function which may be set by the + * programmer in appropriate circumstances, rather than immediately fail. + * The typical use of such a feature may be when a program needs a large + * chunk of memory to do an operation, but the exact size is not critical. + * This feature gives the programmer the opportunity to make a smaller * request and try again, limiting the size of the operating buffer. * @@ -362,7 +362,7 @@ /** Set call back for when a particular memory block is allocated * - * A private variable, p_psMemAllocateID, can be used to trace the allocation - * and freeing of specific memory blocks. If p_psMemAllocateID is set and a - * memory block with that ID is allocated, psMemAllocateCallback is called + * A private variable, p_psMemAllocateID, can be used to trace the allocation + * and freeing of specific memory blocks. If p_psMemAllocateID is set and a + * memory block with that ID is allocated, psMemAllocateCallback is called * just before memory is returned to the calling function. * @@ -377,6 +377,6 @@ /** Set call back for when a particular memory block is freed * - * A private variable, p_psMemFreeID, can be used to trace the freeing of - * specific memory blocks. If p_psMemFreeID is set and the memory block with + * A private variable, p_psMemFreeID, can be used to trace the freeing of + * specific memory blocks. If p_psMemFreeID is set and the memory block with * the ID is about to be freed, the psMemFreeCallback callback is called just * before the memory block is freed. @@ -400,14 +400,14 @@ /** set p_psMemAllocateID to specific id * - * A private variable, p_psMemAllocateID, can be used to trace the allocation - * and freeing of specific memory blocks. If p_psMemAllocateID is set and a - * memory block with that ID is allocated, psMemAllocateCallback is called + * A private variable, p_psMemAllocateID, can be used to trace the allocation + * and freeing of specific memory blocks. If p_psMemAllocateID is set and a + * memory block with that ID is allocated, psMemAllocateCallback is called * just before memory is returned to the calling function. * * @ingroup memCallback * - * @return psMemoryId - * - * @see psMemAllocateCallbackSet + * @return psMemoryId + * + * @see psMemAllocateCallbackSet */ psMemoryId psMemAllocateCallbackSetID( @@ -417,6 +417,6 @@ /** set p_psMemFreeID to id * - * A private variable, p_psMemFreeID, can be used to trace the freeing of - * specific memory blocks. If p_psMemFreeID is set and the memory block with + * A private variable, p_psMemFreeID, can be used to trace the freeing of + * specific memory blocks. If p_psMemFreeID is set and the memory block with * the ID is about to be freed, the psMemFreeCallback callback is called just * before the memory block is freed. @@ -442,14 +442,13 @@ #ifdef __GNUC__ #pragma GCC poison malloc realloc calloc free -#else +#else // __GNUC__ #define malloc(S) _Pragma("error Use of malloc is not allowed. Use psAlloc instead.") #define realloc(P,S) _Pragma("error Use of realloc is not allowed. Use psRealloc instead.") #define calloc(S) _Pragma("error Use of calloc is not allowed. Use psAlloc instead.") #define free(P) _Pragma("error Use of free is not allowed. Use psFree instead.") -#endif -#endif - -#endif -// doxygen skip - -#endif // end of header file +#endif // ! __GNUC__ +#endif // #ifndef PS_ALLOW_MALLOC + +#endif // #ifndef DOXYGEN + +#endif // #ifndef PS_MEMORY_H Index: trunk/psLib/src/sysUtils/psString.h =================================================================== --- trunk/psLib/src/sysUtils/psString.h (revision 4160) +++ trunk/psLib/src/sysUtils/psString.h (revision 4162) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-20 01:41:57 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -99,5 +99,5 @@ ); -/* @} */// Doxygen - End of SystemGroup Functions +/** @} */// Doxygen - End of SystemGroup Functions -#endif +#endif // #ifndef PS_STRING_H Index: trunk/psLib/src/sysUtils/psSysUtilsErrors.h =================================================================== --- trunk/psLib/src/sysUtils/psSysUtilsErrors.h (revision 4160) +++ trunk/psLib/src/sysUtils/psSysUtilsErrors.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -23,5 +23,5 @@ * $2 The error text (rest of the line in psSysUtilsErrors.dat) * $n The order of the source line in psSysUtilsErrors.dat (comments excluded) - * + * * DO NOT EDIT THE LINES BETWEEN //~Start and //~End! ANY CHANGES WILL BE OVERWRITTEN. */ @@ -50,3 +50,3 @@ //~End -#endif +#endif // #ifndef PS_SYSUTILS_ERRORS_H Index: trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- trunk/psLib/src/sysUtils/psTrace.c (revision 4160) +++ trunk/psLib/src/sysUtils/psTrace.c (revision 4162) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-05 21:24:50 $ + * @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -555,3 +555,3 @@ } -#endif +#endif // #ifndef PS_NO_TRACE Index: trunk/psLib/src/sysUtils/psType.h =================================================================== --- trunk/psLib/src/sysUtils/psType.h (revision 4160) +++ trunk/psLib/src/sysUtils/psType.h (revision 4162) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-06 01:12:58 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -62,8 +62,8 @@ } psC64; -#else +#else // SWIG typedef float _Complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers typedef double _Complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers -#endif +#endif // !SWIG typedef void* psPtr; ///< void pointer @@ -243,3 +243,3 @@ /// @} -#endif +#endif // #ifndef PS_TYPE_H Index: trunk/psLib/src/types/psArray.h =================================================================== --- trunk/psLib/src/types/psArray.h (revision 4160) +++ trunk/psLib/src/types/psArray.h (revision 4162) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -48,5 +48,5 @@ /** Allocate an array. * - * Uses psLib memory allocation functions to create an array collection of + * Uses psLib memory allocation functions to create an array collection of * data * @@ -60,6 +60,6 @@ /** Reallocate an array. * - * Uses psLib memory allocation functions to reallocate an array collection - * of data. + * Uses psLib memory allocation functions to reallocate an array collection + * of data. * * @return psArray* : Pointer to psArray. @@ -85,7 +85,7 @@ /** Remove an element from the array * - * Finds and removes the specified data pointer from the list. + * Finds and removes the specified data pointer from the list. * - * @return bool: TRUE if the specified data pointer was found and removed, + * @return bool: TRUE if the specified data pointer was found and removed, * otherwise FALSE. * @@ -98,5 +98,5 @@ /** Deallocate/Dereference elements of an array. * - * Uses psLib memory allocation functions to deallocate/dereference elements + * Uses psLib memory allocation functions to deallocate/dereference elements * of a array of void pointers. The array psArr is not freed, and its elements * will all be set to NULL. @@ -112,9 +112,9 @@ * to specify how the objects on the array should be sorted. * - * The comparison function must return an integer less than, equal to, or - * greater than zero if the first argument is considered to be respectively - * less than, equal to, or greater than the second. + * The comparison function must return an integer less than, equal to, or + * greater than zero if the first argument is considered to be respectively + * less than, equal to, or greater than the second. * - * If two members compare as equal, their order in the sorted array is + * If two members compare as equal, their order in the sorted array is * undefined. * @@ -148,3 +148,3 @@ /// @} -#endif +#endif // #ifndef PS_ARRAY_H Index: trunk/psLib/src/types/psBitSet.h =================================================================== --- trunk/psLib/src/types/psBitSet.h (revision 4160) +++ trunk/psLib/src/types/psBitSet.h (revision 4162) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -75,7 +75,7 @@ /** Clear a bit. * - * Clear a bit at a given bit location. The bit is cleared based on a zero - * index with the first bit set in the zero bit slot of the zero element of - * the byte array. + * Clear a bit at a given bit location. The bit is cleared based on a zero + * index with the first bit set in the zero bit slot of the zero element of + * the byte array. * * @return psBitSet* : Pointer to struct containing psBitSet. @@ -143,3 +143,3 @@ /// @} -#endif +#endif // #ifndef PSBITSET_H Index: trunk/psLib/src/types/psHash.h =================================================================== --- trunk/psLib/src/types/psHash.h (revision 4160) +++ trunk/psLib/src/types/psHash.h (revision 4162) @@ -11,10 +11,11 @@ * @author GLG, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 22:36:48 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ -#if !defined(PS_HASH_H) + +#ifndef PS_HASH_H #define PS_HASH_H @@ -83,3 +84,3 @@ /* \} */// End of DataGroup Functions -#endif +#endif // #ifndef PS_HASH_H Index: trunk/psLib/src/types/psList.h =================================================================== --- trunk/psLib/src/types/psList.h (revision 4160) +++ trunk/psLib/src/types/psList.h (revision 4162) @@ -1,5 +1,2 @@ -#if !defined(PS_LIST_H) -#define PS_LIST_H - /** @file psList.h * @brief Support for doubly linked lists @@ -10,9 +7,12 @@ * @ingroup LinkedList * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-11 23:17:46 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii */ + +#ifndef PS_LIST_H +#define PS_LIST_H #include // we need a mutex to make this stuff thread safe. @@ -210,9 +210,9 @@ /** Sort a list via a comparison function. * - * The comparison function must return an integer less than, equal to, or - * greater than zero if the first argument is considered to be respectively - * less than, equal to, or greater than the second. - * - * If two members compare as equal, their order in the sorted array is + * The comparison function must return an integer less than, equal to, or + * greater than zero if the first argument is considered to be respectively + * less than, equal to, or greater than the second. + * + * If two members compare as equal, their order in the sorted array is * undefined. * @@ -226,3 +226,4 @@ /// @} End of DataGroup Functions -#endif +#endif // #ifndef PS_LIST_H + Index: trunk/psLib/src/types/psLookupTable.c =================================================================== --- trunk/psLib/src/types/psLookupTable.c (revision 4160) +++ trunk/psLib/src/types/psLookupTable.c (revision 4162) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-31 21:46:56 $ +* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -15,13 +15,6 @@ #include #include -//#ifdef DARWIN -#undef __STRICT_ANSI__ -//#endif #include -//#ifdef DARWIN -#define __STRICT_ANSI__ -//#endif #include -#include #include "psMemory.h" Index: trunk/psLib/src/types/psLookupTable.h =================================================================== --- trunk/psLib/src/types/psLookupTable.h (revision 4160) +++ trunk/psLib/src/types/psLookupTable.h (revision 4162) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-05-31 21:46:56 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -131,3 +131,3 @@ ); -#endif +#endif // #ifndef PS_LOOKUPTABLE_H Index: trunk/psLib/src/types/psMetadata.h =================================================================== --- trunk/psLib/src/types/psMetadata.h (revision 4160) +++ trunk/psLib/src/types/psMetadata.h (revision 4162) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-07 19:59:39 $ +* @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -70,5 +70,5 @@ * * Enumeration for the modification of the behaviour in psMetadataAddItem. - * + * * @see psMetadataAddItem */ @@ -239,5 +239,5 @@ va_list list ///< Arguments for name formatting and metadata item data. ); -#endif +#endif // #ifndef SWIG /** Create a metadata collection. @@ -294,5 +294,5 @@ va_list list ///< Arguments for name formatting and metadata item data. ); -#endif +#endif // #ifndef SWIG psBool psMetadataAddS32(psMetadata* md, psS32 location, const char* name, @@ -479,3 +479,3 @@ /// @} -#endif +#endif // #ifndef PS_METADATA_H Index: trunk/psLib/src/types/psMetadataConfig.h =================================================================== --- trunk/psLib/src/types/psMetadataConfig.h (revision 4160) +++ trunk/psLib/src/types/psMetadataConfig.h (revision 4162) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-16 19:43:53 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -94,3 +94,3 @@ /// @} -#endif +#endif // #ifndef PS_METADATAIO_H Index: trunk/psLib/src/types/psPixels.h =================================================================== --- trunk/psLib/src/types/psPixels.h (revision 4160) +++ trunk/psLib/src/types/psPixels.h (revision 4162) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 23:57:36 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -132,3 +132,3 @@ ); -#endif +#endif // #ifndef PS_PIXELS_H Index: trunk/psLib/src/xml/psXML.h =================================================================== --- trunk/psLib/src/xml/psXML.h (revision 4160) +++ trunk/psLib/src/xml/psXML.h (revision 4162) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-16 19:43:53 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-08 23:40:45 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -94,3 +94,3 @@ /// @} -#endif +#endif // #ifndef PS_METADATAIO_H Index: trunk/psLib/test/psTest.h =================================================================== --- trunk/psLib/test/psTest.h (revision 4160) +++ trunk/psLib/test/psTest.h (revision 4162) @@ -80,3 +80,3 @@ ); -#endif +#endif // #ifndef PSTEST_H