Changeset 1092
- Timestamp:
- Feb 14, 2008, 10:54:19 PM (14 years ago)
- Location:
- trunk/yat
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yat/statistics/EuclideanDistance.h
r1069 r1092 56 56 template <typename Iter1, typename Iter2> 57 57 double distance (Iter1 beg1,Iter1 end1, Iter2 beg2, 58 utility::unweighted_ type) const58 utility::unweighted_iterator_tag) const 59 59 { 60 60 AveragerPair ap; … … 65 65 template <typename Iter1, typename Iter2> 66 66 double distance (Iter1 beg1,Iter1 end1, Iter2 beg2, 67 utility::weighted_ type) const67 utility::weighted_iterator_tag) const 68 68 { 69 69 AveragerPairWeighted ap; -
trunk/yat/statistics/PearsonDistance.h
r1071 r1092 54 54 template <typename Iter1, typename Iter2> 55 55 double distance (Iter1 beg1,Iter1 end1, Iter2 beg2, 56 utility::unweighted_ type) const56 utility::unweighted_iterator_tag) const 57 57 { 58 58 AveragerPairWeighted ap; … … 63 63 template <typename Iter1, typename Iter2> 64 64 double distance (Iter1 beg1,Iter1 end1, Iter2 beg2, 65 utility::weighted_ type) const65 utility::weighted_iterator_tag) const 66 66 { 67 67 AveragerPairWeighted ap; -
trunk/yat/utility/IteratorPolicy.h
r1083 r1092 39 39 typedef reference data_type; 40 40 typedef weight_t weight_type; 41 typedef unweighted_ typeweighted_iterator_type;41 typedef unweighted_iterator_tag weighted_iterator_type; 42 42 43 43 data_type data(const Container& c, size_t row, size_t column) const … … 68 68 typedef data_t data_type; 69 69 typedef weight_t weight_type; 70 typedef weighted_ typeweighted_iterator_type;70 typedef weighted_iterator_tag weighted_iterator_type; 71 71 72 72 data_type data(const Container& c, size_t row, size_t column) const -
trunk/yat/utility/iterator_traits.h
r1089 r1092 33 33 unweighted, which is the default. 34 34 */ 35 struct unweighted_type { 36 typedef unweighted_type type; 37 }; 35 struct unweighted_iterator_tag {}; 38 36 39 37 /** … … 43 41 unweighted cousin). 44 42 */ 45 struct weighted_type { 46 typedef weighted_type type; 47 }; 43 struct weighted_iterator_tag {}; 48 44 49 45 /** … … 54 50 template <class T> 55 51 struct weighted_iterator_traits { 56 typedef unweighted_ typetype;52 typedef unweighted_iterator_tag type; 57 53 }; 58 54 … … 64 60 template <class T1, class T2> 65 61 struct unweighted_type_and { 66 typedef weighted_ typetype;62 typedef weighted_iterator_tag type; 67 63 }; 68 64 … … 72 68 */ 73 69 template <> 74 struct unweighted_type_and<unweighted_ type, unweighted_type> {75 typedef unweighted_ typetype;70 struct unweighted_type_and<unweighted_iterator_tag, unweighted_iterator_tag> { 71 typedef unweighted_iterator_tag type; 76 72 }; 77 73 … … 99 95 100 96 /// check (at compile time) that iterator is unweighted. 101 inline void check_iterator_is_unweighted(unweighted_ typex){}97 inline void check_iterator_is_unweighted(unweighted_iterator_tag x){} 102 98 103 99 /**
Note: See TracChangeset
for help on using the changeset viewer.