add tests for check_data mode & associated fixes

Author: TomDonoghue

fooof/objs/fit.py

@@ -445,7 +445,7 @@ def fit(self, freqs=None, power_spectrum=None, freq_range=None):
             #   This serves as a catch all for curve_fits which will fail given NaN or Inf
             #   Because FitError's are by default caught, this allows fitting to continue
             if not self._check_data:
-                if not np.any(np.isinf(power_spectrum)) or np.any(np.isnan(power_spectrum)):
+                if np.any(np.isinf(self.power_spectrum)) or np.any(np.isnan(self.power_spectrum)):
                     raise FitError("There are NaN or Inf values in the data,  "
                                     "which preclude model fitting.")
 
@@ -703,7 +703,7 @@ def set_debug_mode(self, debug):
         self._debug = debug
 
 
-    def set_check_data(self, check_data):
+    def set_check_data_mode(self, check_data):
         """Set check data mode, which controls if an error is raised if NaN or Inf data are added.
 
         Parameters

fooof/tests/objs/test_fit.py

@@ -12,7 +12,7 @@
 from fooof.core.items import OBJ_DESC
 from fooof.core.errors import FitError
 from fooof.core.utils import group_three
-from fooof.sim import gen_power_spectrum
+from fooof.sim import gen_freqs, gen_power_spectrum
 from fooof.data import FOOOFSettings, FOOOFMetaData, FOOOFResults
 from fooof.core.errors import DataError, NoDataError, InconsistentDataError
 
@@ -364,7 +364,7 @@ def raise_runtime_error(*args, **kwargs):
         assert np.all(np.isnan(getattr(tfm, result)))
 
 def test_fooof_debug():
-    """Test FOOOF fit failure in debug mode."""
+    """Test FOOOF in debug mode, including with fit failures."""
 
     tfm = FOOOF(verbose=False)
     tfm._maxfev = 5
@@ -374,3 +374,22 @@ def test_fooof_debug():
 
     with raises(FitError):
         tfm.fit(*gen_power_spectrum([3, 50], [50, 2], [10, 0.5, 2, 20, 0.3, 4]))
+
+def test_fooof_check_data():
+    """Test FOOOF in with check data mode turned off, including with NaN data."""
+
+    tfm = FOOOF(verbose=False)
+
+    tfm.set_check_data_mode(False)
+    assert tfm._check_data is False
+
+    # Add data, with check data turned off
+    #   In check data mode, adding data with NaN should run
+    freqs = gen_freqs([3, 50], 0.5)
+    powers = np.ones_like(freqs) * np.nan
+    tfm.add_data(freqs, powers)
+    assert tfm.has_data
+
+    # Model fitting should execute, but return a null model fit, given the NaNs, without failing
+    tfm.fit()
+    assert not fm.has_model