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

Timestamp:

Jan 26, 2006, 1:49:11 PM (20 years ago)

Author:

gusciora

Message:

Made the requested changes to the psStats structure and added the fitted
statistics.

File:

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

trunk/psLib/src/math/psStats.h

@@ -14 +14 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-30 01:14:13 $
+ *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-26 23:49:11 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
 // XXX: Is PS_STAT_ROBUST_FOR_SAMPLE obsolete?
 typedef enum {
-    PS_STAT_SAMPLE_MEAN = 0x000001,         ///< Sample Mean
-    PS_STAT_SAMPLE_MEDIAN = 0x000002,       ///< Sample Median
-    PS_STAT_SAMPLE_STDEV = 0x000004,        ///< Sample Standard Deviation
-    PS_STAT_SAMPLE_QUARTILE = 0x000008,     ///< Sample Quartile
-    PS_STAT_ROBUST_MEAN = 0x000010,         ///< Robust Mean
-    PS_STAT_ROBUST_MEDIAN = 0x000020,       ///< Robust Median
-    PS_STAT_ROBUST_MODE = 0x000040,         ///< Robust Mode
-    PS_STAT_ROBUST_STDEV = 0x000080,        ///< Robust Standarad Deviation
-    PS_STAT_ROBUST_QUARTILE = 0x000100,     ///< Robust Quartile
-    PS_STAT_CLIPPED_MEAN = 0x000200,        ///< Clipped Mean
-    PS_STAT_CLIPPED_STDEV = 0x000400,       ///< Clipped Standard Deviation
-    PS_STAT_MAX =  0x000800,                ///< Maximum
-    PS_STAT_MIN =  0x001000,                ///< Minumum
-    PS_STAT_USE_RANGE =  0x002000,          ///< Range
-    PS_STAT_USE_BINSIZE = 0x004000,         ///< Binsize
+    PS_STAT_SAMPLE_MEAN     = 0x000001, ///< Sample Mean
+    PS_STAT_SAMPLE_MEDIAN   = 0x000002, ///< Sample Median
+    PS_STAT_SAMPLE_STDEV    = 0x000004, ///< Sample Standard Deviation
+    PS_STAT_SAMPLE_QUARTILE = 0x000008, ///< Sample Quartile
+    PS_STAT_ROBUST_MEDIAN   = 0x000010, ///< Robust Median
+    PS_STAT_ROBUST_STDEV    = 0x000020, ///< Robust Standarad Deviation
+    PS_STAT_ROBUST_QUARTILE = 0x000040, ///< Robust Quartile
+    PS_STAT_FITTED_MEAN     = 0x000080, ///< Fitted Mean
+    PS_STAT_FITTED_STDEV    = 0x000100, ///< Fitted Standard Deviation
+    PS_STAT_CLIPPED_MEAN    = 0x000200, ///< Clipped Mean
+    PS_STAT_CLIPPED_STDEV   = 0x000400, ///< Clipped Standard Deviation
+    PS_STAT_MAX             = 0x000800, ///< Maximum
+    PS_STAT_MIN             = 0x001000, ///< Minumum
+    PS_STAT_USE_RANGE       = 0x002000, ///< Range
+    PS_STAT_USE_BINSIZE     = 0x004000, ///< Binsize
 } psStatsOptions;
 
@@ -62 +62 @@
     double sampleMedian;               ///< formal median of sample
     double sampleStdev;                ///< standard deviation of sample
+    double sampleLQ;                   ///< lower quartile 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 fittedMean;                 ///< robust mean of data
+    double fittedStdev;                ///< robust standard deviation of data
+    int fittedNfit;                    ///< Number of points in Gaussian fit
     double clippedMean;                ///< Nsigma clipped mean
     double clippedStdev;               ///< standard deviation after clipping
@@ -80 +80 @@
     double max;                        ///< maximum data value in array
     double binsize;                    ///< binsize for robust fit (input/ouput)
+    int nSubsample;                    ///< maxinum number of measurements (input)
     psStatsOptions options;            ///< bitmask of calculated values
 }