Add fft used info

Author: janjongboom

flatten/dsp.py

@@ -51,6 +51,7 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
         'features': features,
         'graphs': [],
         'labels': labels,
+        'fft_used': [],
         'output_config': { 'type': 'flat', 'shape': { 'width': len(features) } }
     }
 

image/dsp.py

@@ -76,7 +76,7 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
     image_config = { 'width': int(width), 'height': int(height), 'channels': num_channels, 'frames': frame_count }
     output_config = { 'type': 'image', 'shape': image_config }
 
-    return { 'features': all_features, 'graphs': graphs, 'output_config': output_config }
+    return { 'features': all_features, 'graphs': graphs, 'output_config': output_config, 'fft_used': [] }
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description='Returns raw data')

mfcc/dsp.py

@@ -88,6 +88,7 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
     return {
         'features': features.tolist(),
         'graphs': graphs,
+        'fft_used': [ num_filters, fft_length ],
         'output_config': {
             'type': 'spectrogram',
             'shape': {

mfe/dsp.py

@@ -122,6 +122,7 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
     return {
         'features': features.tolist(),
         'graphs': graphs,
+        'fft_used': [ fft_length ],
         'output_config': {
             'type': 'spectrogram',
             'shape': {

raw/dsp.py

@@ -13,6 +13,7 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
     return {
         'features': raw_data * scale_axes,
         'graphs': [],
+        'fft_used': [],
         'output_config': { 'type': 'flat', 'shape': { 'width': len(raw_data) } }
     }
 

spectral-analysis/dsp.py

@@ -9,6 +9,10 @@
 def filter(type, freq_hz, cut_off_freq, filt_order, data):
     Wn = cut_off_freq / freq_hz    # Normalized frequency (6 / 62.5) = 0.096
 
+    # Catch when frequency too low
+    if (Wn >= 1.0):
+        raise Exception('Sample frequency must be greater than ' + str(cut_off_freq) + 'Hz. Try increasing the frequency in the "Impulse design" page.')
+
     [b, a] = signal.butter(filt_order, Wn=Wn, btype=type)
 
     filtered_data = lfilter(b,a,data)
@@ -221,6 +225,7 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
         'features': np.array(features).tolist(),
         'graphs': graphs,
         'labels': labels,
+        'fft_used': [ fft_length ],
         'output_config': { 'type': 'flat', 'shape': { 'width': len(features) } }
     }
 

spectrogram/dsp.py

@@ -120,6 +120,7 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
     return {
         'features': features.tolist(),
         'graphs': graphs,
+        'fft_used': [ fft_length ],
         'output_config': {
             'type': 'spectrogram',
             'shape': {
@@ -156,8 +157,8 @@ def generate_features(implementation_version, draw_graphs, raw_data, axes, sampl
     raw_axes = args.axes.split(',')
 
     try:
-        processed = generate_features(2, args.draw_graphs, raw_features, raw_axes, args.frequency,
-            args.frame_length, args.frame_stride, args.num_filters, args.fft_length, args.noise_floor_db)
+        processed = generate_features(3, args.draw_graphs, raw_features, raw_axes, args.frequency,
+            args.frame_length, args.frame_stride, args.fft_length, args.show_axes, args.noise_floor_db)
 
         print('Begin output')
         print(json.dumps(processed))