Changeset 1083

Timestamp:

Feb 13, 2008, 2:13:18 PM (16 years ago)

Author:

Peter

Message:

working on #247

Location:

trunk/yat

Files:

• classifier/DataLookup1D.h (modified) (1 diff)
• classifier/KernelLookup.h (modified) (1 diff)
• classifier/MatrixLookup.h (modified) (1 diff)
• utility/Iterator.h (modified) (2 diffs)
• utility/IteratorPolicy.h (modified) (3 diffs)

trunk/yat/classifier/DataLookup1D.h

@@ -51 +51 @@
     /// 'Read Only' iterator
     typedef utility::StrideIterator<
-    utility::Iterator<const DataLookup2D, utility::unweighted_type, const double,
-                      void, const double> >
+    utility::Iterator<const DataLookup2D, const double, void, const double> >
     const_iterator;
 

trunk/yat/classifier/KernelLookup.h

@@ -72 +72 @@
     /// 'Read Only' iterator
     typedef utility::StrideIterator<
-    utility::Iterator<const KernelLookup, utility::unweighted_type, const double,
-                      void, const double> >
+    utility::Iterator<const KernelLookup, const double, void, const double> >
     const_iterator;
 

trunk/yat/classifier/MatrixLookup.h

@@ -75 +75 @@
     /// 'Read Only' iterator
     typedef utility::StrideIterator<
-    utility::Iterator<const MatrixLookup, utility::unweighted_type, const double,
-                      void, const double> >
+    utility::Iterator<const MatrixLookup, const double, void, const double> >
     const_iterator;
 

trunk/yat/utility/Iterator.h

@@ -40 +40 @@
      @brief Iterator
   */
-  template<typename Container, typename weighted_tag, typename value, 
+  template<typename Container, typename value, 
            typename pointer = value*, typename reference = value&,
            class Policy = IteratorPolicy<Container, reference, value> > 
@@ -48 +48 @@
   {
   public:
-    typedef weighted_tag weighted_iterator_type;
+    typedef typename Policy::weighted_iterator_type weighted_iterator_type;
 
   private:
-    typedef Iterator<Container, weighted_tag, value, pointer, reference,
-                     Policy> self;
+    typedef Iterator<Container, value, pointer, reference, Policy> self;
 
   public:

trunk/yat/utility/IteratorPolicy.h

@@ -25 +25 @@
 */
 
+#include "iterator_traits.h"
+
 namespace theplu {
 namespace yat {
@@ -37 +39 @@
     typedef reference data_type;
     typedef weight_t weight_type;
+    typedef unweighted_type weighted_iterator_type;
 
     data_type data(const Container& c, size_t row, size_t column) const
@@ -54 +57 @@
    
   };
+
+
+  /**
+     \brief policy for weighted Iterator
+  */
+  template<class Container, typename data_t, typename weight_t>
+  struct IteratorPolicyWeighted
+  {
+    typedef std::pair<data_t, weight_t> reference;
+    typedef data_t data_type;
+    typedef weight_t weight_type;
+    typedef weighted_type weighted_iterator_type;
+
+    data_type data(const Container& c, size_t row, size_t column) const
+    {
+      return c.data(row, column);
+    }
+
+    reference dereference(const Container& c, size_t row, size_t column) const
+    {
+      return reference(this->data(c, row, column),this->weight(c, row, column));
+    }
+
+    weight_type weight(const Container& c, size_t row, size_t column) const
+    {
+      return c.weight(row, column);
+    }
+   
+  };
 }}} // of namespace utility, yat, and theplu