Disentangle kernel-manager include tree

doc/htmldoc/networks/spatially_structured_networks.rst

@@ -1516,7 +1516,6 @@ files for the ``Mask`` parent class:
 .. code:: c
 
    #include "mask.h"
-   #include "mask_impl.h"
 
 The ``Mask`` class has a few methods that must be overridden:
 

libnestutil/dict_util.h

@@ -25,8 +25,8 @@
 
 // Includes from nestkernel:
 #include "kernel_manager.h"
+#include "nest.h"
 #include "nest_datums.h"
-#include "vp_manager_impl.h"
 
 // Includes from sli:
 #include "dictdatum.h"

models/CMakeLists.txt

@@ -23,10 +23,10 @@ set(models_sources
     weight_recorder.h weight_recorder.cpp # Required by CommonSynapseProperties
     cm_compartmentcurrents.h cm_compartmentcurrents.cpp
     cm_tree.h cm_tree.cpp
-    rate_neuron_ipn.h rate_neuron_ipn_impl.h
-    rate_neuron_opn.h rate_neuron_opn_impl.h
-    rate_transformer_node.h rate_transformer_node_impl.h
-    weight_optimizer.h weight_optimizer.cpp
+    rate_neuron_ipn.h
+        rate_neuron_opn.h
+        rate_transformer_node.h
+        weight_optimizer.h weight_optimizer.cpp
     ${MODELS_SOURCES_GENERATED}
 )
 

models/ac_generator.cpp

@@ -30,10 +30,8 @@
 #include "numerics.h"
 
 // Includes from nestkernel:
-#include "event_delivery_manager_impl.h"
+#include "event_delivery_manager.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dict.h"

models/aeif_cond_alpha.cpp

@@ -37,9 +37,7 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
 #include "nest_names.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/aeif_cond_alpha_astro.cpp

@@ -37,9 +37,7 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
 #include "nest_names.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/aeif_cond_alpha_multisynapse.cpp

@@ -34,8 +34,6 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dict.h"

models/aeif_cond_beta_multisynapse.cpp

@@ -35,8 +35,6 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dict.h"

models/aeif_cond_exp.cpp

@@ -37,9 +37,7 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
 #include "nest_names.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/aeif_psc_alpha.cpp

@@ -37,9 +37,7 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
 #include "nest_names.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/aeif_psc_delta.cpp

@@ -37,9 +37,7 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
 #include "nest_names.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/aeif_psc_delta_clopath.cpp

@@ -37,9 +37,7 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
 #include "nest_names.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/aeif_psc_exp.cpp

@@ -37,9 +37,7 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
 #include "nest_names.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/amat2_psc_exp.cpp

@@ -30,8 +30,6 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/astrocyte_lr_1994.cpp

@@ -37,8 +37,6 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "nest_impl.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dictutils.h"

models/bernoulli_synapse.cpp

@@ -22,9 +22,6 @@
 
 #include "bernoulli_synapse.h"
 
-// Includes from nestkernel:
-#include "nest_impl.h"
-
 void
 nest::register_bernoulli_synapse( const std::string& name )
 {

models/binary_neuron.h

@@ -35,7 +35,6 @@
 #include "archiving_node.h"
 #include "connection.h"
 #include "event.h"
-#include "event_delivery_manager_impl.h"
 #include "exceptions.h"
 #include "kernel_manager.h"
 #include "nest_timeconverter.h"

models/clopath_synapse.cpp

@@ -22,9 +22,6 @@
 
 #include "clopath_synapse.h"
 
-// Includes from nestkernel:
-#include "nest_impl.h"
-
 void
 nest::register_clopath_synapse( const std::string& name )
 {

models/cm_compartmentcurrents.h

@@ -24,6 +24,8 @@
 
 #include <stdlib.h>
 
+#include "logging.h"
+#include "logging_manager.h"
 #include "ring_buffer.h"
 
 namespace nest

models/cm_default.cpp

@@ -22,9 +22,6 @@
 
 #include "cm_default.h"
 
-// Includes from nestkernel:
-#include "nest_impl.h"
-
 namespace nest
 {
 void

models/cm_tree.cpp

@@ -21,6 +21,9 @@
  */
 #include "cm_tree.h"
 
+#include "logging.h"
+#include "logging_manager.h"
+
 
 nest::Compartment::Compartment( const long compartment_index, const long parent_index )
   : xx_( 0.0 )

models/cm_tree.h

@@ -38,7 +38,6 @@
 // Includes from nestkernel:
 #include "exceptions.h"
 #include "kernel_manager.h"
-#include "universal_data_logger_impl.h"
 
 // Includes from sli:
 #include "dict.h"

models/cont_delay_synapse.cpp

@@ -21,10 +21,6 @@
  */
 
 #include "cont_delay_synapse.h"
-#include "cont_delay_synapse_impl.h"
-
-// Includes from nestkernel:
-#include "nest_impl.h"
 
 void
 nest::register_cont_delay_synapse( const std::string& name )

models/cont_delay_synapse.h

@@ -248,6 +248,74 @@ cont_delay_synapse< targetidentifierT >::send( Event& e, size_t t, const CommonS
 template < typename targetidentifierT >
 constexpr ConnectionModelProperties cont_delay_synapse< targetidentifierT >::properties;
 
+template < typename targetidentifierT >
+cont_delay_synapse< targetidentifierT >::cont_delay_synapse()
+  : ConnectionBase()
+  , weight_( 1.0 )
+  , delay_offset_( 0.0 )
+{
+}
+
+template < typename targetidentifierT >
+void
+cont_delay_synapse< targetidentifierT >::get_status( DictionaryDatum& d ) const
+{
+  ConnectionBase::get_status( d );
+
+  def< double >( d, names::weight, weight_ );
+  def< double >( d, names::delay, Time( Time::step( get_delay_steps() ) ).get_ms() - delay_offset_ );
+  def< long >( d, names::size_of, sizeof( *this ) );
+}
+
+template < typename targetidentifierT >
+void
+cont_delay_synapse< targetidentifierT >::set_status( const DictionaryDatum& d, ConnectorModel& cm )
+{
+  ConnectionBase::set_status( d, cm );
+
+  updateValue< double >( d, names::weight, weight_ );
+
+  // set delay if mentioned
+  double delay;
+
+  if ( updateValue< double >( d, names::delay, delay ) )
+  {
+
+    const double h = Time::get_resolution().get_ms();
+
+    double int_delay;
+    const double frac_delay = std::modf( delay / h, &int_delay );
+
+    if ( frac_delay == 0 )
+    {
+      kernel().connection_manager.get_delay_checker().assert_valid_delay_ms( delay );
+      set_delay_steps( Time::delay_ms_to_steps( delay ) );
+      delay_offset_ = 0.0;
+    }
+    else
+    {
+      const long lowerbound = static_cast< long >( int_delay );
+      kernel().connection_manager.get_delay_checker().assert_two_valid_delays_steps( lowerbound, lowerbound + 1 );
+      set_delay_steps( lowerbound + 1 );
+      delay_offset_ = h * ( 1.0 - frac_delay );
+    }
+  }
+}
+
+template < typename targetidentifierT >
+void
+cont_delay_synapse< targetidentifierT >::check_synapse_params( const DictionaryDatum& syn_spec ) const
+{
+  if ( syn_spec->known( names::delay ) )
+  {
+    LOG( M_WARNING,
+      "Connect",
+      "The delay will be rounded to the next multiple of the time step. "
+      "To use a more precise time delay it needs to be defined within "
+      "the synapse, e.g. with CopyModel()." );
+  }
+}
+
 } // of namespace nest
 
 #endif // of #ifndef CONT_DELAY_SYNAPSE_H