Changeset 1003 for trunk

Timestamp:

Jan 18, 2008, 11:13:13 PM (15 years ago)

Author:

Peter

Message:

adding class for Kolmogorov Smirnov test

Location:

trunk/yat

Files:

• statistics/KolmogorovSmirnov.cc (added)
• statistics/KolmogorovSmirnov.h (added)
• statistics/Makefile.am (modified) (3 diffs)
• utility/stl_utility.h (modified) (2 diffs)

trunk/yat/statistics/Makefile.am

@@ -6 +6 @@
 # Copyright (C) 2006 Jari Häkkinen, Markus Ringnér, Peter Johansson
 # Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2008 Peter Johansson
 #
 # This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -29 +30 @@
 libstatistics_la_SOURCES = AUC.cc Averager.cc AveragerPair.cc \
   AveragerWeighted.cc AveragerPairWeighted.cc \
-  Fisher.cc FoldChange.cc Histogram.cc Pearson.cc \
+  Fisher.cc FoldChange.cc Histogram.cc \
+  KolmogorovSmirnov.cc Pearson.cc \
   PearsonCorrelation.cc ROC.cc \
   SAMScore.cc Score.cc SNRScore.cc tScore.cc tTest.cc \
@@ -39 +41 @@
   AveragerWeighted.h AveragerPairWeighted.h \
   euclidean_vector_distance.h Fisher.h \
-  FoldChange.h Histogram.h Pearson.h PearsonCorrelation.h \
+  FoldChange.h Histogram.h \
+  KolmogorovSmirnov.h \
+  Pearson.h PearsonCorrelation.h \
   pearson_vector_distance.h ROC.h \
   SAMScore.h Score.h SNRScore.h tScore.h tTest.h \

trunk/yat/utility/stl_utility.h

@@ -36 +36 @@
 
 #include <algorithm>
+#include <functional>
 #include <ostream>
 #include <string>
@@ -56 +57 @@
 namespace yat {
 namespace utility {
+
+  /**
+     Functor class taking absolute value
+  */
+  template<typename T>
+  struct abs : std::unary_function<T, T>
+  {
+    /**
+       \return absolute value
+     */
+    inline T operator()(T x) const
+    { return std::abs(x); }
+  };
+
+  /**
+     See The C++ Standard Library - A Tutorial and Reference by
+     Nicolai M. Josuttis
+
+     If f is a binary functor, both g and h are unary functors, and
+     return type of g (and h) is convertible to F's argument type,
+     then compose_f_gx_hy can be used to create a functor equivalent
+     to \f$ f(g(x), h(y)) \f$
+   */
+  template<class F, class G, class H>
+  class compose_f_gx_hy
+  {
+  public:
+    /**
+       \brief Constructor
+     */
+    compose_f_gx_hy(F f, G g, H h)
+      : f_(f), g_(g), h_(h) {}
+
+    /**
+       \brief Does the work
+     */
+    bool
+    operator()(double x, 
+               double y) const
+    {
+      return f_(g_(x), h_(y));
+    }
+
+  private:
+    F f_;
+    G g_;
+    H h_;
+  };
+
+  /**
+     Convenient function to create a compose_f_gx_hy.
+
+     \see std::make_pair
+  */
+  template<class F, class G, class H>
+  compose_f_gx_hy<F, G, H> make_compose_f_gx_hy(F f, G g, H h)
+  {
+    return compose_f_gx_hy<F,G,H>(f,g,h);
+  }  
 
   /**