Changeset 15840

Timestamp:

Dec 14, 2007, 3:17:28 PM (18 years ago)

Author:

Paul Price

Message:

Adding psStatsMeanOption and psStatsStdevOption

Location:

trunk/psLib/src/math

Files:

• psStats.c (modified) (2 diffs)
• psStats.h (modified) (2 diffs)

trunk/psLib/src/math/psStats.c

@@ -13 +13 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.220 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-29 20:36:28 $
+ *  @version $Revision: 1.221 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-12-15 01:17:28 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -2494 +2494 @@
     return 0;
 }
+
+psStatsOptions psStatsMeanOption(psStatsOptions options)
+{
+    return options & (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_MEDIAN | PS_STAT_ROBUST_MEDIAN |
+                      PS_STAT_CLIPPED_MEAN | PS_STAT_FITTED_MEAN | PS_STAT_FITTED_MEAN_V2 |
+                      PS_STAT_FITTED_MEAN_V3 | PS_STAT_FITTED_MEAN_V4);
+}
+
+psStatsOptions psStatsStdevOption(psStatsOptions options)
+{
+    return options & (PS_STAT_SAMPLE_STDEV | PS_STAT_ROBUST_STDEV | PS_STAT_CLIPPED_STDEV |
+                      PS_STAT_FITTED_STDEV | PS_STAT_FITTED_STDEV_V2 | PS_STAT_FITTED_STDEV_V3 |
+                      PS_STAT_FITTED_STDEV_V4);
+}
+
 
 double psStatsGetValue(const psStats *stats, psStatsOptions option)

trunk/psLib/src/math/psStats.h

@@ -8 +8 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-09-20 23:59:03 $
+ * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-12-15 01:17:28 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -146 +146 @@
 // Return a particular stats value
 double psStatsGetValue(const psStats *stats, psStatsOptions option);
+// Return the statistics option(s) for the mean/median
+psStatsOptions psStatsMeanOption(psStatsOptions options);
+// Return the statistics option(s) for the stdev
+psStatsOptions psStatsStdevOption(psStatsOptions options);
 
 /// @}