- Timestamp:
- Jul 16, 2008, 9:32:20 PM (14 years ago)
- Location:
- trunk/yat/utility
- Files:
-
- 2 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/yat/utility/DataIterator.h
r1375 r1376 24 24 02111-1307, USA. 25 25 */ 26 27 #include "iterator_traits.h" 26 28 27 29 #include <boost/iterator/iterator_adaptor.hpp> -
trunk/yat/utility/Makefile.am
r1365 r1376 47 47 SVD.h TypeInfo.h utility.h Vector.h \ 48 48 VectorBase.h VectorConstView.h VectorMutable.h VectorView.h \ 49 We NNI.h yat_assert.h49 WeightIterator.h WeNNI.h yat_assert.h 50 50 -
trunk/yat/utility/WeightIterator.h
r1375 r1376 1 #ifndef _theplu_yat_utility_ data_iterator_2 #define _theplu_yat_utility_ data_iterator_1 #ifndef _theplu_yat_utility_weight_iterator_ 2 #define _theplu_yat_utility_weight_iterator_ 3 3 4 4 // $Id$ … … 36 36 */ 37 37 template<typename Base> 38 class DataIterator38 class WeightIterator 39 39 : public boost::iterator_adaptor< 40 DataIterator<Base> // Derived40 WeightIterator<Base> // Derived 41 41 , Base // Base 42 , boost::remove_reference<typename iterator_traits<Base>:: data_reference>42 , boost::remove_reference<typename iterator_traits<Base>::weight_reference> 43 43 , boost::forward_traversal_tag // CategoryOrTraversal 44 , typename iterator_traits<Base>:: data_reference // Reference44 , typename iterator_traits<Base>::weight_reference // Reference 45 45 > 46 46 … … 50 50 \brief Constructor from \a Base iterator 51 51 */ 52 explicit DataIterator(Base b)53 : DataIterator::iterator_adaptor_(b) {}52 explicit WeightIterator(Base b) 53 : WeightIterator::iterator_adaptor_(b) {} 54 54 55 55 /** … … 58 58 \return data 59 59 */ 60 typename iterator_traits<Base>:: data_reference operator*(void) const61 { return iterator_traits<Base>(). data(this->base()); }60 typename iterator_traits<Base>::weight_reference operator*(void) const 61 { return iterator_traits<Base>().weight(this->base()); } 62 62 63 63 private: … … 70 70 */ 71 71 template<typename Base> 72 DataIterator<Base> make_data_iterator(Base base)72 WeightIterator<Base> make_weight_iterator(Base base) 73 73 { 74 return DataIterator<Base>(base);74 return WeightIterator<Base>(base); 75 75 } 76 76
Note: See TracChangeset
for help on using the changeset viewer.