Changeset 1583
- Timestamp:
- Oct 15, 2008, 8:29:47 PM (14 years ago)
- Location:
- trunk/yat/utility
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yat/utility/MatrixWeighted.cc
r1487 r1583 78 78 79 79 80 MatrixWeighted::iterator MatrixWeighted::begin_column(size_t i) 81 { 82 return iterator(vec_.begin()+i, columns_); 83 } 84 85 86 MatrixWeighted::const_iterator MatrixWeighted::begin_column(size_t i) const 87 { 88 return const_iterator(vec_.begin()+i, columns_); 89 } 90 91 92 MatrixWeighted::iterator MatrixWeighted::begin_row(size_t i) 93 { 94 return iterator(vec_.begin()+columns_*i); 80 MatrixWeighted::column_iterator MatrixWeighted::begin_column(size_t i) 81 { 82 return column_iterator(vec_.begin()+i, columns_); 83 } 84 85 86 MatrixWeighted::const_column_iterator 87 MatrixWeighted::begin_column(size_t i) const 88 { 89 return const_column_iterator(vec_.begin()+i, columns_); 90 } 91 92 93 MatrixWeighted::row_iterator MatrixWeighted::begin_row(size_t i) 94 { 95 return row_iterator(vec_.begin()+columns_*i); 95 96 } 96 97 … … 98 99 MatrixWeighted::const_iterator MatrixWeighted::begin_row(size_t i) const 99 100 { 100 return const_ iterator(vec_.begin()+columns_*i);101 return const_row_iterator(vec_.begin()+columns_*i); 101 102 } 102 103 … … 141 142 142 143 143 MatrixWeighted::iterator MatrixWeighted::end_column(size_t i) 144 { 145 return iterator(vec_.begin()+i+vec_.size(), columns_); 146 } 147 148 149 MatrixWeighted::const_iterator MatrixWeighted::end_column(size_t i) const 150 { 151 return const_iterator(vec_.begin()+i+vec_.size(), columns_); 152 } 153 154 155 MatrixWeighted::iterator MatrixWeighted::end_row(size_t i) 156 { 157 return iterator(vec_.begin()+columns_*(i+1)); 158 } 159 160 161 MatrixWeighted::const_iterator MatrixWeighted::end_row(size_t i) const 162 { 163 return const_iterator(vec_.begin()+columns_*(i+1)); 144 MatrixWeighted::column_iterator MatrixWeighted::end_column(size_t i) 145 { 146 return column_iterator(vec_.begin()+i+vec_.size(), columns_); 147 } 148 149 150 MatrixWeighted::const_column_iterator 151 MatrixWeighted::end_column(size_t i) const 152 { 153 return const_column_iterator(vec_.begin()+i+vec_.size(), columns_); 154 } 155 156 157 MatrixWeighted::row_iterator MatrixWeighted::end_row(size_t i) 158 { 159 return row_iterator(vec_.begin()+columns_*(i+1)); 160 } 161 162 163 MatrixWeighted::const_row_iterator MatrixWeighted::end_row(size_t i) const 164 { 165 return const_row_iterator(vec_.begin()+columns_*(i+1)); 164 166 } 165 167 -
trunk/yat/utility/MatrixWeighted.h
r1549 r1583 63 63 Mutable iterator that iterates over all elements 64 64 */ 65 typedef StrideIterator<std::vector<DataWeight>::iterator>iterator;65 typedef std::vector<DataWeight>::iterator iterator; 66 66 67 67 /** 68 68 Read-only iterator that iterates over all elements 69 69 */ 70 typedef StrideIterator<std::vector<DataWeight>::const_iterator> 71 const_iterator; 70 typedef std::vector<DataWeight>::const_iterator const_iterator; 72 71 73 72 /** … … 85 84 Mutable iterator that iterates over one row 86 85 */ 87 typedef StrideIterator<std::vector<DataWeight>::iterator>row_iterator;86 typedef std::vector<DataWeight>::iterator row_iterator; 88 87 89 88 /** 90 89 Read-only iterator that iterates over one row 91 90 */ 92 typedef StrideIterator<std::vector<DataWeight>::const_iterator> 93 const_row_iterator; 91 typedef std::vector<DataWeight>::const_iterator const_row_iterator; 94 92 95 93 /** … … 153 151 \return iterator pointing to first element of column \a i. 154 152 */ 155 iterator begin_column(size_t i);153 column_iterator begin_column(size_t i); 156 154 157 155 /** … … 160 158 \return const_iterator pointing to first element of column \a i. 161 159 */ 162 const_ iterator begin_column(size_t i) const;160 const_column_iterator begin_column(size_t i) const; 163 161 164 162 /** … … 167 165 \return iterator pointing to first element of row \a i. 168 166 */ 169 iterator begin_row(size_t i);167 row_iterator begin_row(size_t i); 170 168 171 169 /** … … 174 172 \return const_iterator pointing to first element of row \a i. 175 173 */ 176 const_ iterator begin_row(size_t i) const;174 const_row_iterator begin_row(size_t i) const; 177 175 178 176 /** … … 194 192 \return iterator pointing to end of column \a i 195 193 */ 196 iterator end_column(size_t i);194 column_iterator end_column(size_t i); 197 195 198 196 /** 199 197 \return const_iterator pointing to end of column \a i 200 198 */ 201 const_ iterator end_column(size_t i) const;199 const_column_iterator end_column(size_t i) const; 202 200 203 201 /** 204 202 \return iterator pointing to end of row \a i 205 203 */ 206 iterator end_row(size_t i);204 row_iterator end_row(size_t i); 207 205 208 206 /** 209 207 \return const_iterator pointing to end of row \a i 210 208 */ 211 const_ iterator end_row(size_t i) const;209 const_row_iterator end_row(size_t i) const; 212 210 213 211 /**
Note: See TracChangeset
for help on using the changeset viewer.