Changeset 1565

Timestamp:

Oct 10, 2008, 11:49:07 PM (14 years ago)

Author:

Peter

Message:

removed Policy from Container2DIterator - refs #398

Location:

trunk/yat

Files:

• classifier/KernelLookup.h (modified) (1 diff)
• classifier/MatrixLookup.h (modified) (1 diff)
• classifier/MatrixLookupWeighted.h (modified) (1 diff)
• utility/Container2DIterator.h (modified) (4 diffs)
• utility/iterator_traits.h (modified) (1 diff)

trunk/yat/classifier/KernelLookup.h

@@ -84 +84 @@
     /// 'Read Only' iterator
     typedef utility::StrideIterator<
-    utility::Container2DIterator<const KernelLookup, double, void,const double> >
+    utility::Container2DIterator<const KernelLookup, value_type,
+                                 const_reference> >
     const_iterator;
 

trunk/yat/classifier/MatrixLookup.h

@@ -87 +87 @@
 
     /// 'Read Only' iterator
-    typedef utility::Container2DIterator<const MatrixLookup, double, 
-                                         void, const double>
+    typedef utility::Container2DIterator<const MatrixLookup, value_type, 
+                                         const_reference>
     const_iterator;
 

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -89 +89 @@
     typedef utility::StrideIterator<
     utility::Container2DIterator<const MatrixLookupWeighted, 
-                                 value_type, void,  
-                                 const_reference,
-             utility::IteratorPolicyWeighted<const MatrixLookupWeighted,
-                                             const double,
-                                             const double> > >
+                                 value_type, const_reference> >
     const_iterator;
 

trunk/yat/utility/Container2DIterator.h

@@ -24 +24 @@
 */
 
-#include "IteratorPolicy.h"
+#include "deprecate.h"
+#include "iterator_traits.h"
 #include "yat_assert.h"
 
@@ -41 +42 @@
      @brief Iterator
   */
-  template<typename Container, typename value, 
-           typename pointer = value*, typename reference = value&,
-           class Policy = IteratorPolicy<Container, reference, value> > 
+  template<typename Container, typename value, typename reference = value&>
   class Container2DIterator
     : public boost::iterator_facade<
-    Container2DIterator<Container, value, pointer, reference, Policy>
+    Container2DIterator<Container, value, reference>
     , value
     , std::random_access_iterator_tag
     , reference>
   {
-  public:
-    /**
-       Tells whether iterator is weighted or not.
-
-       \see weighted_iterator_tag and unweighted_iterator_tag
-     */
-    typedef typename Policy::weighted_iterator_type weighted_iterator_type;
-
   private:
-    typedef Container2DIterator<Container, value, pointer,reference,Policy> self;
+    typedef Container2DIterator<Container, value, reference> self;
 
   public:
@@ -78 +69 @@
       : container_(&container), index_(row*container.columns()+column) {}
 
-    /**
-       \return data
-    */
-    typename Policy::data_type data(void) const 
-    { yat_assert<std::out_of_range>(index_<this->size(), 
-                                    "Container2DIterator::data"); 
-      return ip_.data(*container_, row(index_), column(index_)); 
-    }
-
-    /**
-       \return weight
-    */
-    typename Policy::weight_type weight(void) const 
-    { yat_assert<std::out_of_range>(index_<this->size(), 
-                                    "Container2DIterator::weight"); 
-      return ip_.weight(*container_, row(index_), column(index_)); 
-    }
-
   private:
     friend class boost::iterator_core_access;
@@ -101 +74 @@
     Container* container_;
     size_t index_;
-    Policy ip_;
 
     void advance(int n) { index_+=n; }

trunk/yat/utility/iterator_traits.h

@@ -298 +298 @@
      that have an underlying iterator (e.g. StrideIterator), this
      class should be specialized, so the class also works when the
-     underlying is an iterator that is not overed by this class
+     underlying is an iterator that is not covered by this class
      e.g. WeightedIterator.
    */