Index: /trunk/psLib/src/dataManip/psStats.h =================================================================== --- /trunk/psLib/src/dataManip/psStats.h (revision 643) +++ /trunk/psLib/src/dataManip/psStats.h (revision 644) @@ -80,6 +80,6 @@ PS_STAT_SAMPLE_MEDIAN = 0x000002, PS_STAT_SAMPLE_STDEV = 0x000004, - PS_STAT_SAMPLE_UQ = 0x000008, - PS_STAT_SAMPLE_LQ = 0x000010, + PS_STAT_SAMPLE_UQ = 0x000008, + PS_STAT_SAMPLE_LQ = 0x000010, PS_STAT_ROBUST_MEAN = 0x000020, PS_STAT_ROBUST_MEAN_NVALUES = 0x000040, @@ -89,13 +89,13 @@ PS_STAT_ROBUST_MODE_NVALUES = 0x000400, PS_STAT_ROBUST_STDEV = 0x000800, - PS_STAT_ROBUST_UQ = 0x001000, - PS_STAT_ROBUST_LQ = 0x002000, + PS_STAT_ROBUST_UQ = 0x001000, + PS_STAT_ROBUST_LQ = 0x002000, PS_STAT_CLIPPED_MEAN = 0x004000, PS_STAT_CLIPPED_MEAN_NVALUES = 0x008000, PS_STAT_CLIPPED_MEAN_NSIGMA = 0x010000, PS_STAT_CLIPPED_STDEV = 0x020000, - PS_STAT_MAX = 0x040000, - PS_STAT_MIN = 0x080000, - PS_STAT_NVALUES = 0x100000 + PS_STAT_MAX = 0x040000, + PS_STAT_MIN = 0x080000, + PS_STAT_NVALUES = 0x100000 } psStatsOptions; @@ -104,27 +104,27 @@ typedef struct { - 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 - int robustMeanNvalues; ///< number of measurements used for robust mean - double robustMedian; ///< robust median of array - int robustMedianNvalues; ///< number of measurements used for robust median - double robustMode; ///< Robust mode of array - int robustModeNvalues; ///< Number of measurements used for robust mode - double robustStdev; ///< robust standard deviation of array - double robustUQ; ///< robust upper quartile - double robustLQ; ///< robust lower quartile - double clippedMean; ///< Nsigma clipped mean + 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 + int robustMeanNvalues; ///< number of measurements used for robust mean + double robustMedian; ///< robust median of array + int robustMedianNvalues; ///< number of measurements used for robust median + double robustMode; ///< Robust mode of array + int robustModeNvalues; ///< Number of measurements used for robust mode + double robustStdev; ///< robust standard deviation of array + double robustUQ; ///< robust upper quartile + double robustLQ; ///< robust lower quartile + double clippedMean; ///< Nsigma clipped mean int clippedMeanNvalues; ///< number of data points used for clipped mean - double clippedStdev; ///< standard deviation after clipping - 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 - int nValues; ///< number of data values in array - psStatsOptions options; ///< bitmask of calculated values + double clippedStdev; ///< standard deviation after clipping + 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 + int nValues; ///< number of data values in array + psStatsOptions options; ///< bitmask of calculated values } psStats; @@ -151,6 +151,4 @@ ); -/***********************************************************************************************************/ - /** Histograms */ typedef struct @@ -158,9 +156,9 @@ const psVector *restrict lower; ///< Lower bounds for the bins (FLOAT) const psVector *restrict upper; ///< Upper bounds for the bins (FLOAT) - psVector *nums; ///< Number in each of the bins (INT) + psVector *nums; ///< Number in each of the bins (INT) float minVal; - float maxVal; ///< Minimum and maximum values + float maxVal; ///< Minimum and maximum values int minNum; - int maxNum; ///< Number below the minimum and above the maximum + int maxNum; ///< Number below the minimum and above the maximum } psHistogram; @@ -170,5 +168,5 @@ psHistogramAlloc(float lower, ///< Lower limit for the bins float upper, ///< Upper limit for the bins - float size ///< Size of the bins + float size ///< Size of the bins ); @@ -177,11 +175,11 @@ psHistogramAllocGeneric(const psVector *restrict lower, ///< Lower bounds for the bins const psVector *restrict upper, ///< Upper bounds for the bins - float minVal, ///< Minimum value - float maxVal ///< Maximum value + float minVal, ///< Minimum value + float maxVal ///< Maximum value ); /** Destructor \ingroup MathGroup **/ void -psHistogramFree(psHistogram *restrict myHist ///< Histogram to destroy +psHistogramFree(psHistogram *restrict myHist ///< Histogram to destroy ); @@ -189,5 +187,5 @@ /** Calculate a histogram \ingroup MathGroup **/ psHistogram * -psGetArrayHistogram(psHistogram *restrict myHist, ///< Histogram data +psGetArrayHistogram(psHistogram *restrict myHist, ///< Histogram data const psVector *restrict myVector ///< Vector to analyse ); Index: /trunk/psLib/src/math/psStats.h =================================================================== --- /trunk/psLib/src/math/psStats.h (revision 643) +++ /trunk/psLib/src/math/psStats.h (revision 644) @@ -80,6 +80,6 @@ PS_STAT_SAMPLE_MEDIAN = 0x000002, PS_STAT_SAMPLE_STDEV = 0x000004, - PS_STAT_SAMPLE_UQ = 0x000008, - PS_STAT_SAMPLE_LQ = 0x000010, + PS_STAT_SAMPLE_UQ = 0x000008, + PS_STAT_SAMPLE_LQ = 0x000010, PS_STAT_ROBUST_MEAN = 0x000020, PS_STAT_ROBUST_MEAN_NVALUES = 0x000040, @@ -89,13 +89,13 @@ PS_STAT_ROBUST_MODE_NVALUES = 0x000400, PS_STAT_ROBUST_STDEV = 0x000800, - PS_STAT_ROBUST_UQ = 0x001000, - PS_STAT_ROBUST_LQ = 0x002000, + PS_STAT_ROBUST_UQ = 0x001000, + PS_STAT_ROBUST_LQ = 0x002000, PS_STAT_CLIPPED_MEAN = 0x004000, PS_STAT_CLIPPED_MEAN_NVALUES = 0x008000, PS_STAT_CLIPPED_MEAN_NSIGMA = 0x010000, PS_STAT_CLIPPED_STDEV = 0x020000, - PS_STAT_MAX = 0x040000, - PS_STAT_MIN = 0x080000, - PS_STAT_NVALUES = 0x100000 + PS_STAT_MAX = 0x040000, + PS_STAT_MIN = 0x080000, + PS_STAT_NVALUES = 0x100000 } psStatsOptions; @@ -104,27 +104,27 @@ typedef struct { - 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 - int robustMeanNvalues; ///< number of measurements used for robust mean - double robustMedian; ///< robust median of array - int robustMedianNvalues; ///< number of measurements used for robust median - double robustMode; ///< Robust mode of array - int robustModeNvalues; ///< Number of measurements used for robust mode - double robustStdev; ///< robust standard deviation of array - double robustUQ; ///< robust upper quartile - double robustLQ; ///< robust lower quartile - double clippedMean; ///< Nsigma clipped mean + 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 + int robustMeanNvalues; ///< number of measurements used for robust mean + double robustMedian; ///< robust median of array + int robustMedianNvalues; ///< number of measurements used for robust median + double robustMode; ///< Robust mode of array + int robustModeNvalues; ///< Number of measurements used for robust mode + double robustStdev; ///< robust standard deviation of array + double robustUQ; ///< robust upper quartile + double robustLQ; ///< robust lower quartile + double clippedMean; ///< Nsigma clipped mean int clippedMeanNvalues; ///< number of data points used for clipped mean - double clippedStdev; ///< standard deviation after clipping - 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 - int nValues; ///< number of data values in array - psStatsOptions options; ///< bitmask of calculated values + double clippedStdev; ///< standard deviation after clipping + 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 + int nValues; ///< number of data values in array + psStatsOptions options; ///< bitmask of calculated values } psStats; @@ -151,6 +151,4 @@ ); -/***********************************************************************************************************/ - /** Histograms */ typedef struct @@ -158,9 +156,9 @@ const psVector *restrict lower; ///< Lower bounds for the bins (FLOAT) const psVector *restrict upper; ///< Upper bounds for the bins (FLOAT) - psVector *nums; ///< Number in each of the bins (INT) + psVector *nums; ///< Number in each of the bins (INT) float minVal; - float maxVal; ///< Minimum and maximum values + float maxVal; ///< Minimum and maximum values int minNum; - int maxNum; ///< Number below the minimum and above the maximum + int maxNum; ///< Number below the minimum and above the maximum } psHistogram; @@ -170,5 +168,5 @@ psHistogramAlloc(float lower, ///< Lower limit for the bins float upper, ///< Upper limit for the bins - float size ///< Size of the bins + float size ///< Size of the bins ); @@ -177,11 +175,11 @@ psHistogramAllocGeneric(const psVector *restrict lower, ///< Lower bounds for the bins const psVector *restrict upper, ///< Upper bounds for the bins - float minVal, ///< Minimum value - float maxVal ///< Maximum value + float minVal, ///< Minimum value + float maxVal ///< Maximum value ); /** Destructor \ingroup MathGroup **/ void -psHistogramFree(psHistogram *restrict myHist ///< Histogram to destroy +psHistogramFree(psHistogram *restrict myHist ///< Histogram to destroy ); @@ -189,5 +187,5 @@ /** Calculate a histogram \ingroup MathGroup **/ psHistogram * -psGetArrayHistogram(psHistogram *restrict myHist, ///< Histogram data +psGetArrayHistogram(psHistogram *restrict myHist, ///< Histogram data const psVector *restrict myVector ///< Vector to analyse );