Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 4408) +++ /trunk/psLib/pslib.kdevses (revision 4409) @@ -2,5 +2,9 @@ - + + + + + Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 4408) +++ /trunk/psLib/src/astro/psTime.c (revision 4409) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.65 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1166,5 +1166,5 @@ } -char* psTimeToISO(const psTime *time) +psString psTimeToISO(const psTime *time) { psS32 ds = 0; @@ -1353,5 +1353,5 @@ } -psTime* psTimeFromISO(const char *time) +psTime* psTimeFromISO(const char *input) { psS32 millisecond; @@ -1360,10 +1360,10 @@ // Check for NULL string - PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(input,NULL); // Convert YYYY-MM-DDThh:mm:ss.sss in string form to tm time - if (sscanf(time, "%d-%d-%dT%d:%d:%d,%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday, + if (sscanf(input, "%d-%d-%dT%d:%d:%d,%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday, &tmTime.tm_hour, &tmTime.tm_min, &tmTime.tm_sec,&millisecond) < 7) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, time); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, input); return NULL; } @@ -1426,5 +1426,5 @@ } -psTime* psTimeFromTimeval(const struct timeval *time) +psTime* psTimeFromTimeval(const struct timeval *input) { psTime *outTime = NULL; @@ -1432,5 +1432,5 @@ // Error check - PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(input,NULL); // Allocate psTime struct @@ -1438,6 +1438,6 @@ // Convert to psTime - outTime->sec = time->tv_sec; - outTime->nsec = time->tv_usec * 1000; + outTime->sec = input->tv_sec; + outTime->nsec = input->tv_usec * 1000; // Error check Index: /trunk/psLib/src/astro/psTime.h =================================================================== --- /trunk/psLib/src/astro/psTime.h (revision 4408) +++ /trunk/psLib/src/astro/psTime.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -38,8 +38,8 @@ */ typedef enum { - PS_TIME_TAI, ///< Temps Atomique International (TAI) time (time with leapseconds). - PS_TIME_UTC, ///< Universal Time Coordinated (UTC) time (time without leapseconds). - PS_TIME_UT1, ///< Universal Time corrected for polar motion - PS_TIME_TT, ///< Terrestrial Time + PS_TIME_TAI, ///< Temps Atomique International (TAI) time (time with leapseconds) + PS_TIME_UTC, ///< Universal Time Coordinated (UTC) time (time without leapseconds) + PS_TIME_UT1, ///< Universal Time corrected for polar motion + PS_TIME_TT, ///< Terrestrial Time } psTimeType; @@ -49,6 +49,6 @@ */ typedef enum { - PS_IERS_A, ///< IERS Bulletin A - PS_IERS_B, ///< IERS Bulletin B + PS_IERS_A, ///< IERS Bulletin A + PS_IERS_B, ///< IERS Bulletin B } psTimeBulletin; @@ -62,8 +62,8 @@ typedef struct psTime { - psS64 sec; ///< Seconds since epoch, Jan 1, 1970. - psU32 nsec; ///< Nanoseconds since last second. - psBool leapsecond; ///< if time falls on UTC leapsecond - psTimeType type; ///< Type of time. + psS64 sec; ///< Seconds since epoch, Jan 1, 1970. + psU32 nsec; ///< Nanoseconds since last second. + psBool leapsecond; ///< if time falls on UTC leapsecond + psTimeType type; ///< Type of time. } psTime; @@ -97,5 +97,5 @@ */ psTime* psTimeAlloc( - psTimeType type ///< Type of time to create (UTC or TAI). + psTimeType type ///< Type of time to create (UTC or TAI). ); @@ -108,5 +108,5 @@ */ psTime* psTimeGetNow( - psTimeType type ///< Type of time to get (UTC or TAI). + psTimeType type ///< Type of time to get (UTC or TAI). ); @@ -118,6 +118,6 @@ */ psTime* psTimeConvert( - psTime *time, ///< Time to be converted. - psTimeType type ///< Type to be converted to. + psTime *time, ///< Time to be converted. + psTimeType type ///< Type to be converted to. ); @@ -131,5 +131,5 @@ double psTimeToLMST( psTime *time, ///< psTime to be converted. - double longitude ///< Longitude. + double longitude ///< Longitude. ); @@ -141,6 +141,6 @@ */ double psTimeGetUT1Delta( - const psTime *time, ///< psTime to be looked up. - psTimeBulletin bulletin ///< IERS bulletin to use + const psTime *time, ///< psTime to be looked up. + psTimeBulletin bulletin ///< IERS bulletin to use ); @@ -152,5 +152,5 @@ */ psF64 p_psTimeGetTAIDelta( - const psTime *time ///< psTime to be looked up. + const psTime *time ///< psTime to be looked up. ); @@ -212,7 +212,7 @@ * This function does not add or subtract leapseconds. * - * @return char*: Pointer null terminated array of chars in ISO time. - */ -char* psTimeToISO( + * @return psString: Pointer null terminated array of chars in ISO time. + */ +psString psTimeToISO( const psTime* time ///< Input time to be converted. ); @@ -268,5 +268,5 @@ */ psTime* psTimeFromISO( - const char* time ///< Input time to be converted. + const char* input ///< Input time to be converted. ); @@ -278,5 +278,5 @@ */ psTime* psTimeFromTimeval( - const struct timeval *time ///< Input time to be converted. + const struct timeval *input ///< Input time to be converted. ); @@ -296,5 +296,5 @@ * Converts UTC time to psTime. It will verify if time specified is a leapsecond. * - * @return psTime*: time (UTC) + * @return psTime*: time (UTC)time */ psTime* psTimeFromUTC( Index: /trunk/psLib/src/astronomy/psTime.c =================================================================== --- /trunk/psLib/src/astronomy/psTime.c (revision 4408) +++ /trunk/psLib/src/astronomy/psTime.c (revision 4409) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.65 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1166,5 +1166,5 @@ } -char* psTimeToISO(const psTime *time) +psString psTimeToISO(const psTime *time) { psS32 ds = 0; @@ -1353,5 +1353,5 @@ } -psTime* psTimeFromISO(const char *time) +psTime* psTimeFromISO(const char *input) { psS32 millisecond; @@ -1360,10 +1360,10 @@ // Check for NULL string - PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(input,NULL); // Convert YYYY-MM-DDThh:mm:ss.sss in string form to tm time - if (sscanf(time, "%d-%d-%dT%d:%d:%d,%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday, + if (sscanf(input, "%d-%d-%dT%d:%d:%d,%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday, &tmTime.tm_hour, &tmTime.tm_min, &tmTime.tm_sec,&millisecond) < 7) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, time); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, input); return NULL; } @@ -1426,5 +1426,5 @@ } -psTime* psTimeFromTimeval(const struct timeval *time) +psTime* psTimeFromTimeval(const struct timeval *input) { psTime *outTime = NULL; @@ -1432,5 +1432,5 @@ // Error check - PS_ASSERT_PTR_NON_NULL(time,NULL); + PS_ASSERT_PTR_NON_NULL(input,NULL); // Allocate psTime struct @@ -1438,6 +1438,6 @@ // Convert to psTime - outTime->sec = time->tv_sec; - outTime->nsec = time->tv_usec * 1000; + outTime->sec = input->tv_sec; + outTime->nsec = input->tv_usec * 1000; // Error check Index: /trunk/psLib/src/astronomy/psTime.h =================================================================== --- /trunk/psLib/src/astronomy/psTime.h (revision 4408) +++ /trunk/psLib/src/astronomy/psTime.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -38,8 +38,8 @@ */ typedef enum { - PS_TIME_TAI, ///< Temps Atomique International (TAI) time (time with leapseconds). - PS_TIME_UTC, ///< Universal Time Coordinated (UTC) time (time without leapseconds). - PS_TIME_UT1, ///< Universal Time corrected for polar motion - PS_TIME_TT, ///< Terrestrial Time + PS_TIME_TAI, ///< Temps Atomique International (TAI) time (time with leapseconds) + PS_TIME_UTC, ///< Universal Time Coordinated (UTC) time (time without leapseconds) + PS_TIME_UT1, ///< Universal Time corrected for polar motion + PS_TIME_TT, ///< Terrestrial Time } psTimeType; @@ -49,6 +49,6 @@ */ typedef enum { - PS_IERS_A, ///< IERS Bulletin A - PS_IERS_B, ///< IERS Bulletin B + PS_IERS_A, ///< IERS Bulletin A + PS_IERS_B, ///< IERS Bulletin B } psTimeBulletin; @@ -62,8 +62,8 @@ typedef struct psTime { - psS64 sec; ///< Seconds since epoch, Jan 1, 1970. - psU32 nsec; ///< Nanoseconds since last second. - psBool leapsecond; ///< if time falls on UTC leapsecond - psTimeType type; ///< Type of time. + psS64 sec; ///< Seconds since epoch, Jan 1, 1970. + psU32 nsec; ///< Nanoseconds since last second. + psBool leapsecond; ///< if time falls on UTC leapsecond + psTimeType type; ///< Type of time. } psTime; @@ -97,5 +97,5 @@ */ psTime* psTimeAlloc( - psTimeType type ///< Type of time to create (UTC or TAI). + psTimeType type ///< Type of time to create (UTC or TAI). ); @@ -108,5 +108,5 @@ */ psTime* psTimeGetNow( - psTimeType type ///< Type of time to get (UTC or TAI). + psTimeType type ///< Type of time to get (UTC or TAI). ); @@ -118,6 +118,6 @@ */ psTime* psTimeConvert( - psTime *time, ///< Time to be converted. - psTimeType type ///< Type to be converted to. + psTime *time, ///< Time to be converted. + psTimeType type ///< Type to be converted to. ); @@ -131,5 +131,5 @@ double psTimeToLMST( psTime *time, ///< psTime to be converted. - double longitude ///< Longitude. + double longitude ///< Longitude. ); @@ -141,6 +141,6 @@ */ double psTimeGetUT1Delta( - const psTime *time, ///< psTime to be looked up. - psTimeBulletin bulletin ///< IERS bulletin to use + const psTime *time, ///< psTime to be looked up. + psTimeBulletin bulletin ///< IERS bulletin to use ); @@ -152,5 +152,5 @@ */ psF64 p_psTimeGetTAIDelta( - const psTime *time ///< psTime to be looked up. + const psTime *time ///< psTime to be looked up. ); @@ -212,7 +212,7 @@ * This function does not add or subtract leapseconds. * - * @return char*: Pointer null terminated array of chars in ISO time. - */ -char* psTimeToISO( + * @return psString: Pointer null terminated array of chars in ISO time. + */ +psString psTimeToISO( const psTime* time ///< Input time to be converted. ); @@ -268,5 +268,5 @@ */ psTime* psTimeFromISO( - const char* time ///< Input time to be converted. + const char* input ///< Input time to be converted. ); @@ -278,5 +278,5 @@ */ psTime* psTimeFromTimeval( - const struct timeval *time ///< Input time to be converted. + const struct timeval *input ///< Input time to be converted. ); @@ -296,5 +296,5 @@ * Converts UTC time to psTime. It will verify if time specified is a leapsecond. * - * @return psTime*: time (UTC) + * @return psTime*: time (UTC)time */ psTime* psTimeFromUTC( Index: /trunk/psLib/src/collections/psMetadataIO.c =================================================================== --- /trunk/psLib/src/collections/psMetadataIO.c (revision 4408) +++ /trunk/psLib/src/collections/psMetadataIO.c (revision 4409) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-27 20:38:12 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1075,5 +1075,5 @@ } -psMetadata* psMetadataConfigParse(psMetadata* md, int *nFail, const char *fileName, bool overwrite) +psMetadata* psMetadataConfigParse(psMetadata* md, unsigned int *nFail, const char *fileName, bool overwrite) { FILE* fp = NULL; Index: /trunk/psLib/src/collections/psMetadataIO.h =================================================================== --- /trunk/psLib/src/collections/psMetadataIO.h (revision 4408) +++ /trunk/psLib/src/collections/psMetadataIO.h (revision 4409) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-27 20:38:12 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -81,5 +81,5 @@ psMetadata* psMetadataConfigParse( psMetadata* md, ///< Resulting metadata from read. - int *nFail, ///< Number of failed lines. + unsigned int *nFail, ///< Number of failed lines. const char *fileName, ///< Name of file to read. bool overwrite ///< Allow overwrite of duplicate specifications. Index: /trunk/psLib/src/collections/psScalar.c =================================================================== --- /trunk/psLib/src/collections/psScalar.c (revision 4408) +++ /trunk/psLib/src/collections/psScalar.c (revision 4409) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ #include "psCollectionsErrors.h" -psScalar* psScalarAlloc(psC64 value, psElemType dataType) +psScalar* psScalarAlloc(complex value, psElemType type) { psScalar* scalar = NULL; @@ -30,7 +30,7 @@ scalar->type.dimen = PS_DIMEN_SCALAR; - scalar->type.type = dataType; + scalar->type.type = type; - switch (dataType) { + switch (type) { case PS_TYPE_S8: scalar->data.S8 = (psS8) value; @@ -72,5 +72,5 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE, - dataType); + type); psFree(scalar); return NULL; Index: /trunk/psLib/src/collections/psScalar.h =================================================================== --- /trunk/psLib/src/collections/psScalar.h (revision 4408) +++ /trunk/psLib/src/collections/psScalar.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -66,6 +66,6 @@ */ psScalar* psScalarAlloc( - psC64 value, ///< Data to be put into psScalar. - psElemType dataType ///< Type of data to be held by psScalar. + complex value, ///< Data to be put into psScalar. + psElemType type ///< Type of data to be held by psScalar. ); Index: /trunk/psLib/src/collections/psVector.c =================================================================== --- /trunk/psLib/src/collections/psVector.c (revision 4408) +++ /trunk/psLib/src/collections/psVector.c (revision 4409) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -48,13 +48,13 @@ // FUNCTION IMPLEMENTATION - PUBLIC -psVector* psVectorAlloc(psU32 nalloc, psElemType elemType) +psVector* psVectorAlloc(unsigned long nalloc, psElemType type) { psVector* psVec = NULL; psS32 elementSize = 0; - elementSize = PSELEMTYPE_SIZEOF(elemType); + elementSize = PSELEMTYPE_SIZEOF(type); if (elementSize < 1) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, elemType); + PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, type); return NULL; } @@ -66,5 +66,5 @@ psVec->type.dimen = PS_DIMEN_VECTOR; - psVec->type.type = elemType; + psVec->type.type = type; *(int*)&psVec->nalloc = nalloc; psVec->n = nalloc; @@ -76,38 +76,38 @@ } -psVector* psVectorRealloc(psVector* in, psU32 nalloc) +psVector* psVectorRealloc(psVector* vector, unsigned long nalloc) { psS32 elementSize = 0; psElemType elemType; - if (in == NULL) { + if (vector == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_REALLOC_NULL); return NULL; - } else if (in->nalloc != nalloc) { // No need to realloc to same size - elemType = in->type.type; + } else if (vector->nalloc != nalloc) { // No need to realloc to same size + elemType = vector->type.type; elementSize = PSELEMTYPE_SIZEOF(elemType); - if (nalloc < in->n) { - in->n = nalloc; + if (nalloc < vector->n) { + vector->n = nalloc; } // Realloc after decrementation to avoid accessing freed array elements - in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize); - *(int*)&in->nalloc = nalloc; - } - - return in; -} - -psVector* psVectorRecycle(psVector* in, psU32 n, psElemType type) + vector->data.U8 = psRealloc(vector->data.U8, nalloc * elementSize); + *(int*)&vector->nalloc = nalloc; + } + + return vector; +} + +psVector* psVectorRecycle(psVector* vector, unsigned long nalloc, psElemType type) { psS32 byteSize; - if (in == NULL) { - return psVectorAlloc(n, type); - } - - if (in->type.dimen != PS_DIMEN_VECTOR && - in->type.dimen != PS_DIMEN_TRANSV) { - psFree(in); + if (vector == NULL) { + return psVectorAlloc(nalloc, type); + } + + if (vector->type.dimen != PS_DIMEN_VECTOR && + vector->type.dimen != PS_DIMEN_TRANSV) { + psFree(vector); psError(PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_psVector_NOT_A_VECTOR); @@ -115,16 +115,16 @@ } - byteSize = n * PSELEMTYPE_SIZEOF(type); + byteSize = nalloc * PSELEMTYPE_SIZEOF(type); // need to increase data buffer? - if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) { - in->data.U8 = psRealloc(in->data.U8, byteSize); - *(int*)&in->nalloc = n; - } - - in->type.dimen = PS_DIMEN_VECTOR; - in->type.type = type; - in->n = n; - return in; + if (byteSize > vector->nalloc*PSELEMTYPE_SIZEOF(vector->type.type)) { + vector->data.U8 = psRealloc(vector->data.U8, byteSize); + *(int*)&vector->nalloc = nalloc; + } + + vector->type.dimen = PS_DIMEN_VECTOR; + vector->type.type = type; + vector->n = nalloc; + return vector; } Index: /trunk/psLib/src/collections/psVector.h =================================================================== --- /trunk/psLib/src/collections/psVector.h (revision 4408) +++ /trunk/psLib/src/collections/psVector.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,17 +29,18 @@ ///< Union of psVector data types. typedef union { - psU8* U8; ///< Unsigned 8-bit integer data. - psU16* U16; ///< Unsigned 16-bit integer data. - psU32* U32; ///< Unsigned 32-bit integer data. - psU64* U64; ///< Unsigned 64-bit integer data. - psS8* S8; ///< Signed 8-bit integer data. - psS16* S16; ///< Signed 16-bit integer data. - psS32* S32; ///< Signed 32-bit integer data. - psS64* S64; ///< Signed 64-bit integer data. - psF32* F32; ///< Single-precision float data. - psF64* F64; ///< Double-precision float data. - psC32* C32; ///< Single-precision complex data. - psC64* C64; ///< Double-precision complex data. -} p_psVectorData; + psU8* U8; ///< Unsigned 8-bit integer data. + psU16* U16; ///< Unsigned 16-bit integer data. + psU32* U32; ///< Unsigned 32-bit integer data. + psU64* U64; ///< Unsigned 64-bit integer data. + psS8* S8; ///< Signed 8-bit integer data. + psS16* S16; ///< Signed 16-bit integer data. + psS32* S32; ///< Signed 32-bit integer data. + psS64* S64; ///< Signed 64-bit integer data. + psF32* F32; ///< Single-precision float data. + psF64* F64; ///< Double-precision float data. + psC32* C32; ///< Single-precision complex data. + psC64* C64; ///< Double-precision complex data. +} +p_psVectorData; /** An vector to support primitive types. @@ -50,8 +51,8 @@ typedef struct { - psType type; ///< Type of data. - int n; ///< Number of elements in use. - const int nalloc; ///< Total number of elements available. - p_psVectorData data; ///< Union for data types. + psType type; ///< Type of data. + int n; ///< Number of elements in use. + const int nalloc; ///< Total number of elements available. + p_psVectorData data; ///< Union for data types. } psVector; @@ -72,6 +73,6 @@ */ psVector* psVectorAlloc( - psU32 nalloc, ///< Total number of elements to make available. - psElemType dataType ///< Type of data to be held by vector. + unsigned long nalloc, ///< Total number of elements to make available. + psElemType type ///< Type of data to be held by vector. ); @@ -86,6 +87,6 @@ */ psVector* psVectorRealloc( - psVector* psVec, ///< Vector to reallocate. - psU32 nalloc ///< Total number of elements to make available. + psVector* vector, ///< Vector to reallocate. + unsigned long nalloc ///< Total number of elements to make available. ); @@ -115,9 +116,9 @@ */ psVector* psVectorRecycle( - psVector* psVec, + psVector* vector, ///< Vector to recycle. If NULL, a new vector is created. No effort ///< taken to preserve the values. - psU32 nalloc, ///< Total number of elements to make available. + unsigned long nalloc, ///< Total number of elements to make available. psElemType type ///< the datatype of the returned vector ); Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 4408) +++ /trunk/psLib/src/dataManip/psStats.c (revision 4409) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.135 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.136 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1987,8 +1987,8 @@ *****************************************************************************/ psHistogram* psVectorHistogram(psHistogram* out, - const psVector* in, + const psVector* values, const psVector* errors, const psVector* mask, - psU32 maskVal) + psMaskType maskVal) { PS_ASSERT_PTR_NON_NULL(out, NULL); @@ -1999,12 +1999,12 @@ PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, NULL); PS_ASSERT_INT_NONNEGATIVE(out->nums->n, NULL); - PS_ASSERT_VECTOR_NON_NULL(in, out); + PS_ASSERT_VECTOR_NON_NULL(values, out); if (mask != NULL) { - PS_ASSERT_VECTORS_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, NULL); PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, NULL); } if (errors != NULL) { - PS_ASSERT_VECTORS_SIZE_EQUAL(in, errors, NULL); - PS_ASSERT_VECTOR_TYPE(errors, in->type.type, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(values, errors, NULL); + PS_ASSERT_VECTOR_TYPE(errors, values->type.type, NULL); } @@ -2021,7 +2021,7 @@ // Convert input and errors vectors to F32 if necessary. - inF32 = p_psConvertToF32((psVector *) in); + inF32 = p_psConvertToF32((psVector *) values); if (inF32 == NULL) { - inF32 = (psVector *) in; + inF32 = (psVector *) values; mustFreeVectorIn = 0; } @@ -2187,5 +2187,5 @@ const psVector* errors, const psVector* mask, - psU32 maskVal) + psMaskType maskVal) { PS_ASSERT_PTR_NON_NULL(stats, NULL); Index: /trunk/psLib/src/dataManip/psStats.h =================================================================== --- /trunk/psLib/src/dataManip/psStats.h (revision 4408) +++ /trunk/psLib/src/dataManip/psStats.h (revision 4409) @@ -14,6 +14,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -94,5 +94,5 @@ const psVector* errors, ///< Errors. const psVector* mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL - psU32 maskVal ///< Only mask elements with one of these bits set in maskVector + psMaskType maskVal ///< Only mask elements with one of these bits set in maskVector ); @@ -160,8 +160,8 @@ psHistogram* psVectorHistogram( psHistogram* out, ///< Histogram data - const psVector* in, ///< Vector to analyse + const psVector* values, ///< Vector to analyse const psVector* errors, ///< Errors const psVector* mask, ///< Mask dat for input vector - psU32 maskVal ///< Mask value + psMaskType maskVal ///< Mask value ); Index: /trunk/psLib/src/dataManip/psUnaryOp.c =================================================================== --- /trunk/psLib/src/dataManip/psUnaryOp.c (revision 4408) +++ /trunk/psLib/src/dataManip/psUnaryOp.c (revision 4409) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -304,5 +304,5 @@ } -psPtr psUnaryOp(psPtr out, psPtr in, char *op) +psPtr psUnaryOp(psPtr out, const psPtr in, const char *op) { #define psUnaryOp_EXIT { \ Index: /trunk/psLib/src/dataManip/psUnaryOp.h =================================================================== --- /trunk/psLib/src/dataManip/psUnaryOp.h (revision 4408) +++ /trunk/psLib/src/dataManip/psUnaryOp.h (revision 4409) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -61,6 +61,6 @@ psType* psUnaryOp( psPtr out, ///< Output type, either psImage or psVector. - psPtr in, ///< Input, either psImage or psVector. - char *op ///< Operator. + const psPtr in, ///< Input, either psImage or psVector. + const char *op ///< Operator. ); Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 4408) +++ /trunk/psLib/src/image/psImage.c (revision 4409) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.71 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.72 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -137,5 +137,5 @@ } -char* psRegionToString(psRegion region) +psString psRegionToString(const psRegion region) { char tmpText[256]; // big enough to store any region as text Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 4408) +++ /trunk/psLib/src/image/psImage.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -132,9 +132,9 @@ /** Create a string of the standard IRAF form '[x0:x1,y0:y1]' from a psRegion. * - * @return char*: A new string representing the psRegion as text, or NULL + * @return psString: A new string representing the psRegion as text, or NULL * is not successful. */ -char* psRegionToString( - psRegion region ///< the psRegion to convert to a string +psString psRegionToString( + const psRegion region ///< the psRegion to convert to a string ); Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 4408) +++ /trunk/psLib/src/math/psStats.c (revision 4409) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.135 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.136 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1987,8 +1987,8 @@ *****************************************************************************/ psHistogram* psVectorHistogram(psHistogram* out, - const psVector* in, + const psVector* values, const psVector* errors, const psVector* mask, - psU32 maskVal) + psMaskType maskVal) { PS_ASSERT_PTR_NON_NULL(out, NULL); @@ -1999,12 +1999,12 @@ PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, NULL); PS_ASSERT_INT_NONNEGATIVE(out->nums->n, NULL); - PS_ASSERT_VECTOR_NON_NULL(in, out); + PS_ASSERT_VECTOR_NON_NULL(values, out); if (mask != NULL) { - PS_ASSERT_VECTORS_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, NULL); PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, NULL); } if (errors != NULL) { - PS_ASSERT_VECTORS_SIZE_EQUAL(in, errors, NULL); - PS_ASSERT_VECTOR_TYPE(errors, in->type.type, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(values, errors, NULL); + PS_ASSERT_VECTOR_TYPE(errors, values->type.type, NULL); } @@ -2021,7 +2021,7 @@ // Convert input and errors vectors to F32 if necessary. - inF32 = p_psConvertToF32((psVector *) in); + inF32 = p_psConvertToF32((psVector *) values); if (inF32 == NULL) { - inF32 = (psVector *) in; + inF32 = (psVector *) values; mustFreeVectorIn = 0; } @@ -2187,5 +2187,5 @@ const psVector* errors, const psVector* mask, - psU32 maskVal) + psMaskType maskVal) { PS_ASSERT_PTR_NON_NULL(stats, NULL); Index: /trunk/psLib/src/math/psStats.h =================================================================== --- /trunk/psLib/src/math/psStats.h (revision 4408) +++ /trunk/psLib/src/math/psStats.h (revision 4409) @@ -14,6 +14,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -94,5 +94,5 @@ const psVector* errors, ///< Errors. const psVector* mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL - psU32 maskVal ///< Only mask elements with one of these bits set in maskVector + psMaskType maskVal ///< Only mask elements with one of these bits set in maskVector ); @@ -160,8 +160,8 @@ psHistogram* psVectorHistogram( psHistogram* out, ///< Histogram data - const psVector* in, ///< Vector to analyse + const psVector* values, ///< Vector to analyse const psVector* errors, ///< Errors const psVector* mask, ///< Mask dat for input vector - psU32 maskVal ///< Mask value + psMaskType maskVal ///< Mask value ); Index: /trunk/psLib/src/math/psUnaryOp.c =================================================================== --- /trunk/psLib/src/math/psUnaryOp.c (revision 4408) +++ /trunk/psLib/src/math/psUnaryOp.c (revision 4409) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -304,5 +304,5 @@ } -psPtr psUnaryOp(psPtr out, psPtr in, char *op) +psPtr psUnaryOp(psPtr out, const psPtr in, const char *op) { #define psUnaryOp_EXIT { \ Index: /trunk/psLib/src/math/psUnaryOp.h =================================================================== --- /trunk/psLib/src/math/psUnaryOp.h (revision 4408) +++ /trunk/psLib/src/math/psUnaryOp.h (revision 4409) @@ -30,6 +30,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -61,6 +61,6 @@ psType* psUnaryOp( psPtr out, ///< Output type, either psImage or psVector. - psPtr in, ///< Input, either psImage or psVector. - char *op ///< Operator. + const psPtr in, ///< Input, either psImage or psVector. + const char *op ///< Operator. ); Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 4408) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 4409) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.71 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.72 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -137,5 +137,5 @@ } -char* psRegionToString(psRegion region) +psString psRegionToString(const psRegion region) { char tmpText[256]; // big enough to store any region as text Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 4408) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -132,9 +132,9 @@ /** Create a string of the standard IRAF form '[x0:x1,y0:y1]' from a psRegion. * - * @return char*: A new string representing the psRegion as text, or NULL + * @return psString: A new string representing the psRegion as text, or NULL * is not successful. */ -char* psRegionToString( - psRegion region ///< the psRegion to convert to a string +psString psRegionToString( + const psRegion region ///< the psRegion to convert to a string ); Index: /trunk/psLib/src/mathtypes/psScalar.c =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.c (revision 4408) +++ /trunk/psLib/src/mathtypes/psScalar.c (revision 4409) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ #include "psCollectionsErrors.h" -psScalar* psScalarAlloc(psC64 value, psElemType dataType) +psScalar* psScalarAlloc(complex value, psElemType type) { psScalar* scalar = NULL; @@ -30,7 +30,7 @@ scalar->type.dimen = PS_DIMEN_SCALAR; - scalar->type.type = dataType; + scalar->type.type = type; - switch (dataType) { + switch (type) { case PS_TYPE_S8: scalar->data.S8 = (psS8) value; @@ -72,5 +72,5 @@ psError(PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE, - dataType); + type); psFree(scalar); return NULL; Index: /trunk/psLib/src/mathtypes/psScalar.h =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.h (revision 4408) +++ /trunk/psLib/src/mathtypes/psScalar.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -66,6 +66,6 @@ */ psScalar* psScalarAlloc( - psC64 value, ///< Data to be put into psScalar. - psElemType dataType ///< Type of data to be held by psScalar. + complex value, ///< Data to be put into psScalar. + psElemType type ///< Type of data to be held by psScalar. ); Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 4408) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 4409) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -48,13 +48,13 @@ // FUNCTION IMPLEMENTATION - PUBLIC -psVector* psVectorAlloc(psU32 nalloc, psElemType elemType) +psVector* psVectorAlloc(unsigned long nalloc, psElemType type) { psVector* psVec = NULL; psS32 elementSize = 0; - elementSize = PSELEMTYPE_SIZEOF(elemType); + elementSize = PSELEMTYPE_SIZEOF(type); if (elementSize < 1) { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, elemType); + PS_ERRORTEXT_psVector_UNSUPPORTED_TYPE, type); return NULL; } @@ -66,5 +66,5 @@ psVec->type.dimen = PS_DIMEN_VECTOR; - psVec->type.type = elemType; + psVec->type.type = type; *(int*)&psVec->nalloc = nalloc; psVec->n = nalloc; @@ -76,38 +76,38 @@ } -psVector* psVectorRealloc(psVector* in, psU32 nalloc) +psVector* psVectorRealloc(psVector* vector, unsigned long nalloc) { psS32 elementSize = 0; psElemType elemType; - if (in == NULL) { + if (vector == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psVector_REALLOC_NULL); return NULL; - } else if (in->nalloc != nalloc) { // No need to realloc to same size - elemType = in->type.type; + } else if (vector->nalloc != nalloc) { // No need to realloc to same size + elemType = vector->type.type; elementSize = PSELEMTYPE_SIZEOF(elemType); - if (nalloc < in->n) { - in->n = nalloc; + if (nalloc < vector->n) { + vector->n = nalloc; } // Realloc after decrementation to avoid accessing freed array elements - in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize); - *(int*)&in->nalloc = nalloc; - } - - return in; -} - -psVector* psVectorRecycle(psVector* in, psU32 n, psElemType type) + vector->data.U8 = psRealloc(vector->data.U8, nalloc * elementSize); + *(int*)&vector->nalloc = nalloc; + } + + return vector; +} + +psVector* psVectorRecycle(psVector* vector, unsigned long nalloc, psElemType type) { psS32 byteSize; - if (in == NULL) { - return psVectorAlloc(n, type); - } - - if (in->type.dimen != PS_DIMEN_VECTOR && - in->type.dimen != PS_DIMEN_TRANSV) { - psFree(in); + if (vector == NULL) { + return psVectorAlloc(nalloc, type); + } + + if (vector->type.dimen != PS_DIMEN_VECTOR && + vector->type.dimen != PS_DIMEN_TRANSV) { + psFree(vector); psError(PS_ERR_BAD_PARAMETER_TYPE, true, PS_ERRORTEXT_psVector_NOT_A_VECTOR); @@ -115,16 +115,16 @@ } - byteSize = n * PSELEMTYPE_SIZEOF(type); + byteSize = nalloc * PSELEMTYPE_SIZEOF(type); // need to increase data buffer? - if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) { - in->data.U8 = psRealloc(in->data.U8, byteSize); - *(int*)&in->nalloc = n; - } - - in->type.dimen = PS_DIMEN_VECTOR; - in->type.type = type; - in->n = n; - return in; + if (byteSize > vector->nalloc*PSELEMTYPE_SIZEOF(vector->type.type)) { + vector->data.U8 = psRealloc(vector->data.U8, byteSize); + *(int*)&vector->nalloc = nalloc; + } + + vector->type.dimen = PS_DIMEN_VECTOR; + vector->type.type = type; + vector->n = nalloc; + return vector; } Index: /trunk/psLib/src/mathtypes/psVector.h =================================================================== --- /trunk/psLib/src/mathtypes/psVector.h (revision 4408) +++ /trunk/psLib/src/mathtypes/psVector.h (revision 4409) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -29,17 +29,18 @@ ///< Union of psVector data types. typedef union { - psU8* U8; ///< Unsigned 8-bit integer data. - psU16* U16; ///< Unsigned 16-bit integer data. - psU32* U32; ///< Unsigned 32-bit integer data. - psU64* U64; ///< Unsigned 64-bit integer data. - psS8* S8; ///< Signed 8-bit integer data. - psS16* S16; ///< Signed 16-bit integer data. - psS32* S32; ///< Signed 32-bit integer data. - psS64* S64; ///< Signed 64-bit integer data. - psF32* F32; ///< Single-precision float data. - psF64* F64; ///< Double-precision float data. - psC32* C32; ///< Single-precision complex data. - psC64* C64; ///< Double-precision complex data. -} p_psVectorData; + psU8* U8; ///< Unsigned 8-bit integer data. + psU16* U16; ///< Unsigned 16-bit integer data. + psU32* U32; ///< Unsigned 32-bit integer data. + psU64* U64; ///< Unsigned 64-bit integer data. + psS8* S8; ///< Signed 8-bit integer data. + psS16* S16; ///< Signed 16-bit integer data. + psS32* S32; ///< Signed 32-bit integer data. + psS64* S64; ///< Signed 64-bit integer data. + psF32* F32; ///< Single-precision float data. + psF64* F64; ///< Double-precision float data. + psC32* C32; ///< Single-precision complex data. + psC64* C64; ///< Double-precision complex data. +} +p_psVectorData; /** An vector to support primitive types. @@ -50,8 +51,8 @@ typedef struct { - psType type; ///< Type of data. - int n; ///< Number of elements in use. - const int nalloc; ///< Total number of elements available. - p_psVectorData data; ///< Union for data types. + psType type; ///< Type of data. + int n; ///< Number of elements in use. + const int nalloc; ///< Total number of elements available. + p_psVectorData data; ///< Union for data types. } psVector; @@ -72,6 +73,6 @@ */ psVector* psVectorAlloc( - psU32 nalloc, ///< Total number of elements to make available. - psElemType dataType ///< Type of data to be held by vector. + unsigned long nalloc, ///< Total number of elements to make available. + psElemType type ///< Type of data to be held by vector. ); @@ -86,6 +87,6 @@ */ psVector* psVectorRealloc( - psVector* psVec, ///< Vector to reallocate. - psU32 nalloc ///< Total number of elements to make available. + psVector* vector, ///< Vector to reallocate. + unsigned long nalloc ///< Total number of elements to make available. ); @@ -115,9 +116,9 @@ */ psVector* psVectorRecycle( - psVector* psVec, + psVector* vector, ///< Vector to recycle. If NULL, a new vector is created. No effort ///< taken to preserve the values. - psU32 nalloc, ///< Total number of elements to make available. + unsigned long nalloc, ///< Total number of elements to make available. psElemType type ///< the datatype of the returned vector ); Index: /trunk/psLib/src/sys/psString.c =================================================================== --- /trunk/psLib/src/sys/psString.c (revision 4408) +++ /trunk/psLib/src/sys/psString.c (revision 4409) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-20 01:41:17 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,13 +26,13 @@ #include "psSysUtilsErrors.h" -char *psStringCopy(const char *str) +psString psStringCopy(const char *string) { // Allocate memory using psAlloc function // Copy input string to memory just allocated // Return the copy - return strcpy(psAlloc(strlen(str) + 1), str); + return strcpy(psAlloc(strlen(string) + 1), string); } -char *psStringNCopy(const char *str, psS32 nChar) +psString psStringNCopy(const char *string, int nChar) { char *returnValue = NULL; @@ -49,5 +49,5 @@ // Copy input string to memory allocated up to nChar characters // Return the copy - returnValue = strncpy(psAlloc((size_t) nChar + 1), str, (size_t) nChar); + returnValue = strncpy(psAlloc((size_t) nChar + 1), string, (size_t) nChar); // Ensure the last byte is NULL character Index: /trunk/psLib/src/sys/psString.h =================================================================== --- /trunk/psLib/src/sys/psString.h (revision 4408) +++ /trunk/psLib/src/sys/psString.h (revision 4409) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,10 +39,9 @@ * plus one and copy the input string to the newly allocated memory. * - * @return char* Copy of input string + * @return psString: Copy of input string * */ -char *psStringCopy( - const char *str - /**< Input string of characters to copy */ +psString psStringCopy( + const char *string ///< Input string of characters to copy ); @@ -57,5 +56,5 @@ * be set to NULL. * - * @return char* Copy of input string + * @return psString: Copy of input string * */ @@ -63,10 +62,7 @@ /*@null@*/ -char *psStringNCopy( - const char *str, - /**< Input string of characters to copy */ - - psS32 nChar - /**< Number of bytes to allocate for string copy */ +psString psStringNCopy( + const char *string, ///< Input string of characters to copy + int nChar ///< Number of bytes to allocate for string copy ); Index: /trunk/psLib/src/sys/psTrace.c =================================================================== --- /trunk/psLib/src/sys/psTrace.c (revision 4408) +++ /trunk/psLib/src/sys/psTrace.c (revision 4409) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,10 +57,10 @@ static void componentFree(p_psComponent* comp); -static p_psComponent* componentAlloc(const char *name, psS32 level); +static p_psComponent* componentAlloc(const char *name, int level); /***************************************************************************** componentAlloc(): allocate memory for a new node, and initialize members. *****************************************************************************/ -static p_psComponent* componentAlloc(const char *name, psS32 level) +static p_psComponent* componentAlloc(const char *name, int level) { p_psComponent* comp = psAlloc(sizeof(p_psComponent)); @@ -245,5 +245,5 @@ *****************************************************************************/ psBool psTraceSetLevel(const char *comp, // component of interest - psS32 level) // desired trace level + int level) // desired trace level { char *compName = NULL; @@ -487,6 +487,6 @@ *****************************************************************************/ void p_psTrace(const char *comp, // component being traced - psS32 level, // desired trace level - ...) // arguments + int level, // desired trace level + ...) // arguments { char *fmt = NULL; Index: /trunk/psLib/src/sys/psTrace.h =================================================================== --- /trunk/psLib/src/sys/psTrace.h (revision 4408) +++ /trunk/psLib/src/sys/psTrace.h (revision 4409) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -60,14 +60,17 @@ #ifdef DOXYGEN -void psTrace(const char *facil, ///< facilty of interest - psS32 myLevel, ///< desired trace level - ...) ///< trace message arguments -; +void psTrace( + const char *facil, ///< facilty of interest + int level, ///< desired trace level + ... ///< trace message arguments +); + #else /// Send a trace message -void p_psTrace(const char *facil, ///< facilty of interest - psS32 myLevel, ///< desired trace level - ...) ///< trace message arguments -; +void p_psTrace( + const char *facil, ///< facilty of interest + psS32 myLevel, ///< desired trace level + ... ///< trace message arguments +); #ifndef SWIG @@ -78,7 +81,8 @@ /// Set trace level -psBool psTraceSetLevel(const char *facil, ///< facilty of interest - psS32 level) ///< desired trace level -; +psBool psTraceSetLevel( + const char *facil, ///< facilty of interest + int level ///< desired trace level +); /// Get the trace level @@ -94,5 +98,7 @@ /// Set the destination of future trace messages. -void psTraceSetDestination(FILE * fp); +void psTraceSetDestination( + FILE * fp ///< +); /// Get the current destination for trace messages. Index: /trunk/psLib/src/sysUtils/psString.c =================================================================== --- /trunk/psLib/src/sysUtils/psString.c (revision 4408) +++ /trunk/psLib/src/sysUtils/psString.c (revision 4409) @@ -12,6 +12,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-20 01:41:17 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,13 +26,13 @@ #include "psSysUtilsErrors.h" -char *psStringCopy(const char *str) +psString psStringCopy(const char *string) { // Allocate memory using psAlloc function // Copy input string to memory just allocated // Return the copy - return strcpy(psAlloc(strlen(str) + 1), str); + return strcpy(psAlloc(strlen(string) + 1), string); } -char *psStringNCopy(const char *str, psS32 nChar) +psString psStringNCopy(const char *string, int nChar) { char *returnValue = NULL; @@ -49,5 +49,5 @@ // Copy input string to memory allocated up to nChar characters // Return the copy - returnValue = strncpy(psAlloc((size_t) nChar + 1), str, (size_t) nChar); + returnValue = strncpy(psAlloc((size_t) nChar + 1), string, (size_t) nChar); // Ensure the last byte is NULL character Index: /trunk/psLib/src/sysUtils/psString.h =================================================================== --- /trunk/psLib/src/sysUtils/psString.h (revision 4408) +++ /trunk/psLib/src/sysUtils/psString.h (revision 4409) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,10 +39,9 @@ * plus one and copy the input string to the newly allocated memory. * - * @return char* Copy of input string + * @return psString: Copy of input string * */ -char *psStringCopy( - const char *str - /**< Input string of characters to copy */ +psString psStringCopy( + const char *string ///< Input string of characters to copy ); @@ -57,5 +56,5 @@ * be set to NULL. * - * @return char* Copy of input string + * @return psString: Copy of input string * */ @@ -63,10 +62,7 @@ /*@null@*/ -char *psStringNCopy( - const char *str, - /**< Input string of characters to copy */ - - psS32 nChar - /**< Number of bytes to allocate for string copy */ +psString psStringNCopy( + const char *string, ///< Input string of characters to copy + int nChar ///< Number of bytes to allocate for string copy ); Index: /trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.c (revision 4408) +++ /trunk/psLib/src/sysUtils/psTrace.c (revision 4409) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.53 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,10 +57,10 @@ static void componentFree(p_psComponent* comp); -static p_psComponent* componentAlloc(const char *name, psS32 level); +static p_psComponent* componentAlloc(const char *name, int level); /***************************************************************************** componentAlloc(): allocate memory for a new node, and initialize members. *****************************************************************************/ -static p_psComponent* componentAlloc(const char *name, psS32 level) +static p_psComponent* componentAlloc(const char *name, int level) { p_psComponent* comp = psAlloc(sizeof(p_psComponent)); @@ -245,5 +245,5 @@ *****************************************************************************/ psBool psTraceSetLevel(const char *comp, // component of interest - psS32 level) // desired trace level + int level) // desired trace level { char *compName = NULL; @@ -487,6 +487,6 @@ *****************************************************************************/ void p_psTrace(const char *comp, // component being traced - psS32 level, // desired trace level - ...) // arguments + int level, // desired trace level + ...) // arguments { char *fmt = NULL; Index: /trunk/psLib/src/sysUtils/psTrace.h =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.h (revision 4408) +++ /trunk/psLib/src/sysUtils/psTrace.h (revision 4409) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-21 03:01:37 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -60,14 +60,17 @@ #ifdef DOXYGEN -void psTrace(const char *facil, ///< facilty of interest - psS32 myLevel, ///< desired trace level - ...) ///< trace message arguments -; +void psTrace( + const char *facil, ///< facilty of interest + int level, ///< desired trace level + ... ///< trace message arguments +); + #else /// Send a trace message -void p_psTrace(const char *facil, ///< facilty of interest - psS32 myLevel, ///< desired trace level - ...) ///< trace message arguments -; +void p_psTrace( + const char *facil, ///< facilty of interest + psS32 myLevel, ///< desired trace level + ... ///< trace message arguments +); #ifndef SWIG @@ -78,7 +81,8 @@ /// Set trace level -psBool psTraceSetLevel(const char *facil, ///< facilty of interest - psS32 level) ///< desired trace level -; +psBool psTraceSetLevel( + const char *facil, ///< facilty of interest + int level ///< desired trace level +); /// Get the trace level @@ -94,5 +98,7 @@ /// Set the destination of future trace messages. -void psTraceSetDestination(FILE * fp); +void psTraceSetDestination( + FILE * fp ///< +); /// Get the current destination for trace messages. Index: /trunk/psLib/src/types/psMetadataConfig.c =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.c (revision 4408) +++ /trunk/psLib/src/types/psMetadataConfig.c (revision 4409) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-27 20:38:12 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1075,5 +1075,5 @@ } -psMetadata* psMetadataConfigParse(psMetadata* md, int *nFail, const char *fileName, bool overwrite) +psMetadata* psMetadataConfigParse(psMetadata* md, unsigned int *nFail, const char *fileName, bool overwrite) { FILE* fp = NULL; Index: /trunk/psLib/src/types/psMetadataConfig.h =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.h (revision 4408) +++ /trunk/psLib/src/types/psMetadataConfig.h (revision 4409) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-27 20:38:12 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -81,5 +81,5 @@ psMetadata* psMetadataConfigParse( psMetadata* md, ///< Resulting metadata from read. - int *nFail, ///< Number of failed lines. + unsigned int *nFail, ///< Number of failed lines. const char *fileName, ///< Name of file to read. bool overwrite ///< Allow overwrite of duplicate specifications. Index: /trunk/psLib/src/xml/psXML.c =================================================================== --- /trunk/psLib/src/xml/psXML.c (revision 4408) +++ /trunk/psLib/src/xml/psXML.c (revision 4409) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-27 20:38:12 $ +* @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1075,5 +1075,5 @@ } -psMetadata* psMetadataConfigParse(psMetadata* md, int *nFail, const char *fileName, bool overwrite) +psMetadata* psMetadataConfigParse(psMetadata* md, unsigned int *nFail, const char *fileName, bool overwrite) { FILE* fp = NULL; Index: /trunk/psLib/src/xml/psXML.h =================================================================== --- /trunk/psLib/src/xml/psXML.h (revision 4408) +++ /trunk/psLib/src/xml/psXML.h (revision 4409) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-27 20:38:12 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-28 20:17:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -81,5 +81,5 @@ psMetadata* psMetadataConfigParse( psMetadata* md, ///< Resulting metadata from read. - int *nFail, ///< Number of failed lines. + unsigned int *nFail, ///< Number of failed lines. const char *fileName, ///< Name of file to read. bool overwrite ///< Allow overwrite of duplicate specifications. Index: /trunk/psLib/test/astronomy/verified/tst_psTime_01.stderr =================================================================== --- /trunk/psLib/test/astronomy/verified/tst_psTime_01.stderr (revision 4408) +++ /trunk/psLib/test/astronomy/verified/tst_psTime_01.stderr (revision 4409) @@ -169,5 +169,5 @@ Following should generate error message for NULL ISO string