IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4330


Ignore:
Timestamp:
Jun 20, 2005, 5:01:37 PM (21 years ago)
Author:
drobbin
Message:

* empty log message *

Location:
trunk/psLib
Files:
48 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/pslib.kdevses

    r4321 r4330  
    22<!DOCTYPE KDevPrjSession>
    33<KDevPrjSession>
    4  <DocsAndViews NumberOfDocuments="4" >
    5   <Doc0 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/collections/psList.h" >
    6    <View0 Type="Source" />
     4 <DocsAndViews NumberOfDocuments="3" >
     5  <Doc0 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/dataManip/psMatrix.c" >
     6   <View0 line="0" Type="Source" />
    77  </Doc0>
    8   <Doc1 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/collections/psList.c" >
    9    <View0 Type="Source" />
     8  <Doc1 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/dataManip/psMatrix.h" >
     9   <View0 line="88" Type="Source" />
    1010  </Doc1>
    11   <Doc2 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/sysUtils/psLogMsg.h" >
    12    <View0 Type="Source" />
     11  <Doc2 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/sysUtils/psMemory.h" >
     12   <View0 line="14" Type="Source" />
    1313  </Doc2>
    14   <Doc3 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/sysUtils/psLogMsg.c" >
    15    <View0 line="369" Type="Source" />
    16   </Doc3>
    1714 </DocsAndViews>
    1815 <pluginList>

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

    r4321 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-20 22:42:29 $
     12*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    221221}
    222222
    223 psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2)
     223psPlaneTransform* psPlaneTransformAlloc(int n1, int n2)
    224224{
    225225    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
    … …  
    290290                             const psPlaneDistort* transform,
    291291                             const psPlane* coords,
    292                              float color,
    293                              float magnitude)
     292                             float mag,
     293                             float color)
    294294{
    295295    PS_ASSERT_PTR_NON_NULL(transform, NULL);
    … …  
    305305                 coords->x,
    306306                 coords->y,
    307                  color,
    308                  magnitude
     307                 mag,
     308                 color
    309309             );
    310310    out->y = psDPolynomial4DEval(
    … …  
    312312                 coords->x,
    313313                 coords->y,
    314                  color,
    315                  magnitude
     314                 mag,
     315                 color
    316316             );
    317317    return (out);
    … …  
    481481
    482482psProjection* psProjectionAlloc(
    483     psF64 R,
    484     psF64 D,
    485     psF64 Xs,
    486     psF64 Ys,
     483    double R,
     484    double D,
     485    double Xs,
     486    double Ys,
    487487    psProjectionType type)
    488488{

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

    r4321 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-20 22:42:29 $
     12*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    188188
    189189psPlaneTransform* psPlaneTransformAlloc(
    190     psS32 n1,  ///< The order of the x term in the transform.
    191     psS32 n2   ///< The order of the y term in the transform.
     190    int n1,                            ///< The order of the x term in the transform.
     191    int n2                             ///< The order of the y term in the transform.
    192192);
    193193
    … …  
    223223    const psPlaneDistort* transform,   ///< the transform to apply
    224224    const psPlane* coords,             ///< the coordinate to apply the transform above.
    225     float term3,                       ///< third term -- maybe magnitude
    226     float term4                        ///< forth term -- maybe color
     225    float mag,                         ///< third term -- maybe magnitude
     226    float color                        ///< forth term -- maybe color
    227227);
    228228
    … …  
    283283 */
    284284psProjection* psProjectionAlloc(
    285     psF64 R,                   ///< Right-ascension of projection center.
    286     psF64 D,                   ///< Declination of projection center.
    287     psF64 Xs,                  ///< Scale in x-dimension
    288     psF64 Ys,                  ///< Scale in y-dimension
     285    double R,                   ///< Right-ascension of projection center.
     286    double D,                   ///< Declination of projection center.
     287    double Xs,                  ///< Scale in x-dimension
     288    double Ys,                  ///< Scale in y-dimension
    289289    psProjectionType type
    290290);

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

    r4209 r4330  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-10 18:09:12 $
     12 *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-21 03:01:37 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    731731}
    732732
    733 psF64 psTimeToLMST(psTime *time, psF64 longitude)
     733double psTimeToLMST(psTime *time, double longitude)
    734734{
    735735    psF64  jdTdtDays    =  0.0;
    … …  
    804804}
    805805
    806 psF64 psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin)
     806double psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin)
    807807{
    808808    psU32              nTables               = 2;
    … …  
    10811081}
    10821082
    1083 psS64 psTimeLeapSecondDelta(const psTime *time1, const psTime *time2)
     1083long psTimeLeapSecondDelta(const psTime *time1, const psTime *time2)
    10841084{
    10851085    psS64 diff = 0;
    … …  
    10951095}
    10961096
    1097 psBool psTimeIsLeapSecond(const psTime* utc)
     1097bool psTimeIsLeapSecond(const psTime* utc)
    10981098{
    10991099    psTime*    prevUtc     = NULL;
    … …  
    11261126}
    11271127
    1128 psF64 psTimeToJD(const psTime *time)
     1128double psTimeToJD(const psTime *time)
    11291129{
    11301130    psF64 jd = NAN;
    … …  
    11461146}
    11471147
    1148 psF64 psTimeToMJD(const psTime *time)
     1148double psTimeToMJD(const psTime *time)
    11491149{
    11501150    psF64 mjd = NAN;
    … …  
    13021302*/
    13031303
    1304 psTime* psTimeFromJD(psF64 time)
     1304psTime* psTimeFromJD(double jd)
    13051305{
    13061306    psF64 days = 0.0;
    … …  
    13121312
    13131313    // Julian date conversion courtesy of Eugene Magnier
    1314     days = time - 2440587.5;
     1314    days = jd - 2440587.5;
    13151315    seconds = days * SEC_PER_DAY;
    13161316    if(seconds < 0.0) {
    … …  
    13271327}
    13281328
    1329 psTime* psTimeFromMJD(psF64 time)
     1329psTime* psTimeFromMJD(double mjd)
    13301330{
    13311331    psF64 days = 0.0;
    … …  
    13371337
    13381338    // Modified Julian date conversion courtesy of Eugene Magnier
    1339     days = time - 40587.0;
     1339    days = mjd - 40587.0;
    13401340    seconds = days * SEC_PER_DAY;
    13411341
    … …  
    14061406}
    14071407
    1408 psTime* psTimeFromUTC(psS64 sec, psU32 nsec, psBool leapsecond)
     1408psTime* psTimeFromUTC(psS64 sec, psU32 nsec, bool leapsecond)
    14091409{
    14101410    psTime*   outTime   = NULL;
    … …  
    15101510}
    15111511
    1512 psTime* psTimeMath(const psTime *time, psF64 delta)
     1512psTime* psTimeMath(const psTime *time, double delta)
    15131513{
    15141514    psF64 sec = 0.0;
    … …  
    15511551}
    15521552
    1553 psF64 psTimeDelta(const psTime *time1, const psTime *time2)
     1553double psTimeDelta(const psTime *time1, const psTime *time2)
    15541554{
    15551555    psF64 out = 0.0;

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

    r4293 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-17 00:10:59 $
     13 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    127127 *  in UTC format, then it is converted.
    128128 *
    129  *  @return  psF64: LST Time.
    130  */
    131 psF64 psTimeToLMST(
    132     psTime *time,                       ///< psTime to be converted.
    133     psF64 longitude                    ///< Longitude.
     129 *  @return  double: LST Time.
     130 */
     131double psTimeToLMST(
     132    psTime *time,                      ///< psTime to be converted.
     133    double longitude                    ///< Longitude.
    134134);
    135135
    … …  
    138138 *  This function is necessary to for various SLALIB functions.
    139139 *
    140  *  @return  psF64: Time difference.
    141  */
    142 psF64 psTimeGetUT1Delta(
     140 *  @return  double: Time difference.
     141 */
     142double psTimeGetUT1Delta(
    143143    const psTime *time,                 ///< psTime to be looked up.
    144144    psTimeBulletin bulletin             ///< IERS bulletin to use
    … …  
    169169 *  Calculates the number of leapseconds between two times.
    170170 *
    171  *  @return  psS64: leapseconds added between given times
    172  */
    173 psS64 psTimeLeapSecondDelta(
    174     const psTime* time1,                ///< First input time.
    175     const psTime* time2                 ///< Second input time.
     171 *  @return  long: leapseconds added between given times
     172 */
     173long psTimeLeapSecondDelta(
     174    const psTime* time1,               ///< First input time.
     175    const psTime* time2                ///< Second input time.
    176176);
    177177
    … …  
    180180 *  Determines if the specified UTC time is a valid leapsecond.
    181181 *
    182  *  @return  psBool: valid leap second
    183  */
    184 psBool psTimeIsLeapSecond(
     182 *  @return  bool: valid leap second
     183 */
     184bool psTimeIsLeapSecond(
    185185    const psTime* utc                  ///< UTC to verify if leap second
    186186);
    … …  
    191191 *  subtract leapseconds.
    192192 *
    193  *  @return  psF64: Julian Date (JD) time.
    194  */
    195 psF64 psTimeToJD(
    196     const psTime* time                  ///< Input time to be converted.
     193 *  @return  double: Julian Date (JD) time.
     194 */
     195double psTimeToJD(
     196    const psTime* time                 ///< Input time to be converted.
    197197);
    198198/** Convert psTime to modified Julian date time.
    … …  
    201201 *  add or subtract leapseconds.
    202202 *
    203  *  @return  psF64: Modified Julian Days (MJD) time.
    204  */
    205 psF64 psTimeToMJD(
     203 *  @return  double: Modified Julian Days (MJD) time.
     204 */
     205double psTimeToMJD(
    206206    const psTime* time                  ///< Input time to be converted.
    207207);
    … …  
    248248 */
    249249psTime* psTimeFromJD(
    250     psF64 time                       ///< Input time to be converted.
     250    double jd                          ///< Input time to be converted.
    251251);
    252252
    … …  
    258258 */
    259259psTime* psTimeFromMJD(
    260     psF64 time                      ///< Input time to be converted.
     260    double mjd                         ///< Input time to be converted.
    261261);
    262262
    … …  
    268268 */
    269269psTime* psTimeFromISO(
    270     const char* time                 ///< Input time to be converted.
     270    const char* time                   ///< Input time to be converted.
    271271);
    272272
    … …  
    278278 */
    279279psTime* psTimeFromTimeval(
    280     const struct timeval *time       ///< Input time to be converted.
     280    const struct timeval *time         ///< Input time to be converted.
    281281);
    282282
    … …  
    288288 */
    289289psTime* psTimeFromTT(
    290     psS64 sec,                      ///< Input terrestrial time in seconds
    291     psU32 nsec                      ///< Input terrestrial time fraction of seconds (nanoseconds)
     290    psS64 sec,                         ///< Input terrestrial time in seconds
     291    psU32 nsec                         ///< Input terrestrial time fraction of seconds (nanoseconds)
    292292);
    293293
    … …  
    299299 */
    300300psTime* psTimeFromUTC(
    301     psS64  sec,                    ///< Input time in seconds
    302     psU32  nsec,                   ///< Input time fraction of seconds (nanoseconds)
    303     psBool leapsecond              ///< Input time is a leapsecond
     301    psS64  sec,                        ///< Input time in seconds
     302    psU32  nsec,                       ///< Input time fraction of seconds (nanoseconds)
     303    bool leapsecond                    ///< Input time is a leapsecond
    304304);
    305305
    … …  
    313313 */
    314314psTime* p_psTimeFromTM(
    315     const struct tm *time            ///< Input time to be converted.
     315    const struct tm *time              ///< Input time to be converted.
    316316);
    317317
    … …  
    323323 */
    324324psTime* psTimeMath(
    325     const psTime *time,              ///< Time.
    326     psF64 delta                      ///< Time delta.
     325    const psTime *time,                ///< Time.
     326    double delta                       ///< Time delta.
    327327);
    328328
    … …  
    331331 *  Determine difference between two times. Input times are converted to TAI format if necessary.
    332332 *
    333  *  @return psF64: Time difference.
    334  */
    335 psF64 psTimeDelta(
    336     const psTime *time1,             ///< First time.
    337     const psTime *time2              ///< Second time.
     333 *  @return double: Time difference.
     334 */
     335double psTimeDelta(
     336    const psTime *time1,               ///< First time.
     337    const psTime *time2                ///< Second time.
    338338);
    339339

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

    r4321 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-20 22:42:29 $
     12*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    221221}
    222222
    223 psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2)
     223psPlaneTransform* psPlaneTransformAlloc(int n1, int n2)
    224224{
    225225    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
    … …  
    290290                             const psPlaneDistort* transform,
    291291                             const psPlane* coords,
    292                              float color,
    293                              float magnitude)
     292                             float mag,
     293                             float color)
    294294{
    295295    PS_ASSERT_PTR_NON_NULL(transform, NULL);
    … …  
    305305                 coords->x,
    306306                 coords->y,
    307                  color,
    308                  magnitude
     307                 mag,
     308                 color
    309309             );
    310310    out->y = psDPolynomial4DEval(
    … …  
    312312                 coords->x,
    313313                 coords->y,
    314                  color,
    315                  magnitude
     314                 mag,
     315                 color
    316316             );
    317317    return (out);
    … …  
    481481
    482482psProjection* psProjectionAlloc(
    483     psF64 R,
    484     psF64 D,
    485     psF64 Xs,
    486     psF64 Ys,
     483    double R,
     484    double D,
     485    double Xs,
     486    double Ys,
    487487    psProjectionType type)
    488488{

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

    r4321 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-20 22:42:29 $
     12*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    188188
    189189psPlaneTransform* psPlaneTransformAlloc(
    190     psS32 n1,  ///< The order of the x term in the transform.
    191     psS32 n2   ///< The order of the y term in the transform.
     190    int n1,                            ///< The order of the x term in the transform.
     191    int n2                             ///< The order of the y term in the transform.
    192192);
    193193
    … …  
    223223    const psPlaneDistort* transform,   ///< the transform to apply
    224224    const psPlane* coords,             ///< the coordinate to apply the transform above.
    225     float term3,                       ///< third term -- maybe magnitude
    226     float term4                        ///< forth term -- maybe color
     225    float mag,                         ///< third term -- maybe magnitude
     226    float color                        ///< forth term -- maybe color
    227227);
    228228
    … …  
    283283 */
    284284psProjection* psProjectionAlloc(
    285     psF64 R,                   ///< Right-ascension of projection center.
    286     psF64 D,                   ///< Declination of projection center.
    287     psF64 Xs,                  ///< Scale in x-dimension
    288     psF64 Ys,                  ///< Scale in y-dimension
     285    double R,                   ///< Right-ascension of projection center.
     286    double D,                   ///< Declination of projection center.
     287    double Xs,                  ///< Scale in x-dimension
     288    double Ys,                  ///< Scale in y-dimension
    289289    psProjectionType type
    290290);

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

    r4209 r4330  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-10 18:09:12 $
     12 *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-21 03:01:37 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    731731}
    732732
    733 psF64 psTimeToLMST(psTime *time, psF64 longitude)
     733double psTimeToLMST(psTime *time, double longitude)
    734734{
    735735    psF64  jdTdtDays    =  0.0;
    … …  
    804804}
    805805
    806 psF64 psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin)
     806double psTimeGetUT1Delta(const psTime *time, psTimeBulletin bulletin)
    807807{
    808808    psU32              nTables               = 2;
    … …  
    10811081}
    10821082
    1083 psS64 psTimeLeapSecondDelta(const psTime *time1, const psTime *time2)
     1083long psTimeLeapSecondDelta(const psTime *time1, const psTime *time2)
    10841084{
    10851085    psS64 diff = 0;
    … …  
    10951095}
    10961096
    1097 psBool psTimeIsLeapSecond(const psTime* utc)
     1097bool psTimeIsLeapSecond(const psTime* utc)
    10981098{
    10991099    psTime*    prevUtc     = NULL;
    … …  
    11261126}
    11271127
    1128 psF64 psTimeToJD(const psTime *time)
     1128double psTimeToJD(const psTime *time)
    11291129{
    11301130    psF64 jd = NAN;
    … …  
    11461146}
    11471147
    1148 psF64 psTimeToMJD(const psTime *time)
     1148double psTimeToMJD(const psTime *time)
    11491149{
    11501150    psF64 mjd = NAN;
    … …  
    13021302*/
    13031303
    1304 psTime* psTimeFromJD(psF64 time)
     1304psTime* psTimeFromJD(double jd)
    13051305{
    13061306    psF64 days = 0.0;
    … …  
    13121312
    13131313    // Julian date conversion courtesy of Eugene Magnier
    1314     days = time - 2440587.5;
     1314    days = jd - 2440587.5;
    13151315    seconds = days * SEC_PER_DAY;
    13161316    if(seconds < 0.0) {
    … …  
    13271327}
    13281328
    1329 psTime* psTimeFromMJD(psF64 time)
     1329psTime* psTimeFromMJD(double mjd)
    13301330{
    13311331    psF64 days = 0.0;
    … …  
    13371337
    13381338    // Modified Julian date conversion courtesy of Eugene Magnier
    1339     days = time - 40587.0;
     1339    days = mjd - 40587.0;
    13401340    seconds = days * SEC_PER_DAY;
    13411341
    … …  
    14061406}
    14071407
    1408 psTime* psTimeFromUTC(psS64 sec, psU32 nsec, psBool leapsecond)
     1408psTime* psTimeFromUTC(psS64 sec, psU32 nsec, bool leapsecond)
    14091409{
    14101410    psTime*   outTime   = NULL;
    … …  
    15101510}
    15111511
    1512 psTime* psTimeMath(const psTime *time, psF64 delta)
     1512psTime* psTimeMath(const psTime *time, double delta)
    15131513{
    15141514    psF64 sec = 0.0;
    … …  
    15511551}
    15521552
    1553 psF64 psTimeDelta(const psTime *time1, const psTime *time2)
     1553double psTimeDelta(const psTime *time1, const psTime *time2)
    15541554{
    15551555    psF64 out = 0.0;

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

    r4293 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-17 00:10:59 $
     13 *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    127127 *  in UTC format, then it is converted.
    128128 *
    129  *  @return  psF64: LST Time.
    130  */
    131 psF64 psTimeToLMST(
    132     psTime *time,                       ///< psTime to be converted.
    133     psF64 longitude                    ///< Longitude.
     129 *  @return  double: LST Time.
     130 */
     131double psTimeToLMST(
     132    psTime *time,                      ///< psTime to be converted.
     133    double longitude                    ///< Longitude.
    134134);
    135135
    … …  
    138138 *  This function is necessary to for various SLALIB functions.
    139139 *
    140  *  @return  psF64: Time difference.
    141  */
    142 psF64 psTimeGetUT1Delta(
     140 *  @return  double: Time difference.
     141 */
     142double psTimeGetUT1Delta(
    143143    const psTime *time,                 ///< psTime to be looked up.
    144144    psTimeBulletin bulletin             ///< IERS bulletin to use
    … …  
    169169 *  Calculates the number of leapseconds between two times.
    170170 *
    171  *  @return  psS64: leapseconds added between given times
    172  */
    173 psS64 psTimeLeapSecondDelta(
    174     const psTime* time1,                ///< First input time.
    175     const psTime* time2                 ///< Second input time.
     171 *  @return  long: leapseconds added between given times
     172 */
     173long psTimeLeapSecondDelta(
     174    const psTime* time1,               ///< First input time.
     175    const psTime* time2                ///< Second input time.
    176176);
    177177
    … …  
    180180 *  Determines if the specified UTC time is a valid leapsecond.
    181181 *
    182  *  @return  psBool: valid leap second
    183  */
    184 psBool psTimeIsLeapSecond(
     182 *  @return  bool: valid leap second
     183 */
     184bool psTimeIsLeapSecond(
    185185    const psTime* utc                  ///< UTC to verify if leap second
    186186);
    … …  
    191191 *  subtract leapseconds.
    192192 *
    193  *  @return  psF64: Julian Date (JD) time.
    194  */
    195 psF64 psTimeToJD(
    196     const psTime* time                  ///< Input time to be converted.
     193 *  @return  double: Julian Date (JD) time.
     194 */
     195double psTimeToJD(
     196    const psTime* time                 ///< Input time to be converted.
    197197);
    198198/** Convert psTime to modified Julian date time.
    … …  
    201201 *  add or subtract leapseconds.
    202202 *
    203  *  @return  psF64: Modified Julian Days (MJD) time.
    204  */
    205 psF64 psTimeToMJD(
     203 *  @return  double: Modified Julian Days (MJD) time.
     204 */
     205double psTimeToMJD(
    206206    const psTime* time                  ///< Input time to be converted.
    207207);
    … …  
    248248 */
    249249psTime* psTimeFromJD(
    250     psF64 time                       ///< Input time to be converted.
     250    double jd                          ///< Input time to be converted.
    251251);
    252252
    … …  
    258258 */
    259259psTime* psTimeFromMJD(
    260     psF64 time                      ///< Input time to be converted.
     260    double mjd                         ///< Input time to be converted.
    261261);
    262262
    … …  
    268268 */
    269269psTime* psTimeFromISO(
    270     const char* time                 ///< Input time to be converted.
     270    const char* time                   ///< Input time to be converted.
    271271);
    272272
    … …  
    278278 */
    279279psTime* psTimeFromTimeval(
    280     const struct timeval *time       ///< Input time to be converted.
     280    const struct timeval *time         ///< Input time to be converted.
    281281);
    282282
    … …  
    288288 */
    289289psTime* psTimeFromTT(
    290     psS64 sec,                      ///< Input terrestrial time in seconds
    291     psU32 nsec                      ///< Input terrestrial time fraction of seconds (nanoseconds)
     290    psS64 sec,                         ///< Input terrestrial time in seconds
     291    psU32 nsec                         ///< Input terrestrial time fraction of seconds (nanoseconds)
    292292);
    293293
    … …  
    299299 */
    300300psTime* psTimeFromUTC(
    301     psS64  sec,                    ///< Input time in seconds
    302     psU32  nsec,                   ///< Input time fraction of seconds (nanoseconds)
    303     psBool leapsecond              ///< Input time is a leapsecond
     301    psS64  sec,                        ///< Input time in seconds
     302    psU32  nsec,                       ///< Input time fraction of seconds (nanoseconds)
     303    bool leapsecond                    ///< Input time is a leapsecond
    304304);
    305305
    … …  
    313313 */
    314314psTime* p_psTimeFromTM(
    315     const struct tm *time            ///< Input time to be converted.
     315    const struct tm *time              ///< Input time to be converted.
    316316);
    317317
    … …  
    323323 */
    324324psTime* psTimeMath(
    325     const psTime *time,              ///< Time.
    326     psF64 delta                      ///< Time delta.
     325    const psTime *time,                ///< Time.
     326    double delta                       ///< Time delta.
    327327);
    328328
    … …  
    331331 *  Determine difference between two times. Input times are converted to TAI format if necessary.
    332332 *
    333  *  @return psF64: Time difference.
    334  */
    335 psF64 psTimeDelta(
    336     const psTime *time1,             ///< First time.
    337     const psTime *time2              ///< Second time.
     333 *  @return double: Time difference.
     334 */
     335double psTimeDelta(
     336    const psTime *time1,               ///< First time.
     337    const psTime *time2                ///< Second time.
    338338);
    339339

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

    r4316 r4330  
    77 *  @ingroup LinkedList
    88 *
    9  *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-18 03:13:02 $
     9 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-21 03:01:37 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    107107 *  iterator position is not changed.
    108108 *
    109  *  @return psBool        TRUE if iterator successfully set, otherwise FALSE.
     109 *  @return bool        TRUE if iterator successfully set, otherwise FALSE.
    110110 */
    111111bool psListIteratorSet(
    … …  
    116116/** Adds an element to a psList at position given.
    117117 *
    118  *  @return psBool        TRUE if item was successfully added, otherwise FALSE.
     118 *  @return bool        TRUE if item was successfully added, otherwise FALSE.
    119119 */
    120120bool psListAdd(
    … …  
    126126/** Adds an data item to a psList at position just after the list position given
    127127 *
    128  *  @return psBool        TRUE if item was successfully added, otherwise FALSE.
     128 *  @return bool        TRUE if item was successfully added, otherwise FALSE.
    129129 */
    130130bool psListAddAfter(
    … …  
    135135/** Adds an data item to a psList at position just before the list position given
    136136 *
    137  *  @return psBool        TRUE if item was successfully added, otherwise FALSE.
     137 *  @return bool        TRUE if item was successfully added, otherwise FALSE.
    138138 */
    139139bool psListAddBefore(
    … …  
    144144/** Remove an item at the specified location from a list.
    145145 *
    146  *  @return psBool        TRUE if element is successfully removed, otherwise FALSE.
     146 *  @return bool        TRUE if element is successfully removed, otherwise FALSE.
    147147 */
    148148bool psListRemove(
    … …  
    153153/** Remove an item from a list.
    154154 *
    155  *  @return psBool        TRUE if element is successfully removed, otherwise FALSE.
     155 *  @return bool        TRUE if element is successfully removed, otherwise FALSE.
    156156 */
    157157bool psListRemoveData(

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

    r4321 r4330  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-06-20 22:42:29 $
     13*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-06-21 03:01:37 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    274274    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
    275275    const char *name,                  ///< Name of metadata item.
    276     int format,                      ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
     276    int format,                        ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
    277277    const char *comment,               ///< Comment for metadata item.
    278278    ...                                ///< Arguments for name formatting and metadata item data.
    … …  
    298298/** Add a psS32 value to metadata collection.
    299299 * 
    300  *  @return psBool:  True for success, False for failure.
     300 *  @return bool:  True for success, False for failure.
    301301 */
    302302bool psMetadataAddS32(
    … …  
    310310/** Add a psF32 value to metadata collection.
    311311 * 
    312  *  @return psBool:  True for success, False for failure.
     312 *  @return bool:  True for success, False for failure.
    313313*/
    314314bool psMetadataAddF32(
    … …  
    322322/** Add a psF64 value to metadata collection.
    323323 * 
    324  *  @return psBool:  True for success, False for failure.
     324 *  @return bool:  True for success, False for failure.
    325325*/
    326326bool psMetadataAddF64(
    … …  
    346346/** Add a string to metadata collection.
    347347 * 
    348  *  @return psBool:  True for success, False for failure.
     348 *  @return bool:  True for success, False for failure.
    349349 */
    350350bool psMetadataAddStr(
    … …  
    505505 *  returned.
    506506 *
    507  * @return psBool : Value of metadata item.
    508  */
    509 psBool psMetadataLookupBool(
     507 * @return bool : Value of metadata item.
     508 */
     509bool psMetadataLookupBool(
    510510    bool *status,                    ///< Status of lookup.
    511511    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
    … …  
    558558 *  invalid the iterator position is not changed.
    559559 *
    560  *  @return psBool        TRUE if iterator successfully set, otherwise FALSE.
     560 *  @return bool        TRUE if iterator successfully set, otherwise FALSE.
    561561*/
    562562bool psMetadataIteratorSet(

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

    r3264 r4330  
    88 *  @author Ross Harman, MHPCC
    99 *
    10  *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-02-17 19:26:23 $
     10 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-21 03:01:37 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8080}
    8181
    82 psScalar* psScalarCopy(psScalar *scalar)
     82psScalar* psScalarCopy(const psScalar *value)
    8383{
    8484    psElemType dataType;
    8585    psScalar *newScalar = NULL;
    8686
    87     if (scalar == NULL) {
     87    if (value == NULL) {
    8888        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    8989                PS_ERRORTEXT_psScalar_COPY_NULL);
    … …  
    9191    }
    9292
    93     dataType = scalar->type.type;
     93    dataType = value->type.type;
    9494    switch (dataType) {
    9595    case PS_TYPE_S8:
    96         newScalar =  psScalarAlloc(scalar->data.S8, dataType);
     96        newScalar =  psScalarAlloc(value->data.S8, dataType);
    9797        break;
    9898    case PS_TYPE_U8:
    99         newScalar =  psScalarAlloc(scalar->data.U8, dataType);
     99        newScalar =  psScalarAlloc(value->data.U8, dataType);
    100100        break;
    101101    case PS_TYPE_S16:
    102         newScalar =  psScalarAlloc(scalar->data.S16, dataType);
     102        newScalar =  psScalarAlloc(value->data.S16, dataType);
    103103        break;
    104104    case PS_TYPE_U16:
    105         newScalar =  psScalarAlloc(scalar->data.U16, dataType);
     105        newScalar =  psScalarAlloc(value->data.U16, dataType);
    106106        break;
    107107    case PS_TYPE_S32:
    108         newScalar =  psScalarAlloc(scalar->data.S32, dataType);
     108        newScalar =  psScalarAlloc(value->data.S32, dataType);
    109109        break;
    110110    case PS_TYPE_U32:
    111         newScalar =  psScalarAlloc(scalar->data.U32, dataType);
     111        newScalar =  psScalarAlloc(value->data.U32, dataType);
    112112        break;
    113113    case PS_TYPE_S64:
    114         newScalar =  psScalarAlloc(scalar->data.S64, dataType);
     114        newScalar =  psScalarAlloc(value->data.S64, dataType);
    115115        break;
    116116    case PS_TYPE_U64:
    117         newScalar =  psScalarAlloc(scalar->data.U64, dataType);
     117        newScalar =  psScalarAlloc(value->data.U64, dataType);
    118118        break;
    119119    case PS_TYPE_F32:
    120         newScalar =  psScalarAlloc(scalar->data.F32, dataType);
     120        newScalar =  psScalarAlloc(value->data.F32, dataType);
    121121        break;
    122122    case PS_TYPE_F64:
    123         newScalar =  psScalarAlloc(scalar->data.F64, dataType);
     123        newScalar =  psScalarAlloc(value->data.F64, dataType);
    124124        break;
    125125    case PS_TYPE_C32:
    126         newScalar =  psScalarAlloc(scalar->data.C32, dataType);
     126        newScalar =  psScalarAlloc(value->data.C32, dataType);
    127127        break;
    128128    case PS_TYPE_C64:
    129         newScalar =  psScalarAlloc(scalar->data.C64, dataType);
     129        newScalar =  psScalarAlloc(value->data.C64, dataType);
    130130        break;
    131131    default:

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

    r4162 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-08 23:40:45 $
     13 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7777 */
    7878psScalar* psScalarCopy(
    79     psScalar *scalar                   ///< Scalar to copy.
     79    const psScalar *value              ///< Scalar to copy.
    8080);
    8181

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

    r4212 r4330  
    99*  @author Robert DeSonia, MHPCC
    1010*
    11 *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-06-10 21:46:46 $
     11*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-06-21 03:01:37 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    129129}
    130130
    131 psVector *psVectorExtend(psVector *vector, int delta, int nExtend)
     131psVector *psVectorExtend(psVector *vector, long delta, long nExtend)
    132132{
    133133    // can't handle a NULL vector (don't know the data type to allocate)
    … …  
    166166}
    167167
    168 psVector* psVectorCopy(psVector* out, const psVector* in, psElemType type)
    169 {
    170     if (in == NULL) {
     168psVector* psVectorCopy(psVector* output, const psVector* input, psElemType type)
     169{
     170    if (input == NULL) {
    171171        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    172172                PS_ERRORTEXT_psVector_SORT_NULL);
    173         psFree(out);
    174         return NULL;
    175     }
    176 
    177     psS32 nElements = in->n;
    178 
    179     out = psVectorRecycle(out, nElements, type);
     173        psFree(output);
     174        return NULL;
     175    }
     176
     177    psS32 nElements = input->n;
     178
     179    output = psVectorRecycle(output, nElements, type);
    180180
    181181    #define PSVECTOR_COPY(INTYPE,OUTTYPE) { \
    182         ps##INTYPE *inVec = in->data.INTYPE; \
    183         ps##OUTTYPE *outVec = out->data.OUTTYPE; \
     182        ps##INTYPE *inVec = input->data.INTYPE; \
     183        ps##OUTTYPE *outVec = output->data.OUTTYPE; \
    184184        for (psS32 col=0;col<nElements;col++) { \
    185185            *(outVec++) = *(inVec++); \
    … …  
    189189    #define PSVECTOR_COPY_CASE(OUTTYPE) \
    190190case PS_TYPE_##OUTTYPE: { \
    191         switch (in->type.type) { \
     191        switch (input->type.type) { \
    192192        case PS_TYPE_S8: \
    193193            PSVECTOR_COPY(S8,OUTTYPE); \
    … …  
    232232                        PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, \
    233233                        typeStr); \
    234                 psFree(out); \
     234                psFree(output); \
    235235            } \
    236236        } \
    … …  
    257257                    PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE,
    258258                    typeStr);
    259             psFree(out);
     259            psFree(output);
    260260
    261261            break;
    262262        }
    263263    }
    264     return out;
     264    return output;
    265265
    266266

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

    r4212 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-10 21:46:46 $
     13 *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    101101psVector *psVectorExtend(
    102102    psVector *vector,                  ///< Vector to extend
    103     int delta,                         ///< Amount to expand allocation, if necessary
    104     int nExtend                        ///< Number of elements to add to vector length
     103    long delta,                        ///< Amount to expand allocation, if necessary
     104    long nExtend                       ///< Number of elements to add to vector length
    105105);
    106106
    … …  
    132132 */
    133133psVector* psVectorCopy(
    134     psVector* out,                     ///< if non-NULL, a psVector to recycle
    135     const psVector* in,                ///< the vector to copy.
     134    psVector* output,                  ///< if non-NULL, a psVector to recycle
     135    const psVector* input,             ///< the vector to copy.
    136136    psElemType type                    ///< the data type of the resulting psVector
    137137);

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

    r4315 r4330  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.109 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-18 02:30:49 $
     9 *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-21 03:01:37 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    18221822XXX: What should be the defualty type for knots be?  psF32 is assumed.
    18231823 *****************************************************************************/
    1824 psSpline1D *psSpline1DAlloc(psS32 numSplines,
    1825                             psS32 order,
    1826                             psF32 min,
    1827                             psF32 max)
     1824psSpline1D *psSpline1DAlloc(int numSplines,
     1825                            int order,
     1826                            float min,
     1827                            float max)
    18281828{
    18291829    PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL);
    … …  
    18671867 *****************************************************************************/
    18681868psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,
    1869                                    psS32 order)
     1869                                   int order)
    18701870{
    18711871    PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
    … …  
    21252125psF64.
    21262126 *****************************************************************************/
    2127 psF32 psSpline1DEval(
     2127float psSpline1DEval(
    21282128    const psSpline1D *spline,
    2129     psF32 x
     2129    float x
    21302130)
    21312131{

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

    r4315 r4330  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-18 02:30:49 $
     14 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-21 03:01:37 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939 *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f]
    4040 *
    41  *  @return psF32      value on the gaussian curve given the input parameters
     41 *  @return float      value on the gaussian curve given the input parameters
    4242 */
    4343float psGaussian(
    … …  
    218218 */
    219219psVector *psPolynomial2DEvalVector(
    220     const psPolynomial2D *myPoly,      ///< Coefficients for the polynomial
     220    const psPolynomial2D *poly,         ///< Coefficients for the polynomial
    221221    const psVector *x,                  ///< x locations at which to evaluate
    222222    const psVector *y                   ///< y locations at which to evaluate
    … …  
    444444 *  @return psSpline1D*    new 1-D spline struct
    445445 */
    446 psSpline1D *psSpline1DAlloc(psS32 n,             ///< Number of spline polynomials
    447                             psS32 order,         ///< Order of spline polynomials
    448                             psF32 min,           ///< Lower boundary value of spline polynomials
    449                             psF32 max);          ///< Upper boundary value of spline polynomials
     446psSpline1D *psSpline1DAlloc(int n,               ///< Number of spline polynomials
     447                            int order,           ///< Order of spline polynomials
     448                            float min,           ///< Lower boundary value of spline polynomials
     449                            float max);          ///< Upper boundary value of spline polynomials
    450450
    451451/** Allocates a psSpline1D structure
    … …  
    456456 */
    457457psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,   ///< Bounds for spline polynomials
    458                                    psS32 order);             ///< Order of spline polynomials
     458                                   int order);               ///< Order of spline polynomials
    459459
    460460/** Evaluates 1-D spline polynomials at a specific coordinate.
    461461 * 
    462  *  @return psF32    result of spline polynomials evaluated at given location
    463  */
    464 psF32 psSpline1DEval(
     462 *  @return float    result of spline polynomials evaluated at given location
     463 */
     464float psSpline1DEval(
    465465    const psSpline1D *spline,          ///< Coefficients for spline polynomials
    466     psF32 x                            ///< location at which to evaluate
     466    float x                            ///< location at which to evaluate
    467467);
    468468

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

    r4321 r4330  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-20 22:42:30 $
     10 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-21 03:01:37 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    109109/** Minimizes a specified function based on the Levenberg-Marquardt method.
    110110 * 
    111  *  @return psBool:   True if successful.
     111 *  @return bool:   True if successful.
    112112 */
    113113bool psMinimizeLMChi2(
    … …  
    165165/** Minimizes a specified function based on the Powell method.
    166166 * 
    167  *  @return psBool:   True if successful.
     167 *  @return bool:   True if successful.
    168168 */
    169169bool psMinimizePowell(
    … …  
    209209/** Minimizes a specified function based on the Powell chi-squared method.
    210210 *
    211  *  @return psBool:   True is successful.
     211 *  @return bool:   True is successful.
    212212 */
    213213bool psMinimizeChi2Powell(

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

    r4083 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-01 23:51:25 $
     12*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5757
    5858psRandom *psRandomAlloc(psRandomType type,
    59                         psU64 seed)
     59                        unsigned long seed)
    6060{
    6161    gsl_rng   *r      = NULL;
    … …  
    8686
    8787void psRandomReset(psRandom *rand,
    88                    psU64 seed)
     88                   unsigned long seed)
    8989{
    9090    // Check null psRandom
    … …  
    103103}
    104104
    105 psF64 psRandomUniform(const psRandom *r)
     105double psRandomUniform(const psRandom *r)
    106106{
    107107    // Check null psRandom variable
    … …  
    116116}
    117117
    118 psF64 psRandomGaussian(const psRandom *r)
     118double psRandomGaussian(const psRandom *r)
    119119{
    120120    // Check null psRandom variable
    … …  
    130130}
    131131
    132 psF64 psRandomPoisson(const psRandom *r, psF64 mean)
     132double psRandomPoisson(const psRandom *r, double mean)
    133133{
    134134    // Check null psRandom variable

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

    r4293 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-17 00:11:05 $
     12*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5454psRandom *psRandomAlloc(
    5555    psRandomType type,                 ///< The type of RNG
    56     psU64 seed                         ///< Known value with which to seed the RNG
     56    unsigned long seed                 ///< Known value with which to seed the RNG
    5757);
    5858
    … …  
    6363void psRandomReset(
    6464    psRandom *rand,                    ///< Existing psRandom struct to reset
    65     psU64 seed                         ///< Known value with which to seed the RNG
     65    unsigned long seed                 ///< Known value with which to seed the RNG
    6666);
    6767
    … …  
    6969 *  Uses gsl_rng_uniform.
    7070 * 
    71  *  @return psF64:     Random number.
     71 *  @return double:     Random number.
    7272 */
    73 psF64 psRandomUniform(
     73double psRandomUniform(
    7474    const psRandom *r                  ///< psRandom struct for RNG
    7575);
    … …  
    7878 *  Uses gsl_ran_gaussian.
    7979 * 
    80  *  @return psF64:     Random number.
     80 *  @return double:     Random number.
    8181 */
    82 psF64 psRandomGaussian(
     82double psRandomGaussian(
    8383    const psRandom *r                  ///< psRandom struct for RNG
    8484);
    … …  
    8787 *  Uses gsl_ran_poisson.
    8888 * 
    89  *  @return psF64:     Random number.
     89 *  @return double:     Random number.
    9090 */
    91 psF64 psRandomPoisson(
     91double psRandomPoisson(
    9292    const psRandom *r,                 ///< psRandom struct for RNG
    93     psF64 mean                         ///< Mean value
     93    double mean                         ///< Mean value
    9494);
    9595

  • trunk/psLib/src/image/psImage.c

    r4316 r4330  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-06-18 03:13:02 $
     11 *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-21 03:01:37 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    106106}
    107107
    108 psRegion psRegionFromString(char* region)
     108psRegion psRegionFromString(const char* region)
    109109{
    110110    psS32 col0;

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

    r4316 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-18 03:13:02 $
     13 *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    127127 */
    128128psRegion psRegionFromString(
    129     char* region                       ///< image rectangular region in the form '[x0:x1,y0:y1]'
     129    const char* region                 ///< image rectangular region in the form '[x0:x1,y0:y1]'
    130130);
    131131
    … …  
    163163/** Frees all children of a psImage.
    164164 *
    165  *  @return psS32      Number of children freed.
     165 *  @return int      Number of children freed.
    166166 *
    167167 */

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

    r4315 r4330  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-18 02:30:49 $
     10 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-21 03:01:37 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3030 *  defined for psU8, psU16, psS8, psS16, psF32, psF64, psC32, and psC64.
    3131 *
    32  *  @return psS32     The number of clipped pixels
     32 *  @return int     The number of clipped pixels
    3333 */
    3434int psImageClip(
    … …  
    6262 *  function is defined for psF32, psF64, psC32, and psC64.
    6363 *
    64  *  @return psS32     The number of clipped pixels
     64 *  @return int     The number of clipped pixels
    6565 */
    6666int psImageClipNaN(

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

    r4315 r4330  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-18 02:30:49 $
     10 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-21 03:01:37 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3030 *  defined for psU8, psU16, psS8, psS16, psF32, psF64, psC32, and psC64.
    3131 *
    32  *  @return psS32     The number of clipped pixels
     32 *  @return int     The number of clipped pixels
    3333 */
    3434int psImageClip(
    … …  
    6262 *  function is defined for psF32, psF64, psC32, and psC64.
    6363 *
    64  *  @return psS32     The number of clipped pixels
     64 *  @return int     The number of clipped pixels
    6565 */
    6666int psImageClipNaN(

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

    r4321 r4330  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-20 22:42:30 $
     10 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-21 03:01:37 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    109109/** Minimizes a specified function based on the Levenberg-Marquardt method.
    110110 * 
    111  *  @return psBool:   True if successful.
     111 *  @return bool:   True if successful.
    112112 */
    113113bool psMinimizeLMChi2(
    … …  
    165165/** Minimizes a specified function based on the Powell method.
    166166 * 
    167  *  @return psBool:   True if successful.
     167 *  @return bool:   True if successful.
    168168 */
    169169bool psMinimizePowell(
    … …  
    209209/** Minimizes a specified function based on the Powell chi-squared method.
    210210 *
    211  *  @return psBool:   True is successful.
     211 *  @return bool:   True is successful.
    212212 */
    213213bool psMinimizeChi2Powell(

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

    r4315 r4330  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.109 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-18 02:30:49 $
     9 *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-21 03:01:37 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    18221822XXX: What should be the defualty type for knots be?  psF32 is assumed.
    18231823 *****************************************************************************/
    1824 psSpline1D *psSpline1DAlloc(psS32 numSplines,
    1825                             psS32 order,
    1826                             psF32 min,
    1827                             psF32 max)
     1824psSpline1D *psSpline1DAlloc(int numSplines,
     1825                            int order,
     1826                            float min,
     1827                            float max)
    18281828{
    18291829    PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL);
    … …  
    18671867 *****************************************************************************/
    18681868psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,
    1869                                    psS32 order)
     1869                                   int order)
    18701870{
    18711871    PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
    … …  
    21252125psF64.
    21262126 *****************************************************************************/
    2127 psF32 psSpline1DEval(
     2127float psSpline1DEval(
    21282128    const psSpline1D *spline,
    2129     psF32 x
     2129    float x
    21302130)
    21312131{

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

    r4315 r4330  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-18 02:30:49 $
     14 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-21 03:01:37 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939 *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f]
    4040 *
    41  *  @return psF32      value on the gaussian curve given the input parameters
     41 *  @return float      value on the gaussian curve given the input parameters
    4242 */
    4343float psGaussian(
    … …  
    218218 */
    219219psVector *psPolynomial2DEvalVector(
    220     const psPolynomial2D *myPoly,      ///< Coefficients for the polynomial
     220    const psPolynomial2D *poly,         ///< Coefficients for the polynomial
    221221    const psVector *x,                  ///< x locations at which to evaluate
    222222    const psVector *y                   ///< y locations at which to evaluate
    … …  
    444444 *  @return psSpline1D*    new 1-D spline struct
    445445 */
    446 psSpline1D *psSpline1DAlloc(psS32 n,             ///< Number of spline polynomials
    447                             psS32 order,         ///< Order of spline polynomials
    448                             psF32 min,           ///< Lower boundary value of spline polynomials
    449                             psF32 max);          ///< Upper boundary value of spline polynomials
     446psSpline1D *psSpline1DAlloc(int n,               ///< Number of spline polynomials
     447                            int order,           ///< Order of spline polynomials
     448                            float min,           ///< Lower boundary value of spline polynomials
     449                            float max);          ///< Upper boundary value of spline polynomials
    450450
    451451/** Allocates a psSpline1D structure
    … …  
    456456 */
    457457psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,   ///< Bounds for spline polynomials
    458                                    psS32 order);             ///< Order of spline polynomials
     458                                   int order);               ///< Order of spline polynomials
    459459
    460460/** Evaluates 1-D spline polynomials at a specific coordinate.
    461461 * 
    462  *  @return psF32    result of spline polynomials evaluated at given location
    463  */
    464 psF32 psSpline1DEval(
     462 *  @return float    result of spline polynomials evaluated at given location
     463 */
     464float psSpline1DEval(
    465465    const psSpline1D *spline,          ///< Coefficients for spline polynomials
    466     psF32 x                            ///< location at which to evaluate
     466    float x                            ///< location at which to evaluate
    467467);
    468468

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

    r4083 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-01 23:51:25 $
     12*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5757
    5858psRandom *psRandomAlloc(psRandomType type,
    59                         psU64 seed)
     59                        unsigned long seed)
    6060{
    6161    gsl_rng   *r      = NULL;
    … …  
    8686
    8787void psRandomReset(psRandom *rand,
    88                    psU64 seed)
     88                   unsigned long seed)
    8989{
    9090    // Check null psRandom
    … …  
    103103}
    104104
    105 psF64 psRandomUniform(const psRandom *r)
     105double psRandomUniform(const psRandom *r)
    106106{
    107107    // Check null psRandom variable
    … …  
    116116}
    117117
    118 psF64 psRandomGaussian(const psRandom *r)
     118double psRandomGaussian(const psRandom *r)
    119119{
    120120    // Check null psRandom variable
    … …  
    130130}
    131131
    132 psF64 psRandomPoisson(const psRandom *r, psF64 mean)
     132double psRandomPoisson(const psRandom *r, double mean)
    133133{
    134134    // Check null psRandom variable

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

    r4293 r4330  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-06-17 00:11:05 $
     12*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-06-21 03:01:37 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5454psRandom *psRandomAlloc(
    5555    psRandomType type,                 ///< The type of RNG
    56     psU64 seed                         ///< Known value with which to seed the RNG
     56    unsigned long seed                 ///< Known value with which to seed the RNG
    5757);
    5858
    … …  
    6363void psRandomReset(
    6464    psRandom *rand,                    ///< Existing psRandom struct to reset
    65     psU64 seed                         ///< Known value with which to seed the RNG
     65    unsigned long seed                 ///< Known value with which to seed the RNG
    6666);
    6767
    … …  
    6969 *  Uses gsl_rng_uniform.
    7070 * 
    71  *  @return psF64:     Random number.
     71 *  @return double:     Random number.
    7272 */
    73 psF64 psRandomUniform(
     73double psRandomUniform(
    7474    const psRandom *r                  ///< psRandom struct for RNG
    7575);
    … …  
    7878 *  Uses gsl_ran_gaussian.
    7979 * 
    80  *  @return psF64:     Random number.
     80 *  @return double:     Random number.
    8181 */
    82 psF64 psRandomGaussian(
     82double psRandomGaussian(
    8383    const psRandom *r                  ///< psRandom struct for RNG
    8484);
    … …  
    8787 *  Uses gsl_ran_poisson.
    8888 * 
    89  *  @return psF64:     Random number.
     89 *  @return double:     Random number.
    9090 */
    91 psF64 psRandomPoisson(
     91double psRandomPoisson(
    9292    const psRandom *r,                 ///< psRandom struct for RNG
    93     psF64 mean                         ///< Mean value
     93    double mean                         ///< Mean value
    9494);
    9595

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

    r4315 r4330  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.109 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-18 02:30:49 $
     9 *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-21 03:01:37 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    18221822XXX: What should be the defualty type for knots be?  psF32 is assumed.
    18231823 *****************************************************************************/
    1824 psSpline1D *psSpline1DAlloc(psS32 numSplines,
    1825                             psS32 order,
    1826                             psF32 min,
    1827                             psF32 max)
     1824psSpline1D *psSpline1DAlloc(int numSplines,
     1825                            int order,
     1826                            float min,
     1827                            float max)
    18281828{
    18291829    PS_ASSERT_INT_NONNEGATIVE(numSplines, NULL);
    … …  
    18671867 *****************************************************************************/
    18681868psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,
    1869                                    psS32 order)
     1869                                   int order)
    18701870{
    18711871    PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
    … …  
    21252125psF64.
    21262126 *****************************************************************************/
    2127 psF32 psSpline1DEval(
     2127float psSpline1DEval(
    21282128    const psSpline1D *spline,
    2129     psF32 x
     2129    float x
    21302130)
    21312131{

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

    r4315 r4330  
    1212 *  @author GLG, MHPCC
    1313 *
    14  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-18 02:30:49 $
     14 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-21 03:01:37 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939 *        \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f]
    4040 *
    41  *  @return psF32      value on the gaussian curve given the input parameters
     41 *  @return float      value on the gaussian curve given the input parameters
    4242 */
    4343float psGaussian(
    … …  
    218218 */
    219219psVector *psPolynomial2DEvalVector(
    220     const psPolynomial2D *myPoly,      ///< Coefficients for the polynomial
     220    const psPolynomial2D *poly,         ///< Coefficients for the polynomial
    221221    const psVector *x,                  ///< x locations at which to evaluate
    222222    const psVector *y                   ///< y locations at which to evaluate
    … …  
    444444 *  @return psSpline1D*    new 1-D spline struct
    445445 */
    446 psSpline1D *psSpline1DAlloc(psS32 n,             ///< Number of spline polynomials
    447                             psS32 order,         ///< Order of spline polynomials
    448                             psF32 min,           ///< Lower boundary value of spline polynomials
    449                             psF32 max);          ///< Upper boundary value of spline polynomials
     446psSpline1D *psSpline1DAlloc(int n,               ///< Number of spline polynomials
     447                            int order,           ///< Order of spline polynomials
     448                            float min,           ///< Lower boundary value of spline polynomials
     449                            float max);          ///< Upper boundary value of spline polynomials
    450450
    451451/** Allocates a psSpline1D structure
    … …  
    456456 */
    457457psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,   ///< Bounds for spline polynomials
    458                                    psS32 order);             ///< Order of spline polynomials
     458                                   int order);               ///< Order of spline polynomials
    459459
    460460/** Evaluates 1-D spline polynomials at a specific coordinate.
    461461 * 
    462  *  @return psF32    result of spline polynomials evaluated at given location
    463  */
    464 psF32 psSpline1DEval(
     462 *  @return float    result of spline polynomials evaluated at given location
     463 */
     464float psSpline1DEval(
    465465    const psSpline1D *spline,          ///< Coefficients for spline polynomials
    466     psF32 x                            ///< location at which to evaluate
     466    float x                            ///< location at which to evaluate
    467467);
    468468

  • trunk/psLib/src/mathtypes/psImage.c

    r4316 r4330  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-06-18 03:13:02 $
     11 *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-21 03:01:37 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    106106}
    107107
    108 psRegion psRegionFromString(char* region)
     108psRegion psRegionFromString(const char* region)
    109109{
    110110    psS32 col0;

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

    r4316 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-18 03:13:02 $
     13 *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    127127 */
    128128psRegion psRegionFromString(
    129     char* region                       ///< image rectangular region in the form '[x0:x1,y0:y1]'
     129    const char* region                 ///< image rectangular region in the form '[x0:x1,y0:y1]'
    130130);
    131131
    … …  
    163163/** Frees all children of a psImage.
    164164 *
    165  *  @return psS32      Number of children freed.
     165 *  @return int      Number of children freed.
    166166 *
    167167 */

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

    r3264 r4330  
    88 *  @author Ross Harman, MHPCC
    99 *
    10  *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-02-17 19:26:23 $
     10 *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-21 03:01:37 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8080}
    8181
    82 psScalar* psScalarCopy(psScalar *scalar)
     82psScalar* psScalarCopy(const psScalar *value)
    8383{
    8484    psElemType dataType;
    8585    psScalar *newScalar = NULL;
    8686
    87     if (scalar == NULL) {
     87    if (value == NULL) {
    8888        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    8989                PS_ERRORTEXT_psScalar_COPY_NULL);
    … …  
    9191    }
    9292
    93     dataType = scalar->type.type;
     93    dataType = value->type.type;
    9494    switch (dataType) {
    9595    case PS_TYPE_S8:
    96         newScalar =  psScalarAlloc(scalar->data.S8, dataType);
     96        newScalar =  psScalarAlloc(value->data.S8, dataType);
    9797        break;
    9898    case PS_TYPE_U8:
    99         newScalar =  psScalarAlloc(scalar->data.U8, dataType);
     99        newScalar =  psScalarAlloc(value->data.U8, dataType);
    100100        break;
    101101    case PS_TYPE_S16:
    102         newScalar =  psScalarAlloc(scalar->data.S16, dataType);
     102        newScalar =  psScalarAlloc(value->data.S16, dataType);
    103103        break;
    104104    case PS_TYPE_U16:
    105         newScalar =  psScalarAlloc(scalar->data.U16, dataType);
     105        newScalar =  psScalarAlloc(value->data.U16, dataType);
    106106        break;
    107107    case PS_TYPE_S32:
    108         newScalar =  psScalarAlloc(scalar->data.S32, dataType);
     108        newScalar =  psScalarAlloc(value->data.S32, dataType);
    109109        break;
    110110    case PS_TYPE_U32:
    111         newScalar =  psScalarAlloc(scalar->data.U32, dataType);
     111        newScalar =  psScalarAlloc(value->data.U32, dataType);
    112112        break;
    113113    case PS_TYPE_S64:
    114         newScalar =  psScalarAlloc(scalar->data.S64, dataType);
     114        newScalar =  psScalarAlloc(value->data.S64, dataType);
    115115        break;
    116116    case PS_TYPE_U64:
    117         newScalar =  psScalarAlloc(scalar->data.U64, dataType);
     117        newScalar =  psScalarAlloc(value->data.U64, dataType);
    118118        break;
    119119    case PS_TYPE_F32:
    120         newScalar =  psScalarAlloc(scalar->data.F32, dataType);
     120        newScalar =  psScalarAlloc(value->data.F32, dataType);
    121121        break;
    122122    case PS_TYPE_F64:
    123         newScalar =  psScalarAlloc(scalar->data.F64, dataType);
     123        newScalar =  psScalarAlloc(value->data.F64, dataType);
    124124        break;
    125125    case PS_TYPE_C32:
    126         newScalar =  psScalarAlloc(scalar->data.C32, dataType);
     126        newScalar =  psScalarAlloc(value->data.C32, dataType);
    127127        break;
    128128    case PS_TYPE_C64:
    129         newScalar =  psScalarAlloc(scalar->data.C64, dataType);
     129        newScalar =  psScalarAlloc(value->data.C64, dataType);
    130130        break;
    131131    default:

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

    r4162 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-08 23:40:45 $
     13 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7777 */
    7878psScalar* psScalarCopy(
    79     psScalar *scalar                   ///< Scalar to copy.
     79    const psScalar *value              ///< Scalar to copy.
    8080);
    8181

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

    r4212 r4330  
    99*  @author Robert DeSonia, MHPCC
    1010*
    11 *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-06-10 21:46:46 $
     11*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2005-06-21 03:01:37 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    129129}
    130130
    131 psVector *psVectorExtend(psVector *vector, int delta, int nExtend)
     131psVector *psVectorExtend(psVector *vector, long delta, long nExtend)
    132132{
    133133    // can't handle a NULL vector (don't know the data type to allocate)
    … …  
    166166}
    167167
    168 psVector* psVectorCopy(psVector* out, const psVector* in, psElemType type)
    169 {
    170     if (in == NULL) {
     168psVector* psVectorCopy(psVector* output, const psVector* input, psElemType type)
     169{
     170    if (input == NULL) {
    171171        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    172172                PS_ERRORTEXT_psVector_SORT_NULL);
    173         psFree(out);
    174         return NULL;
    175     }
    176 
    177     psS32 nElements = in->n;
    178 
    179     out = psVectorRecycle(out, nElements, type);
     173        psFree(output);
     174        return NULL;
     175    }
     176
     177    psS32 nElements = input->n;
     178
     179    output = psVectorRecycle(output, nElements, type);
    180180
    181181    #define PSVECTOR_COPY(INTYPE,OUTTYPE) { \
    182         ps##INTYPE *inVec = in->data.INTYPE; \
    183         ps##OUTTYPE *outVec = out->data.OUTTYPE; \
     182        ps##INTYPE *inVec = input->data.INTYPE; \
     183        ps##OUTTYPE *outVec = output->data.OUTTYPE; \
    184184        for (psS32 col=0;col<nElements;col++) { \
    185185            *(outVec++) = *(inVec++); \
    … …  
    189189    #define PSVECTOR_COPY_CASE(OUTTYPE) \
    190190case PS_TYPE_##OUTTYPE: { \
    191         switch (in->type.type) { \
     191        switch (input->type.type) { \
    192192        case PS_TYPE_S8: \
    193193            PSVECTOR_COPY(S8,OUTTYPE); \
    … …  
    232232                        PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, \
    233233                        typeStr); \
    234                 psFree(out); \
     234                psFree(output); \
    235235            } \
    236236        } \
    … …  
    257257                    PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE,
    258258                    typeStr);
    259             psFree(out);
     259            psFree(output);
    260260
    261261            break;
    262262        }
    263263    }
    264     return out;
     264    return output;
    265265
    266266

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

    r4212 r4330  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-10 21:46:46 $
     13 *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    101101psVector *psVectorExtend(
    102102    psVector *vector,                  ///< Vector to extend
    103     int delta,                         ///< Amount to expand allocation, if necessary
    104     int nExtend                        ///< Number of elements to add to vector length
     103    long delta,                        ///< Amount to expand allocation, if necessary
     104    long nExtend                       ///< Number of elements to add to vector length
    105105);
    106106
    … …  
    132132 */
    133133psVector* psVectorCopy(
    134     psVector* out,                     ///< if non-NULL, a psVector to recycle
    135     const psVector* in,                ///< the vector to copy.
     134    psVector* output,                  ///< if non-NULL, a psVector to recycle
     135    const psVector* input,             ///< the vector to copy.
    136136    psElemType type                    ///< the data type of the resulting psVector
    137137);

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

    r4321 r4330  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-20 22:42:30 $
     13 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4242 *  be displayed.  The old log level will be returned.
    4343 *
    44  *  @return psS32    old logging level
     44 *  @return int    old logging level
    4545 */
    4646int psLogSetLevel(

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

    r4321 r4330  
    1212 *  @ingroup MemoryManagement
    1313 *
    14  *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-20 22:42:30 $
     14 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-21 03:01:37 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    190190 *  Memory marked as persistent is excluded from memory leak checks.
    191191 *
    192  *  @return psBool    true if memory is marked persistent, otherwise false.
     192 *  @return bool    true if memory is marked persistent, otherwise false.
    193193 */
    194194bool p_psMemGetPersistent(

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

    r4308 r4330  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-06-17 23:44:21 $
     11 *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-21 03:01:37 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    377377 The level of "name" in the root component tree.
    378378 *****************************************************************************/
    379 psS32 psTraceGetLevel(const char *name)
     379int psTraceGetLevel(const char *name)
    380380{
    381381    char *compName = NULL;

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

    r3781 r4330  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-04-28 23:46:29 $
     11 *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-21 03:01:37 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8383
    8484/// Get the trace level
    85 psS32 psTraceGetLevel(const char *facil) ///< facilty of interest
    86 ;
     85int psTraceGetLevel(
     86    const char *facil                  ///< facilty of interest
     87);
    8788
    8889/// Set all trace levels to zero (do not free nodes in the component tree).

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

    r4321 r4330  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-20 22:42:30 $
     13 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-21 03:01:37 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    4242 *  be displayed.  The old log level will be returned.
    4343 *
    44  *  @return psS32    old logging level
     44 *  @return int    old logging level
    4545 */
    4646int psLogSetLevel(

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

    r4321 r4330  
    1212 *  @ingroup MemoryManagement
    1313 *
    14  *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-06-20 22:42:30 $
     14 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-06-21 03:01:37 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    190190 *  Memory marked as persistent is excluded from memory leak checks.
    191191 *
    192  *  @return psBool    true if memory is marked persistent, otherwise false.
     192 *  @return bool    true if memory is marked persistent, otherwise false.
    193193 */
    194194bool p_psMemGetPersistent(

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

    r4308 r4330  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-06-17 23:44:21 $
     11 *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-21 03:01:37 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    377377 The level of "name" in the root component tree.
    378378 *****************************************************************************/
    379 psS32 psTraceGetLevel(const char *name)
     379int psTraceGetLevel(const char *name)
    380380{
    381381    char *compName = NULL;

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

    r3781 r4330  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-04-28 23:46:29 $
     11 *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-06-21 03:01:37 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8383
    8484/// Get the trace level
    85 psS32 psTraceGetLevel(const char *facil) ///< facilty of interest
    86 ;
     85int psTraceGetLevel(
     86    const char *facil                  ///< facilty of interest
     87);
    8788
    8889/// Set all trace levels to zero (do not free nodes in the component tree).

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

    r4316 r4330  
    77 *  @ingroup LinkedList
    88 *
    9  *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-18 03:13:02 $
     9 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-21 03:01:37 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    107107 *  iterator position is not changed.
    108108 *
    109  *  @return psBool        TRUE if iterator successfully set, otherwise FALSE.
     109 *  @return bool        TRUE if iterator successfully set, otherwise FALSE.
    110110 */
    111111bool psListIteratorSet(
    … …  
    116116/** Adds an element to a psList at position given.
    117117 *
    118  *  @return psBool        TRUE if item was successfully added, otherwise FALSE.
     118 *  @return bool        TRUE if item was successfully added, otherwise FALSE.
    119119 */
    120120bool psListAdd(
    … …  
    126126/** Adds an data item to a psList at position just after the list position given
    127127 *
    128  *  @return psBool        TRUE if item was successfully added, otherwise FALSE.
     128 *  @return bool        TRUE if item was successfully added, otherwise FALSE.
    129129 */
    130130bool psListAddAfter(
    … …  
    135135/** Adds an data item to a psList at position just before the list position given
    136136 *
    137  *  @return psBool        TRUE if item was successfully added, otherwise FALSE.
     137 *  @return bool        TRUE if item was successfully added, otherwise FALSE.
    138138 */
    139139bool psListAddBefore(
    … …  
    144144/** Remove an item at the specified location from a list.
    145145 *
    146  *  @return psBool        TRUE if element is successfully removed, otherwise FALSE.
     146 *  @return bool        TRUE if element is successfully removed, otherwise FALSE.
    147147 */
    148148bool psListRemove(
    … …  
    153153/** Remove an item from a list.
    154154 *
    155  *  @return psBool        TRUE if element is successfully removed, otherwise FALSE.
     155 *  @return bool        TRUE if element is successfully removed, otherwise FALSE.
    156156 */
    157157bool psListRemoveData(

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

    r4321 r4330  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-06-20 22:42:29 $
     13*  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-06-21 03:01:37 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    274274    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
    275275    const char *name,                  ///< Name of metadata item.
    276     int format,                      ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
     276    int format,                        ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
    277277    const char *comment,               ///< Comment for metadata item.
    278278    ...                                ///< Arguments for name formatting and metadata item data.
    … …  
    298298/** Add a psS32 value to metadata collection.
    299299 * 
    300  *  @return psBool:  True for success, False for failure.
     300 *  @return bool:  True for success, False for failure.
    301301 */
    302302bool psMetadataAddS32(
    … …  
    310310/** Add a psF32 value to metadata collection.
    311311 * 
    312  *  @return psBool:  True for success, False for failure.
     312 *  @return bool:  True for success, False for failure.
    313313*/
    314314bool psMetadataAddF32(
    … …  
    322322/** Add a psF64 value to metadata collection.
    323323 * 
    324  *  @return psBool:  True for success, False for failure.
     324 *  @return bool:  True for success, False for failure.
    325325*/
    326326bool psMetadataAddF64(
    … …  
    346346/** Add a string to metadata collection.
    347347 * 
    348  *  @return psBool:  True for success, False for failure.
     348 *  @return bool:  True for success, False for failure.
    349349 */
    350350bool psMetadataAddStr(
    … …  
    505505 *  returned.
    506506 *
    507  * @return psBool : Value of metadata item.
    508  */
    509 psBool psMetadataLookupBool(
     507 * @return bool : Value of metadata item.
     508 */
     509bool psMetadataLookupBool(
    510510    bool *status,                    ///< Status of lookup.
    511511    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
    … …  
    558558 *  invalid the iterator position is not changed.
    559559 *
    560  *  @return psBool        TRUE if iterator successfully set, otherwise FALSE.
     560 *  @return bool        TRUE if iterator successfully set, otherwise FALSE.
    561561*/
    562562bool psMetadataIteratorSet(
Note: See TracChangeset for help on using the changeset viewer.