Skip to content

Merge nest-dev into master, support for NEST 2.12.0#460

Merged
apdavison merged 20 commits into
NeuralEnsemble:masterfrom
apdavison:nest-dev
Mar 9, 2017
Merged

Merge nest-dev into master, support for NEST 2.12.0#460
apdavison merged 20 commits into
NeuralEnsemble:masterfrom
apdavison:nest-dev

Conversation

@apdavison

Copy link
Copy Markdown
Member

No description provided.

Maximilian Schmidt and others added 20 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
…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
# Conflicts:
#	pyNN/nest/cells.py
#	pyNN/neuron/standardmodels/cells.py
@apdavison apdavison added this to the 0.8.3 milestone Mar 8, 2017
@apdavison apdavison changed the title Merge nest-dev into master, for NEST 2.12.0 release Merge nest-dev into master, support for NEST 2.12.0 Mar 8, 2017
@coveralls

coveralls commented Mar 8, 2017

Copy link
Copy Markdown

Coverage Status

Coverage increased (+31.8%) to 61.918% when pulling 4e50b8d on apdavison:nest-dev into 3270908 on NeuralEnsemble:master.

@apdavison apdavison merged commit 45f348d into NeuralEnsemble:master Mar 9, 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

Development

Successfully merging this pull request may close these issues.

2 participants