IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4162


Ignore:
Timestamp:
Jun 8, 2005, 1:40:46 PM (21 years ago)
Author:
desonia
Message:

added comments on the end of #endif and #else

Location:
trunk/psLib
Files:
103 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astro/psCoord.h

    r4127 r4162  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-07 02:08:26 $
     12*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-08 23:40:45 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    357357/** Takes a given transform and inverts it linearly if possible.
    358358 *
    359  *  @return psPlaneTransform           
     359 *  @return psPlaneTransform
    360360 *  the linearly inverted transform
    361361*/
    … …  
    367367/** Takes a transform and tests whether or not it is a linear projection.
    368368 *
    369  *  @return psS32                     
     369 *  @return psS32
    370370 *  the order of the projection
    371371*/
    … …  
    446446/// @}
    447447
    448 #endif
     448#endif // #ifndef PS_COORD_H

  • trunk/psLib/src/astro/psTime.h

    r4051 r4162  
    11/** @file  psTime.h
    22 *
    3  *  @brief Definitions for time, time utilities, and conversion functions for use 
     3 *  @brief Definitions for time, time utilities, and conversion functions for use
    44 *  with psLib astronomy functions.
    55 *
    6  *  A collection of functions are required by psLib to manipulate time data. These 
    7  *  functions primarily consist of conversions between specific time formats.  They 
    8  *  use the UNIX timeval time system as the base upon which International Atomic 
     6 *  A collection of functions are required by psLib to manipulate time data. These
     7 *  functions primarily consist of conversions between specific time formats.  They
     8 *  use the UNIX timeval time system as the base upon which International Atomic
    99 *  Time (TAI) and Universal Time Coordinated (UTC) are calculated.
    1010 *
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-05-31 21:47:46 $
     13 *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8888/** Allocate time struct.
    8989 *
    90  * Allocates an empty time struct. User must specify the psTimeType 
    91  * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members 
     90 * Allocates an empty time struct. User must specify the psTimeType
     91 * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members
    9292 * of the struct are set to zero.
    9393 *
    … …  
    100100/** Get current time.
    101101 *
    102  * Gets current time from the system clock. User must specify the psTimeType 
     102 * Gets current time from the system clock. User must specify the psTimeType
    103103 * (PS_TIME_TAI or PS_TIME_UTC) in the argument.
    104104 *
    … …  
    122122/** Convert psTime to Local Mean Sidereal Time (LMST).
    123123 *
    124  *  Converts psTime at the given longitude to LMST time. If the input time is not 
     124 *  Converts psTime at the given longitude to LMST time. If the input time is not
    125125 *  in UTC format, then it is converted.
    126126 *
    … …  
    186186/** Convert psTime to Julian date time.
    187187 *
    188  *  Converts psTime to Julian date (JD) time. This function does not add or 
     188 *  Converts psTime to Julian date (JD) time. This function does not add or
    189189 *  subtract leapseconds.
    190190 *
    … …  
    196196/** Convert psTime to modified Julian date time.
    197197 *
    198  *  Converts psTime to modified Julian date (MJD) time. This function does not 
     198 *  Converts psTime to modified Julian date (MJD) time. This function does not
    199199 *  add or subtract leapseconds.
    200200 *
    … …  
    207207/** Convert psTime to ISO8601 formatted string.
    208208 *
    209  *  Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss. 
     209 *  Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss.
    210210 *  This function does not add or subtract leapseconds.
    211211 *
    … …  
    229229 * Convert psTime to tm time.
    230230 *
    231  * Converts psTime to tm time. This function is based on a Perl algorithm availble 
    232  * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function 
     231 * Converts psTime to tm time. This function is based on a Perl algorithm availble
     232 * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function
    233233 * does not add or subtract leapseconds.
    234234 *
    … …  
    304304/** Convert tm time to psTime.
    305305 *
    306  *  Converts tm time to psTime. This function is based on a Perl algorithm availble 
    307  *  in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function 
     306 *  Converts tm time to psTime. This function is based on a Perl algorithm availble
     307 *  in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function
    308308 *  does not add or subtract leapseconds.
    309309 *
    … …  
    346346/// @}
    347347
    348 #endif
     348#endif // #ifndef PSTIME_H

  • trunk/psLib/src/astronomy/psAstrometry.h

    r4143 r4162  
    88*  @author GLG, MHPCC
    99*
    10 *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-06-08 00:26:01 $
     10*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    532532
    533533
    534 #endif
     534#endif // #ifndef PS_ASTROMETRY_H

  • trunk/psLib/src/astronomy/psAstronomyErrors.h

    r3955 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-05-17 21:12:42 $
     9 *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8787//~End
    8888
    89 #endif
     89#endif // #ifndef PS_ASTRONOMY_ERRORS_H

  • trunk/psLib/src/astronomy/psCoord.h

    r4127 r4162  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-07 02:08:26 $
     12*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-08 23:40:45 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    357357/** Takes a given transform and inverts it linearly if possible.
    358358 *
    359  *  @return psPlaneTransform           
     359 *  @return psPlaneTransform
    360360 *  the linearly inverted transform
    361361*/
    … …  
    367367/** Takes a transform and tests whether or not it is a linear projection.
    368368 *
    369  *  @return psS32                     
     369 *  @return psS32
    370370 *  the order of the projection
    371371*/
    … …  
    446446/// @}
    447447
    448 #endif
     448#endif // #ifndef PS_COORD_H

  • trunk/psLib/src/astronomy/psPhotometry.h

    r4134 r4162  
    1212*  incorporate it into psAstrometry.h
    1313*
    14 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-06-07 22:27:28 $
     14*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2005-06-08 23:40:45 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929/** The photometric system description
    3030 *
    31  *  The photometric system is defined by the psPhotSystem structure. A 
    32  *  photometric system is identified by a human-readable name (ie, SDSS.g, 
    33  *  Landolt92.B, GPC1.OTA32.r). Each photometric system is given a unique 
    34  *  identifier ID. Observations taken with a specific camera, detector, and 
    35  *  filter represent their own photometric system, and it may be necessary to 
    36  *  perform transformations between these systems. Photometric systems 
    37  *  associated with observations from a specific camera/ detector/filter 
     31 *  The photometric system is defined by the psPhotSystem structure. A
     32 *  photometric system is identified by a human-readable name (ie, SDSS.g,
     33 *  Landolt92.B, GPC1.OTA32.r). Each photometric system is given a unique
     34 *  identifier ID. Observations taken with a specific camera, detector, and
     35 *  filter represent their own photometric system, and it may be necessary to
     36 *  perform transformations between these systems. Photometric systems
     37 *  associated with observations from a specific camera/ detector/filter
    3838 *  combination can be associated with those components.
    3939 *
    … …  
    7272/// @}
    7373
    74 #endif
     74#endif // #ifndef PS_PHOTOMETRIC_H

  • trunk/psLib/src/astronomy/psTime.h

    r4051 r4162  
    11/** @file  psTime.h
    22 *
    3  *  @brief Definitions for time, time utilities, and conversion functions for use 
     3 *  @brief Definitions for time, time utilities, and conversion functions for use
    44 *  with psLib astronomy functions.
    55 *
    6  *  A collection of functions are required by psLib to manipulate time data. These 
    7  *  functions primarily consist of conversions between specific time formats.  They 
    8  *  use the UNIX timeval time system as the base upon which International Atomic 
     6 *  A collection of functions are required by psLib to manipulate time data. These
     7 *  functions primarily consist of conversions between specific time formats.  They
     8 *  use the UNIX timeval time system as the base upon which International Atomic
    99 *  Time (TAI) and Universal Time Coordinated (UTC) are calculated.
    1010 *
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-05-31 21:47:46 $
     13 *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8888/** Allocate time struct.
    8989 *
    90  * Allocates an empty time struct. User must specify the psTimeType 
    91  * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members 
     90 * Allocates an empty time struct. User must specify the psTimeType
     91 * (PS_TIME_TAI or PS_TIME_UTC) in the argument. The seconds and microseconds members
    9292 * of the struct are set to zero.
    9393 *
    … …  
    100100/** Get current time.
    101101 *
    102  * Gets current time from the system clock. User must specify the psTimeType 
     102 * Gets current time from the system clock. User must specify the psTimeType
    103103 * (PS_TIME_TAI or PS_TIME_UTC) in the argument.
    104104 *
    … …  
    122122/** Convert psTime to Local Mean Sidereal Time (LMST).
    123123 *
    124  *  Converts psTime at the given longitude to LMST time. If the input time is not 
     124 *  Converts psTime at the given longitude to LMST time. If the input time is not
    125125 *  in UTC format, then it is converted.
    126126 *
    … …  
    186186/** Convert psTime to Julian date time.
    187187 *
    188  *  Converts psTime to Julian date (JD) time. This function does not add or 
     188 *  Converts psTime to Julian date (JD) time. This function does not add or
    189189 *  subtract leapseconds.
    190190 *
    … …  
    196196/** Convert psTime to modified Julian date time.
    197197 *
    198  *  Converts psTime to modified Julian date (MJD) time. This function does not 
     198 *  Converts psTime to modified Julian date (MJD) time. This function does not
    199199 *  add or subtract leapseconds.
    200200 *
    … …  
    207207/** Convert psTime to ISO8601 formatted string.
    208208 *
    209  *  Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss. 
     209 *  Converts psTime to a null terminated string in the form of YYYY-MM-DDThh:mm:ss.sss.
    210210 *  This function does not add or subtract leapseconds.
    211211 *
    … …  
    229229 * Convert psTime to tm time.
    230230 *
    231  * Converts psTime to tm time. This function is based on a Perl algorithm availble 
    232  * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function 
     231 * Converts psTime to tm time. This function is based on a Perl algorithm availble
     232 * in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function
    233233 * does not add or subtract leapseconds.
    234234 *
    … …  
    304304/** Convert tm time to psTime.
    305305 *
    306  *  Converts tm time to psTime. This function is based on a Perl algorithm availble 
    307  *  in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function 
     306 *  Converts tm time to psTime. This function is based on a Perl algorithm availble
     307 *  in the Pan-STARRS Image processing Algorithm Design Description (ADD). This function
    308308 *  does not add or subtract leapseconds.
    309309 *
    … …  
    346346/// @}
    347347
    348 #endif
     348#endif // #ifndef PSTIME_H

  • trunk/psLib/src/collections/psArray.h

    r3264 r4162  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-02-17 19:26:23 $
     14 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4848/** Allocate an array.
    4949 *
    50  * Uses psLib memory allocation functions to create an array collection of 
     50 * Uses psLib memory allocation functions to create an array collection of
    5151 * data
    5252 *
    … …  
    6060/** Reallocate an array.
    6161 *
    62  * Uses psLib memory allocation functions to reallocate an array collection 
    63  * of data. 
     62 * Uses psLib memory allocation functions to reallocate an array collection
     63 * of data.
    6464 *
    6565 * @return psArray* : Pointer to psArray.
    … …  
    8585/** Remove an element from the array
    8686 *
    87  *  Finds and removes the specified data pointer from the list. 
     87 *  Finds and removes the specified data pointer from the list.
    8888 *
    89  * @return bool:  TRUE if the specified data pointer was found and removed, 
     89 * @return bool:  TRUE if the specified data pointer was found and removed,
    9090 *                otherwise FALSE.
    9191 *
    … …  
    9898/** Deallocate/Dereference elements of an array.
    9999 *
    100  * Uses psLib memory allocation functions to deallocate/dereference elements 
     100 * Uses psLib memory allocation functions to deallocate/dereference elements
    101101 * of a array of void pointers.  The array psArr is not freed, and its elements
    102102 * will all be set to NULL.
    … …  
    112112 *  to specify how the objects on the array should be sorted.
    113113 *
    114  *  The comparison function must return an integer less than, equal to, or 
    115  *  greater than zero if the first argument is considered to be respectively 
    116  *  less than, equal to, or greater than the second. 
     114 *  The comparison function must return an integer less than, equal to, or
     115 *  greater than zero if the first argument is considered to be respectively
     116 *  less than, equal to, or greater than the second.
    117117 *
    118  *  If two members compare as equal, their order in the sorted array is 
     118 *  If two members compare as equal, their order in the sorted array is
    119119 *  undefined.
    120120 *
    … …  
    148148/// @}
    149149
    150 #endif
     150#endif // #ifndef PS_ARRAY_H

  • trunk/psLib/src/collections/psBitSet.h

    r3264 r4162  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-02-17 19:26:23 $
     14 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7575/** Clear a bit.
    7676 *
    77  *  Clear a bit at a given bit location. The bit is cleared based on a zero 
    78  *  index with the first bit set in the zero bit slot of the zero element of 
    79  *  the byte array. 
     77 *  Clear a bit at a given bit location. The bit is cleared based on a zero
     78 *  index with the first bit set in the zero bit slot of the zero element of
     79 *  the byte array.
    8080 *
    8181 *  @return  psBitSet* : Pointer to struct containing psBitSet.
    … …  
    143143/// @}
    144144
    145 #endif
     145#endif // #ifndef PSBITSET_H

  • trunk/psLib/src/collections/psCollectionsErrors.h

    r3959 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-05-18 21:38:19 $
     9 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2323 *     $2  The error text (rest of the line in psCollectionsErrors.dat)
    2424 *     $n  The order of the source line in psCollecitonsErrors.dat (comments excluded)
    25  * 
     25 *
    2626 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
    2727 */
    … …  
    6767//~End
    6868
    69 #endif
     69#endif // #ifndef PS_COLLECTIONS_ERRORS_H

  • trunk/psLib/src/collections/psCompare.h

    r3264 r4162  
    66 *  @ingroup Compare
    77 *
    8  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-02-17 19:26:23 $
     8 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-06-08 23:40:45 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1212 */
    1313
    14 #if !defined(PS_COMPARE_H)
     14#ifndef PS_COMPARE_H
    1515#define PS_COMPARE_H
    1616
    … …  
    2424 *  e.g., for psList of pointers to numeric values.
    2525 *
    26  *  @return int      an integer less than, equal to, or greater than zero if 
    27  *                   the first argument is considered to be respectively less 
    28  *                   than, equal to, or greater than the second. 
     26 *  @return int      an integer less than, equal to, or greater than zero if
     27 *                   the first argument is considered to be respectively less
     28 *                   than, equal to, or greater than the second.
    2929 */
    3030typedef int (*psComparePtrFcn) (
    … …  
    3535/** A comparison function for sorting.
    3636 *
    37  *  @return int      an integer less than, equal to, or greater than zero if 
    38  *                   the first argument is considered to be respectively less 
    39  *                   than, equal to, or greater than the second. 
     37 *  @return int      an integer less than, equal to, or greater than zero if
     38 *                   the first argument is considered to be respectively less
     39 *                   than, equal to, or greater than the second.
    4040 */
    4141typedef int (*psCompareFcn) (
    … …  
    4646/** Compare function of psS8 data.  For use with psListSort.
    4747 *
    48  *  @return int      an integer less than, equal to, or greater than zero if 
    49  *                   the first argument is considered to be respectively less 
    50  *                   than, equal to, or greater than the second. 
     48 *  @return int      an integer less than, equal to, or greater than zero if
     49 *                   the first argument is considered to be respectively less
     50 *                   than, equal to, or greater than the second.
    5151 */
    5252int psCompareS8Ptr(
    … …  
    5757/** Compare function of psS16 data.  For use with psListSort.
    5858 *
    59  *  @return int      an integer less than, equal to, or greater than zero if 
    60  *                   the first argument is considered to be respectively less 
    61  *                   than, equal to, or greater than the second. 
     59 *  @return int      an integer less than, equal to, or greater than zero if
     60 *                   the first argument is considered to be respectively less
     61 *                   than, equal to, or greater than the second.
    6262 */
    6363int psCompareS16Ptr(
    … …  
    6868/** Compare function of psS32 data.  For use with psListSort.
    6969 *
    70  *  @return int      an integer less than, equal to, or greater than zero if 
    71  *                   the first argument is considered to be respectively less 
    72  *                   than, equal to, or greater than the second. 
     70 *  @return int      an integer less than, equal to, or greater than zero if
     71 *                   the first argument is considered to be respectively less
     72 *                   than, equal to, or greater than the second.
    7373 */
    7474int psCompareS32Ptr(
    … …  
    7979/** Compare function of psS64 data.  For use with psListSort.
    8080 *
    81  *  @return int      an integer less than, equal to, or greater than zero if 
    82  *                   the first argument is considered to be respectively less 
    83  *                   than, equal to, or greater than the second. 
     81 *  @return int      an integer less than, equal to, or greater than zero if
     82 *                   the first argument is considered to be respectively less
     83 *                   than, equal to, or greater than the second.
    8484 */
    8585int psCompareS64Ptr(
    … …  
    9090/** Compare function of psU8 data.  For use with psListSort.
    9191 *
    92  *  @return int      an integer less than, equal to, or greater than zero if 
    93  *                   the first argument is considered to be respectively less 
    94  *                   than, equal to, or greater than the second. 
     92 *  @return int      an integer less than, equal to, or greater than zero if
     93 *                   the first argument is considered to be respectively less
     94 *                   than, equal to, or greater than the second.
    9595 */
    9696int psCompareU8Ptr(
    … …  
    101101/** Compare function of psU16 data.  For use with psListSort.
    102102 *
    103  *  @return int      an integer less than, equal to, or greater than zero if 
    104  *                   the first argument is considered to be respectively less 
    105  *                   than, equal to, or greater than the second. 
     103 *  @return int      an integer less than, equal to, or greater than zero if
     104 *                   the first argument is considered to be respectively less
     105 *                   than, equal to, or greater than the second.
    106106 */
    107107int psCompareU16Ptr(
    … …  
    112112/** Compare function of psU32 data.  For use with psListSort.
    113113 *
    114  *  @return int      an integer less than, equal to, or greater than zero if 
    115  *                   the first argument is considered to be respectively less 
    116  *                   than, equal to, or greater than the second. 
     114 *  @return int      an integer less than, equal to, or greater than zero if
     115 *                   the first argument is considered to be respectively less
     116 *                   than, equal to, or greater than the second.
    117117 */
    118118int psCompareU32Ptr(
    … …  
    123123/** Compare function of psU64 data.  For use with psListSort.
    124124 *
    125  *  @return int      an integer less than, equal to, or greater than zero if 
    126  *                   the first argument is considered to be respectively less 
    127  *                   than, equal to, or greater than the second. 
     125 *  @return int      an integer less than, equal to, or greater than zero if
     126 *                   the first argument is considered to be respectively less
     127 *                   than, equal to, or greater than the second.
    128128 */
    129129int psCompareU64Ptr(
    … …  
    134134/** Compare function of psF32 data.  For use with psListSort.
    135135 *
    136  *  @return int      an integer less than, equal to, or greater than zero if 
    137  *                   the first argument is considered to be respectively less 
    138  *                   than, equal to, or greater than the second. 
     136 *  @return int      an integer less than, equal to, or greater than zero if
     137 *                   the first argument is considered to be respectively less
     138 *                   than, equal to, or greater than the second.
    139139 */
    140140int psCompareF32Ptr(
    … …  
    145145/** Compare function of psF64 data.  For use with psListSort.
    146146 *
    147  *  @return int      an integer less than, equal to, or greater than zero if 
    148  *                   the first argument is considered to be respectively less 
    149  *                   than, equal to, or greater than the second. 
     147 *  @return int      an integer less than, equal to, or greater than zero if
     148 *                   the first argument is considered to be respectively less
     149 *                   than, equal to, or greater than the second.
    150150 */
    151151int psCompareF64Ptr(
    … …  
    156156/** Compare function of psS8 data.  For use with psListSort for descending ordering.
    157157 *
    158  *  @return int      an integer less than, equal to, or greater than zero if 
    159  *                   the first argument is considered to be respectively greater 
    160  *                   than, equal to, or less than the second. 
     158 *  @return int      an integer less than, equal to, or greater than zero if
     159 *                   the first argument is considered to be respectively greater
     160 *                   than, equal to, or less than the second.
    161161 */
    162162int psCompareDescendingS8Ptr(
    … …  
    167167/** Compare function of psS16 data.  For use with psListSort for descending ordering.
    168168 *
    169  *  @return int      an integer less than, equal to, or greater than zero if 
    170  *                   the first argument is considered to be respectively greater 
    171  *                   than, equal to, or less than the second. 
     169 *  @return int      an integer less than, equal to, or greater than zero if
     170 *                   the first argument is considered to be respectively greater
     171 *                   than, equal to, or less than the second.
    172172 */
    173173int psCompareDescendingS16Ptr(
    … …  
    178178/** Compare function of psS32 data.  For use with psListSort for descending ordering.
    179179 *
    180  *  @return int      an integer less than, equal to, or greater than zero if 
    181  *                   the first argument is considered to be respectively greater 
    182  *                   than, equal to, or less than the second. 
     180 *  @return int      an integer less than, equal to, or greater than zero if
     181 *                   the first argument is considered to be respectively greater
     182 *                   than, equal to, or less than the second.
    183183 */
    184184int psCompareDescendingS32Ptr(
    … …  
    189189/** Compare function of psS64 data.  For use with psListSort for descending ordering.
    190190 *
    191  *  @return int      an integer less than, equal to, or greater than zero if 
    192  *                   the first argument is considered to be respectively greater 
    193  *                   than, equal to, or less than the second. 
     191 *  @return int      an integer less than, equal to, or greater than zero if
     192 *                   the first argument is considered to be respectively greater
     193 *                   than, equal to, or less than the second.
    194194 */
    195195int psCompareDescendingS64Ptr(
    … …  
    200200/** Compare function of psU8 data.  For use with psListSort for descending ordering.
    201201 *
    202  *  @return int      an integer less than, equal to, or greater than zero if 
    203  *                   the first argument is considered to be respectively greater 
    204  *                   than, equal to, or less than the second. 
     202 *  @return int      an integer less than, equal to, or greater than zero if
     203 *                   the first argument is considered to be respectively greater
     204 *                   than, equal to, or less than the second.
    205205 */
    206206int psCompareDescendingU8Ptr(
    … …  
    211211/** Compare function of psU16 data.  For use with psListSort for descending ordering.
    212212 *
    213  *  @return int      an integer less than, equal to, or greater than zero if 
    214  *                   the first argument is considered to be respectively greater 
    215  *                   than, equal to, or less than the second. 
     213 *  @return int      an integer less than, equal to, or greater than zero if
     214 *                   the first argument is considered to be respectively greater
     215 *                   than, equal to, or less than the second.
    216216 */
    217217int psCompareDescendingU16Ptr(
    … …  
    222222/** Compare function of psU32 data.  For use with psListSort for descending ordering.
    223223 *
    224  *  @return int      an integer less than, equal to, or greater than zero if 
    225  *                   the first argument is considered to be respectively greater 
    226  *                   than, equal to, or lessg than the second. 
     224 *  @return int      an integer less than, equal to, or greater than zero if
     225 *                   the first argument is considered to be respectively greater
     226 *                   than, equal to, or lessg than the second.
    227227 */
    228228int psCompareDescendingU32Ptr(
    … …  
    233233/** Compare function of psU64 data.  For use with psListSort for descending ordering.
    234234 *
    235  *  @return int      an integer less than, equal to, or greater than zero if 
    236  *                   the first argument is considered to be respectively greater 
    237  *                   than, equal to, or lessg than the second. 
     235 *  @return int      an integer less than, equal to, or greater than zero if
     236 *                   the first argument is considered to be respectively greater
     237 *                   than, equal to, or lessg than the second.
    238238 */
    239239int psCompareDescendingU64Ptr(
    … …  
    244244/** Compare function of psF32 data.  For use with psListSort for descending ordering.
    245245 *
    246  *  @return int      an integer less than, equal to, or greater than zero if 
    247  *                   the first argument is considered to be respectively greater 
    248  *                   than, equal to, or lessg than the second. 
     246 *  @return int      an integer less than, equal to, or greater than zero if
     247 *                   the first argument is considered to be respectively greater
     248 *                   than, equal to, or lessg than the second.
    249249 */
    250250int psCompareDescendingF32Ptr(
    … …  
    255255/** Compare function of psF64 data.  For use with psListSort for descending ordering.
    256256 *
    257  *  @return int      an integer less than, equal to, or greater than zero if 
    258  *                   the first argument is considered to be respectively greater 
    259  *                   than, equal to, or lessg than the second. 
     257 *  @return int      an integer less than, equal to, or greater than zero if
     258 *                   the first argument is considered to be respectively greater
     259 *                   than, equal to, or lessg than the second.
    260260 */
    261261int psCompareDescendingF64Ptr(
    … …  
    266266/** Compare function of psS8 data.
    267267 *
    268  *  @return int      an integer less than, equal to, or greater than zero if 
    269  *                   the first argument is considered to be respectively less 
    270  *                   than, equal to, or greater than the second. 
     268 *  @return int      an integer less than, equal to, or greater than zero if
     269 *                   the first argument is considered to be respectively less
     270 *                   than, equal to, or greater than the second.
    271271 */
    272272int psCompareS8(
    … …  
    278278/** Compare function of psS16 data.
    279279 *
    280  *  @return int      an integer less than, equal to, or greater than zero if 
    281  *                   the first argument is considered to be respectively less 
    282  *                   than, equal to, or greater than the second. 
     280 *  @return int      an integer less than, equal to, or greater than zero if
     281 *                   the first argument is considered to be respectively less
     282 *                   than, equal to, or greater than the second.
    283283 */
    284284int psCompareS16(
    … …  
    290290/** Compare function of psS32 data.
    291291 *
    292  *  @return int      an integer less than, equal to, or greater than zero if 
    293  *                   the first argument is considered to be respectively less 
    294  *                   than, equal to, or greater than the second. 
     292 *  @return int      an integer less than, equal to, or greater than zero if
     293 *                   the first argument is considered to be respectively less
     294 *                   than, equal to, or greater than the second.
    295295 */
    296296int psCompareS32(
    … …  
    302302/** Compare function of psS64 data.
    303303 *
    304  *  @return int      an integer less than, equal to, or greater than zero if 
    305  *                   the first argument is considered to be respectively less 
    306  *                   than, equal to, or greater than the second. 
     304 *  @return int      an integer less than, equal to, or greater than zero if
     305 *                   the first argument is considered to be respectively less
     306 *                   than, equal to, or greater than the second.
    307307 */
    308308int psCompareS64(
    … …  
    314314/** Compare function of psU8 data.
    315315 *
    316  *  @return int      an integer less than, equal to, or greater than zero if 
    317  *                   the first argument is considered to be respectively less 
    318  *                   than, equal to, or greater than the second. 
     316 *  @return int      an integer less than, equal to, or greater than zero if
     317 *                   the first argument is considered to be respectively less
     318 *                   than, equal to, or greater than the second.
    319319 */
    320320int psCompareU8(
    … …  
    326326/** Compare function of psU16 data.
    327327 *
    328  *  @return int      an integer less than, equal to, or greater than zero if 
    329  *                   the first argument is considered to be respectively less 
    330  *                   than, equal to, or greater than the second. 
     328 *  @return int      an integer less than, equal to, or greater than zero if
     329 *                   the first argument is considered to be respectively less
     330 *                   than, equal to, or greater than the second.
    331331 */
    332332int psCompareU16(
    … …  
    338338/** Compare function of psU32 data.
    339339 *
    340  *  @return int      an integer less than, equal to, or greater than zero if 
    341  *                   the first argument is considered to be respectively less 
    342  *                   than, equal to, or greater than the second. 
     340 *  @return int      an integer less than, equal to, or greater than zero if
     341 *                   the first argument is considered to be respectively less
     342 *                   than, equal to, or greater than the second.
    343343 */
    344344int psCompareU32(
    … …  
    350350/** Compare function of psU64 data.
    351351 *
    352  *  @return int      an integer less than, equal to, or greater than zero if 
    353  *                   the first argument is considered to be respectively less 
    354  *                   than, equal to, or greater than the second. 
     352 *  @return int      an integer less than, equal to, or greater than zero if
     353 *                   the first argument is considered to be respectively less
     354 *                   than, equal to, or greater than the second.
    355355 */
    356356int psCompareU64(
    … …  
    362362/** Compare function of psF32 data.
    363363 *
    364  *  @return int      an integer less than, equal to, or greater than zero if 
    365  *                   the first argument is considered to be respectively less 
    366  *                   than, equal to, or greater than the second. 
     364 *  @return int      an integer less than, equal to, or greater than zero if
     365 *                   the first argument is considered to be respectively less
     366 *                   than, equal to, or greater than the second.
    367367 */
    368368int psCompareF32(
    … …  
    374374/** Compare function of psF64 data.
    375375 *
    376  *  @return int      an integer less than, equal to, or greater than zero if 
    377  *                   the first argument is considered to be respectively less 
    378  *                   than, equal to, or greater than the second. 
     376 *  @return int      an integer less than, equal to, or greater than zero if
     377 *                   the first argument is considered to be respectively less
     378 *                   than, equal to, or greater than the second.
    379379 */
    380380int psCompareF64(
    … …  
    386386/** Compare function of psS8 data.
    387387 *
    388  *  @return int      an integer less than, equal to, or greater than zero if 
    389  *                   the first argument is considered to be respectively greater 
    390  *                   than, equal to, or less than the second. 
     388 *  @return int      an integer less than, equal to, or greater than zero if
     389 *                   the first argument is considered to be respectively greater
     390 *                   than, equal to, or less than the second.
    391391 */
    392392int psCompareDescendingS8(
    … …  
    398398/** Compare function of psS16 data.
    399399 *
    400  *  @return int      an integer less than, equal to, or greater than zero if 
    401  *                   the first argument is considered to be respectively greater 
    402  *                   than, equal to, or less than the second. 
     400 *  @return int      an integer less than, equal to, or greater than zero if
     401 *                   the first argument is considered to be respectively greater
     402 *                   than, equal to, or less than the second.
    403403 */
    404404int psCompareDescendingS16(
    … …  
    410410/** Compare function of psS32 data.
    411411 *
    412  *  @return int      an integer less than, equal to, or greater than zero if 
    413  *                   the first argument is considered to be respectively greater 
    414  *                   than, equal to, or less than the second. 
     412 *  @return int      an integer less than, equal to, or greater than zero if
     413 *                   the first argument is considered to be respectively greater
     414 *                   than, equal to, or less than the second.
    415415 */
    416416int psCompareDescendingS32(
    … …  
    422422/** Compare function of psS64 data.
    423423 *
    424  *  @return int      an integer less than, equal to, or greater than zero if 
    425  *                   the first argument is considered to be respectively greater 
    426  *                   than, equal to, or less than the second. 
     424 *  @return int      an integer less than, equal to, or greater than zero if
     425 *                   the first argument is considered to be respectively greater
     426 *                   than, equal to, or less than the second.
    427427 */
    428428int psCompareDescendingS64(
    … …  
    434434/** Compare function of psU8 data.
    435435 *
    436  *  @return int      an integer less than, equal to, or greater than zero if 
    437  *                   the first argument is considered to be respectively greater 
    438  *                   than, equal to, or less than the second. 
     436 *  @return int      an integer less than, equal to, or greater than zero if
     437 *                   the first argument is considered to be respectively greater
     438 *                   than, equal to, or less than the second.
    439439 */
    440440int psCompareDescendingU8(
    … …  
    446446/** Compare function of psU16 data.
    447447 *
    448  *  @return int      an integer less than, equal to, or greater than zero if 
    449  *                   the first argument is considered to be respectively greater 
    450  *                   than, equal to, or less than the second. 
     448 *  @return int      an integer less than, equal to, or greater than zero if
     449 *                   the first argument is considered to be respectively greater
     450 *                   than, equal to, or less than the second.
    451451 */
    452452int psCompareDescendingU16(
    … …  
    458458/** Compare function of psU32 data.
    459459 *
    460  *  @return int      an integer less than, equal to, or greater than zero if 
    461  *                   the first argument is considered to be respectively greater 
    462  *                   than, equal to, or less than the second. 
     460 *  @return int      an integer less than, equal to, or greater than zero if
     461 *                   the first argument is considered to be respectively greater
     462 *                   than, equal to, or less than the second.
    463463 */
    464464int psCompareDescendingU32(
    … …  
    470470/** Compare function of psU64 data.
    471471 *
    472  *  @return int      an integer less than, equal to, or greater than zero if 
    473  *                   the first argument is considered to be respectively greater 
    474  *                   than, equal to, or less than the second. 
     472 *  @return int      an integer less than, equal to, or greater than zero if
     473 *                   the first argument is considered to be respectively greater
     474 *                   than, equal to, or less than the second.
    475475 */
    476476int psCompareDescendingU64(
    … …  
    482482/** Compare function of psF32 data.
    483483 *
    484  *  @return int      an integer less than, equal to, or greater than zero if 
    485  *                   the first argument is considered to be respectively greater 
    486  *                   than, equal to, or less than the second. 
     484 *  @return int      an integer less than, equal to, or greater than zero if
     485 *                   the first argument is considered to be respectively greater
     486 *                   than, equal to, or less than the second.
    487487 */
    488488int psCompareDescendingF32(
    … …  
    494494/** Compare function of psF64 data.
    495495 *
    496  *  @return int      an integer less than, equal to, or greater than zero if 
    497  *                   the first argument is considered to be respectively greater 
    498  *                   than, equal to, or less than the second. 
     496 *  @return int      an integer less than, equal to, or greater than zero if
     497 *                   the first argument is considered to be respectively greater
     498 *                   than, equal to, or less than the second.
    499499 */
    500500int psCompareDescendingF64(
    … …  
    506506/// @}
    507507
    508 #endif
     508#endif  // #ifndef PS_COMPARE_H

  • trunk/psLib/src/collections/psHash.h

    r4135 r4162  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-07 22:36:48 $
     13 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1717 */
    18 #if !defined(PS_HASH_H)
     18
     19#ifndef PS_HASH_H
    1920#define PS_HASH_H
    2021
    … …  
    8384/* \} */// End of DataGroup Functions
    8485
    85 #endif
     86#endif // #ifndef PS_HASH_H

  • trunk/psLib/src/collections/psList.h

    r3409 r4162  
    1 #if !defined(PS_LIST_H)
    2 #define PS_LIST_H
    3 
    41/** @file psList.h
    52 *  @brief Support for doubly linked lists
    … …  
    107 *  @ingroup LinkedList
    118 *
    12  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-03-11 23:17:46 $
     9 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1411 *
    1512 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1613 */
     14
     15#ifndef PS_LIST_H
     16#define PS_LIST_H
    1717
    1818#include <pthread.h>                   // we need a mutex to make this stuff thread safe.
    … …  
    210210/** Sort a list via a comparison function.
    211211 *
    212  *  The comparison function must return an integer less than, equal to, or 
    213  *  greater than zero if the first argument is considered to be respectively 
    214  *  less than, equal to, or greater than the second. 
    215  *
    216  *  If two members compare as equal, their order in the sorted array is 
     212 *  The comparison function must return an integer less than, equal to, or
     213 *  greater than zero if the first argument is considered to be respectively
     214 *  less than, equal to, or greater than the second.
     215 *
     216 *  If two members compare as equal, their order in the sorted array is
    217217 *  undefined.
    218218 *
    … …  
    226226/// @} End of DataGroup Functions
    227227
    228 #endif
     228#endif // #ifndef PS_LIST_H
     229

  • trunk/psLib/src/collections/psMetadata.h

    r4130 r4162  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-06-07 19:59:39 $
     13*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-06-08 23:40:45 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7070 *
    7171 *  Enumeration for the modification of the behaviour in psMetadataAddItem.
    72  * 
     72 *
    7373 *  @see psMetadataAddItem
    7474 */
    … …  
    239239    va_list list                       ///< Arguments for name formatting and metadata item data.
    240240);
    241 #endif
     241#endif // #ifndef SWIG
    242242
    243243/** Create a metadata collection.
    … …  
    294294    va_list list                       ///< Arguments for name formatting and metadata item data.
    295295);
    296 #endif
     296#endif // #ifndef SWIG
    297297
    298298psBool psMetadataAddS32(psMetadata* md, psS32 location, const char* name,
    … …  
    479479/// @}
    480480
    481 #endif
     481#endif // #ifndef PS_METADATA_H

  • trunk/psLib/src/collections/psMetadataIO.h

    r3945 r4162  
    1010 *  @author Robert DeSonia, MHPCC
    1111 *
    12  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-05-16 19:43:53 $
     12 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-08 23:40:45 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9494/// @}
    9595
    96 #endif
     96#endif // #ifndef PS_METADATAIO_H

  • trunk/psLib/src/collections/psPixels.h

    r3990 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-05-19 23:57:36 $
     9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    132132);
    133133
    134 #endif
     134#endif // #ifndef PS_PIXELS_H

  • trunk/psLib/src/collections/psScalar.h

    r3264 r4162  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-02-17 19:26:23 $
     13 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8282/// @}
    8383
    84 #endif
     84#endif // #ifndef PS_SCALAR_H

  • trunk/psLib/src/collections/psVector.h

    r3786 r4162  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-04-29 02:25:09 $
     13 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    176176/// @}
    177177
    178 #endif
     178#endif // #ifndef PS_VECTOR_H

  • trunk/psLib/src/dataIO/psFileUtilsErrors.h

    r3684 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-04-08 17:58:57 $
     9 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2323 *     $2  The error text (rest of the line in psAstronomyErrors.dat)
    2424 *     $n  The order of the source line in psAstronomyErrors.dat (comments excluded)
    25  * 
     25 *
    2626 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
    2727 */
    … …  
    7878//~End
    7979
    80 #endif
     80#endif // #ifndef PS_FILEUTIL_ERRORS_H

  • trunk/psLib/src/dataIO/psFits.h

    r4158 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-08 21:07:59 $
     9 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    265265/// @}
    266266
    267 #endif
     267#endif // #ifndef PS_FITS_H

  • trunk/psLib/src/dataIO/psLookupTable.c

    r4050 r4162  
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-05-31 21:46:56 $
     9*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-06-08 23:40:45 $
    1111*
    1212*  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    1515#include <string.h>
    1616#include <ctype.h>
    17 //#ifdef DARWIN
    18 #undef __STRICT_ANSI__
    19 //#endif
    2017#include <stdlib.h>
    21 //#ifdef DARWIN
    22 #define __STRICT_ANSI__
    23 //#endif
    2418#include <math.h>
    25 #include <stdlib.h>
    2619
    2720#include "psMemory.h"

  • trunk/psLib/src/dataIO/psLookupTable.h

    r4050 r4162  
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-05-31 21:46:56 $
     9*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-06-08 23:40:45 $
    1111*
    1212*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    131131);
    132132
    133 #endif
     133#endif // #ifndef PS_LOOKUPTABLE_H

  • trunk/psLib/src/dataManip/psBinaryOp.h

    r3182 r4162  
    1 
    21/** @file  psBinaryOp.h
    32 *
    … …  
    3130 *  @author Robert DeSonia, MHPCC
    3231 *
    33  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    34  *  @date $Date: 2005-02-10 02:36:41 $
     32 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     33 *  @date $Date: 2005-06-08 23:40:45 $
    3534 *
    3635 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6564/// @}
    6665
    67 #endif
     66#endif // #ifndef PSBINARY_OP_H

  • trunk/psLib/src/dataManip/psConstants.h

    r4108 r4162  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-06-04 00:49:48 $
     8 *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-06-08 23:40:45 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4545#define M_1_PI 0.3183098861837906715377675267450287  /* 1/pi */
    4646#define M_2_PI 0.6366197723675813430755350534900574  /* 2/pi */
    47 #endif
    48 #define PS_PI   3.1415926535897932384626433832795029  /* pi */
     47#endif // #ifndef M_PI
    4948
    5049#define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)
    … …  
    699698 *****************************************************************************/
    700699#define PS_MAX(A, B) \
    701 (((A) > (B)) ? (A) : (B)) \
     700(((A) > (B)) ? (A) : (B))
    702701
    703702#define PS_MIN(A, B) \
    704 (((A) < (B)) ? (A) : (B)) \
     703(((A) < (B)) ? (A) : (B))
    705704
    706705#define PS_SQR(A) \
    707 ((A) * (A)) \
    708 
    709 #ifdef DARWIN
    710 #define PS_SQRT_F32(A) ((float) sqrt(A))
    711 #else
    712 #define PS_SQRT_F32(A) (sqrtf(A))
    713 #endif
     706((A) * (A))

  • trunk/psLib/src/dataManip/psDataManipErrors.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:23 $
     9 *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6969//~End
    7070
    71 #endif
     71#endif // #ifndef PS_DATAMANIP_ERRORS_H

  • trunk/psLib/src/dataManip/psFunctions.c

    r4029 r4162  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-05-25 20:26:55 $
     9 *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    10241024
    10251025    if (normal == true) {
    1026         tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma));
     1026        tmp = 1.0 / sqrtf(2.0 * M_PI * (sigma * sigma));
    10271027    }
    10281028

  • trunk/psLib/src/dataManip/psFunctions.h

    r3598 r4162  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-31 23:01:46 $
     14 *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1818 */
    1919
    20 #if !defined(PS_FUNCTIONS_H)
     20#ifndef PS_FUNCTIONS_H
    2121#define PS_FUNCTIONS_H
    2222
    … …  
    3434
    3535/** Evaluate a non-normalized Gaussian with the given mean and sigma at the
    36  *  given coordianate. 
    37  *
    38  *  Note that this is not a Gaussian deviate.  The evaluated Gaussian is: 
    39  *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] 
     36 *  given coordianate.
     37 *
     38 *  Note that this is not a Gaussian deviate.  The evaluated Gaussian is:
     39 *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f]
    4040 *
    4141 *  @return psF32      value on the gaussian curve given the input parameters
    … …  
    4949
    5050/** Produce a vector of random numbers from a Gaussian distribution with
    51  *  the specified mean and sigma 
    52  * 
     51 *  the specified mean and sigma
     52 *
    5353 *  @return psVector*    vector of random numbers
    54  * 
     54 *
    5555 */
    5656psVector* p_psGaussianDev(
    … …  
    433433                         const psVector* y,
    434434                         psF32 X);
    435 #endif
    436 
    437 /* \} */// End of MathGroup Functions
    438 
    439 #endif
    440 
     435#endif // #if 0
     436
     437/** \} */ // End of MathGroup Functions
     438
     439#endif // #ifndef PS_FUNCTIONS_H
     440

  • trunk/psLib/src/dataManip/psMatrix.h

    r3264 r4162  
    1 
    21/** @file  psMatrix.h
    32 *
    … …  
    2221 *  @author Ross Harman, MHPCC
    2322 *
    24  *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    25  *  @date $Date: 2005-02-17 19:26:23 $
     23 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     24 *  @date $Date: 2005-06-08 23:40:45 $
    2625 *
    2726 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    164163/// @}
    165164
    166 #endif
     165#endif // #ifndef PSMATRIX_H

  • trunk/psLib/src/dataManip/psMinimize.h

    r3855 r4162  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-05-05 22:23:29 $
     10 *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-08 23:40:45 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1515 */
    1616
    17 #if !defined(PS_MINIMIZE_H)
     17#ifndef PS_MINIMIZE_H
    1818#define PS_MINIMIZE_H
    1919
    … …  
    5353/** Derive a polynomial fit.
    5454 *
    55  *  psVectorFitPolynomial1d returns the polynomial that best fits the 
    56  *  observations. The input parameters are a polynomial that specifies the 
    57  *  fit order, myPoly, which will be altered and returned with the best-fit 
    58  *  coefficients; and the observations, x, y and yErr. The independent 
    59  *  variable list, x may be NULL, in which case the vector index is used. 
    60  *  The dependent variable error, yErr may be null, in which case the solution 
    61  *  is determined in the assumption that all data errors are equal. This 
     55 *  psVectorFitPolynomial1d returns the polynomial that best fits the
     56 *  observations. The input parameters are a polynomial that specifies the
     57 *  fit order, myPoly, which will be altered and returned with the best-fit
     58 *  coefficients; and the observations, x, y and yErr. The independent
     59 *  variable list, x may be NULL, in which case the vector index is used.
     60 *  The dependent variable error, yErr may be null, in which case the solution
     61 *  is determined in the assumption that all data errors are equal. This
    6262 *  function must be valid only for types psF32, psF64.
    6363 *
    … …  
    142142/* \} */// End of MathGroup Functions
    143143
    144 #endif
     144#endif // #ifndef PS_MINIMIZE_H
    145145

  • trunk/psLib/src/dataManip/psRandom.h

    r3264 r4162  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-02-17 19:26:23 $
     12*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-08 23:40:45 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1616*/
    1717
    18 #if !defined(PS_RANDOM_H)
     18#ifndef PS_RANDOM_H
    1919#define PS_RANDOM_H
    2020
    … …  
    5656/* \} */// End of MathGroup Functions
    5757
    58 #endif
    59 
     58#endif // #ifndef PS_RANDOM_H

  • trunk/psLib/src/dataManip/psStats.c

    r4138 r4162  
    1414 *      stats->binsize
    1515 *
    16  *  @version $Revision: 1.131 $ $Name: not supported by cvs2svn $
    17  *  @date $Date: 2005-06-07 23:11:54 $
     16 *  @version $Revision: 1.132 $ $Name: not supported by cvs2svn $
     17 *  @date $Date: 2005-06-08 23:40:45 $
    1818 *
    1919 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    878878    } else {
    879879        countFloat = (psF32)countInt;
    880         stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
     880        stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
    881881    }
    882882}
    … …  
    992992        // data ranges are used correctly.
    993993        if (errors != NULL) {
    994             stats->sampleStdev = (1.0 / PS_SQRT_F32(errorDivisor));
     994            stats->sampleStdev = (1.0 / sqrtf(errorDivisor));
    995995        } else {
    996996            countFloat = (psF32)countInt;
    997             stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
     997            stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
    998998
    999999        }
    … …  
    16271627        }
    16281628    }
    1629     myStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
     1629    myStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
    16301630
    16311631    p_psNormalizeVectorRangeF32(robustHistogramVector, 0.0, 1.0);
    … …  
    16571657                     "WARNING: failed fit a 1D polynomial.\n");
    16581658        }
    1659         psF32 polyFitSigma = PS_SQRT_F32(-0.5 / tmpPoly->coeff[2]);
     1659        psF32 polyFitSigma = sqrtf(-0.5 / tmpPoly->coeff[2]);
    16601660        psF32 polyFitMean = tmpPoly->coeff[1] * PS_SQR(polyFitSigma);
    16611661        // psF32 polyFitNorm = exp(tmpPoly->coedd[0] + PS_SQR(polyFitMean) / (2.0 * PS_SQR(polyFitSigma)));

  • trunk/psLib/src/dataManip/psStats.h

    r4138 r4162  
    1414 *  @author GLG, MHPCC
    1515 *
    16  *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
    17  *  @date $Date: 2005-06-07 23:11:54 $
     16 *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
     17 *  @date $Date: 2005-06-08 23:40:45 $
    1818 *
    1919 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    2020 */
    21 #if !defined(PS_STATS_H)
     21#ifndef PS_STATS_H
    2222#define PS_STATS_H
    2323
    … …  
    112112/** The basic histogram structure which contains bounds and bins.
    113113 *
    114  *  In this structure, the vector bounds specifies the boundaries of the 
    115  *  histogram bins, and must of type psF32, while nums specifies the number 
    116  *  of entries in the bin, and must of type psU32. The value of bounds.n must 
    117  *  therefore be 1 greater than than nums.n. The two values minNum and maxNum 
    118  *  are the number of data values which fell below the lower limit bound or 
     114 *  In this structure, the vector bounds specifies the boundaries of the
     115 *  histogram bins, and must of type psF32, while nums specifies the number
     116 *  of entries in the bin, and must of type psU32. The value of bounds.n must
     117 *  therefore be 1 greater than than nums.n. The two values minNum and maxNum
     118 *  are the number of data values which fell below the lower limit bound or
    119119 *  above the upper limit bound, respectively.
    120120 */
    … …  
    130130
    131131/** Allocator for psHistogram where the bounds of the bins are implicitly
    132  *  specified through simply specifying an upper and lower limit along with 
    133  *  the size of the bins. 
     132 *  specified through simply specifying an upper and lower limit along with
     133 *  the size of the bins.
    134134 *
    135135 *  @return psHistogram*    Newly allocated psHistogram
    … …  
    142142
    143143/** Allocator for psHistogram where the bounds of the bins are explicitly
    144  *  specified. 
     144 *  specified.
    145145 *
    146146 *  @return psHistogram*    Newly allocated psHistogram
    … …  
    152152/** Calculate a histogram
    153153 *
    154  *  The following function populates the histogram bins from the specified 
     154 *  The following function populates the histogram bins from the specified
    155155 *  vector (in). It alters and returns the histogram out structure. The input
    156156 *  vector may be of types psU8, psU16, psF32, psF64.
    … …  
    169169 *
    170170 *  @return psBool    If more than one statistic result is set in stats->options,
    171  *                    false is returned and the value parameter is not set, 
     171 *                    false is returned and the value parameter is not set,
    172172 *                    otherwise true is returned.
    173173 */
    … …  
    193193/// @}
    194194
    195 #endif
     195#endif // #ifndef PS_STATS_H

  • trunk/psLib/src/dataManip/psUnaryOp.h

    r3182 r4162  
    3030 *  @author Robert DeSonia, MHPCC
    3131 *
    32  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    33  *  @date $Date: 2005-02-10 02:36:41 $
     32 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     33 *  @date $Date: 2005-06-08 23:40:45 $
    3434 *
    3535 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767/// @}
    6868
    69 #endif
     69#endif // #ifndef PSUNARY_OP_H

  • trunk/psLib/src/dataManip/psVectorFFT.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:23 $
     9 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636/** Forward and reverse FFT calculations.
    3737 *
    38  *  This takes as input the vector of interest (in) and the direction 
     38 *  This takes as input the vector of interest (in) and the direction
    3939 *  (direction), which is specified by an enumerated type psFftDirection.
    40  *  The input vector may be of type psF32 or psC32, the result is always 
    41  *  psC32. If the input vector is psF32, the direction must be forward. 
    42  * 
     40 *  The input vector may be of type psF32 or psC32, the result is always
     41 *  psC32. If the input vector is psF32, the direction must be forward.
     42 *
    4343 *  @return psVector* the FFT transformation result
    4444 */
    … …  
    5050
    5151/** extract the real portion of a complex vector
    52  * 
     52 *
    5353 *  @return psVector*   real portion of the input vector.
    5454 */
    … …  
    5959
    6060/** extract the imaginary portion of a complex vector
    61  * 
     61 *
    6262 *  @return psVector*   imaginary portion of the input vector.
    6363 */
    … …  
    6868
    6969/** creates a complex vector from separate real and imaginary vectors
    70  * 
     70 *
    7171 *  @return psVector*   resulting complex vector
    7272 */
    … …  
    7878
    7979/** computes the complex conjugate of a vector
    80  * 
     80 *
    8181 *  @return psVector*   the complex conjugate of the 'in' vector
    8282 */
    … …  
    8787
    8888/** computes the power spectrum of a vector
    89  * 
     89 *
    9090 *  @return psVector*   the power spectrum of the 'in' vector
    9191 */
    … …  
    9797/// @}
    9898
    99 #endif
     99#endif // #ifndef PS_VECTOR_FFT_H

  • trunk/psLib/src/fft/psImageFFT.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2424/** Forward and reverse FFT calculations.
    2525 *
    26  *  This takes as input the image of interest (in) and the direction 
     26 *  This takes as input the image of interest (in) and the direction
    2727 *  (direction), which is specified by an enumerated type psFftDirection.
    28  *  The input image may be of type psF32 or psC32, the result is always 
    29  *  psC32. If the input vector is psF32, the direction must be forward. 
    30  * 
     28 *  The input image may be of type psF32 or psC32, the result is always
     29 *  psC32. If the input vector is psF32, the direction must be forward.
     30 *
    3131 *  @return psImage* the FFT transformation result
    3232 */
    … …  
    3838
    3939/** extract the real portion of a complex image
    40  * 
     40 *
    4141 *  @return psImage*   real portion of the input image.
    4242 */
    … …  
    4747
    4848/** extract the imaginary portion of a complex image
    49  * 
     49 *
    5050 *  @return psImage*   imaginary portion of the input image.
    5151 */
    … …  
    5656
    5757/** creates a complex image from separate real and imaginary plane images
    58  * 
     58 *
    5959 *  @return psImage*   resulting complex image
    6060 */
    … …  
    6666
    6767/** computes the complex conjugate of an image
    68  * 
     68 *
    6969 *  @return psImage*   the complex conjugate of the 'in' image
    7070 */
    … …  
    7575
    7676/** computes the power spectrum of an image
    77  * 
     77 *
    7878 *  @return psImage*   the power spectrum of the 'in' image
    7979 */
    … …  
    8585/// @}
    8686
    87 #endif
     87#endif // #ifndef PS_IMAGE_FFT_H

  • trunk/psLib/src/fft/psVectorFFT.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:23 $
     9 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3636/** Forward and reverse FFT calculations.
    3737 *
    38  *  This takes as input the vector of interest (in) and the direction 
     38 *  This takes as input the vector of interest (in) and the direction
    3939 *  (direction), which is specified by an enumerated type psFftDirection.
    40  *  The input vector may be of type psF32 or psC32, the result is always 
    41  *  psC32. If the input vector is psF32, the direction must be forward. 
    42  * 
     40 *  The input vector may be of type psF32 or psC32, the result is always
     41 *  psC32. If the input vector is psF32, the direction must be forward.
     42 *
    4343 *  @return psVector* the FFT transformation result
    4444 */
    … …  
    5050
    5151/** extract the real portion of a complex vector
    52  * 
     52 *
    5353 *  @return psVector*   real portion of the input vector.
    5454 */
    … …  
    5959
    6060/** extract the imaginary portion of a complex vector
    61  * 
     61 *
    6262 *  @return psVector*   imaginary portion of the input vector.
    6363 */
    … …  
    6868
    6969/** creates a complex vector from separate real and imaginary vectors
    70  * 
     70 *
    7171 *  @return psVector*   resulting complex vector
    7272 */
    … …  
    7878
    7979/** computes the complex conjugate of a vector
    80  * 
     80 *
    8181 *  @return psVector*   the complex conjugate of the 'in' vector
    8282 */
    … …  
    8787
    8888/** computes the power spectrum of a vector
    89  * 
     89 *
    9090 *  @return psVector*   the power spectrum of the 'in' vector
    9191 */
    … …  
    9797/// @}
    9898
    99 #endif
     99#endif // #ifndef PS_VECTOR_FFT_H

  • trunk/psLib/src/fits/psFits.h

    r4158 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-08 21:07:59 $
     9 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    265265/// @}
    266266
    267 #endif
     267#endif // #ifndef PS_FITS_H

  • trunk/psLib/src/image/psImageConvolve.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4141/** Allocates a convolution kernel of the given range
    4242 *
    43  *  In order to perform a convolution, we need to define the convolution 
    44  *  kernel. We need a more general object than a psImage so that we can 
    45  *  incorporate the offset from the (0, 0) pixel to the (0, 0) value of the 
    46  *  kernel. It might be convenient to allow both positive and negative 
    47  *  indices to convey the positive and negative shifts. One might consider 
    48  *  setting the x0 and y0 members of a psImage to the appropriate offsets, 
    49  *  but this is not the purpose of these members, and doing so may affect the 
     43 *  In order to perform a convolution, we need to define the convolution
     44 *  kernel. We need a more general object than a psImage so that we can
     45 *  incorporate the offset from the (0, 0) pixel to the (0, 0) value of the
     46 *  kernel. It might be convenient to allow both positive and negative
     47 *  indices to convey the positive and negative shifts. One might consider
     48 *  setting the x0 and y0 members of a psImage to the appropriate offsets,
     49 *  but this is not the purpose of these members, and doing so may affect the
    5050 *  behavior of other psImage operations.
    5151 *
    52  *  This construction allows the kernel member to use negative indices, while 
     52 *  This construction allows the kernel member to use negative indices, while
    5353 *  preserving the location of psMemBlocks relative to allocated memory.
    5454 *
    55  *  The maximum extent of the kernel shifts shall be defined by the xMin, 
    56  *  xMax, yMin and yMax members. Note that xMin and yMin, under normal 
    57  *  circumstances, should be negative numbers. That is, 
    58  *  myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or 
     55 *  The maximum extent of the kernel shifts shall be defined by the xMin,
     56 *  xMax, yMin and yMax members. Note that xMin and yMin, under normal
     57 *  circumstances, should be negative numbers. That is,
     58 *  myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or
    5959 *  more negative than -3 and -2, respectively.
    6060 *
    61  *  In the event that one of the minimum values is greater than the 
    62  *  corresponding maximum value, the function shall generate a warning, and 
     61 *  In the event that one of the minimum values is greater than the
     62 *  corresponding maximum value, the function shall generate a warning, and
    6363 *  the offending values shall be exchanged.
    6464 *
    … …  
    7474/** Generates a kernel given a list of shift values
    7575 *
    76  *  Given a list of values (e.g., shifts made in the course of OT guiding), 
    77  *  psKernelGenerate shall return the appropriate kernel.  The vectors xShifts 
    78  *  and yShifts, which are a list of shifts relative to some starting point, 
    79  *  will be supplied by the user. The elements of the vectors should be of an 
    80  *  integer type; otherwise the values shall be truncated to integers. The 
    81  *  output kernel shall be normalized such that the sum over the kernel is 
    82  *  unity. 
     76 *  Given a list of values (e.g., shifts made in the course of OT guiding),
     77 *  psKernelGenerate shall return the appropriate kernel.  The vectors xShifts
     78 *  and yShifts, which are a list of shifts relative to some starting point,
     79 *  will be supplied by the user. The elements of the vectors should be of an
     80 *  integer type; otherwise the values shall be truncated to integers. The
     81 *  output kernel shall be normalized such that the sum over the kernel is
     82 *  unity.
    8383 *
    84  *  If the vectors are not of the same number of elements, then the function 
    85  *  shall generate a warning shall be generated, following which, the longer 
     84 *  If the vectors are not of the same number of elements, then the function
     85 *  shall generate a warning shall be generated, following which, the longer
    8686 *  vector trimmed to the length of the shorter, and the function shall continue.
    8787 *
    … …  
    9797/** convolve an image with a kernel
    9898 *
    99  *  Given an input image and the convolution kernel, psImageConvolve shall 
    100  *  convolve the input image, in, with the kernel, kernel and return the 
     99 *  Given an input image and the convolution kernel, psImageConvolve shall
     100 *  convolve the input image, in, with the kernel, kernel and return the
    101101 *  convolved image, out.
    102  * 
    103  *  Two methods shall be available for the convolution: if direct is true, 
    104  *  then the convolution shall be performed in real space (appropriate for 
    105  *  small kernels); otherwise, the convolution shall be performed using Fast 
    106  *  Fourier Transforms (FFTs; appropriate for larger kernels). The latter 
    107  *  option involves padding the input image, copying the kernel into an image 
    108  *  of the same size as the padded input image, performing an FFT on each, 
    109  *  multiplying the FFTs, and performing an inverse FFT before trimming the 
     102 *
     103 *  Two methods shall be available for the convolution: if direct is true,
     104 *  then the convolution shall be performed in real space (appropriate for
     105 *  small kernels); otherwise, the convolution shall be performed using Fast
     106 *  Fourier Transforms (FFTs; appropriate for larger kernels). The latter
     107 *  option involves padding the input image, copying the kernel into an image
     108 *  of the same size as the padded input image, performing an FFT on each,
     109 *  multiplying the FFTs, and performing an inverse FFT before trimming the
    110110 *  image back to the original size.
    111111 *
    112  *  @return psImage*  resulting image 
     112 *  @return psImage*  resulting image
    113113 */
    114114psImage* psImageConvolve(
    … …  
    119119);
    120120
    121 #endif
     121#endif // #ifndef PS_IMAGE_CONVOLVE_H

  • trunk/psLib/src/image/psImageErrors.h

    r3476 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-22 21:52:49 $
     9 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2323 *     $2  The error text (rest of the line in psImageErrors.dat)
    2424 *     $n  The order of the source line in psImageErrors.dat (comments excluded)
    25  * 
     25 *
    2626 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
    2727 */
    … …  
    9999//~End
    100100
    101 #endif
     101#endif // #ifndef PS_IMAGE_ERRORS_H

  • trunk/psLib/src/image/psImageFFT.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2424/** Forward and reverse FFT calculations.
    2525 *
    26  *  This takes as input the image of interest (in) and the direction 
     26 *  This takes as input the image of interest (in) and the direction
    2727 *  (direction), which is specified by an enumerated type psFftDirection.
    28  *  The input image may be of type psF32 or psC32, the result is always 
    29  *  psC32. If the input vector is psF32, the direction must be forward. 
    30  * 
     28 *  The input image may be of type psF32 or psC32, the result is always
     29 *  psC32. If the input vector is psF32, the direction must be forward.
     30 *
    3131 *  @return psImage* the FFT transformation result
    3232 */
    … …  
    3838
    3939/** extract the real portion of a complex image
    40  * 
     40 *
    4141 *  @return psImage*   real portion of the input image.
    4242 */
    … …  
    4747
    4848/** extract the imaginary portion of a complex image
    49  * 
     49 *
    5050 *  @return psImage*   imaginary portion of the input image.
    5151 */
    … …  
    5656
    5757/** creates a complex image from separate real and imaginary plane images
    58  * 
     58 *
    5959 *  @return psImage*   resulting complex image
    6060 */
    … …  
    6666
    6767/** computes the complex conjugate of an image
    68  * 
     68 *
    6969 *  @return psImage*   the complex conjugate of the 'in' image
    7070 */
    … …  
    7575
    7676/** computes the power spectrum of an image
    77  * 
     77 *
    7878 *  @return psImage*   the power spectrum of the 'in' image
    7979 */
    … …  
    8585/// @}
    8686
    87 #endif
     87#endif // #ifndef PS_IMAGE_FFT_H

  • trunk/psLib/src/image/psImageGeomManip.h

    r3968 r4162  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-05-19 02:08:21 $
     10 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-08 23:40:45 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    155155);
    156156
    157 #endif
     157#endif // #ifndef PS_IMAGE_GEOM_MANIP_H

  • trunk/psLib/src/image/psImagePixelExtract.h

    r3968 r4162  
    88*  @author Robert DeSonia, MHPCC
    99*
    10 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-05-19 02:08:21 $
     10*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    130130/// @}
    131131
    132 #endif
     132#endif // #ifndef PSIMAGE_PIXEL_EXTRACT_H

  • trunk/psLib/src/image/psImagePixelManip.h

    r3968 r4162  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-05-19 02:08:21 $
     10 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-08 23:40:45 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8888);
    8989
    90 #endif
     90#endif // #ifndef PS_IMAGE_PIXEL_MANIP_H

  • trunk/psLib/src/image/psImageStats.h

    r3493 r4162  
    99*  @author GLG, MHPCC
    1010*
    11 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-03-24 19:39:53 $
     11*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-06-08 23:40:45 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1515*/
    16 #if !defined(PS_IMAGE_STATS_H)
     16#ifndef PS_IMAGE_STATS_H
    1717#define PS_IMAGE_STATS_H
    1818
    … …  
    2828/** This routine must determine the various statistics for the image.
    2929 *
    30  *  Determine statistics for image (or subimage). The statistics to be 
    31  *  determined are specified by stats. The mask allows pixels to be excluded 
    32  *  if their corresponding mask pixel value matches the value of maskVal. 
    33  *  This function must be defined for the following types: psS8, psU16, psF32, 
     30 *  Determine statistics for image (or subimage). The statistics to be
     31 *  determined are specified by stats. The mask allows pixels to be excluded
     32 *  if their corresponding mask pixel value matches the value of maskVal.
     33 *  This function must be defined for the following types: psS8, psU16, psF32,
    3434 *  psF64.
    3535 *
    … …  
    4545/** Construct a histogram from an image (or subimage).
    4646 *
    47  *  The histogram to generate is specified by psHistogram hist (see section 
    48  *  4.3.2 in SDRS). This function must be defined for the following types: 
     47 *  The histogram to generate is specified by psHistogram hist (see section
     48 *  4.3.2 in SDRS). This function must be defined for the following types:
    4949 *  psS8, psU16, psF32, psF64.
    5050 *
    … …  
    6060/** Fit a 2-D polynomial surface to an image.
    6161 *
    62  *  The input structure coeffs contains the desired order and terms of 
    63  *  interest. This function must be defined for the following types: psS8, 
     62 *  The input structure coeffs contains the desired order and terms of
     63 *  interest. This function must be defined for the following types: psS8,
    6464 *  psU16, psF32, psF64.
    6565 *
    … …  
    7474/** Evaluate a 2-D polynomial surface for the image pixels.
    7575 *
    76  *  Given the input polynomial coefficients, set the image pixel values on the 
    77  *  basis of the polynomial function. This function must be defined for the 
     76 *  Given the input polynomial coefficients, set the image pixel values on the
     77 *  basis of the polynomial function. This function must be defined for the
    7878 *  following types: psS8, psU16, psF32, psF64.
    7979 *
    … …  
    8787/// @}
    8888
    89 #endif
     89#endif // #ifndef PS_IMAGE_STATS_H

  • trunk/psLib/src/image/psImageStructManip.h

    r3977 r4162  
    88*  @author Robert DeSonia, MHPCC
    99*
    10 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-05-19 05:18:20 $
     10*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8282/// @}
    8383
    84 #endif
     84#endif // #ifndef PSIMAGE_STRUCT_MANIP_H

  • trunk/psLib/src/imageops/psImageConvolve.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4141/** Allocates a convolution kernel of the given range
    4242 *
    43  *  In order to perform a convolution, we need to define the convolution 
    44  *  kernel. We need a more general object than a psImage so that we can 
    45  *  incorporate the offset from the (0, 0) pixel to the (0, 0) value of the 
    46  *  kernel. It might be convenient to allow both positive and negative 
    47  *  indices to convey the positive and negative shifts. One might consider 
    48  *  setting the x0 and y0 members of a psImage to the appropriate offsets, 
    49  *  but this is not the purpose of these members, and doing so may affect the 
     43 *  In order to perform a convolution, we need to define the convolution
     44 *  kernel. We need a more general object than a psImage so that we can
     45 *  incorporate the offset from the (0, 0) pixel to the (0, 0) value of the
     46 *  kernel. It might be convenient to allow both positive and negative
     47 *  indices to convey the positive and negative shifts. One might consider
     48 *  setting the x0 and y0 members of a psImage to the appropriate offsets,
     49 *  but this is not the purpose of these members, and doing so may affect the
    5050 *  behavior of other psImage operations.
    5151 *
    52  *  This construction allows the kernel member to use negative indices, while 
     52 *  This construction allows the kernel member to use negative indices, while
    5353 *  preserving the location of psMemBlocks relative to allocated memory.
    5454 *
    55  *  The maximum extent of the kernel shifts shall be defined by the xMin, 
    56  *  xMax, yMin and yMax members. Note that xMin and yMin, under normal 
    57  *  circumstances, should be negative numbers. That is, 
    58  *  myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or 
     55 *  The maximum extent of the kernel shifts shall be defined by the xMin,
     56 *  xMax, yMin and yMax members. Note that xMin and yMin, under normal
     57 *  circumstances, should be negative numbers. That is,
     58 *  myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or
    5959 *  more negative than -3 and -2, respectively.
    6060 *
    61  *  In the event that one of the minimum values is greater than the 
    62  *  corresponding maximum value, the function shall generate a warning, and 
     61 *  In the event that one of the minimum values is greater than the
     62 *  corresponding maximum value, the function shall generate a warning, and
    6363 *  the offending values shall be exchanged.
    6464 *
    … …  
    7474/** Generates a kernel given a list of shift values
    7575 *
    76  *  Given a list of values (e.g., shifts made in the course of OT guiding), 
    77  *  psKernelGenerate shall return the appropriate kernel.  The vectors xShifts 
    78  *  and yShifts, which are a list of shifts relative to some starting point, 
    79  *  will be supplied by the user. The elements of the vectors should be of an 
    80  *  integer type; otherwise the values shall be truncated to integers. The 
    81  *  output kernel shall be normalized such that the sum over the kernel is 
    82  *  unity. 
     76 *  Given a list of values (e.g., shifts made in the course of OT guiding),
     77 *  psKernelGenerate shall return the appropriate kernel.  The vectors xShifts
     78 *  and yShifts, which are a list of shifts relative to some starting point,
     79 *  will be supplied by the user. The elements of the vectors should be of an
     80 *  integer type; otherwise the values shall be truncated to integers. The
     81 *  output kernel shall be normalized such that the sum over the kernel is
     82 *  unity.
    8383 *
    84  *  If the vectors are not of the same number of elements, then the function 
    85  *  shall generate a warning shall be generated, following which, the longer 
     84 *  If the vectors are not of the same number of elements, then the function
     85 *  shall generate a warning shall be generated, following which, the longer
    8686 *  vector trimmed to the length of the shorter, and the function shall continue.
    8787 *
    … …  
    9797/** convolve an image with a kernel
    9898 *
    99  *  Given an input image and the convolution kernel, psImageConvolve shall 
    100  *  convolve the input image, in, with the kernel, kernel and return the 
     99 *  Given an input image and the convolution kernel, psImageConvolve shall
     100 *  convolve the input image, in, with the kernel, kernel and return the
    101101 *  convolved image, out.
    102  * 
    103  *  Two methods shall be available for the convolution: if direct is true, 
    104  *  then the convolution shall be performed in real space (appropriate for 
    105  *  small kernels); otherwise, the convolution shall be performed using Fast 
    106  *  Fourier Transforms (FFTs; appropriate for larger kernels). The latter 
    107  *  option involves padding the input image, copying the kernel into an image 
    108  *  of the same size as the padded input image, performing an FFT on each, 
    109  *  multiplying the FFTs, and performing an inverse FFT before trimming the 
     102 *
     103 *  Two methods shall be available for the convolution: if direct is true,
     104 *  then the convolution shall be performed in real space (appropriate for
     105 *  small kernels); otherwise, the convolution shall be performed using Fast
     106 *  Fourier Transforms (FFTs; appropriate for larger kernels). The latter
     107 *  option involves padding the input image, copying the kernel into an image
     108 *  of the same size as the padded input image, performing an FFT on each,
     109 *  multiplying the FFTs, and performing an inverse FFT before trimming the
    110110 *  image back to the original size.
    111111 *
    112  *  @return psImage*  resulting image 
     112 *  @return psImage*  resulting image
    113113 */
    114114psImage* psImageConvolve(
    … …  
    119119);
    120120
    121 #endif
     121#endif // #ifndef PS_IMAGE_CONVOLVE_H

  • trunk/psLib/src/imageops/psImageGeomManip.h

    r3968 r4162  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-05-19 02:08:21 $
     10 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-08 23:40:45 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    155155);
    156156
    157 #endif
     157#endif // #ifndef PS_IMAGE_GEOM_MANIP_H

  • trunk/psLib/src/imageops/psImagePixelExtract.h

    r3968 r4162  
    88*  @author Robert DeSonia, MHPCC
    99*
    10 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-05-19 02:08:21 $
     10*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    130130/// @}
    131131
    132 #endif
     132#endif // #ifndef PSIMAGE_PIXEL_EXTRACT_H

  • trunk/psLib/src/imageops/psImagePixelManip.h

    r3968 r4162  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-05-19 02:08:21 $
     10 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-08 23:40:45 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8888);
    8989
    90 #endif
     90#endif // #ifndef PS_IMAGE_PIXEL_MANIP_H

  • trunk/psLib/src/imageops/psImageStats.h

    r3493 r4162  
    99*  @author GLG, MHPCC
    1010*
    11 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-03-24 19:39:53 $
     11*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-06-08 23:40:45 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1515*/
    16 #if !defined(PS_IMAGE_STATS_H)
     16#ifndef PS_IMAGE_STATS_H
    1717#define PS_IMAGE_STATS_H
    1818
    … …  
    2828/** This routine must determine the various statistics for the image.
    2929 *
    30  *  Determine statistics for image (or subimage). The statistics to be 
    31  *  determined are specified by stats. The mask allows pixels to be excluded 
    32  *  if their corresponding mask pixel value matches the value of maskVal. 
    33  *  This function must be defined for the following types: psS8, psU16, psF32, 
     30 *  Determine statistics for image (or subimage). The statistics to be
     31 *  determined are specified by stats. The mask allows pixels to be excluded
     32 *  if their corresponding mask pixel value matches the value of maskVal.
     33 *  This function must be defined for the following types: psS8, psU16, psF32,
    3434 *  psF64.
    3535 *
    … …  
    4545/** Construct a histogram from an image (or subimage).
    4646 *
    47  *  The histogram to generate is specified by psHistogram hist (see section 
    48  *  4.3.2 in SDRS). This function must be defined for the following types: 
     47 *  The histogram to generate is specified by psHistogram hist (see section
     48 *  4.3.2 in SDRS). This function must be defined for the following types:
    4949 *  psS8, psU16, psF32, psF64.
    5050 *
    … …  
    6060/** Fit a 2-D polynomial surface to an image.
    6161 *
    62  *  The input structure coeffs contains the desired order and terms of 
    63  *  interest. This function must be defined for the following types: psS8, 
     62 *  The input structure coeffs contains the desired order and terms of
     63 *  interest. This function must be defined for the following types: psS8,
    6464 *  psU16, psF32, psF64.
    6565 *
    … …  
    7474/** Evaluate a 2-D polynomial surface for the image pixels.
    7575 *
    76  *  Given the input polynomial coefficients, set the image pixel values on the 
    77  *  basis of the polynomial function. This function must be defined for the 
     76 *  Given the input polynomial coefficients, set the image pixel values on the
     77 *  basis of the polynomial function. This function must be defined for the
    7878 *  following types: psS8, psU16, psF32, psF64.
    7979 *
    … …  
    8787/// @}
    8888
    89 #endif
     89#endif // #ifndef PS_IMAGE_STATS_H

  • trunk/psLib/src/imageops/psImageStructManip.h

    r3977 r4162  
    88*  @author Robert DeSonia, MHPCC
    99*
    10 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-05-19 05:18:20 $
     10*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8282/// @}
    8383
    84 #endif
     84#endif // #ifndef PSIMAGE_STRUCT_MANIP_H

  • trunk/psLib/src/math/psBinaryOp.h

    r3182 r4162  
    1 
    21/** @file  psBinaryOp.h
    32 *
    … …  
    3130 *  @author Robert DeSonia, MHPCC
    3231 *
    33  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    34  *  @date $Date: 2005-02-10 02:36:41 $
     32 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     33 *  @date $Date: 2005-06-08 23:40:45 $
    3534 *
    3635 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6564/// @}
    6665
    67 #endif
     66#endif // #ifndef PSBINARY_OP_H

  • trunk/psLib/src/math/psCompare.h

    r3264 r4162  
    66 *  @ingroup Compare
    77 *
    8  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-02-17 19:26:23 $
     8 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-06-08 23:40:45 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1212 */
    1313
    14 #if !defined(PS_COMPARE_H)
     14#ifndef PS_COMPARE_H
    1515#define PS_COMPARE_H
    1616
    … …  
    2424 *  e.g., for psList of pointers to numeric values.
    2525 *
    26  *  @return int      an integer less than, equal to, or greater than zero if 
    27  *                   the first argument is considered to be respectively less 
    28  *                   than, equal to, or greater than the second. 
     26 *  @return int      an integer less than, equal to, or greater than zero if
     27 *                   the first argument is considered to be respectively less
     28 *                   than, equal to, or greater than the second.
    2929 */
    3030typedef int (*psComparePtrFcn) (
    … …  
    3535/** A comparison function for sorting.
    3636 *
    37  *  @return int      an integer less than, equal to, or greater than zero if 
    38  *                   the first argument is considered to be respectively less 
    39  *                   than, equal to, or greater than the second. 
     37 *  @return int      an integer less than, equal to, or greater than zero if
     38 *                   the first argument is considered to be respectively less
     39 *                   than, equal to, or greater than the second.
    4040 */
    4141typedef int (*psCompareFcn) (
    … …  
    4646/** Compare function of psS8 data.  For use with psListSort.
    4747 *
    48  *  @return int      an integer less than, equal to, or greater than zero if 
    49  *                   the first argument is considered to be respectively less 
    50  *                   than, equal to, or greater than the second. 
     48 *  @return int      an integer less than, equal to, or greater than zero if
     49 *                   the first argument is considered to be respectively less
     50 *                   than, equal to, or greater than the second.
    5151 */
    5252int psCompareS8Ptr(
    … …  
    5757/** Compare function of psS16 data.  For use with psListSort.
    5858 *
    59  *  @return int      an integer less than, equal to, or greater than zero if 
    60  *                   the first argument is considered to be respectively less 
    61  *                   than, equal to, or greater than the second. 
     59 *  @return int      an integer less than, equal to, or greater than zero if
     60 *                   the first argument is considered to be respectively less
     61 *                   than, equal to, or greater than the second.
    6262 */
    6363int psCompareS16Ptr(
    … …  
    6868/** Compare function of psS32 data.  For use with psListSort.
    6969 *
    70  *  @return int      an integer less than, equal to, or greater than zero if 
    71  *                   the first argument is considered to be respectively less 
    72  *                   than, equal to, or greater than the second. 
     70 *  @return int      an integer less than, equal to, or greater than zero if
     71 *                   the first argument is considered to be respectively less
     72 *                   than, equal to, or greater than the second.
    7373 */
    7474int psCompareS32Ptr(
    … …  
    7979/** Compare function of psS64 data.  For use with psListSort.
    8080 *
    81  *  @return int      an integer less than, equal to, or greater than zero if 
    82  *                   the first argument is considered to be respectively less 
    83  *                   than, equal to, or greater than the second. 
     81 *  @return int      an integer less than, equal to, or greater than zero if
     82 *                   the first argument is considered to be respectively less
     83 *                   than, equal to, or greater than the second.
    8484 */
    8585int psCompareS64Ptr(
    … …  
    9090/** Compare function of psU8 data.  For use with psListSort.
    9191 *
    92  *  @return int      an integer less than, equal to, or greater than zero if 
    93  *                   the first argument is considered to be respectively less 
    94  *                   than, equal to, or greater than the second. 
     92 *  @return int      an integer less than, equal to, or greater than zero if
     93 *                   the first argument is considered to be respectively less
     94 *                   than, equal to, or greater than the second.
    9595 */
    9696int psCompareU8Ptr(
    … …  
    101101/** Compare function of psU16 data.  For use with psListSort.
    102102 *
    103  *  @return int      an integer less than, equal to, or greater than zero if 
    104  *                   the first argument is considered to be respectively less 
    105  *                   than, equal to, or greater than the second. 
     103 *  @return int      an integer less than, equal to, or greater than zero if
     104 *                   the first argument is considered to be respectively less
     105 *                   than, equal to, or greater than the second.
    106106 */
    107107int psCompareU16Ptr(
    … …  
    112112/** Compare function of psU32 data.  For use with psListSort.
    113113 *
    114  *  @return int      an integer less than, equal to, or greater than zero if 
    115  *                   the first argument is considered to be respectively less 
    116  *                   than, equal to, or greater than the second. 
     114 *  @return int      an integer less than, equal to, or greater than zero if
     115 *                   the first argument is considered to be respectively less
     116 *                   than, equal to, or greater than the second.
    117117 */
    118118int psCompareU32Ptr(
    … …  
    123123/** Compare function of psU64 data.  For use with psListSort.
    124124 *
    125  *  @return int      an integer less than, equal to, or greater than zero if 
    126  *                   the first argument is considered to be respectively less 
    127  *                   than, equal to, or greater than the second. 
     125 *  @return int      an integer less than, equal to, or greater than zero if
     126 *                   the first argument is considered to be respectively less
     127 *                   than, equal to, or greater than the second.
    128128 */
    129129int psCompareU64Ptr(
    … …  
    134134/** Compare function of psF32 data.  For use with psListSort.
    135135 *
    136  *  @return int      an integer less than, equal to, or greater than zero if 
    137  *                   the first argument is considered to be respectively less 
    138  *                   than, equal to, or greater than the second. 
     136 *  @return int      an integer less than, equal to, or greater than zero if
     137 *                   the first argument is considered to be respectively less
     138 *                   than, equal to, or greater than the second.
    139139 */
    140140int psCompareF32Ptr(
    … …  
    145145/** Compare function of psF64 data.  For use with psListSort.
    146146 *
    147  *  @return int      an integer less than, equal to, or greater than zero if 
    148  *                   the first argument is considered to be respectively less 
    149  *                   than, equal to, or greater than the second. 
     147 *  @return int      an integer less than, equal to, or greater than zero if
     148 *                   the first argument is considered to be respectively less
     149 *                   than, equal to, or greater than the second.
    150150 */
    151151int psCompareF64Ptr(
    … …  
    156156/** Compare function of psS8 data.  For use with psListSort for descending ordering.
    157157 *
    158  *  @return int      an integer less than, equal to, or greater than zero if 
    159  *                   the first argument is considered to be respectively greater 
    160  *                   than, equal to, or less than the second. 
     158 *  @return int      an integer less than, equal to, or greater than zero if
     159 *                   the first argument is considered to be respectively greater
     160 *                   than, equal to, or less than the second.
    161161 */
    162162int psCompareDescendingS8Ptr(
    … …  
    167167/** Compare function of psS16 data.  For use with psListSort for descending ordering.
    168168 *
    169  *  @return int      an integer less than, equal to, or greater than zero if 
    170  *                   the first argument is considered to be respectively greater 
    171  *                   than, equal to, or less than the second. 
     169 *  @return int      an integer less than, equal to, or greater than zero if
     170 *                   the first argument is considered to be respectively greater
     171 *                   than, equal to, or less than the second.
    172172 */
    173173int psCompareDescendingS16Ptr(
    … …  
    178178/** Compare function of psS32 data.  For use with psListSort for descending ordering.
    179179 *
    180  *  @return int      an integer less than, equal to, or greater than zero if 
    181  *                   the first argument is considered to be respectively greater 
    182  *                   than, equal to, or less than the second. 
     180 *  @return int      an integer less than, equal to, or greater than zero if
     181 *                   the first argument is considered to be respectively greater
     182 *                   than, equal to, or less than the second.
    183183 */
    184184int psCompareDescendingS32Ptr(
    … …  
    189189/** Compare function of psS64 data.  For use with psListSort for descending ordering.
    190190 *
    191  *  @return int      an integer less than, equal to, or greater than zero if 
    192  *                   the first argument is considered to be respectively greater 
    193  *                   than, equal to, or less than the second. 
     191 *  @return int      an integer less than, equal to, or greater than zero if
     192 *                   the first argument is considered to be respectively greater
     193 *                   than, equal to, or less than the second.
    194194 */
    195195int psCompareDescendingS64Ptr(
    … …  
    200200/** Compare function of psU8 data.  For use with psListSort for descending ordering.
    201201 *
    202  *  @return int      an integer less than, equal to, or greater than zero if 
    203  *                   the first argument is considered to be respectively greater 
    204  *                   than, equal to, or less than the second. 
     202 *  @return int      an integer less than, equal to, or greater than zero if
     203 *                   the first argument is considered to be respectively greater
     204 *                   than, equal to, or less than the second.
    205205 */
    206206int psCompareDescendingU8Ptr(
    … …  
    211211/** Compare function of psU16 data.  For use with psListSort for descending ordering.
    212212 *
    213  *  @return int      an integer less than, equal to, or greater than zero if 
    214  *                   the first argument is considered to be respectively greater 
    215  *                   than, equal to, or less than the second. 
     213 *  @return int      an integer less than, equal to, or greater than zero if
     214 *                   the first argument is considered to be respectively greater
     215 *                   than, equal to, or less than the second.
    216216 */
    217217int psCompareDescendingU16Ptr(
    … …  
    222222/** Compare function of psU32 data.  For use with psListSort for descending ordering.
    223223 *
    224  *  @return int      an integer less than, equal to, or greater than zero if 
    225  *                   the first argument is considered to be respectively greater 
    226  *                   than, equal to, or lessg than the second. 
     224 *  @return int      an integer less than, equal to, or greater than zero if
     225 *                   the first argument is considered to be respectively greater
     226 *                   than, equal to, or lessg than the second.
    227227 */
    228228int psCompareDescendingU32Ptr(
    … …  
    233233/** Compare function of psU64 data.  For use with psListSort for descending ordering.
    234234 *
    235  *  @return int      an integer less than, equal to, or greater than zero if 
    236  *                   the first argument is considered to be respectively greater 
    237  *                   than, equal to, or lessg than the second. 
     235 *  @return int      an integer less than, equal to, or greater than zero if
     236 *                   the first argument is considered to be respectively greater
     237 *                   than, equal to, or lessg than the second.
    238238 */
    239239int psCompareDescendingU64Ptr(
    … …  
    244244/** Compare function of psF32 data.  For use with psListSort for descending ordering.
    245245 *
    246  *  @return int      an integer less than, equal to, or greater than zero if 
    247  *                   the first argument is considered to be respectively greater 
    248  *                   than, equal to, or lessg than the second. 
     246 *  @return int      an integer less than, equal to, or greater than zero if
     247 *                   the first argument is considered to be respectively greater
     248 *                   than, equal to, or lessg than the second.
    249249 */
    250250int psCompareDescendingF32Ptr(
    … …  
    255255/** Compare function of psF64 data.  For use with psListSort for descending ordering.
    256256 *
    257  *  @return int      an integer less than, equal to, or greater than zero if 
    258  *                   the first argument is considered to be respectively greater 
    259  *                   than, equal to, or lessg than the second. 
     257 *  @return int      an integer less than, equal to, or greater than zero if
     258 *                   the first argument is considered to be respectively greater
     259 *                   than, equal to, or lessg than the second.
    260260 */
    261261int psCompareDescendingF64Ptr(
    … …  
    266266/** Compare function of psS8 data.
    267267 *
    268  *  @return int      an integer less than, equal to, or greater than zero if 
    269  *                   the first argument is considered to be respectively less 
    270  *                   than, equal to, or greater than the second. 
     268 *  @return int      an integer less than, equal to, or greater than zero if
     269 *                   the first argument is considered to be respectively less
     270 *                   than, equal to, or greater than the second.
    271271 */
    272272int psCompareS8(
    … …  
    278278/** Compare function of psS16 data.
    279279 *
    280  *  @return int      an integer less than, equal to, or greater than zero if 
    281  *                   the first argument is considered to be respectively less 
    282  *                   than, equal to, or greater than the second. 
     280 *  @return int      an integer less than, equal to, or greater than zero if
     281 *                   the first argument is considered to be respectively less
     282 *                   than, equal to, or greater than the second.
    283283 */
    284284int psCompareS16(
    … …  
    290290/** Compare function of psS32 data.
    291291 *
    292  *  @return int      an integer less than, equal to, or greater than zero if 
    293  *                   the first argument is considered to be respectively less 
    294  *                   than, equal to, or greater than the second. 
     292 *  @return int      an integer less than, equal to, or greater than zero if
     293 *                   the first argument is considered to be respectively less
     294 *                   than, equal to, or greater than the second.
    295295 */
    296296int psCompareS32(
    … …  
    302302/** Compare function of psS64 data.
    303303 *
    304  *  @return int      an integer less than, equal to, or greater than zero if 
    305  *                   the first argument is considered to be respectively less 
    306  *                   than, equal to, or greater than the second. 
     304 *  @return int      an integer less than, equal to, or greater than zero if
     305 *                   the first argument is considered to be respectively less
     306 *                   than, equal to, or greater than the second.
    307307 */
    308308int psCompareS64(
    … …  
    314314/** Compare function of psU8 data.
    315315 *
    316  *  @return int      an integer less than, equal to, or greater than zero if 
    317  *                   the first argument is considered to be respectively less 
    318  *                   than, equal to, or greater than the second. 
     316 *  @return int      an integer less than, equal to, or greater than zero if
     317 *                   the first argument is considered to be respectively less
     318 *                   than, equal to, or greater than the second.
    319319 */
    320320int psCompareU8(
    … …  
    326326/** Compare function of psU16 data.
    327327 *
    328  *  @return int      an integer less than, equal to, or greater than zero if 
    329  *                   the first argument is considered to be respectively less 
    330  *                   than, equal to, or greater than the second. 
     328 *  @return int      an integer less than, equal to, or greater than zero if
     329 *                   the first argument is considered to be respectively less
     330 *                   than, equal to, or greater than the second.
    331331 */
    332332int psCompareU16(
    … …  
    338338/** Compare function of psU32 data.
    339339 *
    340  *  @return int      an integer less than, equal to, or greater than zero if 
    341  *                   the first argument is considered to be respectively less 
    342  *                   than, equal to, or greater than the second. 
     340 *  @return int      an integer less than, equal to, or greater than zero if
     341 *                   the first argument is considered to be respectively less
     342 *                   than, equal to, or greater than the second.
    343343 */
    344344int psCompareU32(
    … …  
    350350/** Compare function of psU64 data.
    351351 *
    352  *  @return int      an integer less than, equal to, or greater than zero if 
    353  *                   the first argument is considered to be respectively less 
    354  *                   than, equal to, or greater than the second. 
     352 *  @return int      an integer less than, equal to, or greater than zero if
     353 *                   the first argument is considered to be respectively less
     354 *                   than, equal to, or greater than the second.
    355355 */
    356356int psCompareU64(
    … …  
    362362/** Compare function of psF32 data.
    363363 *
    364  *  @return int      an integer less than, equal to, or greater than zero if 
    365  *                   the first argument is considered to be respectively less 
    366  *                   than, equal to, or greater than the second. 
     364 *  @return int      an integer less than, equal to, or greater than zero if
     365 *                   the first argument is considered to be respectively less
     366 *                   than, equal to, or greater than the second.
    367367 */
    368368int psCompareF32(
    … …  
    374374/** Compare function of psF64 data.
    375375 *
    376  *  @return int      an integer less than, equal to, or greater than zero if 
    377  *                   the first argument is considered to be respectively less 
    378  *                   than, equal to, or greater than the second. 
     376 *  @return int      an integer less than, equal to, or greater than zero if
     377 *                   the first argument is considered to be respectively less
     378 *                   than, equal to, or greater than the second.
    379379 */
    380380int psCompareF64(
    … …  
    386386/** Compare function of psS8 data.
    387387 *
    388  *  @return int      an integer less than, equal to, or greater than zero if 
    389  *                   the first argument is considered to be respectively greater 
    390  *                   than, equal to, or less than the second. 
     388 *  @return int      an integer less than, equal to, or greater than zero if
     389 *                   the first argument is considered to be respectively greater
     390 *                   than, equal to, or less than the second.
    391391 */
    392392int psCompareDescendingS8(
    … …  
    398398/** Compare function of psS16 data.
    399399 *
    400  *  @return int      an integer less than, equal to, or greater than zero if 
    401  *                   the first argument is considered to be respectively greater 
    402  *                   than, equal to, or less than the second. 
     400 *  @return int      an integer less than, equal to, or greater than zero if
     401 *                   the first argument is considered to be respectively greater
     402 *                   than, equal to, or less than the second.
    403403 */
    404404int psCompareDescendingS16(
    … …  
    410410/** Compare function of psS32 data.
    411411 *
    412  *  @return int      an integer less than, equal to, or greater than zero if 
    413  *                   the first argument is considered to be respectively greater 
    414  *                   than, equal to, or less than the second. 
     412 *  @return int      an integer less than, equal to, or greater than zero if
     413 *                   the first argument is considered to be respectively greater
     414 *                   than, equal to, or less than the second.
    415415 */
    416416int psCompareDescendingS32(
    … …  
    422422/** Compare function of psS64 data.
    423423 *
    424  *  @return int      an integer less than, equal to, or greater than zero if 
    425  *                   the first argument is considered to be respectively greater 
    426  *                   than, equal to, or less than the second. 
     424 *  @return int      an integer less than, equal to, or greater than zero if
     425 *                   the first argument is considered to be respectively greater
     426 *                   than, equal to, or less than the second.
    427427 */
    428428int psCompareDescendingS64(
    … …  
    434434/** Compare function of psU8 data.
    435435 *
    436  *  @return int      an integer less than, equal to, or greater than zero if 
    437  *                   the first argument is considered to be respectively greater 
    438  *                   than, equal to, or less than the second. 
     436 *  @return int      an integer less than, equal to, or greater than zero if
     437 *                   the first argument is considered to be respectively greater
     438 *                   than, equal to, or less than the second.
    439439 */
    440440int psCompareDescendingU8(
    … …  
    446446/** Compare function of psU16 data.
    447447 *
    448  *  @return int      an integer less than, equal to, or greater than zero if 
    449  *                   the first argument is considered to be respectively greater 
    450  *                   than, equal to, or less than the second. 
     448 *  @return int      an integer less than, equal to, or greater than zero if
     449 *                   the first argument is considered to be respectively greater
     450 *                   than, equal to, or less than the second.
    451451 */
    452452int psCompareDescendingU16(
    … …  
    458458/** Compare function of psU32 data.
    459459 *
    460  *  @return int      an integer less than, equal to, or greater than zero if 
    461  *                   the first argument is considered to be respectively greater 
    462  *                   than, equal to, or less than the second. 
     460 *  @return int      an integer less than, equal to, or greater than zero if
     461 *                   the first argument is considered to be respectively greater
     462 *                   than, equal to, or less than the second.
    463463 */
    464464int psCompareDescendingU32(
    … …  
    470470/** Compare function of psU64 data.
    471471 *
    472  *  @return int      an integer less than, equal to, or greater than zero if 
    473  *                   the first argument is considered to be respectively greater 
    474  *                   than, equal to, or less than the second. 
     472 *  @return int      an integer less than, equal to, or greater than zero if
     473 *                   the first argument is considered to be respectively greater
     474 *                   than, equal to, or less than the second.
    475475 */
    476476int psCompareDescendingU64(
    … …  
    482482/** Compare function of psF32 data.
    483483 *
    484  *  @return int      an integer less than, equal to, or greater than zero if 
    485  *                   the first argument is considered to be respectively greater 
    486  *                   than, equal to, or less than the second. 
     484 *  @return int      an integer less than, equal to, or greater than zero if
     485 *                   the first argument is considered to be respectively greater
     486 *                   than, equal to, or less than the second.
    487487 */
    488488int psCompareDescendingF32(
    … …  
    494494/** Compare function of psF64 data.
    495495 *
    496  *  @return int      an integer less than, equal to, or greater than zero if 
    497  *                   the first argument is considered to be respectively greater 
    498  *                   than, equal to, or less than the second. 
     496 *  @return int      an integer less than, equal to, or greater than zero if
     497 *                   the first argument is considered to be respectively greater
     498 *                   than, equal to, or less than the second.
    499499 */
    500500int psCompareDescendingF64(
    … …  
    506506/// @}
    507507
    508 #endif
     508#endif  // #ifndef PS_COMPARE_H

  • trunk/psLib/src/math/psConstants.h

    r4108 r4162  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-06-04 00:49:48 $
     8 *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-06-08 23:40:45 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4545#define M_1_PI 0.3183098861837906715377675267450287  /* 1/pi */
    4646#define M_2_PI 0.6366197723675813430755350534900574  /* 2/pi */
    47 #endif
    48 #define PS_PI   3.1415926535897932384626433832795029  /* pi */
     47#endif // #ifndef M_PI
    4948
    5049#define DEG_TO_RAD(DEGREES) ((DEGREES) * M_PI / 180.0)
    … …  
    699698 *****************************************************************************/
    700699#define PS_MAX(A, B) \
    701 (((A) > (B)) ? (A) : (B)) \
     700(((A) > (B)) ? (A) : (B))
    702701
    703702#define PS_MIN(A, B) \
    704 (((A) < (B)) ? (A) : (B)) \
     703(((A) < (B)) ? (A) : (B))
    705704
    706705#define PS_SQR(A) \
    707 ((A) * (A)) \
    708 
    709 #ifdef DARWIN
    710 #define PS_SQRT_F32(A) ((float) sqrt(A))
    711 #else
    712 #define PS_SQRT_F32(A) (sqrtf(A))
    713 #endif
     706((A) * (A))

  • trunk/psLib/src/math/psMatrix.h

    r3264 r4162  
    1 
    21/** @file  psMatrix.h
    32 *
    … …  
    2221 *  @author Ross Harman, MHPCC
    2322 *
    24  *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    25  *  @date $Date: 2005-02-17 19:26:23 $
     23 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     24 *  @date $Date: 2005-06-08 23:40:45 $
    2625 *
    2726 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    164163/// @}
    165164
    166 #endif
     165#endif // #ifndef PSMATRIX_H

  • trunk/psLib/src/math/psMinimize.h

    r3855 r4162  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-05-05 22:23:29 $
     10 *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-08 23:40:45 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1515 */
    1616
    17 #if !defined(PS_MINIMIZE_H)
     17#ifndef PS_MINIMIZE_H
    1818#define PS_MINIMIZE_H
    1919
    … …  
    5353/** Derive a polynomial fit.
    5454 *
    55  *  psVectorFitPolynomial1d returns the polynomial that best fits the 
    56  *  observations. The input parameters are a polynomial that specifies the 
    57  *  fit order, myPoly, which will be altered and returned with the best-fit 
    58  *  coefficients; and the observations, x, y and yErr. The independent 
    59  *  variable list, x may be NULL, in which case the vector index is used. 
    60  *  The dependent variable error, yErr may be null, in which case the solution 
    61  *  is determined in the assumption that all data errors are equal. This 
     55 *  psVectorFitPolynomial1d returns the polynomial that best fits the
     56 *  observations. The input parameters are a polynomial that specifies the
     57 *  fit order, myPoly, which will be altered and returned with the best-fit
     58 *  coefficients; and the observations, x, y and yErr. The independent
     59 *  variable list, x may be NULL, in which case the vector index is used.
     60 *  The dependent variable error, yErr may be null, in which case the solution
     61 *  is determined in the assumption that all data errors are equal. This
    6262 *  function must be valid only for types psF32, psF64.
    6363 *
    … …  
    142142/* \} */// End of MathGroup Functions
    143143
    144 #endif
     144#endif // #ifndef PS_MINIMIZE_H
    145145

  • trunk/psLib/src/math/psPolynomial.c

    r4029 r4162  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-05-25 20:26:55 $
     9 *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    10241024
    10251025    if (normal == true) {
    1026         tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma));
     1026        tmp = 1.0 / sqrtf(2.0 * M_PI * (sigma * sigma));
    10271027    }
    10281028

  • trunk/psLib/src/math/psPolynomial.h

    r3598 r4162  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-31 23:01:46 $
     14 *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1818 */
    1919
    20 #if !defined(PS_FUNCTIONS_H)
     20#ifndef PS_FUNCTIONS_H
    2121#define PS_FUNCTIONS_H
    2222
    … …  
    3434
    3535/** Evaluate a non-normalized Gaussian with the given mean and sigma at the
    36  *  given coordianate. 
    37  *
    38  *  Note that this is not a Gaussian deviate.  The evaluated Gaussian is: 
    39  *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] 
     36 *  given coordianate.
     37 *
     38 *  Note that this is not a Gaussian deviate.  The evaluated Gaussian is:
     39 *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f]
    4040 *
    4141 *  @return psF32      value on the gaussian curve given the input parameters
    … …  
    4949
    5050/** Produce a vector of random numbers from a Gaussian distribution with
    51  *  the specified mean and sigma 
    52  * 
     51 *  the specified mean and sigma
     52 *
    5353 *  @return psVector*    vector of random numbers
    54  * 
     54 *
    5555 */
    5656psVector* p_psGaussianDev(
    … …  
    433433                         const psVector* y,
    434434                         psF32 X);
    435 #endif
    436 
    437 /* \} */// End of MathGroup Functions
    438 
    439 #endif
    440 
     435#endif // #if 0
     436
     437/** \} */ // End of MathGroup Functions
     438
     439#endif // #ifndef PS_FUNCTIONS_H
     440

  • trunk/psLib/src/math/psRandom.h

    r3264 r4162  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-02-17 19:26:23 $
     12*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-08 23:40:45 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1616*/
    1717
    18 #if !defined(PS_RANDOM_H)
     18#ifndef PS_RANDOM_H
    1919#define PS_RANDOM_H
    2020
    … …  
    5656/* \} */// End of MathGroup Functions
    5757
    58 #endif
    59 
     58#endif // #ifndef PS_RANDOM_H

  • trunk/psLib/src/math/psSpline.c

    r4029 r4162  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-05-25 20:26:55 $
     9 *  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    10241024
    10251025    if (normal == true) {
    1026         tmp = 1.0 / PS_SQRT_F32(2.0 * M_PI * (sigma * sigma));
     1026        tmp = 1.0 / sqrtf(2.0 * M_PI * (sigma * sigma));
    10271027    }
    10281028

  • trunk/psLib/src/math/psSpline.h

    r3598 r4162  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-31 23:01:46 $
     14 *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1818 */
    1919
    20 #if !defined(PS_FUNCTIONS_H)
     20#ifndef PS_FUNCTIONS_H
    2121#define PS_FUNCTIONS_H
    2222
    … …  
    3434
    3535/** Evaluate a non-normalized Gaussian with the given mean and sigma at the
    36  *  given coordianate. 
    37  *
    38  *  Note that this is not a Gaussian deviate.  The evaluated Gaussian is: 
    39  *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] 
     36 *  given coordianate.
     37 *
     38 *  Note that this is not a Gaussian deviate.  The evaluated Gaussian is:
     39 *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f]
    4040 *
    4141 *  @return psF32      value on the gaussian curve given the input parameters
    … …  
    4949
    5050/** Produce a vector of random numbers from a Gaussian distribution with
    51  *  the specified mean and sigma 
    52  * 
     51 *  the specified mean and sigma
     52 *
    5353 *  @return psVector*    vector of random numbers
    54  * 
     54 *
    5555 */
    5656psVector* p_psGaussianDev(
    … …  
    433433                         const psVector* y,
    434434                         psF32 X);
    435 #endif
    436 
    437 /* \} */// End of MathGroup Functions
    438 
    439 #endif
    440 
     435#endif // #if 0
     436
     437/** \} */ // End of MathGroup Functions
     438
     439#endif // #ifndef PS_FUNCTIONS_H
     440

  • trunk/psLib/src/math/psStats.c

    r4138 r4162  
    1414 *      stats->binsize
    1515 *
    16  *  @version $Revision: 1.131 $ $Name: not supported by cvs2svn $
    17  *  @date $Date: 2005-06-07 23:11:54 $
     16 *  @version $Revision: 1.132 $ $Name: not supported by cvs2svn $
     17 *  @date $Date: 2005-06-08 23:40:45 $
    1818 *
    1919 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    878878    } else {
    879879        countFloat = (psF32)countInt;
    880         stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
     880        stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
    881881    }
    882882}
    … …  
    992992        // data ranges are used correctly.
    993993        if (errors != NULL) {
    994             stats->sampleStdev = (1.0 / PS_SQRT_F32(errorDivisor));
     994            stats->sampleStdev = (1.0 / sqrtf(errorDivisor));
    995995        } else {
    996996            countFloat = (psF32)countInt;
    997             stats->sampleStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
     997            stats->sampleStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
    998998
    999999        }
    … …  
    16271627        }
    16281628    }
    1629     myStdev = PS_SQRT_F32((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
     1629    myStdev = sqrtf((sumSquares - (sumDiffs * sumDiffs / countFloat)) / (countFloat - 1));
    16301630
    16311631    p_psNormalizeVectorRangeF32(robustHistogramVector, 0.0, 1.0);
    … …  
    16571657                     "WARNING: failed fit a 1D polynomial.\n");
    16581658        }
    1659         psF32 polyFitSigma = PS_SQRT_F32(-0.5 / tmpPoly->coeff[2]);
     1659        psF32 polyFitSigma = sqrtf(-0.5 / tmpPoly->coeff[2]);
    16601660        psF32 polyFitMean = tmpPoly->coeff[1] * PS_SQR(polyFitSigma);
    16611661        // psF32 polyFitNorm = exp(tmpPoly->coedd[0] + PS_SQR(polyFitMean) / (2.0 * PS_SQR(polyFitSigma)));

  • trunk/psLib/src/math/psStats.h

    r4138 r4162  
    1414 *  @author GLG, MHPCC
    1515 *
    16  *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
    17  *  @date $Date: 2005-06-07 23:11:54 $
     16 *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
     17 *  @date $Date: 2005-06-08 23:40:45 $
    1818 *
    1919 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    2020 */
    21 #if !defined(PS_STATS_H)
     21#ifndef PS_STATS_H
    2222#define PS_STATS_H
    2323
    … …  
    112112/** The basic histogram structure which contains bounds and bins.
    113113 *
    114  *  In this structure, the vector bounds specifies the boundaries of the 
    115  *  histogram bins, and must of type psF32, while nums specifies the number 
    116  *  of entries in the bin, and must of type psU32. The value of bounds.n must 
    117  *  therefore be 1 greater than than nums.n. The two values minNum and maxNum 
    118  *  are the number of data values which fell below the lower limit bound or 
     114 *  In this structure, the vector bounds specifies the boundaries of the
     115 *  histogram bins, and must of type psF32, while nums specifies the number
     116 *  of entries in the bin, and must of type psU32. The value of bounds.n must
     117 *  therefore be 1 greater than than nums.n. The two values minNum and maxNum
     118 *  are the number of data values which fell below the lower limit bound or
    119119 *  above the upper limit bound, respectively.
    120120 */
    … …  
    130130
    131131/** Allocator for psHistogram where the bounds of the bins are implicitly
    132  *  specified through simply specifying an upper and lower limit along with 
    133  *  the size of the bins. 
     132 *  specified through simply specifying an upper and lower limit along with
     133 *  the size of the bins.
    134134 *
    135135 *  @return psHistogram*    Newly allocated psHistogram
    … …  
    142142
    143143/** Allocator for psHistogram where the bounds of the bins are explicitly
    144  *  specified. 
     144 *  specified.
    145145 *
    146146 *  @return psHistogram*    Newly allocated psHistogram
    … …  
    152152/** Calculate a histogram
    153153 *
    154  *  The following function populates the histogram bins from the specified 
     154 *  The following function populates the histogram bins from the specified
    155155 *  vector (in). It alters and returns the histogram out structure. The input
    156156 *  vector may be of types psU8, psU16, psF32, psF64.
    … …  
    169169 *
    170170 *  @return psBool    If more than one statistic result is set in stats->options,
    171  *                    false is returned and the value parameter is not set, 
     171 *                    false is returned and the value parameter is not set,
    172172 *                    otherwise true is returned.
    173173 */
    … …  
    193193/// @}
    194194
    195 #endif
     195#endif // #ifndef PS_STATS_H

  • trunk/psLib/src/math/psUnaryOp.h

    r3182 r4162  
    3030 *  @author Robert DeSonia, MHPCC
    3131 *
    32  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    33  *  @date $Date: 2005-02-10 02:36:41 $
     32 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     33 *  @date $Date: 2005-06-08 23:40:45 $
    3434 *
    3535 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767/// @}
    6868
    69 #endif
     69#endif // #ifndef PSUNARY_OP_H

  • trunk/psLib/src/mathtypes/psScalar.h

    r3264 r4162  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-02-17 19:26:23 $
     13 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8282/// @}
    8383
    84 #endif
     84#endif // #ifndef PS_SCALAR_H

  • trunk/psLib/src/mathtypes/psVector.h

    r3786 r4162  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-04-29 02:25:09 $
     13 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    176176/// @}
    177177
    178 #endif
     178#endif // #ifndef PS_VECTOR_H

  • trunk/psLib/src/psTest.h

    r3598 r4162  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-03-31 23:01:46 $
     7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-06-08 23:40:45 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9393);
    9494
    95 #endif
     95#endif // #ifndef PSTEST_H

  • trunk/psLib/src/pslib.h

    r3682 r4162  
    88*  @author Eric Van Alst, MHPCC
    99*
    10 *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-04-07 20:27:41 $
     10*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    1919#include "pslib_strict.h"
    2020
    21 #endif
     21#endif // #ifndef PS_LIB_H

  • trunk/psLib/src/pslib_strict.h

    r4128 r4162  
    99*  @author Eric Van Alst, MHPCC
    1010*
    11 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-06-07 02:29:44 $
     11*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-06-08 23:40:45 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2121#ifndef PS_ALLOW_MALLOC
    2222#define PS_ALLOW_MALLOC
    23 #endif
     23#endif // #ifndef PS_ALLOW_MALLOC
    2424#else
    2525#undef PS_ALLOW_MALLOC /* don't allow code to not poison malloc, i.e., strict poisioning */
    26 #endif
     26#endif // #else
    2727
    2828// // System Utilities
    … …  
    183183/// @}
    184184
    185 #endif
     185#endif // #ifndef PS_LIB_STRICT_H

  • trunk/psLib/src/sys/psAbort.h

    r3264 r4162  
    1212 *  @author Eric Van Alst, MHPCC
    1313 *
    14  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-02-17 19:26:24 $
     14 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929/** Reports an abort message to logging facility
    3030 *
    31  *  This function will invoke the psLogMsg function with a level of 
     31 *  This function will invoke the psLogMsg function with a level of
    3232 *  PS_LOG_ABORT and pass the parameters name and fmt to generate a proper
    33  *  log message.  After logging, this function will call system abort 
     33 *  log message.  After logging, this function will call system abort
    3434 *  function to abnormally terminate the program.
    3535 *
    … …  
    4343);
    4444
    45 /* @} */// Doxygen - End of SystemGroup Functions
     45/** @} */ // Doxygen - End of SystemGroup Functions
    4646
    47 #endif
     47#endif // #ifndef PS_ABORT_H

  • trunk/psLib/src/sys/psConfigure.h

    r4137 r4162  
    1313 *  @author Robert DeSonia, MHPCC
    1414 *
    15  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    16  *  @date $Date: 2005-06-07 22:53:40 $
     15 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     16 *  @date $Date: 2005-06-08 23:40:45 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3838/** Initializes persistent memory.
    3939 *
    40  *  Creates persistant memory items used throughout psLib. Items created 
     40 *  Creates persistant memory items used throughout psLib. Items created
    4141 *  within this method should be freed with the psLibFinalize function.
    4242 *  current, a non-NULL psErr is returned with code PS_ERR_NONE.
    … …  
    6161
    6262
    63 /* @} */
     63/** @} */
    6464
    65 #endif
     65#endif // #ifndef PS_CONFIGURE_H

  • trunk/psLib/src/sys/psError.h

    r3476 r4162  
    1212 *  @author Eric Van Alst, MHPCC
    1313 *
    14  *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-22 21:52:49 $
     14 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    104104    va_list va                         ///< any parameters required in fmt
    105105);
    106 #endif
     106#endif // #ifndef SWIG
    107107
    108108#ifdef DOXYGEN
    … …  
    135135    ...
    136136);
    137 #else
     137#else // #ifdef DOXYGEN
    138138psErrorCode p_psError(
    139139    const char* file,
    … …  
    157157#define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
    158158#define psWarning(...) p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__)
    159 #endif
     159#endif // #ifndef SWIG
    160160
    161 #endif
     161#endif // ! DOXYGEN
    162162
    163163/** Create a new psErr struct

  • trunk/psLib/src/sys/psErrorCodes.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2525 *     $2  The error description (rest of the line in psErrorCodes.dat)
    2626 *     $n  The order of the source line in psErrorCodes.dat (comments excluded)
    27  * 
     27 *
    2828 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
    2929 */
    … …  
    7878/** Retrieves the description of an error code.
    7979 *
    80  *  The routine psErrorCodeString returns the string associated with an error 
     80 *  The routine psErrorCodeString returns the string associated with an error
    8181 *  code.
    8282 *
    … …  
    9090 *
    9191 *  Any project needed to use psLib must define the necessary error codes and
    92  *  associated message strings.  This function registers an array of error 
     92 *  associated message strings.  This function registers an array of error
    9393 *  codes with the error handling subsystem.
    9494 *
    … …  
    109109/// @}
    110110
    111 #endif
     111#endif // #ifndef PS_ERROR_CODES_H

  • trunk/psLib/src/sys/psLogMsg.c

    r3476 r4162  
    1111 *  @author George Gusciora, MHPCC
    1212 *
    13  *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-03-22 21:52:49 $
     13 *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    227227}
    228228
    229 #if !defined(HOST_NAME_MAX)                // should be in limits.h
     229#ifndef HOST_NAME_MAX                // should be in limits.h
    230230#define HOST_NAME_MAX 256
    231 #endif
     231#endif // #ifndef HOST_NAME_MAX
    232232
    233233/*****************************************************************************

  • trunk/psLib/src/sys/psLogMsg.h

    r3476 r4162  
    1111 *  @author George Gusciora, MHPCC
    1212 *
    13  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-03-22 21:52:49 $
     13 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1717 */
    18 #if !defined(PS_LOG_MSG_H)
     18#ifndef PS_LOG_MSG_H
    1919#define PS_LOG_MSG_H
    2020#include <stdarg.h>
    … …  
    8585    va_list ap                         ///< varargs argument list
    8686);
    87 #endif
     87#endif // #ifndef SWIG
    8888
    8989///< Status codes for log messages
    … …  
    104104/// @}
    105105
    106 #endif
     106#endif // #ifndef PS_LOG_MSG_H

  • trunk/psLib/src/sys/psMemory.c

    r3784 r4162  
    88*  @author Robert Lupton, Princeton University
    99*
    10 *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-04-29 00:39:22 $
     10*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5050#ifdef PS_MEM_DEBUG
    5151static psMemBlock* deadBlockList;       // a place to put dead memBlocks in debug mode.
    52 #endif
     52#endif // #ifdef PS_MEM_DEBUG
    5353
    5454/**
    … …  
    626626            }
    627627            deadBlockList = ptr;
    628             #else
     628            #else // #ifdef PS_MEM_DEBUG
    629629
    630630            pthread_mutex_destroy(&ptr->refCounterMutex);
    631631            free(ptr);
    632             #endif
     632            #endif // #else - #ifdef PS_MEM_DEBUG
    633633
    634634        }

  • trunk/psLib/src/sys/psMemory.h

    r3682 r4162  
    1212 *  @ingroup MemoryManagement
    1313 *
    14  *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-04-07 20:27:41 $
     14 *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1818 */
    1919
    20 #if !defined(PS_MEMORY_H)
     20#ifndef PS_MEMORY_H
    2121#define PS_MEMORY_H
    2222
    … …  
    125125 *
    126126 *  @return psPtr pointer to the allocated buffer. This will not be NULL.
    127  *  @see psFree 
     127 *  @see psFree
    128128 */
    129129#ifdef DOXYGEN
    130130psPtr psAlloc(size_t size       ///< Size required
    131131             );
    132 #else
     132#else // #ifdef DOXYGEN
    133133psPtr p_psAlloc(size_t size,    ///< Size required
    134134                const char *file,       ///< File of call
    … …  
    139139#ifndef SWIG
    140140#define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__)
    141 #endif
    142 
    143 #endif
     141#endif // ! SWIG
     142
     143#endif // ! DOXYGEN
    144144
    145145/** Set the deallocator routine
    146146 *
    147  *  A deallocator routine can optionally be assigned to a memory block to 
     147 *  A deallocator routine can optionally be assigned to a memory block to
    148148 *  ensure that associated memory blocks also get freed, e.g., memory buffers
    149149 *  referenced within a struct.
    … …  
    157157/** Get the deallocator routine
    158158 *
    159  *  This function returns the deallocator for a memory block.  A deallocator 
    160  *  routine can optionally be assigned to a memory block to ensure that 
    161  *  associated memory blocks also get freed, e.g., memory buffers referenced 
    162  *  within a struct. 
     159 *  This function returns the deallocator for a memory block.  A deallocator
     160 *  routine can optionally be assigned to a memory block to ensure that
     161 *  associated memory blocks also get freed, e.g., memory buffers referenced
     162 *  within a struct.
    163163 *
    164164 *  @return psFreeFcn    the routine to be called at deallocation.
    … …  
    170170/** Set the memory as persistent so that it is ignored when detecting memory leaks.
    171171 *
    172  *  Used to mark a memory block as persistent data within the library, 
     172 *  Used to mark a memory block as persistent data within the library,
    173173 *  i.e., non user-level data used to hold psLib's state or cache data.  Such
    174174 *  examples of this class of memory is psTrace's trace-levels and dynamic
    … …  
    185185/** Get the memory's persistent flag.
    186186 *
    187  *  Checks if a memory block has been marked as persistent by 
     187 *  Checks if a memory block has been marked as persistent by
    188188 *  p_psMemSetPresistent.
    189189 *
    … …  
    207207    size_t size                         ///< Size required
    208208);
    209 #else
     209#else // #ifdef DOXYGEN
    210210psPtr p_psRealloc(
    211211    psPtr ptr,                         ///< Pointer to re-allocate
    … …  
    218218#ifndef SWIG
    219219#define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__)
    220 #endif
    221 
    222 #endif
     220#endif // ! SWIG
     221
     222#endif // ! DOXYGEN
    223223
    224224/** Free memory.  This operates much like free().
    … …  
    230230    psPtr ptr                          ///< Pointer to free, if NULL, function returns immediately.
    231231);
    232 #else
     232#else // #ifdef DOXYGEN
    233233void p_psFree(
    234234    psPtr ptr,                         ///< Pointer to free
    … …  
    240240#ifndef SWIG
    241241#define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__)
    242 #endif
    243 
    244 #endif
     242#endif // ! SWIG
     243
     244#endif // ! DOXYGEN
    245245
    246246/** Check for memory leaks.  This scans for allocated memory buffers not freed with an ID not less than id0.
    … …  
    299299#ifndef SWIG
    300300#define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__)
    301 #endif
    302 
    303 #endif
     301#endif // !SWIG
     302
     303#endif // !DOXYGEN
    304304
    305305/** Decrement reference counter and return the pointer
    … …  
    307307 *  @ingroup memRefCount
    308308 *
    309  *  @return psPtr    the pointer deremented in refCount, or NULL if pointer is 
     309 *  @return psPtr    the pointer deremented in refCount, or NULL if pointer is
    310310 *                   fully dereferenced.
    311311 */
    … …  
    314314    psPtr vptr                         ///< Pointer to decrement refCounter, and return
    315315);
    316 #else
     316#else // DOXYGEN
    317317psPtr p_psMemDecrRefCounter(
    318318    psPtr vptr,                        ///< Pointer to decrement refCounter, and return
    … …  
    323323#ifndef SWIG
    324324#define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__)
    325 #endif
    326 
    327 #endif
     325#endif // !SWIG
     326
     327#endif // !DOXYGEN
    328328
    329329/** Set callback for problems.
    330330 *
    331  *  At various occasions, the memory manager can check the state of the memory 
     331 *  At various occasions, the memory manager can check the state of the memory
    332332 *  stack. If any of these checks discover that the memory stack is corrupted,
    333333 *  the psMemProblemCallback is called.
    … …  
    343343/** Set callback for out-of-memory.
    344344 *
    345  *  If not enough memory is available to satisfy a request by psAlloc or 
    346  *  psRealloc, these functions attempt to find an alternative solution by 
    347  *  calling the psMemExhaustedCallback, a function which may be set by the 
    348  *  programmer in appropriate circumstances, rather than immediately fail. 
    349  *  The typical use of such a feature may be when a program needs a large 
    350  *  chunk of memory to do an operation, but the exact size is not critical. 
    351  *  This feature gives the programmer the opportunity to make a smaller 
     345 *  If not enough memory is available to satisfy a request by psAlloc or
     346 *  psRealloc, these functions attempt to find an alternative solution by
     347 *  calling the psMemExhaustedCallback, a function which may be set by the
     348 *  programmer in appropriate circumstances, rather than immediately fail.
     349 *  The typical use of such a feature may be when a program needs a large
     350 *  chunk of memory to do an operation, but the exact size is not critical.
     351 *  This feature gives the programmer the opportunity to make a smaller
    352352 *  request and try again, limiting the size of the operating buffer.
    353353 *
    … …  
    362362/** Set call back for when a particular memory block is allocated
    363363 *
    364  *  A private variable, p_psMemAllocateID, can be used to trace the allocation 
    365  *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a 
    366  *  memory block with that ID is allocated, psMemAllocateCallback is called 
     364 *  A private variable, p_psMemAllocateID, can be used to trace the allocation
     365 *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a
     366 *  memory block with that ID is allocated, psMemAllocateCallback is called
    367367 *  just before memory is returned to the calling function.
    368368 *
    … …  
    377377/** Set call back for when a particular memory block is freed
    378378 *
    379  *  A private variable, p_psMemFreeID, can be used to trace the freeing of 
    380  *  specific memory blocks. If p_psMemFreeID is set and the memory block with 
     379 *  A private variable, p_psMemFreeID, can be used to trace the freeing of
     380 *  specific memory blocks. If p_psMemFreeID is set and the memory block with
    381381 *  the ID is about to be freed, the psMemFreeCallback callback is called just
    382382 *  before the memory block is freed.
    … …  
    400400/** set p_psMemAllocateID to specific id
    401401 *
    402  *  A private variable, p_psMemAllocateID, can be used to trace the allocation 
    403  *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a 
    404  *  memory block with that ID is allocated, psMemAllocateCallback is called 
     402 *  A private variable, p_psMemAllocateID, can be used to trace the allocation
     403 *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a
     404 *  memory block with that ID is allocated, psMemAllocateCallback is called
    405405 *  just before memory is returned to the calling function.
    406406 *
    407407 *  @ingroup memCallback
    408408 *
    409  *  @return psMemoryId       
    410  *
    411  *  @see psMemAllocateCallbackSet   
     409 *  @return psMemoryId
     410 *
     411 *  @see psMemAllocateCallbackSet
    412412 */
    413413psMemoryId psMemAllocateCallbackSetID(
    … …  
    417417/** set p_psMemFreeID to id
    418418 *
    419  *  A private variable, p_psMemFreeID, can be used to trace the freeing of 
    420  *  specific memory blocks. If p_psMemFreeID is set and the memory block with 
     419 *  A private variable, p_psMemFreeID, can be used to trace the freeing of
     420 *  specific memory blocks. If p_psMemFreeID is set and the memory block with
    421421 *  the ID is about to be freed, the psMemFreeCallback callback is called just
    422422 *  before the memory block is freed.
    … …  
    442442#ifdef __GNUC__
    443443#pragma GCC poison malloc realloc calloc free
    444 #else
     444#else // __GNUC__
    445445#define malloc(S)       _Pragma("error Use of malloc is not allowed.  Use psAlloc instead.")
    446446#define realloc(P,S)    _Pragma("error Use of realloc is not allowed.  Use psRealloc instead.")
    447447#define calloc(S)       _Pragma("error Use of calloc is not allowed.  Use psAlloc instead.")
    448448#define free(P)         _Pragma("error Use of free is not allowed.  Use psFree instead.")
    449 #endif
    450 #endif
    451 
    452 #endif
    453 // doxygen skip
    454 
    455 #endif // end of header file
     449#endif // ! __GNUC__
     450#endif // #ifndef PS_ALLOW_MALLOC
     451
     452#endif // #ifndef DOXYGEN
     453
     454#endif // #ifndef PS_MEMORY_H

  • trunk/psLib/src/sys/psString.h

    r3998 r4162  
    1313 *  @author Eric Van Alst, MHPCC
    1414 *
    15  *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    16  *  @date $Date: 2005-05-20 01:41:57 $
     15 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     16 *  @date $Date: 2005-06-08 23:40:45 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9999);
    100100
    101 /* @} */// Doxygen - End of SystemGroup Functions
     101/** @} */// Doxygen - End of SystemGroup Functions
    102102
    103 #endif
     103#endif // #ifndef PS_STRING_H

  • trunk/psLib/src/sys/psTrace.c

    r3850 r4162  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-05-05 21:24:50 $
     11 *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-08 23:40:45 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    555555}
    556556
    557 #endif
     557#endif // #ifndef PS_NO_TRACE

  • trunk/psLib/src/sys/psType.h

    r3671 r4162  
    1010*  @author Ross Harman, MHPCC
    1111*
    12 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-04-06 01:12:58 $
     12*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-08 23:40:45 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6262}
    6363psC64;
    64 #else
     64#else // SWIG
    6565typedef float _Complex psC32;          ///< complex with 32-bit floating point Real and Imagary numbers
    6666typedef double _Complex psC64;         ///< complex with 64-bit floating point Real and Imagary numbers
    67 #endif
     67#endif // !SWIG
    6868
    6969typedef void* psPtr;                   ///< void pointer
    … …  
    243243/// @}
    244244
    245 #endif
     245#endif // #ifndef PS_TYPE_H

  • trunk/psLib/src/sysUtils/psAbort.h

    r3264 r4162  
    1212 *  @author Eric Van Alst, MHPCC
    1313 *
    14  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-02-17 19:26:24 $
     14 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2929/** Reports an abort message to logging facility
    3030 *
    31  *  This function will invoke the psLogMsg function with a level of 
     31 *  This function will invoke the psLogMsg function with a level of
    3232 *  PS_LOG_ABORT and pass the parameters name and fmt to generate a proper
    33  *  log message.  After logging, this function will call system abort 
     33 *  log message.  After logging, this function will call system abort
    3434 *  function to abnormally terminate the program.
    3535 *
    … …  
    4343);
    4444
    45 /* @} */// Doxygen - End of SystemGroup Functions
     45/** @} */ // Doxygen - End of SystemGroup Functions
    4646
    47 #endif
     47#endif // #ifndef PS_ABORT_H

  • trunk/psLib/src/sysUtils/psConfigure.h

    r4137 r4162  
    1313 *  @author Robert DeSonia, MHPCC
    1414 *
    15  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    16  *  @date $Date: 2005-06-07 22:53:40 $
     15 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     16 *  @date $Date: 2005-06-08 23:40:45 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3838/** Initializes persistent memory.
    3939 *
    40  *  Creates persistant memory items used throughout psLib. Items created 
     40 *  Creates persistant memory items used throughout psLib. Items created
    4141 *  within this method should be freed with the psLibFinalize function.
    4242 *  current, a non-NULL psErr is returned with code PS_ERR_NONE.
    … …  
    6161
    6262
    63 /* @} */
     63/** @} */
    6464
    65 #endif
     65#endif // #ifndef PS_CONFIGURE_H

  • trunk/psLib/src/sysUtils/psError.h

    r3476 r4162  
    1212 *  @author Eric Van Alst, MHPCC
    1313 *
    14  *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-03-22 21:52:49 $
     14 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    104104    va_list va                         ///< any parameters required in fmt
    105105);
    106 #endif
     106#endif // #ifndef SWIG
    107107
    108108#ifdef DOXYGEN
    … …  
    135135    ...
    136136);
    137 #else
     137#else // #ifdef DOXYGEN
    138138psErrorCode p_psError(
    139139    const char* file,
    … …  
    157157#define psError(code,new,...) p_psError(__FILE__,__LINE__,__func__,code,new,__VA_ARGS__)
    158158#define psWarning(...) p_psWarning(__FILE__,__LINE__,__func__,__VA_ARGS__)
    159 #endif
     159#endif // #ifndef SWIG
    160160
    161 #endif
     161#endif // ! DOXYGEN
    162162
    163163/** Create a new psErr struct

  • trunk/psLib/src/sysUtils/psErrorCodes.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2525 *     $2  The error description (rest of the line in psErrorCodes.dat)
    2626 *     $n  The order of the source line in psErrorCodes.dat (comments excluded)
    27  * 
     27 *
    2828 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
    2929 */
    … …  
    7878/** Retrieves the description of an error code.
    7979 *
    80  *  The routine psErrorCodeString returns the string associated with an error 
     80 *  The routine psErrorCodeString returns the string associated with an error
    8181 *  code.
    8282 *
    … …  
    9090 *
    9191 *  Any project needed to use psLib must define the necessary error codes and
    92  *  associated message strings.  This function registers an array of error 
     92 *  associated message strings.  This function registers an array of error
    9393 *  codes with the error handling subsystem.
    9494 *
    … …  
    109109/// @}
    110110
    111 #endif
     111#endif // #ifndef PS_ERROR_CODES_H

  • trunk/psLib/src/sysUtils/psLogMsg.c

    r3476 r4162  
    1111 *  @author George Gusciora, MHPCC
    1212 *
    13  *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-03-22 21:52:49 $
     13 *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    227227}
    228228
    229 #if !defined(HOST_NAME_MAX)                // should be in limits.h
     229#ifndef HOST_NAME_MAX                // should be in limits.h
    230230#define HOST_NAME_MAX 256
    231 #endif
     231#endif // #ifndef HOST_NAME_MAX
    232232
    233233/*****************************************************************************

  • trunk/psLib/src/sysUtils/psLogMsg.h

    r3476 r4162  
    1111 *  @author George Gusciora, MHPCC
    1212 *
    13  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-03-22 21:52:49 $
     13 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1717 */
    18 #if !defined(PS_LOG_MSG_H)
     18#ifndef PS_LOG_MSG_H
    1919#define PS_LOG_MSG_H
    2020#include <stdarg.h>
    … …  
    8585    va_list ap                         ///< varargs argument list
    8686);
    87 #endif
     87#endif // #ifndef SWIG
    8888
    8989///< Status codes for log messages
    … …  
    104104/// @}
    105105
    106 #endif
     106#endif // #ifndef PS_LOG_MSG_H

  • trunk/psLib/src/sysUtils/psMemory.c

    r3784 r4162  
    88*  @author Robert Lupton, Princeton University
    99*
    10 *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-04-29 00:39:22 $
     10*  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-06-08 23:40:45 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5050#ifdef PS_MEM_DEBUG
    5151static psMemBlock* deadBlockList;       // a place to put dead memBlocks in debug mode.
    52 #endif
     52#endif // #ifdef PS_MEM_DEBUG
    5353
    5454/**
    … …  
    626626            }
    627627            deadBlockList = ptr;
    628             #else
     628            #else // #ifdef PS_MEM_DEBUG
    629629
    630630            pthread_mutex_destroy(&ptr->refCounterMutex);
    631631            free(ptr);
    632             #endif
     632            #endif // #else - #ifdef PS_MEM_DEBUG
    633633
    634634        }

  • trunk/psLib/src/sysUtils/psMemory.h

    r3682 r4162  
    1212 *  @ingroup MemoryManagement
    1313 *
    14  *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-04-07 20:27:41 $
     14 *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1818 */
    1919
    20 #if !defined(PS_MEMORY_H)
     20#ifndef PS_MEMORY_H
    2121#define PS_MEMORY_H
    2222
    … …  
    125125 *
    126126 *  @return psPtr pointer to the allocated buffer. This will not be NULL.
    127  *  @see psFree 
     127 *  @see psFree
    128128 */
    129129#ifdef DOXYGEN
    130130psPtr psAlloc(size_t size       ///< Size required
    131131             );
    132 #else
     132#else // #ifdef DOXYGEN
    133133psPtr p_psAlloc(size_t size,    ///< Size required
    134134                const char *file,       ///< File of call
    … …  
    139139#ifndef SWIG
    140140#define psAlloc(size) p_psAlloc(size, __FILE__, __LINE__)
    141 #endif
    142 
    143 #endif
     141#endif // ! SWIG
     142
     143#endif // ! DOXYGEN
    144144
    145145/** Set the deallocator routine
    146146 *
    147  *  A deallocator routine can optionally be assigned to a memory block to 
     147 *  A deallocator routine can optionally be assigned to a memory block to
    148148 *  ensure that associated memory blocks also get freed, e.g., memory buffers
    149149 *  referenced within a struct.
    … …  
    157157/** Get the deallocator routine
    158158 *
    159  *  This function returns the deallocator for a memory block.  A deallocator 
    160  *  routine can optionally be assigned to a memory block to ensure that 
    161  *  associated memory blocks also get freed, e.g., memory buffers referenced 
    162  *  within a struct. 
     159 *  This function returns the deallocator for a memory block.  A deallocator
     160 *  routine can optionally be assigned to a memory block to ensure that
     161 *  associated memory blocks also get freed, e.g., memory buffers referenced
     162 *  within a struct.
    163163 *
    164164 *  @return psFreeFcn    the routine to be called at deallocation.
    … …  
    170170/** Set the memory as persistent so that it is ignored when detecting memory leaks.
    171171 *
    172  *  Used to mark a memory block as persistent data within the library, 
     172 *  Used to mark a memory block as persistent data within the library,
    173173 *  i.e., non user-level data used to hold psLib's state or cache data.  Such
    174174 *  examples of this class of memory is psTrace's trace-levels and dynamic
    … …  
    185185/** Get the memory's persistent flag.
    186186 *
    187  *  Checks if a memory block has been marked as persistent by 
     187 *  Checks if a memory block has been marked as persistent by
    188188 *  p_psMemSetPresistent.
    189189 *
    … …  
    207207    size_t size                         ///< Size required
    208208);
    209 #else
     209#else // #ifdef DOXYGEN
    210210psPtr p_psRealloc(
    211211    psPtr ptr,                         ///< Pointer to re-allocate
    … …  
    218218#ifndef SWIG
    219219#define psRealloc(ptr, size) p_psRealloc(ptr, size, __FILE__, __LINE__)
    220 #endif
    221 
    222 #endif
     220#endif // ! SWIG
     221
     222#endif // ! DOXYGEN
    223223
    224224/** Free memory.  This operates much like free().
    … …  
    230230    psPtr ptr                          ///< Pointer to free, if NULL, function returns immediately.
    231231);
    232 #else
     232#else // #ifdef DOXYGEN
    233233void p_psFree(
    234234    psPtr ptr,                         ///< Pointer to free
    … …  
    240240#ifndef SWIG
    241241#define psFree(ptr) p_psFree(ptr, __FILE__, __LINE__)
    242 #endif
    243 
    244 #endif
     242#endif // ! SWIG
     243
     244#endif // ! DOXYGEN
    245245
    246246/** Check for memory leaks.  This scans for allocated memory buffers not freed with an ID not less than id0.
    … …  
    299299#ifndef SWIG
    300300#define psMemIncrRefCounter(vptr) p_psMemIncrRefCounter(vptr, __FILE__, __LINE__)
    301 #endif
    302 
    303 #endif
     301#endif // !SWIG
     302
     303#endif // !DOXYGEN
    304304
    305305/** Decrement reference counter and return the pointer
    … …  
    307307 *  @ingroup memRefCount
    308308 *
    309  *  @return psPtr    the pointer deremented in refCount, or NULL if pointer is 
     309 *  @return psPtr    the pointer deremented in refCount, or NULL if pointer is
    310310 *                   fully dereferenced.
    311311 */
    … …  
    314314    psPtr vptr                         ///< Pointer to decrement refCounter, and return
    315315);
    316 #else
     316#else // DOXYGEN
    317317psPtr p_psMemDecrRefCounter(
    318318    psPtr vptr,                        ///< Pointer to decrement refCounter, and return
    … …  
    323323#ifndef SWIG
    324324#define psMemDecrRefCounter(vptr) p_psMemDecrRefCounter(vptr, __FILE__, __LINE__)
    325 #endif
    326 
    327 #endif
     325#endif // !SWIG
     326
     327#endif // !DOXYGEN
    328328
    329329/** Set callback for problems.
    330330 *
    331  *  At various occasions, the memory manager can check the state of the memory 
     331 *  At various occasions, the memory manager can check the state of the memory
    332332 *  stack. If any of these checks discover that the memory stack is corrupted,
    333333 *  the psMemProblemCallback is called.
    … …  
    343343/** Set callback for out-of-memory.
    344344 *
    345  *  If not enough memory is available to satisfy a request by psAlloc or 
    346  *  psRealloc, these functions attempt to find an alternative solution by 
    347  *  calling the psMemExhaustedCallback, a function which may be set by the 
    348  *  programmer in appropriate circumstances, rather than immediately fail. 
    349  *  The typical use of such a feature may be when a program needs a large 
    350  *  chunk of memory to do an operation, but the exact size is not critical. 
    351  *  This feature gives the programmer the opportunity to make a smaller 
     345 *  If not enough memory is available to satisfy a request by psAlloc or
     346 *  psRealloc, these functions attempt to find an alternative solution by
     347 *  calling the psMemExhaustedCallback, a function which may be set by the
     348 *  programmer in appropriate circumstances, rather than immediately fail.
     349 *  The typical use of such a feature may be when a program needs a large
     350 *  chunk of memory to do an operation, but the exact size is not critical.
     351 *  This feature gives the programmer the opportunity to make a smaller
    352352 *  request and try again, limiting the size of the operating buffer.
    353353 *
    … …  
    362362/** Set call back for when a particular memory block is allocated
    363363 *
    364  *  A private variable, p_psMemAllocateID, can be used to trace the allocation 
    365  *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a 
    366  *  memory block with that ID is allocated, psMemAllocateCallback is called 
     364 *  A private variable, p_psMemAllocateID, can be used to trace the allocation
     365 *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a
     366 *  memory block with that ID is allocated, psMemAllocateCallback is called
    367367 *  just before memory is returned to the calling function.
    368368 *
    … …  
    377377/** Set call back for when a particular memory block is freed
    378378 *
    379  *  A private variable, p_psMemFreeID, can be used to trace the freeing of 
    380  *  specific memory blocks. If p_psMemFreeID is set and the memory block with 
     379 *  A private variable, p_psMemFreeID, can be used to trace the freeing of
     380 *  specific memory blocks. If p_psMemFreeID is set and the memory block with
    381381 *  the ID is about to be freed, the psMemFreeCallback callback is called just
    382382 *  before the memory block is freed.
    … …  
    400400/** set p_psMemAllocateID to specific id
    401401 *
    402  *  A private variable, p_psMemAllocateID, can be used to trace the allocation 
    403  *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a 
    404  *  memory block with that ID is allocated, psMemAllocateCallback is called 
     402 *  A private variable, p_psMemAllocateID, can be used to trace the allocation
     403 *  and freeing of specific memory blocks. If p_psMemAllocateID is set and a
     404 *  memory block with that ID is allocated, psMemAllocateCallback is called
    405405 *  just before memory is returned to the calling function.
    406406 *
    407407 *  @ingroup memCallback
    408408 *
    409  *  @return psMemoryId       
    410  *
    411  *  @see psMemAllocateCallbackSet   
     409 *  @return psMemoryId
     410 *
     411 *  @see psMemAllocateCallbackSet
    412412 */
    413413psMemoryId psMemAllocateCallbackSetID(
    … …  
    417417/** set p_psMemFreeID to id
    418418 *
    419  *  A private variable, p_psMemFreeID, can be used to trace the freeing of 
    420  *  specific memory blocks. If p_psMemFreeID is set and the memory block with 
     419 *  A private variable, p_psMemFreeID, can be used to trace the freeing of
     420 *  specific memory blocks. If p_psMemFreeID is set and the memory block with
    421421 *  the ID is about to be freed, the psMemFreeCallback callback is called just
    422422 *  before the memory block is freed.
    … …  
    442442#ifdef __GNUC__
    443443#pragma GCC poison malloc realloc calloc free
    444 #else
     444#else // __GNUC__
    445445#define malloc(S)       _Pragma("error Use of malloc is not allowed.  Use psAlloc instead.")
    446446#define realloc(P,S)    _Pragma("error Use of realloc is not allowed.  Use psRealloc instead.")
    447447#define calloc(S)       _Pragma("error Use of calloc is not allowed.  Use psAlloc instead.")
    448448#define free(P)         _Pragma("error Use of free is not allowed.  Use psFree instead.")
    449 #endif
    450 #endif
    451 
    452 #endif
    453 // doxygen skip
    454 
    455 #endif // end of header file
     449#endif // ! __GNUC__
     450#endif // #ifndef PS_ALLOW_MALLOC
     451
     452#endif // #ifndef DOXYGEN
     453
     454#endif // #ifndef PS_MEMORY_H

  • trunk/psLib/src/sysUtils/psString.h

    r3998 r4162  
    1313 *  @author Eric Van Alst, MHPCC
    1414 *
    15  *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    16  *  @date $Date: 2005-05-20 01:41:57 $
     15 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     16 *  @date $Date: 2005-06-08 23:40:45 $
    1717 *
    1818 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9999);
    100100
    101 /* @} */// Doxygen - End of SystemGroup Functions
     101/** @} */// Doxygen - End of SystemGroup Functions
    102102
    103 #endif
     103#endif // #ifndef PS_STRING_H

  • trunk/psLib/src/sysUtils/psSysUtilsErrors.h

    r3264 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-02-17 19:26:24 $
     9 *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2323 *     $2  The error text (rest of the line in psSysUtilsErrors.dat)
    2424 *     $n  The order of the source line in psSysUtilsErrors.dat (comments excluded)
    25  * 
     25 *
    2626 * DO NOT EDIT THE LINES BETWEEN //~Start and //~End!  ANY CHANGES WILL BE OVERWRITTEN.
    2727 */
    … …  
    5050//~End
    5151
    52 #endif
     52#endif // #ifndef PS_SYSUTILS_ERRORS_H

  • trunk/psLib/src/sysUtils/psTrace.c

    r3850 r4162  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-05-05 21:24:50 $
     11 *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-08 23:40:45 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    555555}
    556556
    557 #endif
     557#endif // #ifndef PS_NO_TRACE

  • trunk/psLib/src/sysUtils/psType.h

    r3671 r4162  
    1010*  @author Ross Harman, MHPCC
    1111*
    12 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-04-06 01:12:58 $
     12*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-08 23:40:45 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6262}
    6363psC64;
    64 #else
     64#else // SWIG
    6565typedef float _Complex psC32;          ///< complex with 32-bit floating point Real and Imagary numbers
    6666typedef double _Complex psC64;         ///< complex with 64-bit floating point Real and Imagary numbers
    67 #endif
     67#endif // !SWIG
    6868
    6969typedef void* psPtr;                   ///< void pointer
    … …  
    243243/// @}
    244244
    245 #endif
     245#endif // #ifndef PS_TYPE_H

  • trunk/psLib/src/types/psArray.h

    r3264 r4162  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-02-17 19:26:23 $
     14 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4848/** Allocate an array.
    4949 *
    50  * Uses psLib memory allocation functions to create an array collection of 
     50 * Uses psLib memory allocation functions to create an array collection of
    5151 * data
    5252 *
    … …  
    6060/** Reallocate an array.
    6161 *
    62  * Uses psLib memory allocation functions to reallocate an array collection 
    63  * of data. 
     62 * Uses psLib memory allocation functions to reallocate an array collection
     63 * of data.
    6464 *
    6565 * @return psArray* : Pointer to psArray.
    … …  
    8585/** Remove an element from the array
    8686 *
    87  *  Finds and removes the specified data pointer from the list. 
     87 *  Finds and removes the specified data pointer from the list.
    8888 *
    89  * @return bool:  TRUE if the specified data pointer was found and removed, 
     89 * @return bool:  TRUE if the specified data pointer was found and removed,
    9090 *                otherwise FALSE.
    9191 *
    … …  
    9898/** Deallocate/Dereference elements of an array.
    9999 *
    100  * Uses psLib memory allocation functions to deallocate/dereference elements 
     100 * Uses psLib memory allocation functions to deallocate/dereference elements
    101101 * of a array of void pointers.  The array psArr is not freed, and its elements
    102102 * will all be set to NULL.
    … …  
    112112 *  to specify how the objects on the array should be sorted.
    113113 *
    114  *  The comparison function must return an integer less than, equal to, or 
    115  *  greater than zero if the first argument is considered to be respectively 
    116  *  less than, equal to, or greater than the second. 
     114 *  The comparison function must return an integer less than, equal to, or
     115 *  greater than zero if the first argument is considered to be respectively
     116 *  less than, equal to, or greater than the second.
    117117 *
    118  *  If two members compare as equal, their order in the sorted array is 
     118 *  If two members compare as equal, their order in the sorted array is
    119119 *  undefined.
    120120 *
    … …  
    148148/// @}
    149149
    150 #endif
     150#endif // #ifndef PS_ARRAY_H

  • trunk/psLib/src/types/psBitSet.h

    r3264 r4162  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-02-17 19:26:23 $
     14 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-08 23:40:45 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7575/** Clear a bit.
    7676 *
    77  *  Clear a bit at a given bit location. The bit is cleared based on a zero 
    78  *  index with the first bit set in the zero bit slot of the zero element of 
    79  *  the byte array. 
     77 *  Clear a bit at a given bit location. The bit is cleared based on a zero
     78 *  index with the first bit set in the zero bit slot of the zero element of
     79 *  the byte array.
    8080 *
    8181 *  @return  psBitSet* : Pointer to struct containing psBitSet.
    … …  
    143143/// @}
    144144
    145 #endif
     145#endif // #ifndef PSBITSET_H

  • trunk/psLib/src/types/psHash.h

    r4135 r4162  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-07 22:36:48 $
     13 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-08 23:40:45 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1717 */
    18 #if !defined(PS_HASH_H)
     18
     19#ifndef PS_HASH_H
    1920#define PS_HASH_H
    2021
    … …  
    8384/* \} */// End of DataGroup Functions
    8485
    85 #endif
     86#endif // #ifndef PS_HASH_H

  • trunk/psLib/src/types/psList.h

    r3409 r4162  
    1 #if !defined(PS_LIST_H)
    2 #define PS_LIST_H
    3 
    41/** @file psList.h
    52 *  @brief Support for doubly linked lists
    … …  
    107 *  @ingroup LinkedList
    118 *
    12  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-03-11 23:17:46 $
     9 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1411 *
    1512 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1613 */
     14
     15#ifndef PS_LIST_H
     16#define PS_LIST_H
    1717
    1818#include <pthread.h>                   // we need a mutex to make this stuff thread safe.
    … …  
    210210/** Sort a list via a comparison function.
    211211 *
    212  *  The comparison function must return an integer less than, equal to, or 
    213  *  greater than zero if the first argument is considered to be respectively 
    214  *  less than, equal to, or greater than the second. 
    215  *
    216  *  If two members compare as equal, their order in the sorted array is 
     212 *  The comparison function must return an integer less than, equal to, or
     213 *  greater than zero if the first argument is considered to be respectively
     214 *  less than, equal to, or greater than the second.
     215 *
     216 *  If two members compare as equal, their order in the sorted array is
    217217 *  undefined.
    218218 *
    … …  
    226226/// @} End of DataGroup Functions
    227227
    228 #endif
     228#endif // #ifndef PS_LIST_H
     229

  • trunk/psLib/src/types/psLookupTable.c

    r4050 r4162  
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-05-31 21:46:56 $
     9*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-06-08 23:40:45 $
    1111*
    1212*  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    1515#include <string.h>
    1616#include <ctype.h>
    17 //#ifdef DARWIN
    18 #undef __STRICT_ANSI__
    19 //#endif
    2017#include <stdlib.h>
    21 //#ifdef DARWIN
    22 #define __STRICT_ANSI__
    23 //#endif
    2418#include <math.h>
    25 #include <stdlib.h>
    2619
    2720#include "psMemory.h"

  • trunk/psLib/src/types/psLookupTable.h

    r4050 r4162  
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-05-31 21:46:56 $
     9*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-06-08 23:40:45 $
    1111*
    1212*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    131131);
    132132
    133 #endif
     133#endif // #ifndef PS_LOOKUPTABLE_H

  • trunk/psLib/src/types/psMetadata.h

    r4130 r4162  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-06-07 19:59:39 $
     13*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-06-08 23:40:45 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7070 *
    7171 *  Enumeration for the modification of the behaviour in psMetadataAddItem.
    72  * 
     72 *
    7373 *  @see psMetadataAddItem
    7474 */
    … …  
    239239    va_list list                       ///< Arguments for name formatting and metadata item data.
    240240);
    241 #endif
     241#endif // #ifndef SWIG
    242242
    243243/** Create a metadata collection.
    … …  
    294294    va_list list                       ///< Arguments for name formatting and metadata item data.
    295295);
    296 #endif
     296#endif // #ifndef SWIG
    297297
    298298psBool psMetadataAddS32(psMetadata* md, psS32 location, const char* name,
    … …  
    479479/// @}
    480480
    481 #endif
     481#endif // #ifndef PS_METADATA_H

  • trunk/psLib/src/types/psMetadataConfig.h

    r3945 r4162  
    1010 *  @author Robert DeSonia, MHPCC
    1111 *
    12  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-05-16 19:43:53 $
     12 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-08 23:40:45 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9494/// @}
    9595
    96 #endif
     96#endif // #ifndef PS_METADATAIO_H

  • trunk/psLib/src/types/psPixels.h

    r3990 r4162  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-05-19 23:57:36 $
     9 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-08 23:40:45 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    132132);
    133133
    134 #endif
     134#endif // #ifndef PS_PIXELS_H

  • trunk/psLib/src/xml/psXML.h

    r3945 r4162  
    1010 *  @author Robert DeSonia, MHPCC
    1111 *
    12  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-05-16 19:43:53 $
     12 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-08 23:40:45 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9494/// @}
    9595
    96 #endif
     96#endif // #ifndef PS_METADATAIO_H

  • trunk/psLib/test/psTest.h

    r2204 r4162  
    8080);
    8181
    82 #endif
     82#endif // #ifndef PSTEST_H
Note: See TracChangeset for help on using the changeset viewer.