Fix80 check multiplicity handling #255

Merged
merged 4 commits into from Apr 25, 2016

Conversation

Projects
None yet
3 participants
@heplesser
Contributor

heplesser commented Mar 3, 2016

This PR allows spike_generator to emit spikes with multiplicity, which is essential for testing multiplicity-handling in neurons. It also adds a test to check that (almost) all neurons handle multiplicity of incoming spikes properly. This should fix #80.

heplesser added some commits Mar 3, 2016

- spike_generator can now emit spikes with given multiplicity. This i…
…s mostly for debugging purposes.

- Added test that ensures that all models heed spike multiplicity.
@heplesser

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser Mar 3, 2016

Contributor

@jougs @tammoippen Would you review?

Contributor

heplesser commented Mar 3, 2016

@jougs @tammoippen Would you review?

models/spike_generator.h
- spike_weights double array - corrsponding spike-weights, the unit depends on the receiver
+ spike_weights double array - corresponding spike-weights, the unit depends on the receiver
+ spike_multiplicities int array - multiplicities of spikes, same length as spike_times;
+ mostly for debugging

This comment has been minimized.

@tammoippen

tammoippen Mar 21, 2016

Contributor

The comment formatting seems off here.

@tammoippen

tammoippen Mar 21, 2016

Contributor

The comment formatting seems off here.

@tammoippen

This comment has been minimized.

Show comment
Hide comment
@tammoippen

tammoippen Mar 21, 2016

Contributor

Very nice. 👍 from my side.

Contributor

tammoippen commented Mar 21, 2016

Very nice. 👍 from my side.

models/spike_generator.h
+ origin double - Time origin for device timer in ms
+ start double - earliest possible time stamp of a spike to be emitted in ms
+ stop double - earliest time stamp of a potential spike event that is not
+ emitted in ms

This comment has been minimized.

@abigailm

abigailm Apr 18, 2016

Contributor

Are comments supposed to wrap like this, or should they be indented after the break?

@abigailm

abigailm Apr 18, 2016

Contributor

Are comments supposed to wrap like this, or should they be indented after the break?

Merge branch 'master' into fix80_check_multiplicity_handling
# Conflicts:
#	models/spike_generator.cpp
#	models/spike_generator.h
@heplesser

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser Apr 25, 2016

Contributor

@abigailm I merged the formatting changes from the master branch now and fixed the comment formatting. I hope you are now happy with the PR.

Contributor

heplesser commented Apr 25, 2016

@abigailm I merged the formatting changes from the master branch now and fixed the comment formatting. I hope you are now happy with the PR.

@abigailm abigailm merged commit 7263679 into nest:master Apr 25, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@heplesser heplesser deleted the heplesser:fix80_check_multiplicity_handling branch Apr 25, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment