Changeset 1305

Timestamp:

May 15, 2008, 12:25:54 AM (14 years ago)

Author:

Peter

Message:

Adding a functor that calculate average of a range. Also added a metafunction that return Averager or AveragerWeighted? depending on context.

Location:

trunk

Files:

• test/statistics_test.cc (modified) (1 diff)
• yat/statistics/Makefile.am (modified) (1 diff)
• yat/statistics/averager_traits.h (added)
• yat/statistics/utility.h (modified) (4 diffs)

trunk/test/statistics_test.cc

@@ -62 +62 @@
   if (!(std::abs(kurtosis_gsl+1.5616363636363637113)<1e-10) ) 
     suite.add(false); 
-  return 0;
+  statistics::Average func;
+  suite.add(suite.equal(func(gsl_vec.begin(), gsl_vec.end()),4.5));
+  // easiest way to get a weighted iterator
+  classifier::MatrixLookupWeighted mlw(10,20,2.0, 1.0);
+  suite.add(suite.equal(func(mlw.begin(), mlw.end()),2.0));
+  
+
+  return suite.return_value();
 }

trunk/yat/statistics/Makefile.am

@@ -39 +39 @@
 include_statistics_HEADERS = AUC.h Averager.h AveragerPair.h \
   AveragerWeighted.h AveragerPairWeighted.h \
-  EuclideanDistance.h Fisher.h \
+  averager_traits.h EuclideanDistance.h Fisher.h \
   FoldChange.h Histogram.h \
   KolmogorovSmirnov.h \

trunk/yat/statistics/utility.h

@@ -29 +29 @@
 */
 
+#include "averager_traits.h"
 #include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
@@ -44 +45 @@
 namespace yat {
 namespace statistics {  
+
+  /**
+     \brief Functor to take average of a range.
+   */
+  struct Average
+  {
+    /**
+       If range is weighted an AveragerWeighted is used else a Averager.
+       
+       \return average of range
+     */
+    template<typename ForwardIterator>
+    inline double operator()(ForwardIterator first, ForwardIterator last) const
+    {
+      typename averager<ForwardIterator>::type a;
+      add(a, first, last);
+      return a.mean();
+    }
+
+  };
+
+
 
   //forward declarations
@@ -77 +100 @@
   ///
   /// @return cumulative hypergeomtric distribution functions P(k).
+  ///
+  /// \deprecated 
   ///
   double cdf_hypergeometric_P(unsigned int k, unsigned int n1, 
@@ -167 +192 @@
   double percentile(T first, T last, double p, bool sorted=false)
   {
-    utility::yat_assert<std::range_error>(first<last);
+    utility::yat_assert<std::range_error>(first<last,
+                                          "percentile: invalid range");
     utility::yat_assert<std::runtime_error>(p>=0, "percentage is negative");
     utility::yat_assert<std::runtime_error>(p<=100,