diff src/DistanceMetric.h @ 190:48f9c50587dc re-minimise

Print some info about scale range, so we can work out what scale factor to use

--- a/src/DistanceMetric.h	Thu Feb 26 12:26:33 2015 +0000
+++ b/src/DistanceMetric.h	Thu Feb 26 15:51:50 2015 +0000
@@ -69,7 +69,7 @@
             metric(Manhattan),
             norm(NormaliseDistanceToLogSum),
             noise(AddNoise),
-            scale(90.)
+            scale(200.)
         {}
 
         Metric metric;
@@ -79,6 +79,8 @@
     };
     
     DistanceMetric(Parameters params);
+
+    ~DistanceMetric();
     
     /** Calculates the distance in some metric between two vectors,
      *  with an optional normalisation by the combined values in the
@@ -100,7 +102,11 @@
 private:
     Parameters m_params;
 
+    distance_t scaleAndTally(double);
     template <typename T> T scaleIntoRange(double);
+
+    distance_t m_max;
+    int m_overcount;
 };
 
 #endif