boost_mirror/graph
1
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2025-05-11 13:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed write_graphviz dynamic_properties overloads to write_graphviz_dp to disambiguate them, plus removed more obsolete GraphViz reader stuff

Browse Source 
[SVN r63000]
This commit is contained in:
Jeremiah Willcock 2010-06-15 21:07:22 +00:00
parent 9196ee6cfd
commit 6e86b10353
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/write-graphviz.html
View File

@ -57,15 +57,15 @@ write_graphviz(std::ostream& out, const VertexAndEdgeListGraph& g,
// Graph structure with dynamic property output
template<typename Graph>
void
write_graphviz(std::ostream& out, const Graph& g,
const dynamic_properties& dp,
const std::string& node_id = "node_id");
write_graphviz_dp(std::ostream& out, const Graph& g,
const dynamic_properties& dp,
const std::string& node_id = "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 vertex_id);
write_graphviz_dp(std::ostream& out, const Graph& g,
const dynamic_properties& dp, const std::string& node_id,
VertexID vertex_id);
</pre>
<p>
@ -92,7 +92,7 @@ version and fourth version require vertex
<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

2
example/graphviz.cpp
View File

@ -68,7 +68,7 @@ void test_graph_read_write(const std::string& filename)
== 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*[])

34
include/boost/graph/graphviz.hpp
View File

@ -449,6 +449,8 @@ namespace boost {
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 @@ namespace boost {
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 @@ namespace boost {
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,