Mercurial > hg > batch-feature-extraction-tool

diff Source/ObservationData.h @ 10:73852457b624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
We now have a the spectral contrast feature
author Geogaddi\David <d.m.ronan@qmul.ac.uk>
date Fri, 14 Aug 2015 18:21:43 +0100
parents 25bf17994ef1
children 761289a660c6
line wrap: on
line diff
--- a/Source/ObservationData.h	Wed Aug 12 22:25:06 2015 +0100
+++ b/Source/ObservationData.h	Fri Aug 14 18:21:43 2015 +0100
@@ -19,7 +19,7 @@
 	ObservationData();
 	~ObservationData();
 
-	ObservationData(float rms, float peak, float crestfactor, float zcr, float centroid, float spread, float skewness, float kurtosis, float brightness, float rolloff85, float rolloff95, float spectralentropy, float flatness, float spectralcf, float spectralflux, std::vector<float> mfccs, float periodicity, float entropyofenergy)
+	ObservationData(float rms, float peak, float crestfactor, float zcr, float centroid, float spread, float skewness, float kurtosis, float brightness, float rolloff85, float rolloff95, float spectralentropy, float flatness, float spectralcf, float spectralflux, std::vector<float> mfccs, std::vector<float> spectralContrast, std::vector<float> spectralValley, float periodicity, float entropyofenergy)
 	{
 		m_peak = peak;
 		m_rms = rms;
@@ -37,11 +37,13 @@
 		m_spectralcf = spectralcf;
 		m_spectralflux = spectralflux;
 		m_mfccs = mfccs;
+		m_spectralContrast = spectralContrast;
+		m_spectralValley = spectralValley;
 		m_periodicity = periodicity;
 		m_entropyofenergy = entropyofenergy;
 	};
 
-	ObservationData(float rms, float peak, float crestfactor, float zcr, float centroid, float spread, float skewness, float kurtosis, float brightness, float rolloff85, float rolloff95, float spectralentropy, float flatness, float spectralcf, float spectralflux, std::vector<float> mfccs, std::vector<float> dmfccs, float periodicity, float entropyofenergy)
+	ObservationData(float rms, float peak, float crestfactor, float zcr, float centroid, float spread, float skewness, float kurtosis, float brightness, float rolloff85, float rolloff95, float spectralentropy, float flatness, float spectralcf, float spectralflux, std::vector<float> mfccs, std::vector<float> dmfccs, std::vector<float> spectralContrast, std::vector<float> spectralValley, float periodicity, float entropyofenergy)
 	{
 		m_peak = peak;
 		m_rms = rms;
@@ -58,6 +60,8 @@
 		m_flatness = flatness;
 		m_spectralcf = spectralcf;
 		m_spectralflux = spectralflux;
+		m_spectralContrast = spectralContrast;
+		m_spectralValley = spectralValley;
 		m_mfccs = mfccs;
 		m_dmfccs = dmfccs;
 		m_periodicity = periodicity;
@@ -84,6 +88,8 @@
 	float GetLowEnergy(){return m_lowEnergy;}
 	std::vector<float> GetMFCCs(){return m_mfccs;}
 	std::vector<float> GetDeltaMFCCs(){return m_dmfccs;}
+	std::vector<float> GetSpectralContrast(){ return m_spectralContrast; }
+	std::vector<float> GetSpectralValley(){ return m_spectralValley; }
 	
 	//WholeTrack Feature
 	void SetLowEnergy(float lowEnergy){m_lowEnergy = lowEnergy;}
@@ -106,6 +112,8 @@
 	float m_spectralflux;
 	std::vector<float> m_mfccs;
 	std::vector<float> m_dmfccs;
+	std::vector<float> m_spectralContrast;
+	std::vector<float> m_spectralValley;
 	float m_periodicity;
 	float m_lowEnergy;
 	float m_entropyofenergy;