[ENH] Multiple improvements to spectral_connectivity_time

mne_connectivity/spectral/tests/test_spectral.py

@@ -472,7 +472,7 @@ def test_epochs_tmin_tmax(kind):
     assert len(w) == 1  # just one even though there were multiple epochs
 
 
-@pytest.mark.parametrize('method', ['coh', 'plv', 'pli', 'wpli'])
+@pytest.mark.parametrize('method', ['coh', 'plv', 'pli', 'wpli', 'ciplv'])
 @pytest.mark.parametrize(
     'mode', ['cwt_morlet', 'multitaper'])
 @pytest.mark.parametrize('data_option', ['sync', 'random'])
@@ -504,11 +504,12 @@ def test_spectral_connectivity_time_phaselocked(method, mode, data_option):
     # hypothesized "connection"
     freq_band_low_limit = (8.)
     freq_band_high_limit = (13.)
-    cwt_freqs = np.arange(freq_band_low_limit, freq_band_high_limit + 1)
+    freqs = np.arange(freq_band_low_limit, freq_band_high_limit + 1) \
+        if mode == 'cwt_morlet' else None
     con = spectral_connectivity_time(data, method=method, mode=mode,
                                      sfreq=sfreq, fmin=freq_band_low_limit,
                                      fmax=freq_band_high_limit,
-                                     cwt_freqs=cwt_freqs, n_jobs=1,
+                                     freqs=freqs, n_jobs=1,
                                      faverage=True, average=True, sm_times=0)
     assert con.shape == (n_channels ** 2, len(con.freqs))
     con_matrix = con.get_data('dense')[..., 0]
@@ -526,7 +527,7 @@ def test_spectral_connectivity_time_phaselocked(method, mode, data_option):
         assert np.all(con_matrix) <= 0.5
 
 
-@pytest.mark.parametrize('method', ['coh', 'plv', 'pli', 'wpli'])
+@pytest.mark.parametrize('method', ['coh', 'plv', 'pli', 'wpli', 'ciplv'])
 @pytest.mark.parametrize(
     'cwt_freqs', [[8., 10.], [8, 10], 10., 10])
 def test_spectral_connectivity_time_cwt_freqs(method, cwt_freqs):
@@ -555,7 +556,7 @@ def test_spectral_connectivity_time_cwt_freqs(method, cwt_freqs):
     con = spectral_connectivity_time(data, method=method, mode='cwt_morlet',
                                      sfreq=sfreq, fmin=np.min(cwt_freqs),
                                      fmax=np.max(cwt_freqs),
-                                     cwt_freqs=cwt_freqs, n_jobs=1,
+                                     freqs=cwt_freqs, n_jobs=1,
                                      faverage=True, average=True, sm_times=0)
     assert con.shape == (n_channels ** 2, len(con.freqs))
     con_matrix = con.get_data('dense')[..., 0]
@@ -589,11 +590,11 @@ def test_spectral_connectivity_time_resolved(method, mode):
     data = EpochsArray(data, info)
 
     # define some frequencies for cwt
-    freqs = np.arange(3, 20.5, 1)
+    freqs = np.arange(3, 20.5, 1) if mode == 'cwt_morlet' else None
 
     # run connectivity estimation
     con = spectral_connectivity_time(
-        data, sfreq=sfreq, cwt_freqs=freqs, method=method, mode=mode,
+        data, sfreq=sfreq, freqs=freqs, method=method, mode=mode,
         n_cycles=5)
     assert con.shape == (n_epochs, n_signals ** 2, len(con.freqs))
     assert con.get_data(output='dense').shape == \