Mercurial > hg > match-vamp
comparison src/DistanceMetric.cpp @ 69:696f6e7f2f31 refactors
distYSize no longer needed, and some tidying and checks
author | Chris Cannam |
---|---|
date | Tue, 18 Nov 2014 16:35:15 +0000 |
parents | a1b7df871496 |
children | eed5f9594268 |
comparison
equal
deleted
inserted
replaced
67:a3efb15e7faf | 69:696f6e7f2f31 |
---|---|
30 | 30 |
31 int featureSize = f1.size(); | 31 int featureSize = f1.size(); |
32 assert(int(f2.size()) == featureSize); | 32 assert(int(f2.size()) == featureSize); |
33 | 33 |
34 for (int i = 0; i < featureSize; i++) { | 34 for (int i = 0; i < featureSize; i++) { |
35 assert(f1[i] >= 0); | |
36 assert(f2[i] >= 0); | |
35 d += fabs(f1[i] - f2[i]); | 37 d += fabs(f1[i] - f2[i]); |
36 sum += f1[i] + f2[i]; | 38 sum += f1[i] + f2[i]; |
37 } | 39 } |
38 | 40 |
39 if (sum == 0) | 41 if (sum == 0) |