[Boost-commit] svn:boost r63000 - in trunk: boost/graph libs/graph/doc libs/graph/example

Subject: [Boost-commit] svn:boost r63000 - in trunk: boost/graph libs/graph/doc libs/graph/example
From: jewillco_at_[hidden]
Date: 2010-06-15 17:07:23

Author: jewillco
Date: 2010-06-15 17:07:22 EDT (Tue, 15 Jun 2010)
New Revision: 63000
URL: http://svn.boost.org/trac/boost/changeset/63000

Log:
Changed write_graphviz dynamic_properties overloads to write_graphviz_dp to disambiguate them, plus removed more obsolete GraphViz reader stuff
Text files modified: 
   trunk/boost/graph/graphviz.hpp           |    34 ++++++++++++++++++----------------      
   trunk/libs/graph/doc/write-graphviz.html |    14 +++++++-------                          
   trunk/libs/graph/example/graphviz.cpp    |     2 +-                                      
   3 files changed, 26 insertions(+), 24 deletions(-)

Modified: trunk/boost/graph/graphviz.hpp
==============================================================================
--- trunk/boost/graph/graphviz.hpp	(original)
+++ trunk/boost/graph/graphviz.hpp	2010-06-15 17:07:22 EDT (Tue, 15 Jun 2010)
@@ -449,6 +449,8 @@
                                     vertex_id);
   }
 
+#if 0
+  // This interface has not worked for a long time
   typedef std::map<std::string, std::string> GraphvizAttrList;
 
   typedef property<vertex_attribute_t, GraphvizAttrList>
@@ -478,15 +480,15 @@
                    GraphvizGraphProperty> >
           GraphvizGraph;
 
-
   // These four require linking the BGL-Graphviz library: libbgl-viz.a
   // from the /src directory.
   // Library has not existed for a while
-  // extern void read_graphviz(const std::string& file, GraphvizDigraph& g);
-  // extern void read_graphviz(FILE* file, GraphvizDigraph& g);
-  //
-  // extern void read_graphviz(const std::string& file, GraphvizGraph& g);
-  // extern void read_graphviz(FILE* file, GraphvizGraph& g);
+  extern void read_graphviz(const std::string& file, GraphvizDigraph& g);
+  extern void read_graphviz(FILE* file, GraphvizDigraph& g);
+  
+  extern void read_graphviz(const std::string& file, GraphvizGraph& g);
+  extern void read_graphviz(FILE* file, GraphvizGraph& g);
+#endif
 
   class dynamic_properties_writer
   {
@@ -576,22 +578,22 @@
 
   template<typename Graph>
   inline void
-  write_graphviz(std::ostream& out, const Graph& g,
-                 const dynamic_properties& dp,
-                 const std::string& node_id = "node_id"
-                 BOOST_GRAPH_ENABLE_IF_MODELS_PARM(Graph,vertex_list_graph_tag))
+  write_graphviz_dp(std::ostream& out, const Graph& g,
+                    const dynamic_properties& dp,
+                    const std::string& node_id = "node_id"
+                    BOOST_GRAPH_ENABLE_IF_MODELS_PARM(Graph,vertex_list_graph_tag))
   {
     typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
-    write_graphviz(out, g, dp, node_id,
-                   graph::detail::node_id_property_map<Vertex>(dp, node_id));
+    write_graphviz_dp(out, g, dp, node_id,
+                      graph::detail::node_id_property_map<Vertex>(dp, node_id));
   }
 
   template<typename Graph, typename VertexID>
   void
-  write_graphviz(std::ostream& out, const Graph& g,
-                 const dynamic_properties& dp, const std::string& node_id,
-                 VertexID id
-                 BOOST_GRAPH_ENABLE_IF_MODELS_PARM(Graph,vertex_list_graph_tag))
+  write_graphviz_dp(std::ostream& out, const Graph& g,
+                    const dynamic_properties& dp, const std::string& node_id,
+                    VertexID id
+                    BOOST_GRAPH_ENABLE_IF_MODELS_PARM(Graph,vertex_list_graph_tag))
   {
     write_graphviz
       (out, g,

Modified: trunk/libs/graph/doc/write-graphviz.html
==============================================================================
--- trunk/libs/graph/doc/write-graphviz.html	(original)
+++ trunk/libs/graph/doc/write-graphviz.html	2010-06-15 17:07:22 EDT (Tue, 15 Jun 2010)
@@ -57,15 +57,15 @@
 // Graph structure with dynamic property output
 template&lt;typename Graph&gt;
 void
-write_graphviz(std::ostream&amp; out, const Graph&amp; g,
-               const dynamic_properties&amp; dp,
-               const std::string&amp; node_id = "node_id");
+write_graphviz_dp(std::ostream&amp; out, const Graph&amp; g,
+                  const dynamic_properties&amp; dp,
+                  const std::string&amp; node_id = "node_id");
 
 template&lt;typename Graph, typename VertexID&gt;
 void
-write_graphviz(std::ostream&amp; out, const Graph&amp; g,
-               const dynamic_properties&amp; dp, const std::string&amp; node_id,
-               VertexID vertex_id);
+write_graphviz_dp(std::ostream&amp; out, const Graph&amp; g,
+                  const dynamic_properties&amp; dp, const std::string&amp; node_id,
+                  VertexID vertex_id);
 </pre>
 
 <p>
@@ -92,7 +92,7 @@
 <a href="./write-graphviz.html#concept:PropertyWriter">PropertyWriter</a>,
 respectively.
 
-<p> The final two overloads of <code>write_graphviz</code> will emit
+<p> The two overloads of <code>write_graphviz_dp</code> will emit
 all of the properties stored in the <a
 href="../../property_map/doc/dynamic_property_map.html"><code>dynamic_properties</a></code>
 object, thereby retaining the properties that have been read in

Modified: trunk/libs/graph/example/graphviz.cpp
==============================================================================
--- trunk/libs/graph/example/graphviz.cpp	(original)
+++ trunk/libs/graph/example/graphviz.cpp	2010-06-15 17:07:22 EDT (Tue, 15 Jun 2010)
@@ -68,7 +68,7 @@
                 == 10.0);
 
   // Write out the graph
-  write_graphviz(std::cout, g, dp, std::string("id"));
+  write_graphviz_dp(std::cout, g, dp, std::string("id"));
 }
 
 int test_main(int, char*[])