Changeset 909

Timestamp:

Sep 29, 2007, 1:49:05 AM (14 years ago)

Author:

Peter

Message:

using weighted_iterator_traits, closes #151

Location:

trunk/yat

Files:

• classifier/NCC.h (modified) (1 diff)
• statistics/euclidean_vector_distance.h (modified) (3 diffs)
• statistics/pearson_vector_distance.h (modified) (3 diffs)
• statistics/vector_distance.h (modified) (2 diffs)
• utility/IteratorTraits.h (modified) (1 diff)
• utility/IteratorWeighted.h (modified) (2 diffs)

trunk/yat/classifier/NCC.h

@@ -99 +99 @@
   private:
     utility::matrix centroids_;
-    const statistics::vector_distance_lookup_weighted_ptr distance_;                 
+    const statistics::vector_distance_lookup_weighted_ptr distance_;
 
     // data_ has to be of type DataLookup2D to accomodate both

trunk/yat/statistics/euclidean_vector_distance.h

@@ -7 +7 @@
 #include "AveragerPairWeighted.h"
 #include "vector_distance.h"
+#include "yat/utility/IteratorTraits.h"
 
 #include <cmath>
@@ -34 +35 @@
   double vector_distance(Iter1 beg1,Iter1 end1, Iter2 beg2,
                          const euclidean_vector_distance_tag& disttype,
-                         std::forward_iterator_tag)
+                         utility::unweighted_type)
   {
     AveragerPair ap;
@@ -50 +51 @@
   double vector_distance(Iter1 beg1, Iter1 end1, Iter2 beg2,
                          const euclidean_vector_distance_tag& disttype,
-                         utility::weighted_random_access_iterator_tag)
+                         utility::weighted_type)
   {
     AveragerPairWeighted ap;

trunk/yat/statistics/pearson_vector_distance.h

@@ -8 +8 @@
 #include "AveragerPair.h"
 #include "AveragerPairWeighted.h"
+#include "yat/utility/IteratorTraits.h"
 
 namespace theplu {
@@ -33 +34 @@
   double vector_distance(Iter beg1,Iter end1, Iter beg2,
                          const pearson_vector_distance_tag& disttype,
-                         std::forward_iterator_tag)
+                         utility::unweighted_type)
   {
     AveragerPair ap;
@@ -48 +49 @@
   double vector_distance(Iter beg1,Iter end1, Iter beg2,
                          const pearson_vector_distance_tag& disttype,
-                         utility::weighted_random_access_iterator_tag)
+                         utility::weighted_type)
   {
     AveragerPairWeighted ap;

trunk/yat/statistics/vector_distance.h

@@ -8 +8 @@
 #include "yat/classifier/DataLookup1D.h"
 #include "yat/classifier/DataLookupWeighted1D.h"
+#include "yat/utility/IteratorTraits.h"
 
 namespace theplu {
@@ -51 +52 @@
   double vector_distance(Iter1 beg1, Iter1 end1, Iter2 beg2, const Dist disttag)
   {
-    return vector_distance(beg1,end1,beg2,
-                           typename vector_distance_traits<Dist>::distance(),
-                           typename std::iterator_traits<Iter1>::iterator_category());
+    return 
+      vector_distance(beg1,end1,beg2,
+                      typename vector_distance_traits<Dist>::distance(),
+                      typename utility::weighted_iterator_traits<Iter1>::type());
   }       
 

trunk/yat/utility/IteratorTraits.h

@@ -58 +58 @@
   struct weighted_iterator_traits<yat::utility::IteratorWeighted<U,V> > {
     typedef weighted_type type;
-  }
-};
-
-
+  };
 
 }}} // of namespace utility, yat, and theplu

trunk/yat/utility/IteratorWeighted.h

@@ -7 +7 @@
 #include <stddef.h>
 
-// namespace std {
-//  struct weighted_random_access_iterator_tag 
-//    : public random_access_iterator_tag {
-//  };
-// }
-
-
 namespace theplu {
 namespace yat {
 namespace utility {
-
-  struct weighted_random_access_iterator_tag 
-    : public std::random_access_iterator_tag {
-  };
 
   /**
@@ -29 +18 @@
   {
   public:
-    typedef weighted_random_access_iterator_tag iterator_category;
+    typedef std::random_access_iterator_tag iterator_category;
     typedef double value_type;
     typedef size_t difference_type;