Update tests for updates, and related fixes

Author: TomDonoghue

fooof/core/info.py

@@ -9,14 +9,18 @@ def get_obj_desc():
         Mapping of FOOOF object attributes, and what kind of data they are.
     """
 
-    attributes = {'results' : ['aperiodic_params_', 'peak_params_', 'error_',
-                               'r_squared_', '_gaussian_params'],
-                  'settings' : ['peak_width_limits', 'max_n_peaks', 'min_peak_amplitude',
-                                'peak_threshold', 'aperiodic_mode'],
+    attributes = {'results' : ['aperiodic_params_', 'peak_params_',
+                               'r_squared_', 'error_',
+                               '_gaussian_params'],
+                  'settings' : ['peak_width_limits', 'max_n_peaks',
+                                'min_peak_amplitude', 'peak_threshold',
+                                'aperiodic_mode'],
                   'data' : ['power_spectrum', 'freq_range', 'freq_res'],
                   'data_info' : ['freq_range', 'freq_res'],
                   'arrays' : ['freqs', 'power_spectrum', 'aperiodic_params_',
-                              'peak_params_', '_gaussian_params']}
+                              'peak_params_', '_gaussian_params'],
+                  'model_components' : ['_spectrum_flat', '_spectrum_peak_rm',
+                                        '_ap_fit', '_peak_fit']}
 
     return attributes
 

fooof/group.py

@@ -318,7 +318,7 @@ def get_fooof(self, ind, regenerate=False):
             fm.add_data(self.freqs, np.power(10, self.power_spectra[ind]))
         # If no power spectrum data available, copy over data information & regenerate freqs
         else:
-            fm.add_data_info(self.get_data_info)
+            fm.add_data_info(self.get_data_info())
 
         # Add results for specified power spectrum, regenerating full fit if requested
         fm.add_results(self.group_results[ind])

fooof/tests/test_fit.py

@@ -128,6 +128,12 @@ def test_adds():
     for setting in get_obj_desc()['settings']:
         assert getattr(tfm, setting) == getattr(fooof_settings, setting)
 
+    # Test adding data info
+    fooof_data_info = FOOOFDataInfo([3, 40], 0.5)
+    tfm.add_data_info(fooof_data_info)
+    for data_info in get_obj_desc()['data_info']:
+        assert getattr(tfm, data_info) == getattr(fooof_data_info, data_info)
+
     # Test adding results
     fooof_results = FOOOFResults([1, 1], [10, 0.5, 0.5], 0.95, 0.02, [10, 0.5, 0.25])
     tfm.add_results(fooof_results)
@@ -180,12 +186,12 @@ def test_fooof_resets():
     tfm._reset_data_results()
     tfm._reset_internal_settings()
 
-    assert tfm.freqs is None and tfm.freq_range is None and tfm.freq_res is None  \
-        and tfm.power_spectrum is None and tfm.fooofed_spectrum_ is None and tfm._spectrum_flat is None \
-        and tfm._spectrum_peak_rm is None and tfm._ap_fit is None and tfm._peak_fit is None
+    desc = get_obj_desc()
 
-    # assert np.all(np.isnan(tfm.aperiodic_params_)) and np.all(np.isnan(tfm.peak_params_)) \
-    #     and np.all(np.isnan(tfm.r_squared_)) and np.all(np.isnan(tfm.error_)) and np.all(np.isnan(tfm._gaussian_params))
+    for data in ['data', 'results', 'model_components']:
+        for field in desc[data]:
+            assert getattr(tfm, field) == None
+    assert tfm.freqs == None and tfm.fooofed_spectrum_ == None
 
 def test_fooof_report(skip_if_no_mpl):
     """Check that running the top level model method runs."""

fooof/tests/test_funcs.py

@@ -20,44 +20,51 @@ def test_combine_fooofs(tfm, tfg):
     tfg2 = tfg.copy(); tfg3 = tfg.copy()
 
     # Check combining 2 FOOOFs
-    fg1 = combine_fooofs([tfm, tfm2])
-    assert fg1
-    assert len(fg1) == 2
-    assert compare_info([fg1, tfm], 'settings')
-    assert fg1.group_results[0] == tfm.get_results()
-    assert fg1.group_results[-1] == tfm2.get_results()
+    nfg1 = combine_fooofs([tfm, tfm2])
+    assert nfg1
+    assert len(nfg1) == 2
+    assert compare_info([nfg1, tfm], 'settings')
+    assert nfg1.group_results[0] == tfm.get_results()
+    assert nfg1.group_results[-1] == tfm2.get_results()
 
     # Check combining 3 FOOOFs
-    fg2 = combine_fooofs([tfm, tfm2, tfm3])
-    assert fg2
-    assert len(fg2) == 3
-    assert compare_info([fg2, tfm], 'settings')
-    assert fg2.group_results[0] == tfm.get_results()
-    assert fg2.group_results[-1] == tfm3.get_results()
+    nfg2 = combine_fooofs([tfm, tfm2, tfm3])
+    assert nfg2
+    assert len(nfg2) == 3
+    assert compare_info([nfg2, tfm], 'settings')
+    assert nfg2.group_results[0] == tfm.get_results()
+    assert nfg2.group_results[-1] == tfm3.get_results()
 
     # Check combining 2 FOOOFGroups
-    nfg1 = combine_fooofs([tfg, tfg2])
-    assert nfg1
-    assert len(nfg1) == len(tfg) + len(tfg2)
-    assert compare_info([nfg1, tfg, tfg2], 'settings')
-    assert nfg1.group_results[0] == tfg.group_results[0]
-    assert nfg1.group_results[-1] == tfg2.group_results[-1]
+    nfg3 = combine_fooofs([tfg, tfg2])
+    assert nfg3
+    assert len(nfg3) == len(tfg) + len(tfg2)
+    assert compare_info([nfg3, tfg, tfg2], 'settings')
+    assert nfg3.group_results[0] == tfg.group_results[0]
+    assert nfg3.group_results[-1] == tfg2.group_results[-1]
 
     # Check combining 3 FOOOFGroups
-    nfg2 = combine_fooofs([tfg, tfg2, tfg3])
-    assert nfg2
-    assert len(nfg2) == len(tfg) + len(tfg2) + len(tfg3)
-    assert compare_info([nfg2, tfg, tfg2, tfg3], 'settings')
-    assert nfg2.group_results[0] == tfg.group_results[0]
-    assert nfg2.group_results[-1] == tfg3.group_results[-1]
+    nfg4 = combine_fooofs([tfg, tfg2, tfg3])
+    assert nfg4
+    assert len(nfg4) == len(tfg) + len(tfg2) + len(tfg3)
+    assert compare_info([nfg4, tfg, tfg2, tfg3], 'settings')
+    assert nfg4.group_results[0] == tfg.group_results[0]
+    assert nfg4.group_results[-1] == tfg3.group_results[-1]
 
     # Check combining a mixture of FOOOF & FOOOFGroup
-    mfg3 = combine_fooofs([tfg, tfm, tfg2, tfm2])
-    assert mfg3
-    assert len(mfg3) == len(tfg) + 1 + len(tfg2) + 1
-    assert compare_info([tfg, tfm, tfg2, tfm2], 'settings')
-    assert mfg3.group_results[0] == tfg.group_results[0]
-    assert mfg3.group_results[-1] == tfm2.get_results()
+    nfg5 = combine_fooofs([tfg, tfm, tfg2, tfm2])
+    assert nfg5
+    assert len(nfg5) == len(tfg) + 1 + len(tfg2) + 1
+    assert compare_info([nfg5, tfg, tfm, tfg2, tfm2], 'settings')
+    assert nfg5.group_results[0] == tfg.group_results[0]
+    assert nfg5.group_results[-1] == tfm2.get_results()
+
+    # Check combining objects with no data
+    tfm2._reset_data_results(False, True, True)
+    tfg2._reset_data_results(False, True, True, True)
+    nfg6 = combine_fooofs([tfm2, tfg2])
+    assert len(nfg6) == 1 + len(tfg2)
+    assert nfg6.power_spectra == None
 
 def test_combine_errors(tfm, tfg):
 

fooof/tests/test_group.py

@@ -144,3 +144,12 @@ def test_fg_get_fooof(tfg):
     # Check that regenerated model is created
     for result in desc['results']:
         assert np.all(getattr(tfm1, result))
+
+    # Test when object has no data (clear a copy of tfg)
+    new_tfg = tfg.copy()
+    new_tfg._reset_data_results(False, True, True, True)
+    tfm2 = new_tfg.get_fooof(0, True)
+    assert tfm2
+    # Check that data info is copied over properly
+    for data_info in desc['data_info']:
+        assert getattr(tfm2, data_info)