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

Refactored Spike Contrast method #1

Merged
merged 34 commits into from
Sep 15, 2020

Conversation

dizcza
Copy link

@dizcza dizcza commented Sep 11, 2020

Dear Philipp,

this is the refactored version that we agree on from Elephant side + hundreds of other commits that now included in master (please merge your private master branch with the up-to-date NeuralEnsemble/master branch in order to get rid of unrelated commits or just accept the changes in this pull request).
The easiest way to proceed for you is to

  1. accept this pull request. The best way would be to "Squash and merge" among the merge options (note the green button below): this will ensure that all these hundreds of commits are merged as a single commit - a nice convenience;
  2. modify spike contrast implementation, if you find something;
  3. let us know in the original pull request that the final version is ready to merge.

Once you accept this pull request (step 1), your original pull request will be automatically updated with our changes.

If you have questions about how to merge this pull request, write them down in the comments.

Cheers,
Danylo

dizcza and others added 30 commits June 22, 2020 13:19
* explicit doc of how the firing rate is computed
…NeuralEnsemble#328)

* include option to return np.nan if spiketrains are too short and change raised error to more meaningful ones
* fixed _check_consistency in BinnedSpikeTrain and parallel.ipynb notebook

* added docs build in travis; fixed plt.eventplot(spiketrains)

* don't use conda-forge channel for python 2.7

* install extra requirements in docs build

* conda install pandoc

* travis hangs

* travis doc mpi error

* travis check if error is occurred

* Revert "travis check if error is occurred"

This reverts commit 3e59894.

* reverted travis
* removed deprecation warning from unitary event analysis

* removed homogeneous_poisson_process_with_refr_period

* don't import pandas_bridge
…form_orderstat_3d (NeuralEnsemble#333)

* removed annoying short-lasting tranges
* vectorized probability_matrix_analytical
* ASSET iterate indices optimized
* replaced np.diff(prepend, append) by manually prepending and appending

Co-authored-by: Cristiano Köhler <c.koehler@fz-juelich.de>
Added funding acknowledgements from HBP SGA3.
…ies (NeuralEnsemble#345)

* Added CITATION.txt file to manifest, so it's included in packages.

* Fixed doi entry to not include the doi resolver.
…NeuralEnsemble#343)

Co-authored-by: stellalessandra <a.stella@fz-juelich.de>
Co-authored-by: p-bouss <peter.bouss@googlemail.com>
Co-authored-by: Cristiano Köhler <42555442+kohlerca@users.noreply.github.com>
…#347)

Co-authored-by: stellalessandra <a.stella@fz-juelich.de>
Co-authored-by: p-bouss <peter.bouss@googlemail.com>
dizcza and others added 4 commits September 7, 2020 14:03
Co-authored-by: ackurth <a.kurth@fz-juelich.de>
Co-authored-by: ackurth <44397333+ackurth@users.noreply.github.com>
Co-authored-by: dizcza <dizcza@gmail.com>
Co-authored-by: Michael Denker <m.denker@fz-juelich.de>
@BranchBroxy BranchBroxy merged commit 8cb04bf into BranchBroxy:master Sep 15, 2020
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.

6 participants