X-Git-Url: http://git.johnwright.org/?p=fmit.git;a=blobdiff_plain;f=libs%2FMusic%2FFreqAnalysis.cpp;fp=libs%2FMusic%2FFreqAnalysis.cpp;h=2bbb4f26d95df19336904a705ebf3f4424baefe1;hp=ed526dce48bdb93c73d8799401511ded35b8c8c8;hb=a8fb82288feb6b258f2c04312f0c36ba8d79b494;hpb=adfba0402927438a1869f1e716bcf0e25574ce1e

diff --git a/libs/Music/FreqAnalysis.cpp b/libs/Music/FreqAnalysis.cpp
index ed526dc..2bbb4f2 100644
--- a/libs/Music/FreqAnalysis.cpp
+++ b/libs/Music/FreqAnalysis.cpp
@@ -133,9 +133,6 @@ namespace Music
 
 	double FundFreqRefinementOfHarmonicStruct(const vector<complex<double> >& spectrum, double approx_f0, int nb_harm, double used_zp)
 	{
-		double approx_f0_rel = approx_f0*spectrum.size()/double(GetSamplingRate());
-		assert(approx_f0_rel>1 && approx_f0_rel<=spectrum.size()/2-1);
-
 		vector<Harmonic> harms = GetHarmonicStruct(spectrum, approx_f0, nb_harm, used_zp, 0.2);
 
 		if(harms.empty())
@@ -144,7 +141,7 @@ namespace Music
 		double sum_f0 = 0.0;
 
 		for(size_t i=0; i<harms.size(); i++)
-			sum_f0 += harms[i].freq/harms[i].harm_number;				// TODO mod weigthed ???
+			sum_f0 += harms[i].freq/harms[i].harm_number; // TODO mod weigthed ???
 
 		return sum_f0/harms.size();
 	}