Add test for gen_noise

parhalje · Jan 29, 2020 · 7eb93d1 · 7eb93d1
1 parent 9e2d2c6
commit 7eb93d1
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 26 deletions.
diff --git a/examples/dat/freqs.npy → examples/data/freqs.npy b/examples/dat/freqs.npy → examples/data/freqs.npy
diff --git a/examples/dat/freqs_2.npy → examples/data/freqs_2.npy b/examples/dat/freqs_2.npy → examples/data/freqs_2.npy
diff --git a/examples/dat/freqs_lfp.npy → examples/data/freqs_lfp.npy b/examples/dat/freqs_lfp.npy → examples/data/freqs_lfp.npy
diff --git a/examples/dat/spectrum.npy → examples/data/spectrum.npy b/examples/dat/spectrum.npy → examples/data/spectrum.npy
diff --git a/examples/dat/spectrum_2.npy → examples/data/spectrum_2.npy b/examples/dat/spectrum_2.npy → examples/data/spectrum_2.npy
diff --git a/examples/dat/spectrum_lfp.npy → examples/data/spectrum_lfp.npy b/examples/dat/spectrum_lfp.npy → examples/data/spectrum_lfp.npy
diff --git a/examples/plot_model_fits.py → examples/plots/plot_model_components.py b/examples/plot_model_fits.py → examples/plots/plot_model_components.py
diff --git a/examples/plot_plots.py → examples/plots/plot_power_spectra.py b/examples/plot_plots.py → examples/plots/plot_power_spectra.py
diff --git a/examples/plot_sim_params.py → examples/sims/plot_sim_params.py b/examples/plot_sim_params.py → examples/sims/plot_sim_params.py
diff --git a/examples/plot_simulated_power_spectra.py → ...ples/sims/plot_simulated_power_spectra.py b/examples/plot_simulated_power_spectra.py → ...ples/sims/plot_simulated_power_spectra.py
diff --git a/examples/plot_transforms.py → examples/sims/plot_transforms.py b/examples/plot_transforms.py → examples/sims/plot_transforms.py
diff --git a/fooof/sim/gen.py b/fooof/sim/gen.py
@@ -226,6 +226,32 @@ def gen_peaks(freqs, gaussian_params):
     return peak_vals
 
 
+def gen_noise(freqs, nlv):
+    """Generate noise values for a simulated power spectrum.
+
+    Parameters
+    ----------
+    freqs : 1d array
+        Frequency vector to create noise values from.
+    nlv : float
+        Noise level to generate.
+
+    Returns
+    -------
+    noise_vals : 1d vector
+        Noise values.
+
+    Notes
+    -----
+    This approach generates noise as randomly distributed white noise.
+    The 'level' of noise is controlled as the scale of the normal distribution.
+    """
+
+    noise_vals = np.random.normal(0, nlv, len(freqs))
+
+    return noise_vals
+
+
 def gen_power_vals(freqs, aperiodic_params, gaussian_params, nlv):
     """Generate power values for a simulated power spectrum.
 
@@ -262,32 +288,6 @@ def gen_power_vals(freqs, aperiodic_params, gaussian_params, nlv):
     return powers
 
 
-def gen_noise(freqs, nlv):
-    """Generate noise values for a simulated power spectrum.
-
-    Parameters
-    ----------
-    freqs : 1d array
-        Frequency vector to create noise values from.
-    nlv : float
-        Noise level to generate.
-
-    Returns
-    -------
-    noise_vals : 1d vector
-        Noise values.
-
-    Notes
-    -----
-    This approach generates noise as randomly distributed white noise.
-    The 'level' of noise is controlled as the scale of the normal distribution.
-    """
-
-    noise_vals = np.random.normal(0, nlv, len(freqs))
-
-    return noise_vals
-
-
 def gen_model(freqs, aperiodic_params, gaussian_params, return_components=False):
     """Generate a power spectrum model for a given parameter definition.
 

diff --git a/fooof/tests/test_sim_gen.py b/fooof/tests/test_sim_gen.py
@@ -79,6 +79,21 @@ def test_gen_peaks():
     peaks = gen_peaks(xs, gaussian_params)
 
     assert np.all(np.invert(np.isnan(peaks)))
+    assert xs[np.argmax(peaks)] == 10
+
+def test_gen_noise():
+
+    xs = gen_freqs([3, 50], 0.5)
+
+    nlv = 0.1
+    noise = gen_noise(xs, nlv)
+    assert np.all(np.invert(np.isnan(noise)))
+    assert np.isclose(np.std(noise), nlv, 0.15)
+
+    nlv = 0.5
+    noise = gen_noise(xs, nlv)
+    assert np.all(np.invert(np.isnan(noise)))
+    assert np.isclose(np.std(noise), nlv, 0.15)
 
 def test_gen_power_values():