comparison Matcher.h @ 29:cd0ffe6b1e68

Make distance scale a parameter as well

 
         Parameters(float rate_, double hopTime_, int fftSize_) :
             sampleRate(rate_),
             frameNorm(NormaliseFrameToSum1),
             distanceNorm(DistanceMetric::NormaliseDistanceToLogSum),
+            distanceScale(90.0),
             useSpectralDifference(true),
             useChromaFrequencyMap(false),
             hopTime(hopTime_),
             fftSize(fftSize_),
             blockTime(10.0),

         FrameNormalisation frameNorm;
 
         /** Type of distance metric normalisation */
         DistanceMetric::DistanceNormalisation distanceNorm;
 
+        /** Scaling factor for distance metric; must guarantee that the
+         *  final value fits in the data type used, that is, unsigned
+         *  char.
+         */
+        double distanceScale;
+
         /** Flag indicating whether or not the half-wave rectified
          *  spectral difference should be used in calculating the
          *  distance metric for pairs of audio frames, instead of the
          *  straight spectrum values. */
         bool useSpectralDifference;

      *  DTW steps. */
     bool firstPM;
 
     /** Configuration parameters */
     Parameters params;
-
-    /** Scaling factor for distance metric; must guarantee that the
-     *  final value fits in the data type used, that is, unsigned
-     *  char.
-     */
-    double scale;
 
     /** Width of the search band in FFT frames (see <code>blockTime</code>) */
     int blockSize;
 
     /** The number of frames of audio data which have been read. */