Unify synaptic recordable names for PSC models #502

Merged
merged 2 commits into from Oct 6, 2016

Conversation

Projects
None yet
3 participants
@Silmathoron
Contributor

Silmathoron commented Oct 4, 2016

This is a fix for issue #501
The PR sets recordable names for synaptic currents as "I_syn_ex" or "I_syn_in" for:

  • amat2_psc_exp (added recordables)
  • hh_psc_alpha
  • iaf_psc_alpha
  • iaf_psc_exp

and removed "I_ex, "I_in", "input_currents_ex", "input_currents_in" from nest_names.

@heplesser

Almost ok, would just like to have a few empty lines and inline declarations.

models/amat2_psc_exp.h
@@ -350,6 +350,16 @@ class amat2_psc_exp : public Archiving_Node
{
return S_.V_th_v_;
}
+ double

This comment has been minimized.

@heplesser

heplesser Oct 4, 2016

Contributor

Insert and empty line before the function definition. Also, I would suggest to add an inline.

@heplesser

heplesser Oct 4, 2016

Contributor

Insert and empty line before the function definition. Also, I would suggest to add an inline.

models/amat2_psc_exp.h
+ {
+ return S_.I_syn_ex_;
+ }
+ double

This comment has been minimized.

@heplesser

heplesser Oct 4, 2016

Contributor

Insert and empty line before the function definition. Also, I would suggest to add an inline.

@heplesser

heplesser Oct 4, 2016

Contributor

Insert and empty line before the function definition. Also, I would suggest to add an inline.

models/iaf_psc_alpha.h
@@ -310,12 +310,12 @@ class iaf_psc_alpha : public Archiving_Node
return V_.weighted_spikes_in_;
}
double
- get_input_currents_ex_() const
+ get_I_syn_ex_() const

This comment has been minimized.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

models/iaf_psc_alpha.h
@@ -310,12 +310,12 @@ class iaf_psc_alpha : public Archiving_Node
return V_.weighted_spikes_in_;
}
double
- get_input_currents_ex_() const
+ get_I_syn_ex_() const
{
return S_.y1_ex_;
}
double

This comment has been minimized.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

models/iaf_psc_exp.h
@@ -313,12 +313,12 @@ class iaf_psc_exp : public Archiving_Node
return V_.weighted_spikes_in_;
}
double

This comment has been minimized.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

models/iaf_psc_exp.h
@@ -313,12 +313,12 @@ class iaf_psc_exp : public Archiving_Node
return V_.weighted_spikes_in_;
}
double
- get_input_currents_ex_() const
+ get_I_syn_ex_() const
{
return S_.i_syn_ex_;
}
double

This comment has been minimized.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

@heplesser

heplesser Oct 4, 2016

Contributor

Added empty line and inline.

@heplesser

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser Oct 4, 2016

Contributor

👍 from me. @jhnnsnk , would you take another quick look?

Contributor

heplesser commented Oct 4, 2016

👍 from me. @jhnnsnk , would you take another quick look?

@Silmathoron Silmathoron referenced this pull request Oct 5, 2016

Merged

Gif models #261

@DimitriPlotnikov

This comment has been minimized.

Show comment
Hide comment
@DimitriPlotnikov

DimitriPlotnikov Oct 6, 2016

Reasonable unification. Also OK from my side. @heplesser since this can break somebody's code, should one notify malinglist?

Reasonable unification. Also OK from my side. @heplesser since this can break somebody's code, should one notify malinglist?

@heplesser

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser Oct 6, 2016

Contributor

@DimitriPlotnikov Good idea to announce!

Contributor

heplesser commented Oct 6, 2016

@DimitriPlotnikov Good idea to announce!

@heplesser heplesser merged commit 8014dd0 into nest:master Oct 6, 2016

1 check passed

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

@Silmathoron Silmathoron deleted the Silmathoron:unified_psc_name branch Oct 6, 2016

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