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

Merge dev into master #236

Open
wants to merge 419 commits into
base: master
Choose a base branch
from
Open

Merge dev into master #236

wants to merge 419 commits into from

Conversation

rgerkin
Copy link
Contributor

@rgerkin rgerkin commented Feb 16, 2020

No description provided.

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

You'll be able to see Jupyter notebook diff and discuss changes. Powered by ReviewNB.

@coveralls
Copy link

coveralls commented Feb 16, 2020

Coverage Status

Coverage decreased (-0.3%) to 35.583% when pulling 701c33a on dev into 8b85b8e on master.

rgerkin and others added 16 commits February 15, 2020 22:09
Added function to return state variables
* Add test_get_files

* Update .travis.yml

* Drop Python 2 support

* Minor update

* Update dependency requirenments.

* Update .travis.yml

* Change allensdk version to 0.16.3 (#1)

* Make it to be setup.cfg-only project

* Make it to be setup.cfg-only project 2

* Update unit tests.

* Update test cases

* fix

* Update parameter

* Update test cases

* Drop support of Python 2

* Import new test cases in __init__.py in unit_test directory

* remove PYTHON_MAJOR_VERSION constant

* Fix error

* Update dependency

* Drop Python 2 support

* Update bluepyopt

* Update unit tests

* Update unit tests

* Improved logic in url_to_path method

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* forceobj = true for jit decorator

* add test_geppetto_backend

* Update unit tests

* Requiring Python version >= 3.5

* Clean up `__future__ import something`

* Import deepcopy, and improve coding style.

* Import available_backends

* Make ExternalModel inherits from RunnableModel instead of Model

* Fix warning

* Make ExternalModel call constructor of the parent class

* Improve ReducedModel, make unit test cases for it.

* get pynn and pyneuroml from Github

* Update unit tests

* Update unit tests

* Try to fix a shell command

* Update unit tests

* Update unit tests

* Update unit tests

* Delete useless code

* Update address of BBP microcircuit portal. Add test cases for bbp.py

* Ran bbp.ipynb

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* Change sciunit.settings to sciunit.config_set
* test NU

* test NU sqaush

* squash circle

* circle squash

* squash circle

* better chance of working

* squash circle

* circle squash

* circle squash

* squash circle

* circle squash

* circle squash

* circle squash

* squash circle ci

* rebase confusion

* Added StaticBackend

* resolve rebase

* Removing duplicate jNeuroMLBackend import (#251)

* fixed cannot be safely interpretated as integer linspace

* merge

* Added StaticBackend

* fixup! Added StaticBackend

* Removing duplicate jNeuroMLBackend import (#251)

* Fix mistake in Izhikevich equation markdown

* merge

* plotly added

* plotly added

* circle squash

* squash circle

* squash circle

* squash circle

* squash circle

* squash circle

* modified requirements

* circle squash

* moved allen api from BPO to NU

* refactor

* circle squash

* circle squash

* circle squash

* redirectory circle squash

* will this work

* circle squash

* circle squash

* circle squash

* circle squash

* circle ci squash

* perhaps fix minor travis annoyance on scidash

* try to make scidash travis work too

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* replace some unit testing files

* adding back in important looking tests

* circle squash

* clean up

* brutal clean up but unit tests work

* brutal clean up but unit tests work

* brutal clean up but unit tests work

* easier target

* easier target

* travis squash

* travis squash

* Update README.md

* travis might work now

* setter property methods added to adexp model

* circle ci squash

* better method stacking and encapsulation, removed redundancy

* fix circle squash

* circle squash

* travis circle squash

* circle travis squash

* travis update

* circle squash

* updates before checkout

* delete silly bug

* unit test for rick to check

* unit tests built in to continuous integration for relative difference sciunit debug

* unit tests built in to continuous integration for relative difference sciunit debug

* unit tests built in to continuous integration for relative difference sciunit debug

* unit tests built in to continuous integration for relative difference sciunit debug

* graphical unit test made

* graphical unit test made

* both Relative difference and ZScore working now

* after change to BPO source code where I remove special treatment for models not ADEXP in BPO

* continuous integration updated

* before merge

* before merge branch

* perhaps branch fixed now

* merge into merge

* meaningless

* simplified best model

* now ephys properties and multispiking optimize, as well as allen examples

* better integration of unit testing

* introduced some typing to optimization management, and some code comments, reduced opt_man file size by 50%

* added back in neuroelectro api

* fixing unit tests for neuroelectro

* removed erroneous path from travis build

* removed erroneous path from travis build

* renamed get_neab neuroelectro_api added in more typing and documentation tried to fix broken import paths

* aggressive typing probably broke some methods

* aggressive typing probably broke some methods

* fixed typing issues

* run black over everything

* fix bug caused by refactor of efel_evaluation revealed in continuous integration

* fix typing bug caused by refactor revealed in continuous integration

* fix typing bug caused by refactor revealed in continuous integration

* fix typing bug caused by refactor revealed in continuous integration

* fixed small bug in constructing neuronunit tests from allen data and neuronunit static models

* updated travis script

* shortened CI tests to avoid timeouts

* made a score obs prediction reformatter in data transport container, did more typing, removed more unnecessary methods used more inheritance in BPO

* reduced cell optimization

* almost ready for pull request take two

* changes

* files changed

* fix skip decorators so that CI works again

* changed circle ci config file to point to BPO circle-ci-branch

* gentle refactor and typing

* ran black over everything

* ran black over everything

* typing accident fixup

* fix ci requirement accident

* fixing ci dependency issue

* merge circle ci

* merge circle ci

* fixed None return type

* refactor unit testing return type

* refactored unit tests

* fixed tab spaces issue

* unit test refactor

* update unit test for refactor rheobase_dtc_tests

* refactor small test

* refactor target current into method

* fixed new method missing argument

* fixed new method missing argument

* fix

* update code

* passing travis tests

* update content

* speed up travis ci unit tests

* speed up travis ci unit tests

* make opt work passable on shorter test duration ci

* reduce travis burden

* reduce travis burden

* make more unit tests pass

* clean up for passing more unit tests, especially import tests

* overall cleaned up unit tests, this commmit represents greater test passing than dev branch

* overall cleaned up unit tests, this commmit represents greater test passing than dev branch

* update for PR

* update for PR

* applied black to all files again

* Update README.md

* izhi optimization slowed down checking out what went wrong

* very effected by mutpb, eta, cxptb

* very effected by mutpb, eta, cxptb

* push changes to ci

* update

* update

* last commit before going backwards through reflog

* make stale branch functional again

* Jan 28th end of day

* found new problems with dtc/model param over ride in dtc class, made variance explained error possible, identified conceptually that brute force is necessary to optimize, made it so that algorithms has functional time diminishing eta

* factored out redundant rheobase seeking method

* added in some comments

* improved documentation

* refactor optimization_management documentation improvements simplify return value of functions

* removed backends depricated/not supported

* removed backends depricated/not supported

* refactor optimization_management documentation improvements simplify return value of functions

* refactor optimization_management documentation improvements simplify return value of functions

* fixing rheobase solving management code

* applied black updated methods called in Allen API

* applied black to unit test directory, and made it so recursively importing eveything should work in theory over CI

* update code for passing CI

* ran black over all neuronunit test files

* rheobase test on CI

* rheobase test on CI

* update ci

* elitism in bpo via neuronunit flag in constructor

* ci will probably work again now

* ci fix

* update ci unit test passing

* shorter build

* turns out the right efel package is important

* updated travis ci build

* update travis build

* abolished dtc, useful dtc methods inherited directly into model

* ci change dependencies

* optimization -> optimization (#255)

* update

* merger

* first incremental pull request

* basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

* Removing duplicate jNeuroMLBackend import (#251)

* Update Unit Test Cases and Other Improvements (#249)

* Add test_get_files

* Update .travis.yml

* Drop Python 2 support

* Minor update

* Update dependency requirenments.

* Update .travis.yml

* Change allensdk version to 0.16.3 (#1)

* Make it to be setup.cfg-only project

* Make it to be setup.cfg-only project 2

* Update unit tests.

* Update test cases

* fix

* Update parameter

* Update test cases

* Drop support of Python 2

* Import new test cases in __init__.py in unit_test directory

* remove PYTHON_MAJOR_VERSION constant

* Fix error

* Update dependency

* Drop Python 2 support

* Update bluepyopt

* Update unit tests

* Update unit tests

* Improved logic in url_to_path method

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* forceobj = true for jit decorator

* add test_geppetto_backend

* Update unit tests

* Requiring Python version >= 3.5

* Clean up `__future__ import something`

* Import deepcopy, and improve coding style.

* Import available_backends

* Make ExternalModel inherits from RunnableModel instead of Model

* Fix warning

* Make ExternalModel call constructor of the parent class

* Improve ReducedModel, make unit test cases for it.

* get pynn and pyneuroml from Github

* Update unit tests

* Update unit tests

* Try to fix a shell command

* Update unit tests

* Update unit tests

* Update unit tests

* Delete useless code

* Update address of BBP microcircuit portal. Add test cases for bbp.py

* Ran bbp.ipynb

* Update unit tests

* Update unit tests

* Update unit tests

* Update unit tests

* Change sciunit.settings to sciunit.config_set

* update

* merger

first incremental pull request

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

adding in continuous integration

update

* update circle

* refactor code

* continuous integration plus coverage related deletions

* Removing duplicate jNeuroMLBackend import (#251)

update

merger

first incremental pull request

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

basic NeuronUnit dev fork from scidash with minimalist changes to support multispiking optimization

adding in continuous integration

update

update circle

refactor code

continuous integration plus coverage related deletions

* resolved merge

* rebuild and squash circle ci

* test NU

* test NU sqaush

* squash circle

* circle squash

* squash circle

* better chance of working

* squash circle

* circle squash

* circle squash

* squash circle

* circle squash

* circle squash

* circle squash

* squash circle ci

* rebase confusion

* Added StaticBackend

* resolve rebase

* Removing duplicate jNeuroMLBackend import (#251)

* fixed cannot be safely interpretated as integer linspace

* merge

* Added StaticBackend

* fixup! Added StaticBackend

* Removing duplicate jNeuroMLBackend import (#251)

* Fix mistake in Izhikevich equation markdown

* merge

* plotly added

* plotly added

* circle squash

* squash circle

* squash circle

* squash circle

* squash circle

* squash circle

* modified requirements

* circle squash

* moved allen api from BPO to NU

* refactor

* circle squash

* circle squash

* circle squash

* redirectory circle squash

* will this work

* circle squash

* circle squash

* circle squash

* circle squash

* circle ci squash

* perhaps fix minor travis annoyance on scidash

* try to make scidash travis work too

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* replace some unit testing files

* adding back in important looking tests

* circle squash

* clean up

* brutal clean up but unit tests work

* brutal clean up but unit tests work

* brutal clean up but unit tests work

* easier target

* easier target

* travis squash

* travis squash

* Update README.md

* travis might work now

* setter property methods added to adexp model

* circle ci squash

* better method stacking and encapsulation, removed redundancy

* fix circle squash

* circle squash

* travis circle squash

* circle travis squash

* travis update

* circle squash

* updates before checkout

* delete silly bug

* unit test for rick to check

* unit tests built in to continuous integration for relative difference sciunit debug

* unit tests built in to continuous integration for relative difference sciunit debug

* unit tests built in to continuous integration for relative difference sciunit debug

* unit tests built in to continuous integration for relative difference sciunit debug

* graphical unit test made

* graphical unit test made

* both Relative difference and ZScore working now

* after change to BPO source code where I remove special treatment for models not ADEXP in BPO

* continuous integration updated

* before merge

* before merge branch

* perhaps branch fixed now

* merge into merge

* meaningless

* simplified best model

* now ephys properties and multispiking optimize, as well as allen examples

* better integration of unit testing

* introduced some typing to optimization management, and some code comments, reduced opt_man file size by 50%

* added back in neuroelectro api

* fixing unit tests for neuroelectro

* removed erroneous path from travis build

* removed erroneous path from travis build

* renamed get_neab neuroelectro_api added in more typing and documentation tried to fix broken import paths

* aggressive typing probably broke some methods

* aggressive typing probably broke some methods

* fixed typing issues

* run black over everything

* fix bug caused by refactor of efel_evaluation revealed in continuous integration

* fix typing bug caused by refactor revealed in continuous integration

* fix typing bug caused by refactor revealed in continuous integration

* fix typing bug caused by refactor revealed in continuous integration

* fixed small bug in constructing neuronunit tests from allen data and neuronunit static models

* updated travis script

* shortened CI tests to avoid timeouts

* made a score obs prediction reformatter in data transport container, did more typing, removed more unnecessary methods used more inheritance in BPO

* reduced cell optimization

* almost ready for pull request take two

* changes

* files changed

* fix skip decorators so that CI works again

* changed circle ci config file to point to BPO circle-ci-branch

* gentle refactor and typing

* ran black over everything

* ran black over everything

* typing accident fixup

* fix ci requirement accident

* fixing ci dependency issue

* merge circle ci

* merge circle ci

* fixed None return type

* refactor unit testing return type

* refactored unit tests

* fixed tab spaces issue

* unit test refactor

* update unit test for refactor rheobase_dtc_tests

* refactor small test

* refactor target current into method

* fixed new method missing argument

* fixed new method missing argument

* fix

* update code

* passing travis tests

* update content

* speed up travis ci unit tests

* speed up travis ci unit tests

* make opt work passable on shorter test duration ci

* reduce travis burden

* reduce travis burden

* make more unit tests pass

* clean up for passing more unit tests, especially import tests

* overall cleaned up unit tests, this commmit represents greater test passing than dev branch

* overall cleaned up unit tests, this commmit represents greater test passing than dev branch

* update for PR

* update for PR

* applied black to all files again

* Update README.md

* izhi optimization slowed down checking out what went wrong

* very effected by mutpb, eta, cxptb

* very effected by mutpb, eta, cxptb

* push changes to ci

* update

* update

* last commit before going backwards through reflog

* make stale branch functional again

* Jan 28th end of day

* found new problems with dtc/model param over ride in dtc class, made variance explained error possible, identified conceptually that brute force is necessary to optimize, made it so that algorithms has functional time diminishing eta

* factored out redundant rheobase seeking method

* added in some comments

* improved documentation

* refactor optimization_management documentation improvements simplify return value of functions

* removed backends depricated/not supported

* removed backends depricated/not supported

* refactor optimization_management documentation improvements simplify return value of functions

* refactor optimization_management documentation improvements simplify return value of functions

* fixing rheobase solving management code

* applied black updated methods called in Allen API

* applied black to unit test directory, and made it so recursively importing eveything should work in theory over CI

* update code for passing CI

* ran black over all neuronunit test files

* rheobase test on CI

* rheobase test on CI

* update ci

* elitism in bpo via neuronunit flag in constructor

* ci will probably work again now

* ci fix

* update ci unit test passing

* shorter build

* turns out the right efel package is important

* updated travis ci build

* update travis build

Co-authored-by: Mark Watts <[email protected]>
Co-authored-by: Zhiwei <[email protected]>
Co-authored-by: Russell Jarvis <[email protected]>
Co-authored-by: Richard Gerkin <[email protected]>

* merge into optimization branch

* bug fix for neuronunit

* replaced dtc with model almost

* managed to factor out DataTC all but in name

* managed to factor out DataTC all but in name

* factor out datatc

* update files

* updates

* update

* updated unit tests

* update setup config

* refactor setup.cfg

* update

* typing unnecessary in setup

* adding in plt depency to opt_man

* update

* update for CI

* update CI

* update for CI

* further factor out DataTC

* factoring out

* update

* update

* update

* update

* CI updates

* circle update

* coverage run

* speed up CI

* update

* update ci

* update ci

* update ci

* update ci

* update ci

* update

* update

* more skip for CI

* update ci

* update rm

* factor out DataTC

* update

* update ci

* update ci

Co-authored-by: Russell Jarvis <[email protected]>
Co-authored-by: Mark Watts <[email protected]>
Co-authored-by: Russell Jarvis <[email protected]>
Co-authored-by: Zhiwei <[email protected]>
Co-authored-by: Rick Gerkin <[email protected]>
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.

8 participants