Add _to_history to get_learning_signal to avoid name clash

nest · Dec 14, 2023 · 4fa0bb3 · 4fa0bb3
1 parent 580f72f
commit 4fa0bb3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/models/eprop_iaf_psc_delta.cpp b/models/eprop_iaf_psc_delta.cpp
@@ -361,7 +361,7 @@ eprop_iaf_psc_delta::update( Time const& origin, const long from, const long to
       reset_spike_count();
     }
 
-    S_.learning_signal_ = get_learning_signal( t );
+    S_.learning_signal_ = get_learning_signal_history( t );
 
     if ( S_.r_ > 0 )
     {

diff --git a/models/eprop_iaf_psc_delta_adapt.cpp b/models/eprop_iaf_psc_delta_adapt.cpp
@@ -401,7 +401,7 @@ eprop_iaf_psc_delta_adapt::update( Time const& origin, const long from, const lo
       reset_spike_count();
     }
 
-    S_.learning_signal_ = get_learning_signal( t );
+    S_.learning_signal_ = get_learning_signal_history( t );
 
     if ( S_.r_ > 0 )
     {

diff --git a/nestkernel/eprop_archiving_node.cpp b/nestkernel/eprop_archiving_node.cpp
@@ -110,7 +110,7 @@ EpropArchivingNodeRecurrent::get_firing_rate_reg_history( const long time_step )
 }
 
 double
-EpropArchivingNodeRecurrent::get_learning_signal( const long time_step )
+EpropArchivingNodeRecurrent::get_learning_signal_history( const long time_step )
 {
   const long shift = delay_rec_out_ + delay_out_norm_ + delay_out_rec_;
 

diff --git a/nestkernel/eprop_archiving_node.h b/nestkernel/eprop_archiving_node.h
@@ -124,7 +124,7 @@ class EpropArchivingNodeRecurrent : public EpropArchivingNode< HistEntryEpropRec
   std::vector< HistEntryEpropFiringRateReg >::iterator get_firing_rate_reg_history( const long time_step );
 
   //! Return learning signal from history for given time step or zero if time step not in history
-  double get_learning_signal( const long time_step );
+  double get_learning_signal_history( const long time_step );
 
   //! Erase no longer needed parts of the firing rate regularization history.
   void erase_unneeded_firing_rate_reg_history();
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     double
-    EpropArchivingNodeRecurrent::get_learning_signal( const long time_step )
+    EpropArchivingNodeRecurrent::get_learning_signal_history( const long time_step )
     {
       const long shift = delay_rec_out_ + delay_out_norm_ + delay_out_rec_;
@@ Expand Down @@