comparison src/Matcher.h @ 188:487261a22b18 re-minimise

distance_t * diagonalWeight might not fit in distance_t; use pathcost_t for it. Also remove C-style casts.
author Chris Cannam
date Thu, 26 Feb 2015 12:19:17 +0000
parents ba0d2104abec
children f415747b151b
comparison
equal deleted inserted replaced
187:ba0d2104abec 188:487261a22b18
82 * performances that may have wildly differing speeds but 82 * performances that may have wildly differing speeds but
83 * which also leads to quite jaggy paths. A more typical 83 * which also leads to quite jaggy paths. A more typical
84 * normal DTW approach for performances with similar speeds 84 * normal DTW approach for performances with similar speeds
85 * might use 1.0 or something close to it. 85 * might use 1.0 or something close to it.
86 */ 86 */
87 float diagonalWeight; 87 double diagonalWeight;
88 }; 88 };
89 89
90 /** Constructor for Matcher. 90 /** Constructor for Matcher.
91 * 91 *
92 * A Matcher expects to be provided with feature vectors 92 * A Matcher expects to be provided with feature vectors
132 132
133 int getOtherFrameCount() { 133 int getOtherFrameCount() {
134 return m_otherMatcher->getFrameCount(); 134 return m_otherMatcher->getFrameCount();
135 } 135 }
136 136
137 float getDiagonalWeight() { 137 double getDiagonalWeight() {
138 return m_params.diagonalWeight; 138 return m_params.diagonalWeight;
139 } 139 }
140 140
141 /** Processes a feature vector frame, presumably calculated from 141 /** Processes a feature vector frame, presumably calculated from
142 * audio data by some external code such as a FeatureExtractor. 142 * audio data by some external code such as a FeatureExtractor.