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

spike field coherence (sfc) function and unit tests #82

Merged
merged 3 commits into from
Mar 29, 2016

Conversation

JuliaSprenger
Copy link
Member

This pull request contains the spike field coherence function and its unit tests. The function is contained in the sta.py file, because we did not want to add additional files which only contain a single function and the sta and sfc functions are related.

@coveralls
Copy link
Collaborator

Coverage Status

Coverage decreased (-0.05%) to 97.083% when pulling 3bdcb6c on INM-6:feature/spikefieldcoherence into fb9647a on NeuralEnsemble:master.

@coveralls
Copy link
Collaborator

Coverage Status

Coverage increased (+0.03%) to 97.164% when pulling c91fa49 on INM-6:feature/spikefieldcoherence into fb9647a on NeuralEnsemble:master.

@alperyeg
Copy link
Contributor

@JuliaSprenger thanks for the corrections. In the unittest it is better to use decorators, e.g. as it was done in the asset unittest here (L14-25). Or in the same manner you can use the following:

@unittest.skipIf(not hasattr(scipy.signal, 'coherence'),
                 "Please update scipy to version ...")

@coveralls
Copy link
Collaborator

Coverage Status

Coverage decreased (-0.1%) to 97.011% when pulling de46ff1 on INM-6:feature/spikefieldcoherence into fb9647a on NeuralEnsemble:master.

@mdenker
Copy link
Member

mdenker commented Mar 28, 2016

I could verify that this works to correctly catch missing cohere on both 0.14 and 0.15 scipy -- thanks for fixing this.

@alperyeg
Copy link
Contributor

👍

@mdenker mdenker merged commit 5561122 into NeuralEnsemble:master Mar 29, 2016
mdenker added a commit that referenced this pull request Aug 13, 2021
* bug fixed dealing with units

* fixed same unit error in trial shuffling

* added Bielefeld fim.so and adapted filtering and added window param to fpgrowth

* removed max_occ test

* further unit stuff

* debugging for new fim version

* enabled multithreading in fpgrowth

* less verbose in spade

* set equal number of bins in bin shuffling wrt spade

* added tolerance to binning in spade everywhere

* Added accelerated FIM algorithm sources by Florian Porrmann.

* Enh/accelerated spade build (#82)

* Added cibuildwheel action

* Added Python requirements to wheel build

* Build only on 64bit machines, otherwise overflow

* Removed Windows for testing, as vc is not available

* Removed MacOS for testing, as -fopenmp is not available

* Removed pp- (pypy) builds since they lack C.

* Fixed removing pp- (pypy) builds since they lack C.

* Put Macos back in.

* Windows Hack

* Remove vcpython alltogether, ignore 2.7 Python

* Removed extra compile option, which breaks on Windows

* Removed more extra compile options, which breaks on Windows

* Try C++ instead of Gnu++.

* Try C++ instead of Gnu++ Windows style argument.

* Remove linux build while testing windows.

* Remove libraries.

* Differentiate Windows and Linux.

* Added missing import.

* Last mile: MacOS

* Remove openMP lib

* Remove openMP lib

* Add openMP lib

* More brew installs

* Mac is called mac on github

* Make sure C is reinstalled.

* Multilib

* Next try, new options

* Ignore warning about void type

* Update newsest fim package

* Revert "Ignore warning about void type"

This reverts commit 3ff6b62

* Revert to prior fim, new compiler argument.

* Revert "Update newsest fim package"

This reverts commit f321f77

* Definitely, gnu++17, but new try.

* Try C++

* Warning message

* llvm maybe?

* Added apple in source

* Small fixes for MacOS, but not comprehensive

* Limit to Windows and Linux for now

* Remove MacOS entry

* Fix fix from mindlessness

* Testrun

* Trying to include fim.so, despite its renaming by wheels

* Added newest version of original module

* Reverted previous breaking change commited by accident.

* Reverted package name from testing.

* Test focal as CI build

* Test bionic as CI build

* Understand installation issue on CI -- is importing elephant importing the installed version?

* Spelling error only

* Try to make sure travis loads the installed elephant, not the cwd.

* One step further -- which version will nosetests use?

* Switch to pytest as of PR #413

* Added authors of new FIM module and reference in new docs.

* Added authors of new FIM module and reference in new docs.

* Small text clarifications.

* Test if entry for fim.so/pyd in MANIFEST is now redundant.

* Update elephant/spade.py

Co-authored-by: Alexander Kleinjohann <[email protected]>

* Update elephant/spade.py

Co-authored-by: Alexander Kleinjohann <[email protected]>

* Added SPADE tutorial

* Prevent wheel building on every push, and limit scipy version workaround

* Pushed tutorial, removed file added in error

* New attempt to make mybinder install requirements.

* New attempt, dropping viziphant.

* Avoid recursive elephant installation by viziphant in postBuild

* Removed unit test that is fragile as it depends on the implementation of surrogate methods

* Add viziphant to RTD environment

* Typo in tutorial

* Add viziphant to travis doc tests

Co-authored-by: pbouss <[email protected]>
Co-authored-by: stellalessandra <[email protected]>
Co-authored-by: Alessandra Stella <[email protected]>
Co-authored-by: Alexander Kleinjohann <[email protected]>
@Moritz-Alexander-Kern Moritz-Alexander-Kern deleted the feature/spikefieldcoherence branch September 6, 2022 07:54
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.

4 participants