Changeset 1317 for trunk

Timestamp:

May 21, 2008, 2:23:18 PM (15 years ago)

Author:

Peter

Message:

moving implementation of percentile to a functor: Percentiler

Location:

trunk

Files:

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

trunk/test/statistics_test.cc

@@ -28 +28 @@
 #include "Suite.h"
 
+#include "yat/statistics/Average.h"
 #include "yat/statistics/utility.h"
 #include "yat/utility/Vector.h"

trunk/yat/statistics/Makefile.am

@@ -31 +31 @@
   Fisher.cc FoldChange.cc Histogram.cc \
   KolmogorovSmirnov.cc Pearson.cc \
-  PearsonCorrelation.cc ROC.cc \
+  PearsonCorrelation.cc Percentiler.cc ROC.cc \
   SAMScore.cc Score.cc Smoother.cc SNRScore.cc tScore.cc tTest.cc \
   utility.cc VectorFunction.cc WilcoxonFoldChange.cc
@@ -37 +37 @@
 include_statisticsdir = $(includedir)/yat/statistics
 
-include_statistics_HEADERS = AUC.h Averager.h AveragerPair.h \
+include_statistics_HEADERS = AUC.h Average.h Averager.h AveragerPair.h \
   AveragerWeighted.h AveragerPairWeighted.h \
   averager_traits.h EuclideanDistance.h Fisher.h \
@@ -43 +43 @@
   KolmogorovSmirnov.h \
   Pearson.h PearsonCorrelation.h \
-  PearsonDistance.h ROC.h \
+  PearsonDistance.h Percentiler.h ROC.h \
   SAMScore.h Score.h Smoother.h SNRScore.h tScore.h tTest.h \
   utility.h VectorFunction.h WilcoxonFoldChange.h

trunk/yat/statistics/utility.h

@@ -29 +29 @@
 */
 
-#include "averager_traits.h"
+#include "Percentiler.h"
+
 #include "yat/classifier/DataLookupWeighted1D.h"
 #include "yat/classifier/Target.h"
@@ -47 +48 @@
 
   /**
-     \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
+     \brief 50th percentile
+     @see Percentiler
+  */
   template <class T> 
   double median(T first, T last, const bool sorted=false); 
 
+  /**
+     \see Percentiler
+  */
   template <class T>
   double percentile(T first, T last, double p, bool sorted=false);
@@ -101 +86 @@
   /// @return cumulative hypergeomtric distribution functions P(k).
   ///
-  /// \deprecated 
+  /// \deprecated use gsl_cdf_hypergeometric_P
   ///
   double cdf_hypergeometric_P(unsigned int k, unsigned int n1, 
@@ -192 +177 @@
   double percentile(T first, T last, double p, bool sorted=false)
   {
-    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, 
-                                            "percentage is larger than 100");
-    if (sorted){
-      if (p>=100)
-        return *(--last);
-      // range is one value only is a special case
-      if (std::distance(first, last)==1) 
-        return *first;
-      double j = p/100 * (std::distance(first,last)-1);
-      int i = static_cast<int>(j);
-      return (1-j+floor(j))*first[i] + (j-floor(j))*first[i+1];
-    }
-
-    std::vector<double> v_copy;
-    v_copy.reserve(std::distance(first,last));
-    std::copy(first, last, std::back_inserter(v_copy));
-    double j = p/100 * (v_copy.size()-1);
-    size_t i = static_cast<size_t>(j);
-    if (i+2 < v_copy.size()) {
-      utility::yat_assert<std::out_of_range>(i+2 < v_copy.size(), 
-                                             "in utility::percentile");
-      std::partial_sort(v_copy.begin(), v_copy.begin()+i+2, v_copy.end());
-    }
-    else
-      std::sort(v_copy.begin(), v_copy.end());
-      
-    return percentile(v_copy.begin(), v_copy.end(), p, true);
+    Percentiler percentiler(p, sorted);
+    return percentiler(first, last);
   }