Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev merge for 2022.12 release #390

Merged
merged 549 commits into from
Dec 12, 2022
Merged

Dev merge for 2022.12 release #390

merged 549 commits into from
Dec 12, 2022

Conversation

tensionhead
Copy link
Contributor

Let's fix the conflicts

dfsp-spirit and others added 30 commits October 14, 2022 16:50
Changes to be committed:
	modified:   syncopy/tests/synth_data.py
Changes to be committed:
	modified:   syncopy/tests/test_metadata.py
- introduced also maximal smoothing bandwidth
- added all supported output keys to spectralDTypes

Changes to be committed:
	modified:   syncopy/plotting/_helpers.py
	modified:   syncopy/plotting/sp_plotting.py
	modified:   syncopy/shared/const_def.py
	modified:   syncopy/shared/input_processors.py
	modified:   syncopy/specest/freqanalysis.py
	modified:   syncopy/specest/mtmfft.py
Changes to be committed:
	modified:   syncopy/plotting/_helpers.py
	modified:   syncopy/plotting/mp_plotting.py
	modified:   syncopy/shared/input_processors.py
	modified:   syncopy/tests/helpers.py
	modified:   syncopy/tests/test_plotting.py
- now return also the fig, ax for CrossSpectralData plotting,
addresses #357

Changes to be committed:
	modified:   syncopy/plotting/mp_plotting.py
	modified:   syncopy/plotting/sp_plotting.py
	modified:   syncopy/specest/freqanalysis.py
	modified:   syncopy/tests/test_plotting.py
- this now allows plotting individual tapers by setting output='imag'
or 'real'
- also imaginary/real part of coherence is now plottable

Changes to be committed:
	modified:   syncopy/nwanalysis/AV_compRoutines.py
	modified:   syncopy/nwanalysis/connectivity_analysis.py
	modified:   syncopy/plotting/_helpers.py
	modified:   syncopy/plotting/mp_plotting.py
	modified:   syncopy/plotting/sp_plotting.py
- also cut back on the random selections

Changes to be committed:
	modified:   syncopy/plotting/mp_plotting.py
	modified:   syncopy/tests/test_plotting.py
Changes to be committed:
	modified:   syncopy/shared/input_processors.py
	modified:   syncopy/tests/test_plotting.py
	modified:   syncopy/tests/test_specest.py
- now all what remains is to populate the SpectralData input branch

Changes to be committed:
	modified:   syncopy/nwanalysis/connectivity_analysis.py
- basic manual testing shows sames results when compared to AnalogData
input after freqanalysis

Changes to be committed:
	modified:   syncopy/nwanalysis/ST_compRoutines.py
	modified:   syncopy/nwanalysis/connectivity_analysis.py
	modified:   syncopy/nwanalysis/csd.py
	modified:   syncopy/shared/computational_routine.py
	modified:   syncopy/shared/input_processors.py
- also smaller fixes regarding effective parameter checks

Changes to be committed:
	modified:   syncopy/nwanalysis/ST_compRoutines.py
	modified:   syncopy/nwanalysis/connectivity_analysis.py
	modified:   syncopy/shared/const_def.py
	modified:   syncopy/shared/input_processors.py
	modified:   syncopy/specest/compRoutines.py
	modified:   syncopy/specest/freqanalysis.py
- to reach agreement with Granger connectivity analysis, there this is
on by default
- added also basic test of polymorphic connectivity frontend

Changes to be committed:
	modified:   syncopy/nwanalysis/connectivity_analysis.py
	modified:   syncopy/specest/freqanalysis.py
	modified:   syncopy/tests/test_connectivity.py
- check conditions on SpectralData (complex, multi-trial, no taper average)
- fidelity of both ways to get to a result is checked

Changes to be committed:
	modified:   syncopy/nwanalysis/connectivity_analysis.py
	modified:   syncopy/shared/input_processors.py
	modified:   syncopy/tests/test_connectivity.py
- instead of digging into cfgs, just check that the dtype of the
SpectralData is complex. This should allow more free pre-processing

Changes to be committed:
	modified:   syncopy/nwanalysis/connectivity_analysis.py
	modified:   syncopy/tests/test_connectivity.py
…upport-custom-dimords

349 plotting does not support custom dimords
tensionhead and others added 24 commits December 8, 2022 16:43
- all other load functions have no leading `_`

Changes to be committed:
	modified:   syncopy/io/__init__.py
	renamed:    syncopy/io/_load_nwb.py -> syncopy/load_nwb.py
- works only on the ESI cluster and with pynwb installed in the env

Changes to be committed:
	modified:   syncopy/io/__init__.py
	deleted:    syncopy/load_nwb.py
	modified:   syncopy/tests/test_spyio.py
Changes to be committed:
	modified:   syncopy/io/__init__.py
	new file:   syncopy/io/load_nwb.py
Changes to be committed:
	modified:   syncopy/datatype/continuous_data.py
	modified:   syncopy/plotting/sp_plotting.py
	modified:   syncopy/specest/freqanalysis.py
	modified:   syncopy/tests/test_welch.py
@codecov
Copy link

codecov bot commented Dec 9, 2022

Codecov Report

Base: 65.83% // Head: 68.72% // Increases project coverage by +2.89% 🎉

Coverage data is based on head (5f34a70) compared to base (8c4d1bf).
Patch coverage: 76.53% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #390      +/-   ##
==========================================
+ Coverage   65.83%   68.72%   +2.89%     
==========================================
  Files          77       79       +2     
  Lines        8730     9534     +804     
  Branches     1785     1947     +162     
==========================================
+ Hits         5747     6552     +805     
+ Misses       2594     2481     -113     
- Partials      389      501     +112     
Impacted Files Coverage Δ
syncopy/io/load_ft.py 9.47% <0.00%> (ø)
syncopy/shared/parsers.py 75.11% <ø> (-1.78%) ⬇️
syncopy/specest/mtmfft.py 100.00% <ø> (ø)
syncopy/tests/conftest.py 55.17% <0.00%> (-18.36%) ⬇️
syncopy/tests/local_spy.py 0.00% <ø> (ø)
syncopy/io/load_nwb.py 8.48% <6.00%> (ø)
syncopy/datatype/methods/padding.py 51.50% <22.22%> (-18.89%) ⬇️
syncopy/plotting/config.py 75.00% <50.00%> (-13.89%) ⬇️
syncopy/shared/input_processors.py 54.43% <50.00%> (-0.48%) ⬇️
syncopy/shared/computational_routine.py 77.72% <60.78%> (+21.27%) ⬆️
... and 67 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Changes to be committed:
	modified:   poetry.lock
@tensionhead tensionhead marked this pull request as ready for review December 12, 2022 09:35
@tensionhead tensionhead merged commit a44a756 into master Dec 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants