Mercurial > hg > plosone_underreview
diff scripts/load_features.py @ 24:852d4377f6ca branch-tests
melodia roots
| author | Maria Panteli <m.x.panteli@gmail.com> |
|---|---|
| date | Wed, 13 Sep 2017 13:52:51 +0100 |
| parents | a35bd818d8e9 |
| children | 8dea2b8349c5 |
line wrap: on
line diff
--- a/scripts/load_features.py Wed Sep 13 12:53:57 2017 +0100 +++ b/scripts/load_features.py Wed Sep 13 13:52:51 2017 +0100 @@ -117,8 +117,8 @@ try: op, mfcc = self.get_op_mfcc_for_file(df['Melspec'].iloc[i]) ch = self.get_chroma_for_file(df['Chroma'].iloc[i]) - #pb = self.get_pb_from_melodia(df['Melodia'].iloc[i]) - pb = self.load_precomputed_pb_from_melodia(df['Melodia'].iloc[i]) + pb = self.get_pb_from_melodia(df['Melodia'].iloc[i]) + #pb = self.load_precomputed_pb_from_melodia(df['Melodia'].iloc[i]) #pb = self.get_contour_feat_from_melodia(df['Melodia'].iloc[i]) except: continue @@ -241,6 +241,12 @@ def load_precomputed_pb_from_melodia(self, melodia_file=None, nmfpb=True, scale=True): base = os.path.basename(melodia_file) root = '/import/c4dm-05/mariap/Melodia-melody-'+str(int(self.win2sec))+'sec/' + root_BL = '/import/c4dm-04/mariap/FeatureCsvs_BL_old/PB-melodia/' + root_SM = '/import/c4dm-04/mariap/FeatureCsvs/PB-melodia/' + if 'SampleAudio' in base: + root = root_SM + else: + root = root_BL print 'load precomputed pitch bihist', root if self.win2sec == 8: pbihist = pd.read_csv(os.path.join(root, base)).iloc[1:,1:]