some bugs and shit

luster · May 17, 2016 · 352100a · 352100a
1 parent 6466dd7
commit 352100a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/thesis/build_networks.py b/thesis/build_networks.py
@@ -11,7 +11,6 @@
 from lasagne.layers import batch_norm
 from lasagne.nonlinearities import rectify, elu, softplus
 from norm_layer import NormalisationLayer
-from dataset import build_dataset2
 from plot import make_plots
 import scikits.audiolab
 from sklearn.metrics import mean_squared_error

diff --git a/thesis/dataset.py b/thesis/dataset.py
@@ -135,9 +135,9 @@ def _avg_energy_scale(x, y):
     x_noise = _norm_signal(x_noise)
     x_clean = np.copy(x_signal)
 
-    x_signal = x_signal[start:end]
-    x_noise = x_noise[start:end]
-    x_clean = x_clean[start:end]
+    #x_signal = x_signal[start:end]
+    #x_noise = x_noise[start:end]
+    #x_clean = x_clean[start:end]
 
     # prevent clipping
     if k < 1:

diff --git a/thesis/graph_server.py b/thesis/graph_server.py
@@ -70,7 +70,7 @@ def generate_graph():
 @app.route('/sound/<reconstruction>/<snr>')
 def play_sound(reconstruction, snr):
     latest = os.path.join(get_latest_sim_dir(), 'wav')
-    regex = '^out_(noisy|Scc|Sdc|Scd|Sdd)_-{0,1}\d\.\d.wav$'
+    regex = '^out_(noisy|Scc|Sdc|Scd|Sdd)_-{0,1}\d{1,2}\.\d.wav$'
     fname = 'out_{}_{}.wav'.format(reconstruction, snr)
     print fname
     if not re.match(regex, fname):

diff --git a/thesis/plot.py b/thesis/plot.py
@@ -27,7 +27,6 @@
 plt.rcParams.update({'font.size': 6})
 
 from config import *
-from dataset import build_dataset
 
 # from network import input_var, signal_specgram, network