Network: Used iterator + size span constructors, because of Apple cla…

…ng weirdness
seldon-code · Mar 9, 2024 · d68a38e · d68a38e
1 parent 7fc843b
commit d68a38e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/network.cpp b/src/network.cpp
@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <numeric>
+#include <span>
 #include <stdexcept>
 
 Seldon::Network::Network(
@@ -47,12 +48,12 @@ std::vector<std::vector<size_t>> Seldon::Network::strongly_connected_components(
 
 std::span<const size_t> Seldon::Network::get_neighbours( std::size_t agent_idx ) const
 {
-    return std::span( neighbour_list[agent_idx].cbegin(), neighbour_list[agent_idx].cend() );
+    return std::span<const size_t, std::dynamic_extent>( neighbour_list[agent_idx].begin(), neighbour_list[agent_idx].size() );
 }
 
 std::span<size_t> Seldon::Network::get_neighbours( std::size_t agent_idx )
 {
-    return std::span( neighbour_list[agent_idx].begin(), neighbour_list[agent_idx].end() );
+    return std::span( neighbour_list[agent_idx].begin(), neighbour_list[agent_idx].size() );
 }
 
 void Seldon::Network::set_neighbours_and_weights(
@@ -84,12 +85,12 @@ void Seldon::Network::push_back_neighbour_and_weight( size_t i, size_t j, Weight
 
 std::span<const Seldon::Network::WeightT> Seldon::Network::get_weights( std::size_t agent_idx ) const
 {
-    return std::span<const Seldon::Network::WeightT>( weight_list[agent_idx].cbegin(), weight_list[agent_idx].cend() );
+    return std::span<const Seldon::Network::WeightT>( weight_list[agent_idx].cbegin(), weight_list[agent_idx].size() );
 }
 
 std::span<Seldon::Network::WeightT> Seldon::Network::get_weights( std::size_t agent_idx )
 {
-    return std::span<Seldon::Network::WeightT>( weight_list[agent_idx].begin(), weight_list[agent_idx].end() );
+    return std::span<Seldon::Network::WeightT>( weight_list[agent_idx].begin(), weight_list[agent_idx].size() );
 }
 
 void Seldon::Network::set_weights( std::size_t agent_idx, std::span<const Seldon::Network::WeightT> weights )