Changeset 1040

Timestamp:

Feb 6, 2008, 1:42:53 AM (15 years ago)

Author:

Peter

Message:

working on #267

Location:

trunk/yat

Files:

• classifier/DataLookup1D.h (modified) (2 diffs)
• utility/Functor.h (added)
• utility/Iterator.h (modified) (3 diffs)
• utility/Makefile.am (modified) (1 diff)

trunk/yat/classifier/DataLookup1D.h

@@ -27 +27 @@
 */
 
+#include "yat/utility/Functor.h"
 #include "yat/utility/Iterator.h"
 
@@ -49 +50 @@
   
   public:
-
     /// 'Read Only' iterator
-    typedef utility::Iterator<const double, const classifier::DataLookup1D> 
+    typedef utility::Iterator<const utility::ContIdentity<const double, 
+                                                          const DataLookup1D> > 
     const_iterator;
 

trunk/yat/utility/Iterator.h

@@ -41 +41 @@
      @brief Iterator
   */
-  template<typename T, typename Container>
+  template<typename T>
   class Iterator
   {
@@ -49 +49 @@
     typedef size_t difference_type;
     typedef double* pointer;
-    typedef T reference;
+    typedef typename T::result_type reference;
+    typedef typename T::container_type Container ;
 
   private:
-    typedef Iterator<reference, Container> self;
+    typedef Iterator<T> self;
 
   public:
@@ -68 +69 @@
     Iterator(Container& container, difference_type index)
       : container_(&container), index_(index) {}
-
-    operator Iterator<const reference, const Container>()
-    { return Iterator<const reference, const Container>(*container_, index_); }
 
     /**

trunk/yat/utility/Makefile.am

@@ -36 +36 @@
 include_utility_HEADERS = \
   Alignment.h ColumnStream.h CommandLine.h \
-  Exception.h FileUtil.h Iterator.h iterator_traits.h \
+  Exception.h FileUtil.h Functor.h Iterator.h iterator_traits.h \
   IteratorWeighted.h kNNI.h matrix.h NNI.h \
   Option.h OptionArg.h OptionFile.h OptionInFile.h OptionOutFile.h \