Changeset 4540 for trunk/psLib/src/math/psStats.h

Timestamp:

Jul 12, 2005, 9:12:01 AM (21 years ago)

Author:

desonia

Message:

massive restructuring of codebase.

File:

• trunk/psLib/src/math/psStats.h (modified) (5 diffs)

trunk/psLib/src/math/psStats.h

@@ -14 +14 @@
  *  @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-12 19:12:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
     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 +60 @@
 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 +90 @@
  */
 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 +121 @@
 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;