Fixed remaining bugs

Author: JanVogelsang

models/glif_psc.cpp

@@ -38,10 +38,10 @@
 
 using namespace nest;
 
-nest::RecordablesMap< nest::glif_psc > nest::glif_psc::recordablesMap_;
-
 namespace nest
 {
+RecordablesMap< glif_psc > glif_psc::recordablesMap_;
+
 void
 register_glif_psc( const std::string& name )
 {
@@ -52,23 +52,22 @@ register_glif_psc( const std::string& name )
 // for each quantity to be recorded.
 template <>
 void
-RecordablesMap< nest::glif_psc >::create()
+RecordablesMap< glif_psc >::create()
 {
-  insert_( names::V_m, &nest::glif_psc::get_V_m_ );
-  insert_( names::ASCurrents_sum, &nest::glif_psc::get_ASCurrents_sum_ );
-  insert_( names::I, &nest::glif_psc::get_I_ );
-  insert_( names::I_syn, &nest::glif_psc::get_I_syn_ );
-  insert_( names::threshold, &nest::glif_psc::get_threshold_ );
-  insert_( names::threshold_spike, &nest::glif_psc::get_threshold_spike_ );
-  insert_( names::threshold_voltage, &nest::glif_psc::get_threshold_voltage_ );
-}
+  insert_( names::V_m, &glif_psc::get_V_m_ );
+  insert_( names::ASCurrents_sum, &glif_psc::get_ASCurrents_sum_ );
+  insert_( names::I, &glif_psc::get_I_ );
+  insert_( names::I_syn, &glif_psc::get_I_syn_ );
+  insert_( names::threshold, &glif_psc::get_threshold_ );
+  insert_( names::threshold_spike, &glif_psc::get_threshold_spike_ );
+  insert_( names::threshold_voltage, &glif_psc::get_threshold_voltage_ );
 }
 
 /* ----------------------------------------------------------------
  * Default constructors defining default parameters and state
  * ---------------------------------------------------------------- */
 
-nest::glif_psc::Parameters_::Parameters_()
+glif_psc::Parameters_::Parameters_()
   : G_( 9.43 )               // in nS
   , E_L_( -78.85 )           // in mV
   , th_inf_( -51.68 - E_L_ ) // in mv, rel to E_L_, - 51.68 - E_L_, i.e., 27.17
@@ -93,7 +92,7 @@ nest::glif_psc::Parameters_::Parameters_()
 {
 }
 
-nest::glif_psc::State_::State_( const Parameters_& p )
+glif_psc::State_::State_( const Parameters_& p )
   : U_( 0.0 )                  // in mV
   , threshold_( p.th_inf_ )    // in mV
   , threshold_spike_( 0.0 )    // in mV
@@ -117,7 +116,7 @@ nest::glif_psc::State_::State_( const Parameters_& p )
  * ---------------------------------------------------------------- */
 
 void
-nest::glif_psc::Parameters_::get( DictionaryDatum& d ) const
+glif_psc::Parameters_::get( DictionaryDatum& d ) const
 {
   def< double >( d, names::V_th, th_inf_ + E_L_ );
   def< double >( d, names::g, G_ );
@@ -147,7 +146,7 @@ nest::glif_psc::Parameters_::get( DictionaryDatum& d ) const
 }
 
 double
-nest::glif_psc::Parameters_::set( const DictionaryDatum& d, Node* node )
+glif_psc::Parameters_::set( const DictionaryDatum& d, Node* node )
 {
   // if E_L_ is changed, we need to adjust all variables defined relative to
   // E_L_
@@ -301,7 +300,7 @@ nest::glif_psc::Parameters_::set( const DictionaryDatum& d, Node* node )
 }
 
 void
-nest::glif_psc::State_::get( DictionaryDatum& d, const Parameters_& p ) const
+glif_psc::State_::get( DictionaryDatum& d, const Parameters_& p ) const
 {
   def< double >( d, names::V_m, U_ + p.E_L_ );
   def< std::vector< double > >( d, names::ASCurrents, ASCurrents_ );
@@ -310,7 +309,7 @@ nest::glif_psc::State_::get( DictionaryDatum& d, const Parameters_& p ) const
 }
 
 void
-nest::glif_psc::State_::set( const DictionaryDatum& d, const Parameters_& p, double delta_EL, Node* node )
+glif_psc::State_::set( const DictionaryDatum& d, const Parameters_& p, double delta_EL, Node* node )
 {
   if ( updateValueParam< double >( d, names::V_m, U_, node ) )
   {
@@ -349,12 +348,12 @@ nest::glif_psc::State_::set( const DictionaryDatum& d, const Parameters_& p, dou
   }
 }
 
-nest::glif_psc::Buffers_::Buffers_( glif_psc& n )
+glif_psc::Buffers_::Buffers_( glif_psc& n )
   : logger_( n )
 {
 }
 
-nest::glif_psc::Buffers_::Buffers_( const Buffers_&, glif_psc& n )
+glif_psc::Buffers_::Buffers_( const Buffers_&, glif_psc& n )
   : logger_( n )
 {
 }
@@ -363,7 +362,7 @@ nest::glif_psc::Buffers_::Buffers_( const Buffers_&, glif_psc& n )
  * Default and copy constructor for node
  * ---------------------------------------------------------------- */
 
-nest::glif_psc::glif_psc()
+glif_psc::glif_psc()
   : ArchivingNode()
   , P_()
   , S_( P_ )
@@ -372,7 +371,7 @@ nest::glif_psc::glif_psc()
   recordablesMap_.create();
 }
 
-nest::glif_psc::glif_psc( const glif_psc& n )
+glif_psc::glif_psc( const glif_psc& n )
   : ArchivingNode( n )
   , P_( n.P_ )
   , S_( n.S_ )
@@ -385,15 +384,15 @@ nest::glif_psc::glif_psc( const glif_psc& n )
  * ---------------------------------------------------------------- */
 
 void
-nest::glif_psc::init_buffers_()
+glif_psc::init_buffers_()
 {
   B_.spikes_.clear();   // includes resize
   B_.currents_.clear(); // include resize
   B_.logger_.reset();   // includes resize
 }
 
 void
-nest::glif_psc::pre_run_hook()
+glif_psc::pre_run_hook()
 {
   B_.logger_.init();
 
@@ -467,7 +466,7 @@ nest::glif_psc::pre_run_hook()
  * ---------------------------------------------------------------- */
 
 void
-nest::glif_psc::update( Time const& origin, const long from, const long to )
+glif_psc::update( Time const& origin, const long from, const long to )
 {
   double v_old = S_.U_;
 
@@ -596,32 +595,4 @@ nest::glif_psc::update( Time const& origin, const long from, const long to )
   }
 }
 
-size_t
-nest::glif_psc::handles_test_event( SpikeEvent&, size_t receptor_type )
-{
-  if ( receptor_type <= 0 or receptor_type > P_.n_receptors_() )
-  {
-    throw IncompatibleReceptorType( receptor_type, get_name(), "SpikeEvent" );
-  }
-
-  P_.has_connections_ = true;
-  return receptor_type;
-}
-
-void
-nest::glif_psc::handle( SpikeEvent& e )
-{
-  assert( e.get_delay_steps() > 0 );
-
-  B_.spikes_[ e.get_rport() - 1 ].add_value(
-    e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_multiplicity() );
-}
-
-void
-nest::glif_psc::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 nest

models/glif_psc.h

@@ -461,12 +461,42 @@ glif_psc::set_status( const DictionaryDatum& d )
   S_ = stmp;
 }
 
-void
-nest::glif_psc::handle( DataLoggingRequest& e )
+inline size_t
+glif_psc::handles_test_event( SpikeEvent&, size_t receptor_type )
+{
+  if ( receptor_type <= 0 or receptor_type > P_.n_receptors_() )
+  {
+    throw IncompatibleReceptorType( receptor_type, get_name(), "SpikeEvent" );
+  }
+
+  P_.has_connections_ = true;
+  return receptor_type;
+}
+
+inline void
+glif_psc::handle( DataLoggingRequest& e )
 {
   B_.logger_.handle( e ); // the logger does this for us
 }
 
+inline void
+glif_psc::handle( SpikeEvent& e )
+{
+  assert( e.get_delay_steps() > 0 );
+
+  B_.spikes_[ e.get_rport() - 1 ].add_value(
+    e.get_rel_delivery_steps( kernel().simulation_manager.get_slice_origin() ), e.get_weight() * e.get_multiplicity() );
+}
+
+inline void
+glif_psc::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 nest
 
 #endif

models/music_cont_in_proxy.cpp

@@ -29,15 +29,17 @@
 #include "dict.h"
 #include "dictutils.h"
 #include "doubledatum.h"
-#include "integerdatum.h"
 
 // Includes from libnestutil:
 #include "compose.hpp"
 #include "dict_util.h"
 #include "logging.h"
 
 // Includes from nestkernel:
+#include "event_delivery_manager.h"
 #include "kernel_manager.h"
+#include "music_manager.h"
+#include "nest.h"
 
 void
 nest::register_music_cont_in_proxy( const std::string& name )

models/music_cont_out_proxy.cpp

@@ -29,7 +29,10 @@
 #include <string>
 
 // Includes from nestkernel:
+#include "event_delivery_manager.h"
 #include "kernel_manager.h"
+#include "music_manager.h"
+#include "nest.h"
 #include "nest_datums.h"
 
 // Includes from libnestutil:
@@ -39,8 +42,6 @@
 // Includes from sli:
 #include "dict.h"
 #include "dictutils.h"
-#include "doubledatum.h"
-#include "integerdatum.h"
 
 void
 nest::register_music_cont_out_proxy( const std::string& name )

models/music_message_in_proxy.cpp

@@ -29,15 +29,16 @@
 
 // Includes from sli:
 #include "arraydatum.h"
-#include "doubledatum.h"
-#include "integerdatum.h"
 
 // Includes from libnestutil:
 #include "compose.hpp"
 #include "logging.h"
 
 // Includes from nestkernel:
+#include "event_delivery_manager.h"
 #include "kernel_manager.h"
+#include "music_manager.h"
+#include "nest.h"
 
 void
 nest::register_music_message_in_proxy( const std::string& name )

models/music_rate_in_proxy.cpp

@@ -29,14 +29,16 @@
 #include "dict.h"
 #include "dictutils.h"
 #include "doubledatum.h"
-#include "integerdatum.h"
 
 // Includes from libnestutil:
 #include "compose.hpp"
 #include "logging.h"
 
 // Includes from nestkernel:
+#include "event_delivery_manager.h"
 #include "kernel_manager.h"
+#include "music_manager.h"
+#include "nest.h"
 
 void
 nest::register_music_rate_in_proxy( const std::string& name )

models/music_rate_out_proxy.cpp

@@ -24,22 +24,20 @@
 
 #ifdef HAVE_MUSIC
 
-// C++ includes:
-#include <numeric>
-
 // Includes from sli:
 #include "arraydatum.h"
 #include "dict.h"
 #include "dictutils.h"
-#include "doubledatum.h"
-#include "integerdatum.h"
 
 // Includes from libnestutil:
 #include "compose.hpp"
 #include "logging.h"
 
 // Includes from nestkernel:
+#include "event_delivery_manager.h"
 #include "kernel_manager.h"
+#include "music_manager.h"
+#include "nest.h"
 
 /* ----------------------------------------------------------------
  * Default constructors defining default parameters and state

nestkernel/connector_base_impl.h

@@ -22,10 +22,7 @@
 
 
 // Includes from nestkernel:
-#include "connector_model_impl.h"
-#include "genericmodel_impl.h"
 #include "kernel_manager.h"
-#include "model_manager_impl.h"
 
 namespace nest
 {