Mercurial > hg > match-vamp
comparison src/DistanceMetric.cpp @ 150:b79151bb75af refactors
Make noise a parameter in DistanceMetric (though not exposed in plugin etc yet)
author | Chris Cannam |
---|---|
date | Thu, 22 Jan 2015 17:25:24 +0000 |
parents | ecfb4ada171b |
children | d6df9fe7b12f |
comparison
equal
deleted
inserted
replaced
149:b990fa45cb1f | 150:b79151bb75af |
---|---|
47 d += fabs(f1[i] - f2[i]); | 47 d += fabs(f1[i] - f2[i]); |
48 sum += fabs(f1[i]) + fabs(f2[i]); | 48 sum += fabs(f1[i]) + fabs(f2[i]); |
49 } | 49 } |
50 | 50 |
51 double noise = 1e-3 * featureSize; | 51 double noise = 1e-3 * featureSize; |
52 d += noise; | 52 if (m_params.noise == AddNoise) { |
53 sum += noise; | 53 d += noise; |
54 sum += noise; | |
55 } | |
54 | 56 |
55 if (sum == 0) { | 57 if (sum == 0) { |
56 return 0; | 58 return 0; |
57 } | 59 } |
58 | 60 |