Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 4525) +++ /trunk/psLib/pslib.kdevses (revision 4526) @@ -3,18 +3,18 @@ - - + + - - + + - - + + - - + + - - + + Index: /trunk/psLib/src/dataIO/psDB.h =================================================================== --- /trunk/psLib/src/dataIO/psDB.h (revision 4525) +++ /trunk/psLib/src/dataIO/psDB.h (revision 4526) @@ -10,6 +10,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-29 19:43:55 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-09 01:24:30 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -34,5 +34,5 @@ typedef struct { - void* mysql; ///< MySQL database handle + void* mysql; ///< MySQL database handle } psDB; @@ -44,8 +44,8 @@ */ psDB *psDBInit( - const char *host, ///< Database server hostname - const char *user, ///< Database username - const char *passwd, ///< Database password - const char *dbname ///< Database namespace + const char *host, ///< Database server hostname + const char *user, ///< Database username + const char *passwd, ///< Database password + const char *dbname ///< Database namespace ); @@ -53,5 +53,5 @@ */ void psDBCleanup( - psDB *dbh ///< Database handle + psDB *dbh ///< Database handle ); @@ -61,6 +61,6 @@ */ bool psDBCreate( - psDB *dbh, ///< Database handle - const char *dbname ///< New database namespace + psDB *dbh, ///< Database handle + const char *dbname ///< New database namespace ); @@ -70,6 +70,6 @@ */ bool psDBChange( - psDB *dbh, ///< Database handle - const char *dbname ///< Database namespace + psDB *dbh, ///< Database handle + const char *dbname ///< Database namespace ); @@ -79,6 +79,6 @@ */ bool psDBDrop( - psDB *dbh, ///< Database handle - const char *dbname ///< Database namespace + psDB *dbh, ///< Database handle + const char *dbname ///< Database namespace ); @@ -92,6 +92,6 @@ */ bool p_psDBRunQuery( - psDB *dbh, ///< Database handle - const char *format ///< SQL string to execute + psDB *dbh, ///< Database handle + const char *format ///< SQL string to execute ); @@ -117,7 +117,7 @@ */ bool psDBCreateTable( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *md ///< Column names, types, and indexes + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *md ///< Column names, types, and indexes ); @@ -140,8 +140,8 @@ */ psArray *psDBSelectColumn( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const char *col, ///< Column name - unsigned long long limit ///< Maximum number of elements to return + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const char *col, ///< Column name + unsigned long long limit ///< Maximum number of elements to return ); @@ -155,9 +155,9 @@ */ psVector *psDBSelectColumnNum( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const char *col, ///< Column name + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const char *col, ///< Column name psElemType type, ///< Resulting psVector type - unsigned long long limit ///< Maximum number of elements to return + unsigned long long limit ///< Maximum number of elements to return ); @@ -177,8 +177,8 @@ */ psArray *psDBSelectRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of elements to return + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of elements to return ); @@ -195,7 +195,7 @@ */ bool psDBInsertOneRow( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *row ///< Row description + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *row ///< Row description ); @@ -210,7 +210,7 @@ */ bool psDBInsertRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psArray *rowSet ///< Set of rows to insert + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psArray *rowSet ///< Set of rows to insert ); @@ -223,6 +223,6 @@ */ psArray *psDBDumpRows( - psDB *dbh, ///< Database handle - const char *tableName ///< Table name + psDB *dbh, ///< Database handle + const char *tableName ///< Table name ); @@ -236,6 +236,6 @@ */ psMetadata *psDBDumpCols( - psDB *dbh, ///< Database handle - const char *tableName ///< Table name + psDB *dbh, ///< Database handle + const char *tableName ///< Table name ); @@ -252,8 +252,8 @@ */ psS64 psDBUpdateRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *where, ///< Row match criteria - const psMetadata *values ///< new field values + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *where, ///< Row match criteria + const psMetadata *values ///< new field values ); @@ -269,8 +269,8 @@ */ psS64 psDBDeleteRows( - psDB *dbh, ///< Database handle - const char *tableName, ///< Table name - const psMetadata *where, ///< Row match criteria - unsigned long long limit ///< Maximum number of rows to delete + psDB *dbh, ///< Database handle + const char *tableName, ///< Table name + const psMetadata *where, ///< Row match criteria + unsigned long long limit ///< Maximum number of rows to delete ); Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 4525) +++ /trunk/psLib/src/dataManip/psStats.c (revision 4526) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.136 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-28 20:17:52 $ + * @version $Revision: 1.137 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-09 01:24:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,6 @@ psBool p_psGetStatValue(const psStats* stats, psF64 *value) { - switch (stats->options & ~(PS_STAT_USE_RANGE | PS_STAT_USE_BINSIZE | PS_STAT_ROBUST_FOR_SAMPLE)) { + // switch (stats->options & ~(PS_STAT_USE_RANGE | PS_STAT_USE_BINSIZE | PS_STAT_ROBUST_FOR_SAMPLE)) { + switch (stats->options & ~(PS_STAT_USE_RANGE | PS_STAT_USE_BINSIZE)) { case PS_STAT_SAMPLE_MEAN: *value = stats->sampleMean; @@ -658,5 +659,5 @@ x.data.F32 = iMid - (PS_GAUSS_WIDTH * sigma); if ((x.data.F32 >= firstBound) && (x.data.F32 <= lastBound)) { - jMin = p_psVectorBinDisect(robustHistogram->bounds, &x); + jMin = p_psVectorBinDisect( *(psVector* *)&robustHistogram->bounds, &x); if (jMin < 0) { psError(PS_ERR_UNEXPECTED_NULL, @@ -673,5 +674,5 @@ x.data.F32 = iMid + (PS_GAUSS_WIDTH * sigma); if ((x.data.F32 >= firstBound) && (x.data.F32 <= lastBound)) { - jMax = p_psVectorBinDisect(robustHistogram->bounds, &x); + jMax = p_psVectorBinDisect( *(psVector* *)&robustHistogram->bounds, &x); if (jMax < 0) { psError(PS_ERR_UNEXPECTED_NULL, @@ -1705,5 +1706,5 @@ //Determine id that is okay. stats->robustMedian = fitQuadraticSearchForYThenReturnX( - robustHistogram->bounds, + *(psVector* *)&robustHistogram->bounds, cumulativeRobustSums, medianBinNum, @@ -1721,5 +1722,5 @@ //Determine id that is okay. stats->robustLQ = fitQuadraticSearchForYThenReturnX( - robustHistogram->bounds, + *(psVector* *)&robustHistogram->bounds, cumulativeRobustSums, LQBinNum, @@ -1728,5 +1729,5 @@ //Determine id that is okay. stats->robustUQ = fitQuadraticSearchForYThenReturnX( - robustHistogram->bounds, + *(psVector* *)&robustHistogram->bounds, cumulativeRobustSums, UQBinNum, @@ -1812,5 +1813,5 @@ psMemSetDeallocator(newHist, (psFreeFunc) histogramFree); newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); - newHist->bounds->n = newHist->bounds->nalloc; + *(int *)&newHist->bounds->n = newHist->bounds->nalloc; // Calculate the bounds for each bin. @@ -1859,5 +1860,5 @@ psMemSetDeallocator(newHist, (psFreeFunc) histogramFree); newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); - newHist->bounds->n = newHist->bounds->nalloc; + *(int *)&newHist->bounds->n = newHist->bounds->nalloc; for (i = 0; i < bounds->n; i++) { newHist->bounds->data.F32[i] = bounds->data.F32[i]; @@ -2067,5 +2068,5 @@ // correct bin number requires a bit more work. tmpScalar.data.F32 = inF32->data.F32[i]; - binNum = p_psVectorBinDisect(out->bounds, &tmpScalar); + binNum = p_psVectorBinDisect( *(psVector* *)&out->bounds, &tmpScalar); if (binNum < 0) { psLogMsg(__func__, PS_LOG_WARN, Index: /trunk/psLib/src/dataManip/psStats.h =================================================================== --- /trunk/psLib/src/dataManip/psStats.h (revision 4525) +++ /trunk/psLib/src/dataManip/psStats.h (revision 4526) @@ -14,6 +14,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-28 20:17:52 $ + * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-09 01:24:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -52,5 +52,5 @@ PS_STAT_USE_RANGE = 0x002000, ///< Range PS_STAT_USE_BINSIZE = 0x004000, ///< Binsize - PS_STAT_ROBUST_FOR_SAMPLE = 0x008000 ///< Robust for sample + // PS_STAT_ROBUST_FOR_SAMPLE = 0x008000 ///< Robust for sample } psStatsOptions; @@ -60,26 +60,26 @@ typedef struct { - psF64 sampleMean; ///< formal mean of sample - psF64 sampleMedian; ///< formal median of sample - psF64 sampleStdev; ///< standard deviation of sample - psF64 sampleUQ; ///< upper quartile of sample - psF64 sampleLQ; ///< lower quartile of sample - psF64 robustMean; ///< robust mean of array - psF64 robustMedian; ///< robust median of array - psF64 robustMode; ///< Robust mode of array - psF64 robustStdev; ///< robust standard deviation of array - psF64 robustUQ; ///< robust upper quartile - psF64 robustLQ; ///< robust lower quartile - psS32 robustN50; ///< Number of points in Gaussian fit. XXX: This is currently never set. - psS32 robustNfit; ///< The number of points between the quartiles. - psF64 clippedMean; ///< Nsigma clipped mean - psF64 clippedStdev; ///< standard deviation after clipping - psS32 clippedNvalues; ///< Number of data points used for clipped mean: This value is never used. - psF64 clipSigma; ///< Nsigma used for clipping; user input - psS32 clipIter; ///< Number of clipping iterations; user input - psF64 min; ///< minimum data value in array - psF64 max; ///< maximum data value in array - psF64 binsize; ///< binsize for robust fit (input/ouput) - psStatsOptions options; ///< bitmask of calculated values + double sampleMean; ///< formal mean of sample + double sampleMedian; ///< formal median of sample + double sampleStdev; ///< standard deviation of sample + double sampleUQ; ///< upper quartile of sample + double sampleLQ; ///< lower quartile of sample + double robustMean; ///< robust mean of array + double robustMedian; ///< robust median of array + double robustMode; ///< Robust mode of array + double robustStdev; ///< robust standard deviation of array + double robustUQ; ///< robust upper quartile + double robustLQ; ///< robust lower quartile + int robustN50; ///< Number of points in Gaussian fit. XXX: This is currently never set. + int robustNfit; ///< The number of points between the quartiles. + double clippedMean; ///< Nsigma clipped mean + double clippedStdev; ///< standard deviation after clipping + int clippedNvalues; ///< Number of data points used for clipped mean: This value is never used. + double clipSigma; ///< Nsigma used for clipping; user input + int clipIter; ///< Number of clipping iterations; user input + double min; ///< minimum data value in array + double max; ///< maximum data value in array + double binsize; ///< binsize for robust fit (input/ouput) + psStatsOptions options; ///< bitmask of calculated values } psStats; @@ -90,9 +90,9 @@ */ psStats* psVectorStats( - psStats* stats, ///< stats structure defines stats to be calculated and how - const psVector* in, ///< Vector to be analysed. - const psVector* errors, ///< Errors. - const psVector* mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL - psMaskType maskVal ///< Only mask elements with one of these bits set in maskVector + psStats* stats, ///< stats structure defines stats to be calculated and how + const psVector* in, ///< Vector to be analysed. + const psVector* errors, ///< Errors. + const psVector* mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL + psMaskType maskVal ///< Only mask elements with one of these bits set in maskVector ); @@ -121,9 +121,9 @@ typedef struct { - psVector* bounds; ///< Bounds for the bins (type F32) + const psVector* bounds; ///< Bounds for the bins (type F32) psVector* nums; ///< Number in each of the bins (INT) - psS32 minNum; ///< Number below the minimum - psS32 maxNum; ///< Number above the maximum - psBool uniform; ///< Is it a uniform distribution? + int minNum; ///< Number below the minimum + int maxNum; ///< Number above the maximum + bool uniform; ///< Is it a uniform distribution? } psHistogram; Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 4525) +++ /trunk/psLib/src/image/psImage.c (revision 4526) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-07 02:17:53 $ + * @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-09 01:24:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -48,6 +48,6 @@ } -psImage* psImageAlloc(psU32 numCols, - psU32 numRows, +psImage* psImageAlloc(int numCols, + int numRows, psElemType type) { @@ -149,6 +149,6 @@ psImage* psImageRecycle(psImage* old, - psU32 numCols, - psU32 numRows, + int numCols, + int numRows, const psElemType type) { Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 4525) +++ /trunk/psLib/src/image/psImage.h (revision 4526) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-07 02:17:53 $ + * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-09 01:24:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,9 +51,9 @@ typedef struct psImage { - const psMathType type; ///< Image data type and dimension. - const psU32 numCols; ///< Number of columns in image - const psU32 numRows; ///< Number of rows in image. - const psS32 col0; ///< Column position relative to parent. - const psS32 row0; ///< Row position relative to parent. + const psMathType type; ///< Image data type and dimension. + const int numCols; ///< Number of columns in image + const int numRows; ///< Number of rows in image. + const int col0; ///< Column position relative to parent. + const int row0; ///< Row position relative to parent. union { @@ -77,4 +77,5 @@ psPtr rawDataBuffer; ///< Raw data buffer for Allocating/Freeing Images + void *lock; ///< Optional lock for thread safety } psImage; @@ -103,8 +104,9 @@ */ psImage* psImageAlloc( - psU32 numCols, ///< Number of rows in image. - psU32 numRows, ///< Number of columns in image. + int numCols, ///< Number of rows in image. + int numRows, ///< Number of columns in image. psElemType type ///< Type of data for image. -); +) +; /** Create a psRegion with the specified attributes. @@ -113,8 +115,8 @@ */ psRegion psRegionSet( - float x0, ///< the first column of the region. - float x1, ///< the last column of the region + 1. - float y0, ///< the first row of the region. - float y1 ///< the last row of the region + 1. + float x0, ///< the first column of the region. + float x1, ///< the last column of the region + 1. + float y0, ///< the first row of the region. + float y1 ///< the last row of the region + 1. ); @@ -146,6 +148,6 @@ psImage* psImageRecycle( psImage* old, ///< the psImage to recycle by resizing image buffer - psU32 numCols, ///< the desired number of columns in image - psU32 numRows, ///< the desired number of rows in image + int numCols, ///< the desired number of columns in image + int numRows, ///< the desired number of rows in image const psElemType type ///< the desired datatype of the image ); Index: /trunk/psLib/src/image/psImageStructManip.c =================================================================== --- /trunk/psLib/src/image/psImageStructManip.c (revision 4525) +++ /trunk/psLib/src/image/psImageStructManip.c (revision 4526) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-07 02:17:53 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-09 01:24:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,15 @@ { psU32 elementSize; // size of image element in bytes - psU32 inputColOffset; // offset in bytes to first subset pixel in input row + psS32 inputColOffset; // offset in bytes to first subset pixel in input row + + if ( col0 < 0 || row0 < 0 ) { + // psError(PS_ERR_BAD_PARAMETER_VALUE, true, + // PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID, + col0, col1-1, row0, row1-1, + image->numCols-1, image->numRows-1); + return NULL; + } if (image == NULL || image->data.V == NULL) { @@ -64,4 +74,7 @@ return NULL; } + + + psS32 numRows = row1-row0; psS32 numCols = col1-col0; @@ -95,6 +108,8 @@ out->data.V = psRealloc(out->data.V,sizeof(psPtr)*numRows); // resize row pointer array *(psMathType*)&out->type = image->type; - *(psU32*)&out->numCols = numCols; - *(psU32*)&out->numRows = numRows; + // *(psU32*)&out->numCols = numCols; + // *(psU32*)&out->numRows = numRows; + *(psS32*)&out->numCols = numCols; + *(psS32*)&out->numRows = numRows; *(psS32*)&out->row0 = row0; *(psS32*)&out->col0 = col0; Index: /trunk/psLib/src/sysUtils/psType.h =================================================================== --- /trunk/psLib/src/sysUtils/psType.h (revision 4525) +++ /trunk/psLib/src/sysUtils/psType.h (revision 4526) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-07 02:17:53 $ +* @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-09 01:24:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii