diff --git a/models/eprop_iaf.cpp b/models/eprop_iaf.cpp index 88999dbc88..f95ae67f0c 100644 --- a/models/eprop_iaf.cpp +++ b/models/eprop_iaf.cpp @@ -170,7 +170,7 @@ eprop_iaf::Parameters_::set( const DictionaryDatum& d, Node* node ) if ( c_reg_ < 0 ) { - throw BadProperty( "Firing rate regularization prefactor c_reg ≥ 0 required." ); + throw BadProperty( "Firing rate regularization coefficient c_reg ≥ 0 required." ); } if ( f_target_ < 0 ) diff --git a/models/eprop_iaf.h b/models/eprop_iaf.h index 20702b7ddf..83f30d8597 100644 --- a/models/eprop_iaf.h +++ b/models/eprop_iaf.h @@ -234,7 +234,7 @@ V_th mV :math:`v_\text{th}` -55.0 Spi ---------------------------------------------------------------------------------------------------------------- Parameter Unit Math equivalent Default Description =========================== ==== =========================== ================ ================================== -c_reg :math:`c_\text{reg}` 0.0 Prefactor of firing rate +c_reg :math:`c_\text{reg}` 0.0 Coefficient of firing rate regularization eprop_isi_trace_cutoff ms :math:`{\Delta t}_\text{c}` maximum value Cutoff for integration of representable e-prop update between two @@ -415,7 +415,7 @@ class eprop_iaf : public EpropArchivingNodeRecurrent //! Capacitance of the membrane (pF). double C_m_; - //! Prefactor of firing rate regularization. + //! Coefficient of firing rate regularization. double c_reg_; //! Leak / resting membrane potential (mV). diff --git a/models/eprop_iaf_adapt.cpp b/models/eprop_iaf_adapt.cpp index 05c641108a..1534b4d772 100644 --- a/models/eprop_iaf_adapt.cpp +++ b/models/eprop_iaf_adapt.cpp @@ -190,7 +190,7 @@ eprop_iaf_adapt::Parameters_::set( const DictionaryDatum& d, Node* node ) if ( c_reg_ < 0 ) { - throw BadProperty( "Firing rate regularization prefactor c_reg ≥ 0 required." ); + throw BadProperty( "Firing rate regularization coefficient c_reg ≥ 0 required." ); } if ( f_target_ < 0 ) diff --git a/models/eprop_iaf_adapt.h b/models/eprop_iaf_adapt.h index 079caea538..856b416426 100644 --- a/models/eprop_iaf_adapt.h +++ b/models/eprop_iaf_adapt.h @@ -217,7 +217,7 @@ V_th mV :math:`v_\text{th}` -55.0 Spi ---------------------------------------------------------------------------------------------------------------- Parameter Unit Math equivalent Default Description =========================== ======= =========================== ================ =============================== -c_reg :math:`c_\text{reg}` 0.0 Prefactor of firing rate +c_reg :math:`c_\text{reg}` 0.0 Coefficient of firing rate regularization eprop_isi_trace_cutoff ms :math:`{\Delta t}_\text{c}` maximum value Cutoff for integration of representable e-prop update between two @@ -389,7 +389,7 @@ class eprop_iaf_adapt : public EpropArchivingNodeRecurrent //! Capacitance of the membrane (pF). double C_m_; - //! Prefactor of firing rate regularization. + //! Coefficient of firing rate regularization. double c_reg_; //! Leak / resting membrane potential (mV). diff --git a/models/eprop_iaf_adapt_bsshslm_2020.cpp b/models/eprop_iaf_adapt_bsshslm_2020.cpp index 37b9d91641..65e6ca927c 100644 --- a/models/eprop_iaf_adapt_bsshslm_2020.cpp +++ b/models/eprop_iaf_adapt_bsshslm_2020.cpp @@ -181,7 +181,7 @@ eprop_iaf_adapt_bsshslm_2020::Parameters_::set( const DictionaryDatum& d, Node* if ( c_reg_ < 0 ) { - throw BadProperty( "Firing rate regularization prefactor c_reg ≥ 0 required." ); + throw BadProperty( "Firing rate regularization coefficient c_reg ≥ 0 required." ); } if ( f_target_ < 0 ) diff --git a/models/eprop_iaf_adapt_bsshslm_2020.h b/models/eprop_iaf_adapt_bsshslm_2020.h index 1abca0b677..83316108b7 100644 --- a/models/eprop_iaf_adapt_bsshslm_2020.h +++ b/models/eprop_iaf_adapt_bsshslm_2020.h @@ -196,7 +196,7 @@ V_th mV :math:`v_\text{th}` -55.0 Spi ---------------------------------------------------------------------------------------------------------------- Parameter Unit Math equivalent Default Description =========================== ======= ======================= ================ =================================== -c_reg :math:`c_\text{reg}` 0.0 Prefactor of firing rate +c_reg :math:`c_\text{reg}` 0.0 Coefficient of firing rate regularization f_target Hz :math:`f^\text{target}` 10.0 Target firing rate of rate regularization @@ -348,7 +348,7 @@ class eprop_iaf_adapt_bsshslm_2020 : public EpropArchivingNodeRecurrent //! Capacitance of the membrane (pF). double C_m_; - //! Prefactor of firing rate regularization. + //! Coefficient of firing rate regularization. double c_reg_; //! Leak / resting membrane potential (mV). diff --git a/models/eprop_iaf_bsshslm_2020.cpp b/models/eprop_iaf_bsshslm_2020.cpp index da6f9bd95b..3b8cde4cbc 100644 --- a/models/eprop_iaf_bsshslm_2020.cpp +++ b/models/eprop_iaf_bsshslm_2020.cpp @@ -161,7 +161,7 @@ eprop_iaf_bsshslm_2020::Parameters_::set( const DictionaryDatum& d, Node* node ) if ( c_reg_ < 0 ) { - throw BadProperty( "Firing rate regularization prefactor c_reg ≥ 0 required." ); + throw BadProperty( "Firing rate regularization coefficient c_reg ≥ 0 required." ); } if ( f_target_ < 0 ) diff --git a/models/eprop_iaf_bsshslm_2020.h b/models/eprop_iaf_bsshslm_2020.h index 3dbab94c92..69ff787be3 100644 --- a/models/eprop_iaf_bsshslm_2020.h +++ b/models/eprop_iaf_bsshslm_2020.h @@ -183,7 +183,7 @@ V_th mV :math:`v_\text{th}` -55.0 Spi ---------------------------------------------------------------------------------------------------------------- Parameter Unit Math equivalent Default Description =========================== ======= ======================= ================ =================================== -c_reg :math:`c_\text{reg}` 0.0 Prefactor of firing rate +c_reg :math:`c_\text{reg}` 0.0 Coefficient of firing rate regularization f_target Hz :math:`f^\text{target}` 10.0 Target firing rate of rate regularization @@ -327,7 +327,7 @@ class eprop_iaf_bsshslm_2020 : public EpropArchivingNodeRecurrent //! Capacitance of the membrane (pF). double C_m_; - //! Prefactor of firing rate regularization. + //! Coefficient of firing rate regularization. double c_reg_; //! Leak / resting membrane potential (mV). diff --git a/models/eprop_iaf_psc_delta.cpp b/models/eprop_iaf_psc_delta.cpp index e967c9f53e..fd1600802d 100644 --- a/models/eprop_iaf_psc_delta.cpp +++ b/models/eprop_iaf_psc_delta.cpp @@ -202,7 +202,7 @@ nest::eprop_iaf_psc_delta::Parameters_::set( const DictionaryDatum& d, Node* nod updateValueParam< bool >( d, names::refractory_input, with_refr_input_, node ); if ( c_reg_ < 0 ) { - throw BadProperty( "Firing rate regularization prefactor c_reg ≥ 0 required." ); + throw BadProperty( "Firing rate regularization coefficient c_reg ≥ 0 required." ); } if ( f_target_ < 0 ) diff --git a/models/eprop_iaf_psc_delta.h b/models/eprop_iaf_psc_delta.h index 205c0aeded..6d993aef96 100644 --- a/models/eprop_iaf_psc_delta.h +++ b/models/eprop_iaf_psc_delta.h @@ -157,7 +157,7 @@ The following parameters can be set in the status dictionary. ------------------------------------------------------------------------------------------------------------------- Parameter Unit Math equivalent Default Description =========================== ======= ========================== ================ =================================== -c_reg :math:`c_\text{reg}` 0.0 Prefactor of firing rate +c_reg :math:`c_\text{reg}` 0.0 Coefficient of firing rate regularization f_target Hz :math:`f^\text{target}` 10.0 Target firing rate of rate regularization @@ -324,7 +324,7 @@ class eprop_iaf_psc_delta : public EpropArchivingNodeRecurrent bool with_refr_input_; //!< spikes arriving during refractory period are //!< counted - //! Prefactor of firing rate regularization. + //! Coefficient of firing rate regularization. double c_reg_; //! Target firing rate of rate regularization (spikes/s). diff --git a/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation.py b/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation.py index 7981c54898..781527532f 100644 --- a/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation.py +++ b/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation.py @@ -202,7 +202,7 @@ params_nrn_reg = { "beta": 1.7, # width scaling of the pseudo-derivative "C_m": 1.0, - "c_reg": 300.0 / duration["sequence"] * duration["learning_window"], # firing rate regularization scaling + "c_reg": 300.0 / duration["sequence"] * duration["learning_window"], # coefficient of firing rate regularization "E_L": 0.0, "eprop_isi_trace_cutoff": 100, "f_target": 10.0, # spikes/s, target firing rate for firing rate regularization diff --git a/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation_bsshslm_2020.py b/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation_bsshslm_2020.py index d2fb95b345..869e3d30d1 100644 --- a/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation_bsshslm_2020.py +++ b/pynest/examples/eprop_plasticity/eprop_supervised_classification_evidence-accumulation_bsshslm_2020.py @@ -205,7 +205,7 @@ params_nrn_reg = { "beta": 1.0, # width scaling of the pseudo-derivative "C_m": 1.0, - "c_reg": 300.0, # firing rate regularization scaling - 2*learning_window*(TF c_reg) for technical reasons + "c_reg": 300.0, # coefficient of firing rate regularization - 2*learning_window*(TF c_reg) for technical reasons "E_L": 0.0, "f_target": 10.0, # spikes/s, target firing rate for firing rate regularization "gamma": 0.3, # height scaling of the pseudo-derivative diff --git a/pynest/examples/eprop_plasticity/eprop_supervised_classification_neuromorphic_mnist.py b/pynest/examples/eprop_plasticity/eprop_supervised_classification_neuromorphic_mnist.py index 30a4e53483..6f4003d3ef 100644 --- a/pynest/examples/eprop_plasticity/eprop_supervised_classification_neuromorphic_mnist.py +++ b/pynest/examples/eprop_plasticity/eprop_supervised_classification_neuromorphic_mnist.py @@ -197,7 +197,7 @@ params_nrn_rec = { "beta": 1.7, # width scaling of the pseudo-derivative "C_m": 1.0, - "c_reg": 2.0 / duration["sequence"], # firing rate regularization scaling + "c_reg": 2.0 / duration["sequence"], # coefficient of firing rate regularization "E_L": 0.0, "eprop_isi_trace_cutoff": 100, "f_target": 10.0, # spikes/s, target firing rate for firing rate regularization diff --git a/pynest/examples/eprop_plasticity/eprop_supervised_regression_handwriting_bsshslm_2020.py b/pynest/examples/eprop_plasticity/eprop_supervised_regression_handwriting_bsshslm_2020.py index 9b6f940d74..7b2c9d0acc 100644 --- a/pynest/examples/eprop_plasticity/eprop_supervised_regression_handwriting_bsshslm_2020.py +++ b/pynest/examples/eprop_plasticity/eprop_supervised_regression_handwriting_bsshslm_2020.py @@ -196,7 +196,7 @@ "beta": 1.0, # width scaling of the pseudo-derivative "adapt_tau": 2000.0, # ms, time constant of adaptive threshold "C_m": 250.0, - "c_reg": 150.0, # firing rate regularization scaling + "c_reg": 150.0, # coefficient of firing rate regularization "E_L": 0.0, "f_target": 20.0, # spikes/s, target firing rate for firing rate regularization "gamma": 0.3, # height scaling of the pseudo-derivative diff --git a/pynest/examples/eprop_plasticity/eprop_supervised_regression_lemniscate_bsshslm_2020.py b/pynest/examples/eprop_plasticity/eprop_supervised_regression_lemniscate_bsshslm_2020.py index 1a75684aff..571774a465 100644 --- a/pynest/examples/eprop_plasticity/eprop_supervised_regression_lemniscate_bsshslm_2020.py +++ b/pynest/examples/eprop_plasticity/eprop_supervised_regression_lemniscate_bsshslm_2020.py @@ -192,7 +192,7 @@ "beta": 1.0, # width scaling of the pseudo-derivative "adapt_tau": 2000.0, # ms, time constant of adaptive threshold "C_m": 250.0, - "c_reg": 150.0, # firing rate regularization scaling + "c_reg": 150.0, # coefficient of firing rate regularization "E_L": 0.0, "f_target": 20.0, # spikes/s, target firing rate for firing rate regularization "gamma": 0.3, # height scaling of the pseudo-derivative diff --git a/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves.py b/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves.py index 8f91cce37a..d06ae871ae 100644 --- a/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves.py +++ b/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves.py @@ -187,7 +187,7 @@ params_nrn_rec = { "beta": 33.3, # width scaling of the pseudo-derivative "C_m": 1.0, - "c_reg": 300.0 / duration["sequence"], # firing rate regularization scaling + "c_reg": 300.0 / duration["sequence"], # coefficient of firing rate regularization "E_L": 0.0, "eprop_isi_trace_cutoff": 100, "f_target": 10.0, # spikes/s, target firing rate for firing rate regularization diff --git a/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves_bsshslm_2020.py b/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves_bsshslm_2020.py index 75122cfacb..b5f851e329 100644 --- a/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves_bsshslm_2020.py +++ b/pynest/examples/eprop_plasticity/eprop_supervised_regression_sine-waves_bsshslm_2020.py @@ -185,7 +185,7 @@ params_nrn_rec = { "beta": 1.0, # width scaling of the pseudo-derivative "C_m": 1.0, - "c_reg": 300.0, # firing rate regularization scaling + "c_reg": 300.0, # coefficient of firing rate regularization "E_L": 0.0, "f_target": 10.0, # spikes/s, target firing rate for firing rate regularization "gamma": 0.3, # height scaling of the pseudo-derivative