Mercurial > hg > plosone_underreview
diff scripts/load_features.py @ 42:90f8a2ea6f6f branch-tests
notebook results and load_features minor edits
| author | mpanteli <m.x.panteli@gmail.com> |
|---|---|
| date | Fri, 15 Sep 2017 16:17:17 +0100 |
| parents | 3b67cd634b9a |
| children | 06e5711f9f62 |
line wrap: on
line diff
--- a/scripts/load_features.py Fri Sep 15 12:27:11 2017 +0100 +++ b/scripts/load_features.py Fri Sep 15 16:17:17 2017 +0100 @@ -103,7 +103,7 @@ return music_idx - def get_features(self, df, stop_sec=30.0, class_label='Country', precomp_melody=False): + def get_features(self, df, stop_sec=30.0, class_label='Country', precomp_melody=True): oplist = [] mflist = [] chlist = [] @@ -119,7 +119,7 @@ if len(music_idx)==0: # no music segments -> skip this file continue - try: + if 1: op, mfcc = self.get_op_mfcc_for_file(df['Melspec'].iloc[i], stop_sec=stop_sec) ch = self.get_chroma_for_file(df['Chroma'].iloc[i], stop_sec=stop_sec) pb = self.get_pb_for_file(df['Melodia'].iloc[i], precomp_melody=precomp_melody, stop_sec=stop_sec) @@ -127,7 +127,7 @@ # pb = self.load_precomputed_pb_from_melodia(df['Melodia'].iloc[i], stop_sec=stop_sec) #else: # pb = self.get_pb_from_melodia(df['Melodia'].iloc[i], stop_sec=stop_sec) - except: + else: continue n_stop = np.int(np.ceil(stop_sec * self.framessr2)) print n_stop, len(op), len(mfcc), len(ch), len(pb)