# HG changeset patch
# User Chris Cannam
# Date 1490369732 0
# Node ID 0432723faf031101a3d05942b9c6d0328bc5ba86
# Parent  9ec558ed83d4d072b9bca399a38c11f456775d5b
Fix compiler warnings (no point in returning const type)

diff -r 9ec558ed83d4 -r 0432723faf03 MonoNoteHMM.cpp
--- a/MonoNoteHMM.cpp	Fri Mar 24 15:08:12 2017 +0000
+++ b/MonoNoteHMM.cpp	Fri Mar 24 15:35:32 2017 +0000
@@ -28,7 +28,7 @@
     build();
 }
 
-const vector<double>
+vector<double>
 MonoNoteHMM::calculateObsProb(const vector<pair<double, double> > pitchProb)
 {
     // pitchProb is a list of pairs (pitches and their probabilities)
diff -r 9ec558ed83d4 -r 0432723faf03 MonoNoteHMM.h
--- a/MonoNoteHMM.h	Fri Mar 24 15:08:12 2017 +0000
+++ b/MonoNoteHMM.h	Fri Mar 24 15:35:32 2017 +0000
@@ -28,7 +28,7 @@
 {
 public:
     MonoNoteHMM(int fixedLag);
-    const std::vector<double> calculateObsProb(const vector<pair<double, double> >);
+    std::vector<double> calculateObsProb(const vector<pair<double, double> >);
 
     double getMidiPitch(size_t index);
     double getFrequency(size_t index);
diff -r 9ec558ed83d4 -r 0432723faf03 MonoPitchHMM.cpp
--- a/MonoPitchHMM.cpp	Fri Mar 24 15:08:12 2017 +0000
+++ b/MonoPitchHMM.cpp	Fri Mar 24 15:35:32 2017 +0000
@@ -44,7 +44,7 @@
     build();
 }
 
-const vector<double>
+vector<double>
 MonoPitchHMM::calculateObsProb(const vector<pair<double, double> > pitchProb)
 {
     vector<double> out = vector<double>(2*m_nPitch+1);
@@ -161,7 +161,7 @@
 Takes a state number and a pitch-prob vector, then finds the pitch that would
 have been closest to the pitch of the state. Easy to understand? ;)
 */
-const float
+float
 MonoPitchHMM::nearestFreq(int state, vector<pair<double, double> > pitchProb)
 {
     float hmmFreq = m_freqs[state];
diff -r 9ec558ed83d4 -r 0432723faf03 MonoPitchHMM.h
--- a/MonoPitchHMM.h	Fri Mar 24 15:08:12 2017 +0000
+++ b/MonoPitchHMM.h	Fri Mar 24 15:35:32 2017 +0000
@@ -27,8 +27,8 @@
 {
 public:
     MonoPitchHMM(int fixedLag);
-    const std::vector<double> calculateObsProb(const vector<pair<double, double> >);
-    const float nearestFreq(int state, vector<pair<double, double> > pitchProb);
+    std::vector<double> calculateObsProb(const vector<pair<double, double> >);
+    float nearestFreq(int state, vector<pair<double, double> > pitchProb);
     void build();
     double m_minFreq; // 82.40689f/2
     int m_nBPS;
diff -r 9ec558ed83d4 -r 0432723faf03 PYinVamp.cpp
--- a/PYinVamp.cpp	Fri Mar 24 15:08:12 2017 +0000
+++ b/PYinVamp.cpp	Fri Mar 24 15:35:32 2017 +0000
@@ -458,7 +458,7 @@
 PYinVamp::FeatureSet
 PYinVamp::process(const float *const *inputBuffers, RealTime timestamp)
 {
-    std::cerr << timestamp << std::endl;
+//    std::cerr << timestamp << std::endl;
     int offset = m_preciseTime == 1.0 ? m_blockSize/2 : m_blockSize/4;
     timestamp = timestamp + Vamp::RealTime::frame2RealTime(offset, 
         lrintf(m_inputSampleRate));
diff -r 9ec558ed83d4 -r 0432723faf03 SparseHMM.cpp
--- a/SparseHMM.cpp	Fri Mar 24 15:08:12 2017 +0000
+++ b/SparseHMM.cpp	Fri Mar 24 15:35:32 2017 +0000
@@ -35,7 +35,7 @@
 
 }
 
-const vector<double>
+vector<double>
 SparseHMM::calculateObsProb(const vector<pair<double, double> > )
 {
     // dummy (virtual?) implementation to be overloaded
@@ -46,7 +46,7 @@
 SparseHMM::build()
 { }
 
-const std::vector<int> 
+std::vector<int> 
 SparseHMM::decodeViterbi(std::vector<vector<double> > obsProb) 
 {
     int nFrame = obsProb.size();
@@ -166,7 +166,7 @@
     return 0;
 }
 
-const vector<int>
+vector<int>
 SparseHMM::track()
 {
     // initialise backward step
diff -r 9ec558ed83d4 -r 0432723faf03 SparseHMM.h
--- a/SparseHMM.h	Fri Mar 24 15:08:12 2017 +0000
+++ b/SparseHMM.h	Fri Mar 24 15:35:32 2017 +0000
@@ -26,14 +26,14 @@
 {
 public:
     SparseHMM(int fixedLag);
-    virtual const std::vector<double>
+    virtual std::vector<double>
                            calculateObsProb(const vector<pair<double, double> >);
     virtual void           build();
-    const std::vector<int> decodeViterbi(std::vector<vector<double> > obs);
+    std::vector<int>       decodeViterbi(std::vector<vector<double> > obs);
     void                   reset();
     void                   initialise(vector<double> firstObs);
     int                    process(vector<double> newObs);
-    const vector<int>      track();
+    vector<int>            track();
     // "sparse" HMM definition
     int m_fixedLag;
     int m_nState;