Fix issue: #3532: Disconnect issue with CompressedSpikes:ON/Off

nestkernel/connection_manager.cpp

@@ -978,7 +978,7 @@ nest::ConnectionManager::find_connection( const size_t tid,
 {
   // lcid will hold the position of the /first/ connection from node
   // snode_id to any local node, or be invalid
-  size_t lcid = source_table_.find_first_source( tid, syn_id, snode_id );
+  size_t lcid = source_table_.find_first_source( tid, syn_id, snode_id, use_compressed_spikes() );
   if ( lcid == invalid_index )
   {
     return invalid_index;
@@ -1428,7 +1428,7 @@ nest::ConnectionManager::get_targets( const std::vector< size_t >& sources,
   {
     for ( size_t i = 0; i < sources.size(); ++i )
     {
-      const size_t start_lcid = source_table_.find_first_source( tid, syn_id, sources[ i ] );
+      const size_t start_lcid = source_table_.find_first_source( tid, syn_id, sources[ i ], use_compressed_spikes() );
       if ( start_lcid != invalid_index )
       {
         connections_[ tid ][ syn_id ]->get_target_node_ids( tid, start_lcid, post_synaptic_element, targets[ i ] );

nestkernel/source_table.h

@@ -29,6 +29,7 @@
 #include <iostream>
 #include <map>
 #include <set>
+#include <utility>
 #include <vector>
 
 // Includes from nestkernel:
@@ -300,7 +301,10 @@
    * Finds the first entry in sources_ at the given thread id and
    * synapse type that is equal to snode_id.
    */
-  size_t find_first_source( const size_t tid, const synindex syn_id, const size_t snode_id ) const;
+  size_t find_first_source( const size_t tid,
+    const synindex syn_id,
+    const size_t snode_id,
+    bool using_compressed_spikes = false ) const;
 
   /**
    * Marks entry in sources_ at given position as disabled.
@@ -471,27 +475,41 @@
 }
 
 inline size_t
-SourceTable::find_first_source( const size_t tid, const synindex syn_id, const size_t snode_id ) const
+SourceTable::find_first_source( const size_t tid,
+  const synindex syn_id,
+  const size_t snode_id,
+  bool using_compressed_spikes /* default = false */ ) const
 {
-  // binary search in sorted sources
-  const BlockVector< Source >::const_iterator begin = sources_[ tid ][ syn_id ].begin();
-  const BlockVector< Source >::const_iterator end = sources_[ tid ][ syn_id ].end();
-  BlockVector< Source >::const_iterator it = std::lower_bound( begin, end, Source( snode_id, true ) );
-
-  // source found by binary search could be disabled, iterate through
-  // sources until a valid one is found
-  while ( it != end )
+
+  const auto source_begin = sources_[ tid ][ syn_id ].cbegin();
+  const auto source_end = sources_[ tid ][ syn_id ].cend();
+
+  const Source selected_source { snode_id, /* is_primary */ true };
+
+  auto find_source = []( auto begin, auto end, const Source& value ) -> size_t
   {
-    if ( it->get_node_id() == snode_id and not it->is_disabled() )
+    iter = std::find_if( begin,
+      end,
+      [ &value ]( const Source& src ) { return src.get_node_id() == value.get_node_id() && not src.is_disabled(); } );
+    if ( iter != end )
     {
-      const size_t lcid = it - begin;
+      const size_t lcid = iter - begin;
       return lcid;
     }
-    ++it;
+    // no enabled entry with this snode ID found
+    return invalid_index;
+  };
+
+  auto iter = source_begin;
+
+  if ( using_compressed_spikes )
+  {
+    auto iter = std::lower_bound( iter, source_end, selected_source );
   }
 
-  // no enabled entry with this snode ID found
-  return invalid_index;
+  auto ret = find_source( iter, source_end, selected_source );
+
+  return ret;
 }
 
 inline void