Mercurial > hg > match-vamp

diff src/DistanceMetric.h @ 184:6c12db195986 re-minimise

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some fixes (still does not yet build)
author Chris Cannam
date Thu, 26 Feb 2015 09:55:28 +0000
parents 24ddab06aace
children a17b22abd551
line wrap: on
line diff
--- a/src/DistanceMetric.h	Thu Feb 19 17:17:20 2015 +0000
+++ b/src/DistanceMetric.h	Thu Feb 26 09:55:28 2015 +0000
@@ -68,12 +68,14 @@
         Parameters() :
             metric(Manhattan),
             norm(NormaliseDistanceToLogSum),
-            noise(AddNoise)
+            noise(AddNoise),
+            scale(90.)
         {}
 
         Metric metric;
         DistanceNormalisation norm;
         NoiseAddition noise;
+        double scale;
     };
     
     DistanceMetric(Parameters params);
@@ -92,6 +94,7 @@
     
 private:
     Parameters m_params;
+    distance_t scaleIntoRange(double distance);
 };
 
 #endif