Merge branch 'master' of github.com:JanVogelsang/nest-simulator into nest-master

Author: JanVogelsang

models/glif_cond.cpp

@@ -800,12 +800,4 @@ nest::glif_cond::handle( CurrentEvent& e )
     e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_current() );
 }
 
-// TODO JV
-// Do not move this function as inline to h-file. It depends on universal_data_logger.h being included here.
-void
-nest::glif_cond::handle( DataLoggingRequest& e )
-{
-  B_.logger_.handle( e ); // the logger does this for us
-}
-
 #endif // HAVE_GSL

models/glif_cond.h

@@ -527,6 +527,12 @@ glif_cond::set_status( const DictionaryDatum& d )
   S_ = stmp;
 }
 
+inline void
+nest::glif_cond::handle( DataLoggingRequest& e )
+{
+  B_.logger_.handle( e ); // the logger does this for us
+}
+
 } // namespace nest
 
 #endif // HAVE_GSL

models/glif_psc_double_alpha.cpp

@@ -695,11 +695,3 @@ nest::glif_psc_double_alpha::handle( CurrentEvent& e )
   B_.currents_.add_value(
     e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_current() );
 }
-
-// TODO JV
-// Do not move this function as inline to h-file. It depends on universal_data_logger.h being included here.
-void
-nest::glif_psc_double_alpha::handle( DataLoggingRequest& e )
-{
-  B_.logger_.handle( e ); // the logger does this for us
-}

models/glif_psc_double_alpha.h

@@ -493,6 +493,12 @@ glif_psc_double_alpha::set_status( const DictionaryDatum& d )
   S_ = stmp;
 }
 
+inline void
+glif_psc_double_alpha::handle( DataLoggingRequest& e )
+{
+  B_.logger_.handle( e ); // the logger does this for us
+}
+
 } // namespace nest
 
 #endif

models/iaf_bw_2001.cpp

@@ -484,41 +484,5 @@ nest::iaf_bw_2001::update( Time const& origin, const long from, const long to )
   }
 }
 
-// TODO JV
-// Do not move this function as inline to h-file. It depends on universal_data_logger.h being included here.
-void
-nest::iaf_bw_2001::handle( DataLoggingRequest& e )
-{
-  B_.logger_.handle( e );
-}
-
-void
-nest::iaf_bw_2001::handle( SpikeEvent& e )
-{
-  assert( e.get_delay_steps() > 0 );
-
-  const double steps = e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() );
-
-  const auto rport = e.get_rport();
-
-  if ( rport < NMDA )
-  {
-    B_.spikes_[ rport - 1 ].add_value( steps, e.get_weight() * e.get_multiplicity() );
-  }
-  else
-  {
-    B_.spikes_[ rport - 1 ].add_value( steps, e.get_weight() * e.get_multiplicity() * e.get_offset() );
-  }
-}
-
-void
-nest::iaf_bw_2001::handle( CurrentEvent& e )
-{
-  assert( e.get_delay_steps() > 0 );
-
-  B_.currents_.add_value(
-    e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_current() );
-}
-
 #endif // HAVE_BOOST
 #endif // HAVE_GSL

models/iaf_bw_2001.h

@@ -523,6 +523,41 @@ iaf_bw_2001::set_status( const DictionaryDatum& d )
   P_ = ptmp;
   S_ = stmp;
 };
+
+inline void
+iaf_bw_2001::handle( DataLoggingRequest& e )
+{
+  B_.logger_.handle( e );
+}
+
+inline void
+iaf_bw_2001::handle( SpikeEvent& e )
+{
+  assert( e.get_delay_steps() > 0 );
+
+  const double steps = e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() );
+
+  const auto rport = e.get_rport();
+
+  if ( rport < NMDA )
+  {
+    B_.spikes_[ rport - 1 ].add_value( steps, e.get_weight() * e.get_multiplicity() );
+  }
+  else
+  {
+    B_.spikes_[ rport - 1 ].add_value( steps, e.get_weight() * e.get_multiplicity() * e.get_offset() );
+  }
+}
+
+inline void
+iaf_bw_2001::handle( CurrentEvent& e )
+{
+  assert( e.get_delay_steps() > 0 );
+
+  B_.currents_.add_value(
+    e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_current() );
+}
+
 } // namespace
 
 #endif // HAVE_BOOST

models/iaf_bw_2001_exact.cpp

@@ -515,53 +515,4 @@ nest::iaf_bw_2001_exact::update( Time const& origin, const long from, const long
   }
 }
 
-// TODO JV
-// Do not move this function as inline to h-file. It depends on universal_data_logger.h being included here.
-void
-nest::iaf_bw_2001_exact::handle( DataLoggingRequest& e )
-{
-  B_.logger_.handle( e );
-}
-
-void
-nest::iaf_bw_2001_exact::handle( SpikeEvent& e )
-{
-  assert( e.get_delay_steps() > 0 );
-  assert( e.get_rport() <= static_cast< int >( B_.spikes_.size() ) );
-
-  const double steps = e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() );
-  const auto rport = e.get_rport();
-
-  if ( rport < NMDA )
-  {
-    B_.spikes_[ rport - 1 ].add_value( steps, e.get_weight() * e.get_multiplicity() );
-  }
-  else
-  // we need to scale each individual S_j variable by its weight,
-  // so we store them
-  {
-    B_.spikes_[ rport - 1 ].add_value( steps, e.get_multiplicity() );
-    // since we scale entire S_j variable by the weight it also affects previous spikes.
-    // we therefore require them to be constant.
-    const size_t w_idx = rport - NMDA;
-    if ( B_.weights_[ w_idx ] == 0 )
-    {
-      B_.weights_[ w_idx ] = e.get_weight();
-    }
-    else if ( B_.weights_[ w_idx ] != e.get_weight() )
-    {
-      throw KernelException( "iaf_bw_2001_exact requires constant weights." );
-    }
-  }
-}
-
-void
-nest::iaf_bw_2001_exact::handle( CurrentEvent& e )
-{
-  assert( e.get_delay_steps() > 0 );
-
-  B_.currents_.add_value(
-    e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_current() );
-}
-
 #endif // HAVE_GSL

models/iaf_bw_2001_exact.h

@@ -540,6 +540,54 @@ iaf_bw_2001_exact::set_status( const DictionaryDatum& d )
   P_ = ptmp;
   S_ = stmp;
 };
+
+inline void
+nest::iaf_bw_2001_exact::handle( DataLoggingRequest& e )
+{
+  B_.logger_.handle( e );
+}
+
+inline void
+nest::iaf_bw_2001_exact::handle( SpikeEvent& e )
+{
+  assert( e.get_delay_steps() > 0 );
+  assert( e.get_rport() <= static_cast< int >( B_.spikes_.size() ) );
+
+  const double steps = e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() );
+  const auto rport = e.get_rport();
+
+  if ( rport < NMDA )
+  {
+    B_.spikes_[ rport - 1 ].add_value( steps, e.get_weight() * e.get_multiplicity() );
+  }
+  else
+  // we need to scale each individual S_j variable by its weight,
+  // so we store them
+  {
+    B_.spikes_[ rport - 1 ].add_value( steps, e.get_multiplicity() );
+    // since we scale entire S_j variable by the weight it also affects previous spikes.
+    // we therefore require them to be constant.
+    const size_t w_idx = rport - NMDA;
+    if ( B_.weights_[ w_idx ] == 0 )
+    {
+      B_.weights_[ w_idx ] = e.get_weight();
+    }
+    else if ( B_.weights_[ w_idx ] != e.get_weight() )
+    {
+      throw KernelException( "iaf_bw_2001_exact requires constant weights." );
+    }
+  }
+}
+
+inline void
+nest::iaf_bw_2001_exact::handle( CurrentEvent& e )
+{
+  assert( e.get_delay_steps() > 0 );
+
+  B_.currents_.add_value(
+    e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_current() );
+}
+
 } // namespace
 
 #endif // HAVE_GSL