Changeset 1528 for trunk/yat/classifier
- Timestamp:
- Sep 24, 2008, 5:46:28 PM (14 years ago)
- Location:
- trunk/yat/classifier
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yat/classifier/MatrixLookup.cc
r1487 r1528 150 150 MatrixLookup::const_iterator MatrixLookup::begin(void) const 151 151 { 152 return const_iterator( const_iterator::iterator_type(*this, 0, 0), 1);152 return const_iterator(*this, 0, 0); 153 153 } 154 154 … … 156 156 MatrixLookup::const_column_iterator MatrixLookup::begin_column(size_t i) const 157 157 { 158 return const_column_iterator(const_column_iterator::iterator_type(*this, 0, 159 i), 160 columns()); 158 return const_column_iterator(data_->begin_column(column_index_[i]), 159 row_index_.begin()); 161 160 } 162 161 … … 164 163 MatrixLookup::const_row_iterator MatrixLookup::begin_row(size_t i) const 165 164 { 166 return const_row_iterator(const_row_iterator::iterator_type(*this,i,0), 1); 165 return const_row_iterator(data_->begin_row(row_index_[i]), 166 column_index_.begin()); 167 167 } 168 168 … … 176 176 MatrixLookup::const_iterator MatrixLookup::end(void) const 177 177 { 178 return const_iterator( const_iterator::iterator_type(*this, rows(), 0), 1);178 return const_iterator(*this, rows(), 0); 179 179 } 180 180 … … 182 182 MatrixLookup::const_column_iterator MatrixLookup::end_column(size_t i) const 183 183 { 184 return 185 const_column_iterator(const_column_iterator::iterator_type(*this,rows(), 186 i), 187 columns()); 184 return const_column_iterator(data_->end_column(column_index_[i]), 185 row_index_.end()); 188 186 } 189 187 … … 191 189 MatrixLookup::const_row_iterator MatrixLookup::end_row(size_t i) const 192 190 { 193 return const_row_iterator(const_row_iterator::iterator_type(*this,i+1,0),1); 191 return const_row_iterator(data_->end_row(row_index_[i]), 192 column_index_.end()); 194 193 } 195 194 -
trunk/yat/classifier/MatrixLookup.h
r1487 r1528 29 29 #include "yat/utility/Index.h" 30 30 #include "yat/utility/iterator_traits.h" 31 #include "yat/utility/Matrix.h" 31 32 #include "yat/utility/SmartPtr.h" 32 #include "yat/utility/StrideIterator.h" 33 34 #include <boost/iterator/permutation_iterator.hpp> 33 35 34 36 #include <iostream> … … 37 39 namespace theplu { 38 40 namespace yat { 39 40 namespace utility {41 class Matrix;42 }43 44 41 namespace classifier { 45 42 … … 76 73 public: 77 74 /// 'Read Only' iterator 78 typedef utility::StrideIterator< 79 utility::Container2DIterator<const MatrixLookup, const double, void, 80 const double> > 75 typedef utility::Container2DIterator<const MatrixLookup, const double, 76 void, const double> 81 77 const_iterator; 82 78 … … 84 80 'Read only' iterator used to iterate over a column 85 81 */ 86 typedef const_iterator const_column_iterator; 82 typedef boost::permutation_iterator<utility::Matrix::const_column_iterator, 83 utility::Index::const_iterator> 84 const_column_iterator; 87 85 88 86 /** 89 87 'Read only' iterator used to iterate over a row 90 88 */ 91 typedef const_ iterator const_row_iterator;89 typedef const_column_iterator const_row_iterator; 92 90 93 91 ///
Note: See TracChangeset
for help on using the changeset viewer.