Changeset 4a1b38

Timestamp:

08/21/09 11:40:53 (4 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master, python3

Children:

a89e06

Parents:

dd98132

git-author:

Tiago de Paula Peixoto <tiago@…> (08/21/09 11:36:54)

git-committer:

Tiago de Paula Peixoto <tiago@…> (08/21/09 11:40:53)

Message:

Small fixes in GraphWrap

Use correct types and always pass GraphWrap objects by value.

Location:

src/graph

Files:

• graph_util.hh (modified) (1 diff)
• graph_wrap.hh (modified) (9 diffs)

src/graph/graph_util.hh

@@ -194 +194 @@
 
 //==============================================================================
+//remove_edge(e, reverse_graph<G>)
+//==============================================================================
+template <class Graph>
+inline
+void remove_edge
+(typename graph_traits<reverse_graph<Graph> >::edge_descriptor e,
+ reverse_graph<Graph>& g)
+{
+    return remove_edge(e,const_cast<Graph&>(g.m_g));
+}
+
+//==============================================================================
 // add_vertex(filtered_graph<G>)
 //==============================================================================

src/graph/graph_wrap.hh

@@ -41 +41 @@
     typedef Graph orig_graph_t;
 
+    typedef typename graph_traits<Graph>::vertex_descriptor vertex_descriptor;
+    typedef typename graph_traits<Graph>::edge_descriptor edge_descriptor;
+
     Graph& _g;
     GraphInterface& _gi;
@@ -53 +56 @@
 template <class Graph>
 struct graph_traits<GraphWrap<Graph> >: public graph_traits<Graph> {};
+
+template <class Graph>
+struct graph_traits<const GraphWrap<Graph> >:
+        public graph_traits<const Graph> {};
 
 template <class Graph>
@@ -166 +173 @@
 add_edge(typename graph_traits<GraphWrap<Graph> >::vertex_descriptor u,
          typename graph_traits<GraphWrap<Graph> >::vertex_descriptor v,
-         GraphWrap<Graph>& g)
+         GraphWrap<Graph> g)
 {
     std::pair<typename graph_traits<GraphWrap<Graph> >::edge_descriptor, bool>
@@ -177 +184 @@
 inline void remove_edge
 (typename graph_traits<GraphWrap<Graph> >::edge_descriptor e,
- GraphWrap<Graph>& g)
+ GraphWrap<Graph> g)
 {
     g._gi.RemoveEdgeIndex(e);
@@ -186 +193 @@
 (typename graph_traits<GraphWrap<Graph> >::vertex_descriptor u,
  typename graph_traits<GraphWrap<Graph> >::vertex_descriptor v,
- Graph& g)
+ GraphWrap<Graph> g)
 {
     vector<typename graph_traits<GraphWrap<Graph> >::edge_descriptor>
@@ -203 +210 @@
 template <class Graph>
 inline typename graph_traits<GraphWrap<Graph> >::vertex_descriptor
-add_vertex(GraphWrap<Graph>& g)
+add_vertex(GraphWrap<Graph> g)
 {
     return add_vertex(g._g);
@@ -211 +218 @@
 inline void clear_vertex
 (typename graph_traits<GraphWrap<Graph> >::vertex_descriptor u,
- GraphWrap<Graph>& g)
+ GraphWrap<Graph> g)
 {
     typedef GraphWrap<Graph> graph_t;
@@ -232 +239 @@
 inline void remove_vertex
 (typename graph_traits<GraphWrap<Graph> >::vertex_descriptor u,
- GraphWrap<Graph>& g)
+ GraphWrap<Graph> g)
 {
     clear_vertex(u, g);
@@ -242 +249 @@
 remove_out_edge_if
 (typename graph_traits<GraphWrap<Graph> >::vertex_descriptor u,
- Predicate predicate, Graph& g)
+ Predicate predicate, GraphWrap<Graph> g)
 {
     vector<typename graph_traits<GraphWrap<Graph> >::edge_descriptor>