Changeset 1306 for trunk/yat

Timestamp:

May 15, 2008, 12:44:30 AM (15 years ago)

Author:

Peter

Message:

adding a similar AveragerPair? traits and using it in PearsonDistance? to simplify the code

Location:

trunk/yat/statistics

Files:

• PearsonDistance.h (modified) (2 diffs)
• averager_traits.h (modified) (4 diffs)

trunk/yat/statistics/PearsonDistance.h

@@ -26 +26 @@
 */
 
-#include "AveragerPair.h"
-#include "AveragerPairWeighted.h"
+#include "averager_traits.h"
 #include "yat/utility/iterator_traits.h"
 
@@ -63 +62 @@
     (Iter1 beg1,Iter1 end1, Iter2 beg2) const
     {
-      return this->distance(beg1, end1, beg2,  
-                      typename utility::weighted_if_any2<Iter1,Iter2>::type());
-    }
-
-  private:
-    template <typename Iter1, typename Iter2>
-    double distance (Iter1 beg1,Iter1 end1, Iter2 beg2, 
-                     utility::unweighted_iterator_tag) const
-    {
-      AveragerPairWeighted ap;
+      typename averager_pair<Iter1, Iter2>::type ap;
       add(ap,beg1,end1,beg2);
       return 1-ap.correlation();
     }
-
-    template <typename Iter1, typename Iter2>
-    double distance (Iter1 beg1,Iter1 end1, Iter2 beg2, 
-                     utility::weighted_iterator_tag) const
-    {
-      AveragerPairWeighted ap;
-      add(ap,beg1,end1,beg2);
-      return 1-ap.correlation();
-    }
-    
   };
 

trunk/yat/statistics/averager_traits.h

@@ -25 +25 @@
 */
 
-#include "yat/utility/iterator_traits.h"
 #include "Averager.h"
 #include "AveragerWeighted.h"
+#include "AveragerPair.h"
+#include "AveragerPairWeighted.h"
+#include "yat/utility/iterator_traits.h"
 
 namespace theplu {
@@ -49 +51 @@
   */
     typedef Averager type;
+    typedef AveragerPair pair_type;
   };
 
@@ -61 +64 @@
   */
     typedef AveragerWeighted type;
+    typedef AveragerPairWeighted pair_type;
   };
 
   /** 
-      Convenience wrapper around averager_t
-      \see averager_t
+      Convenience wrapper around averager_traits
       \see weighted_iterator_traits                                         \
   */
@@ -79 +82 @@
   };
 
+  /** 
+      Convenience wrapper around averager_traits
+      \see weighted_iterator_traits                                         \
+  */
+  template <typename Iterator1, typename Iterator2>
+  struct averager_pair 
+  {
+  /** 
+      Convenience Metafunction taking iterator as argument and return
+      either Averager (if both iterators are unweighted) or AveragerWeighted
+      otherwise.
+  */
+    typedef typename 
+      averager_traits<
+        typename utility::weighted_if_any2<Iterator1, Iterator2>::type
+      >::pair_type type;
+  };
+
 }}} // of namespace statistics, yat, and theplu