revision vertex_range, removed container_iterator_adaptor.hpp (#53)

Author: tonibohnlein

include/osp/bsp/model/BspArchitecture.hpp

@@ -30,7 +30,7 @@ limitations under the License.
 #include "osp/auxiliary/misc.hpp"
 #include "osp/concepts/computational_dag_concept.hpp"
 #include "osp/concepts/graph_traits.hpp"
-#include "osp/graph_implementations/vertex_iterator.hpp"
+#include "osp/graph_implementations/integral_range.hpp"
 
 namespace osp {
 
@@ -282,7 +282,7 @@ class BspArchitecture {
                     }
     }
 
-    inline auto processors() const { return vertex_range<unsigned>(number_processors); }    
+    inline auto processors() const { return integral_range<unsigned>(number_processors); }    
 
     /**
      * @brief Computes the average communication cost of the BspArchitecture.

include/osp/graph_implementations/adj_list_impl/compact_sparse_graph.hpp

@@ -31,7 +31,7 @@ limitations under the License.
 #include "osp/concepts/constructable_computational_dag_concept.hpp"
 #include "osp/concepts/specific_graph_impl.hpp"
 #include "osp/graph_algorithms/directed_graph_edge_view.hpp"
-#include "osp/graph_implementations/vertex_iterator.hpp"
+#include "osp/graph_implementations/integral_range.hpp"
 
 namespace osp {
 
@@ -664,7 +664,7 @@ class Compact_Sparse_Graph {
             }
         }
 
-        inline auto vertices() const { return vertex_range<vertex_idx>(number_of_vertices); };
+        inline auto vertices() const { return integral_range<vertex_idx>(number_of_vertices); };
 
         inline vert_t num_vertices() const { return number_of_vertices; };
         inline edge_t num_edges() const { return number_of_edges; }

include/osp/graph_implementations/adj_list_impl/compact_sparse_graph_edge_desc.hpp

@@ -224,7 +224,7 @@ class Compact_Sparse_Graph_EdgeDesc : public Compact_Sparse_Graph<keep_vertex_or
 
 
 
-        inline auto edges() const { return vertex_range<directed_edge_descriptor>(BaseT::number_of_edges); };
+        inline auto edges() const { return integral_range<directed_edge_descriptor>(BaseT::number_of_edges); };
         inline directed_edge_descriptor edge(const vertex_idx &src, const vertex_idx &tgt) const {
             typename BaseT::Compact_Children_Edges::Children_range range = BaseT::csc_out_edges.children(src);
 
@@ -240,7 +240,7 @@ class Compact_Sparse_Graph_EdgeDesc : public Compact_Sparse_Graph<keep_vertex_or
         inline vertex_idx source(const directed_edge_descriptor &edge) const { return BaseT::csc_out_edges.source(edge); };
         inline vertex_idx target(const directed_edge_descriptor &edge) const { return BaseT::csc_out_edges.target(edge); };
 
-        inline auto out_edges(const vertex_idx &vert) const { return vertex_range<directed_edge_descriptor>(BaseT::csc_out_edges.children_indx_begin(vert), BaseT::csc_out_edges.children_indx_begin(vert + 1)); };
+        inline auto out_edges(const vertex_idx &vert) const { return integral_range<directed_edge_descriptor>(BaseT::csc_out_edges.children_indx_begin(vert), BaseT::csc_out_edges.children_indx_begin(vert + 1)); };
         inline auto in_edges(const vertex_idx &vert) const { return In_Edges_range(vert, *this, BaseT::csc_out_edges); };
 
         template<typename RetT = edge_comm_weight_type>

include/osp/graph_implementations/adj_list_impl/computational_dag_edge_idx_vector_impl.hpp

@@ -23,8 +23,6 @@ limitations under the License.
 #include "osp/graph_algorithms/computational_dag_construction_util.hpp"
 #include <vector>
 
-// #include "container_iterator_adaptor.hpp"
-
 namespace osp {
 
 template<typename v_impl>
@@ -160,7 +158,7 @@ class computational_dag_edge_idx_vector_impl {
     inline auto parents(vertex_idx v) const { return edge_source_range(in_edges_[v], *this); }
     inline auto children(vertex_idx v) const { return edge_target_range(out_edges_[v], *this); }
 
-    inline auto vertices() const { return vertex_range<vertex_idx>(static_cast<vertex_idx>(vertices_.size())); }
+    inline auto vertices() const { return integral_range<vertex_idx>(static_cast<vertex_idx>(vertices_.size())); }
 
     inline const std::vector<directed_edge_descriptor> &in_edges(vertex_idx v) const { return in_edges_[v]; }
     inline const std::vector<directed_edge_descriptor> &out_edges(vertex_idx v) const { return out_edges_[v]; }

include/osp/graph_implementations/adj_list_impl/computational_dag_vector_impl.hpp

@@ -20,7 +20,7 @@ limitations under the License.
 #include "osp/concepts/computational_dag_concept.hpp"
 #include "osp/concepts/directed_graph_edge_desc_concept.hpp"
 #include "osp/graph_algorithms/computational_dag_construction_util.hpp"
-#include "osp/graph_implementations/vertex_iterator.hpp"
+#include "osp/graph_implementations/integral_range.hpp"
 #include <vector>
 
 namespace osp {
@@ -115,7 +115,7 @@ class computational_dag_vector_impl {
 
     virtual ~computational_dag_vector_impl() = default;
 
-    inline auto vertices() const { return vertex_range<vertex_idx>(static_cast<vertex_idx>(vertices_.size())); }
+    inline auto vertices() const { return integral_range<vertex_idx>(static_cast<vertex_idx>(vertices_.size())); }
 
     inline vertex_idx num_vertices() const { return static_cast<vertex_idx>(vertices_.size()); }
 

include/osp/graph_implementations/adj_list_impl/dag_vector_adapter.hpp

@@ -20,8 +20,7 @@ limitations under the License.
 #include "computational_dag_vector_impl.hpp"
 #include "osp/concepts/computational_dag_concept.hpp"
 #include "osp/graph_algorithms/computational_dag_construction_util.hpp"
-#include "osp/graph_implementations/container_iterator_adaptor.hpp"
-#include "osp/graph_implementations/vertex_iterator.hpp"
+#include "osp/graph_implementations/integral_range.hpp"
 #include <vector>
 
 namespace osp {
@@ -127,7 +126,7 @@ class dag_vector_adapter {
         num_vertex_types_ = 1;
     }
 
-    inline auto vertices() const { return vertex_range<vertex_idx>(static_cast<vertex_idx>(vertices_.size())); }
+    inline auto vertices() const { return integral_range<vertex_idx>(static_cast<vertex_idx>(vertices_.size())); }
 
     inline vertex_idx num_vertices() const { return static_cast<vertex_idx>(vertices_.size()); }
 

include/osp/graph_implementations/container_iterator_adaptor.hpp

@@ -24,7 +24,7 @@ limitations under the License.
 #include "osp/concepts/directed_graph_concept.hpp"
 #include "osp/concepts/directed_graph_edge_desc_concept.hpp"
 #include "osp/concepts/computational_dag_concept.hpp"
-#include "osp/graph_implementations/vertex_iterator.hpp"
+#include "osp/graph_implementations/integral_range.hpp"
 #include "eigen_sparse_iterator.hpp"
 
 namespace osp {
@@ -72,7 +72,7 @@ class SparseMatrixImp {
 
     /// @brief Return a range over all vertices [0, num_vertices)
     auto vertices() const {
-        return osp::vertex_range<size_t>(num_vertices());
+        return osp::integral_range<size_t>(num_vertices());
     }
 
     /// @brief Number of edges = total non-zeros minus diagonal elements