Changeset 2151
- Timestamp:
- Jan 17, 2010, 6:29:47 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/iterator_test.cc
r2119 r2151 63 63 void test_pair_second_iterator(test::Suite&); 64 64 65 void test_iterator_traits(test::Suite& suite); 65 66 void test_stride_iterator(test::Suite& suite); 66 67 void test_weighted_iterator(test::Suite& suite); … … 76 77 suite.out() << "testing boost_util\n"; 77 78 test_boost_util(suite); 79 test_iterator_traits(suite); 78 80 suite.out() << "testing pair_second_iterator\n"; 79 81 test_pair_second_iterator(suite); … … 287 289 } 288 290 291 292 void test_iterator_traits(test::Suite& suite) 293 { 294 typedef std::vector<utility::DataWeight> WeightVector; 295 WeightVector vec(1); 296 utility::iterator_traits<WeightVector::const_iterator> traits; 297 double w = traits.weight(vec.begin()); 298 suite.add(suite.equal(w, 1.0)); 299 } 300 301 289 302 void test_stride_iterator(test::Suite& suite) 290 303 { -
trunk/test/normalization_test.cc
r2150 r2151 194 194 boost::random_access_iterator_archetype<double>(), 195 195 boost::mutable_random_access_iterator_archetype<double>()); 196 using utility::DataWeight; 197 qQuantileNormalizer qqn4(boost::forward_iterator_archetype<DataWeight>(), 198 boost::forward_iterator_archetype<DataWeight>(), 199 100); 200 qqn4(boost::random_access_iterator_archetype<DataWeight>(), 201 boost::random_access_iterator_archetype<DataWeight>(), 202 boost::mutable_random_access_iterator_archetype<DataWeight>()); 196 203 } 197 204 } -
trunk/yat/utility/iterator_traits.h
r2119 r2151 232 232 \return reference to data of iterator 233 233 */ 234 data_reference data(Iter iter) const { return iter->data(); }234 data_reference data(Iter iter) const { return (*iter).data(); } 235 235 236 236 /** 237 237 \return reference to weight of iterator 238 238 */ 239 weight_reference weight(Iter iter) const { return iter->weight(); }239 weight_reference weight(Iter iter) const { return (*iter).weight(); } 240 240 }; 241 241 … … 259 259 \return const reference to data of iterator 260 260 */ 261 data_reference data(Iter iter) const { return iter->data(); }261 data_reference data(Iter iter) const { return (*iter).data(); } 262 262 263 263 /** 264 264 \return const reference to weight of iterator 265 265 */ 266 weight_reference weight(Iter iter) const { return iter->weight(); }266 weight_reference weight(Iter iter) const { return (*iter).weight(); } 267 267 }; 268 268
Note: See TracChangeset
for help on using the changeset viewer.