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

Aeif psc delta 2 continued #849

Merged
merged 11 commits into from Nov 28, 2017
Merged

Conversation

@stinebuu
Copy link
Contributor

@stinebuu stinebuu commented Oct 31, 2017

This is a continuation of PR #613, and can replace that PR. Most of the work has been reviewed, the difference is that with_refr_input_ is defaulted to false and is made set/getable as requested. I have also reordered the placement of with_refr_input_ in aeif_psc_delta.h to get rid of a warning.

Almost all the work is done @lepmik.

lepmik and others added 10 commits Jan 3, 2017
…aeif_psc_delta2

Name change in remote caused conflict
set/getable. Reordered position of with_refr_input_ in aeif_psc_delta.h
to avoid warning.
@stinebuu stinebuu mentioned this pull request Oct 31, 2017
@heplesser heplesser requested review from Silmathoron and heplesser Nov 6, 2017
Copy link
Member

@Silmathoron Silmathoron left a comment

Good work, just a question about possible use of defaultdict to make it lighter and (maybe) easier to understand, otherwise it's all fine!


# Compare models to the LSODAR implementation.

def test_closeness_nest_lsodar(self):

This comment has been minimized.

@Silmathoron

Silmathoron Nov 7, 2017
Member

this was changed by @gtrensch is it okay to switch back to docstrings now?

aeif_DT0_delta = aeif_DT0.copy()
aeif_DT0_delta.pop('tau_syn_ex')

DT0_params = {"aeif_cond_alpha": aeif_DT0,

This comment has been minimized.

@stinebuu
Copy link
Contributor Author

@stinebuu stinebuu commented Nov 27, 2017

Sorry I took so long to address your comments, @Silmathoron!

Copy link
Member

@Silmathoron Silmathoron left a comment

Ok 👍
(the question of the docstrings was to be answered by @gtrensch but I guess this is fine ^^)

@heplesser
Copy link
Contributor

@heplesser heplesser commented Nov 28, 2017

@lepmik @stinebuu Thanks for your efforts, merging!

@heplesser heplesser merged commit 7d59720 into nest:master Nov 28, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@stinebuu stinebuu deleted the stinebuu:lepmik-aeif_psc_delta2 branch Jan 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.