Mercurial > hg > qm-dsp
diff dsp/segmentation/ClusterMeltSegmenter.h @ 480:175e51ae78eb
Untabify, indent, tidy
author | Chris Cannam <cannam@all-day-breakfast.com> |
---|---|
date | Fri, 31 May 2019 10:53:39 +0100 |
parents | d5014ab8b0e5 |
children | 7f2dadbdb544 |
line wrap: on
line diff
--- a/dsp/segmentation/ClusterMeltSegmenter.h Fri May 31 10:35:08 2019 +0100 +++ b/dsp/segmentation/ClusterMeltSegmenter.h Fri May 31 10:53:39 2019 +0100 @@ -39,13 +39,13 @@ fmax(16000), nbins(8), ncomponents(20), - nHMMStates(40), + nHMMStates(40), nclusters(10), histogramLength(15), neighbourhoodLimit(20) { } feature_types featureType; - double hopSize; // in secs - double windowSize; // in secs + double hopSize; // in secs + double windowSize; // in secs int fmin; int fmax; int nbins; @@ -65,14 +65,14 @@ virtual int getWindowsize(); virtual int getHopsize(); virtual void extractFeatures(const double* samples, int nsamples); - void setFeatures(const vector<vector<double> >& f); // provide the features yourself - virtual void segment(); // segment into default number of segment-types - void segment(int m); // segment into m segment-types + void setFeatures(const vector<vector<double> >& f); // provide the features yourself + virtual void segment(); // segment into default number of segment-types + void segment(int m); // segment into m segment-types int getNSegmentTypes() { return nclusters; } protected: void makeSegmentation(int* q, int len); - + void extractFeaturesConstQ(const double *, int); void extractFeaturesMFCC(const double *, int); @@ -80,13 +80,13 @@ FFTReal *fft; ConstantQ* constq; MFCC* mfcc; - model_t* model; // the HMM - int* q; // the decoded HMM state sequence - vector<vector<double> > histograms; + model_t* model; // the HMM + int* q; // the decoded HMM state sequence + vector<vector<double> > histograms; - feature_types featureType; - double hopSize; // in seconds - double windowSize; // in seconds + feature_types featureType; + double hopSize; // in seconds + double windowSize; // in seconds // constant-Q parameters int fmin;