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 from main master #7

Merged
merged 26 commits into from
Mar 30, 2017
Merged

Merge from main master #7

merged 26 commits into from
Mar 30, 2017

Conversation

pgleeson
Copy link
Owner

No description provided.

Maximilian Schmidt and others added 26 commits June 29, 2016 10:44
In NEST, min_delay is no longer set in the defaults of each synapse but min_delay is set globally in the NEST kernel
Change the NEST-version that Travis downloads to current master branch
Change script to download and re-build NEST every time so that Travis always checks the current master
 into mschmidt87-fix_min_delay_error

# Conflicts:
#	.travis.yml
#	ci/install_nest.sh
…es for the start time of DCSource or for the simulation time)
…for `pyNN.neuron`, using NMODL description from Christian Roessert
… rather than 0 mV, during the refractory period (to match the behaviour of other IF models).
…, so it is not necessary to use the MyModule approach.

Also modified the NEURON implementation to increment the eta and gamma variables at spike onset rather than after the refractory period. This matches the description in Pozzorini et al., and the behaviour of the NEST implementation.
Generalized integrate-and-fire model
# Conflicts:
#	pyNN/neuron/standardmodels/cells.py
Export of PyNN models to NeuroML2
# Conflicts:
#	pyNN/nest/cells.py
#	pyNN/neuron/standardmodels/cells.py
Merge nest-dev into master, support for NEST 2.12.0
@pgleeson pgleeson merged commit 1c618d7 into pgleeson:master Mar 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants