|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63658 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/iostreams boost/math boost/msm boost/numeric/ublas boost/program_options boost/property_tree boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/array/doc libs/array/test libs/bimap libs/config libs/config/test libs/filesystem libs/functional/hash libs/fusion libs/graph/test libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/python/doc/v2 libs/range libs/range/doc libs/regex libs/serialization libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more more/getting_started status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/jam tools/quickbook tools/regression tools/release tools/wave
From: jewillco_at_[hidden]
Date: 2010-07-05 11:38:38
Author: jewillco
Date: 2010-07-05 11:38:37 EDT (Mon, 05 Jul 2010)
New Revision: 63658
URL: http://svn.boost.org/trac/boost/changeset/63658
Log:
Merged r63657 from trunk
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost/ (props changed)
branches/release/boost-build.jam (props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/endian.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/msm/ (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/numeric/ublas/functional.hpp (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/property_tree/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/range/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/serialization/factory.hpp (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (props changed)
branches/release/boost/statechart/ (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/boost/utility/ (props changed)
branches/release/boost/utility/value_init.hpp (props changed)
branches/release/boost/uuid/ (props changed)
branches/release/boost/variant/ (props changed)
branches/release/boost/version.hpp (props changed)
branches/release/boost/wave/ (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (props changed)
branches/release/doc/ (props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/libs/ (props changed)
branches/release/libs/array/doc/array.xml (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/config/test/boost_no_com_value_init.ipp (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/functional/hash/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
branches/release/libs/msm/ (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/python/doc/v2/args.html (props changed)
branches/release/libs/python/doc/v2/return_internal_reference.html (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/range/doc/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/classic/example/ (props changed)
branches/release/libs/spirit/doc/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/phoenix/ (props changed)
branches/release/libs/spirit/test/ (props changed)
branches/release/libs/spirit/test/qi/optional.cpp (props changed)
branches/release/libs/statechart/ (props changed)
branches/release/libs/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/thread/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/unordered/ (props changed)
branches/release/libs/utility/ (props changed)
branches/release/libs/utility/swap.html (props changed)
branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
branches/release/libs/utility/value_init.htm (props changed)
branches/release/libs/utility/value_init_test.cpp (props changed)
branches/release/libs/uuid/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (props changed)
branches/release/more/getting_started/ (props changed)
branches/release/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/tools/ (props changed)
branches/release/tools/bcp/ (props changed)
branches/release/tools/boostbook/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/build/v2/tools/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/jam/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/libs/graph/test/mcgregor_subgraphs_test.cpp | 140 +++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 71 deletions(-)
Modified: branches/release/libs/graph/test/mcgregor_subgraphs_test.cpp
==============================================================================
--- branches/release/libs/graph/test/mcgregor_subgraphs_test.cpp (original)
+++ branches/release/libs/graph/test/mcgregor_subgraphs_test.cpp 2010-07-05 11:38:37 EDT (Mon, 05 Jul 2010)
@@ -25,8 +25,6 @@
#include <boost/property_map/shared_array_property_map.hpp>
#include <boost/test/minimal.hpp>
-using namespace boost;
-
bool was_common_subgraph_found = false, output_graphs = false;
std::vector<std::string> simple_subgraph_list;
@@ -46,52 +44,52 @@
typename CorrespondenceMapSecondToFirst>
bool operator()(CorrespondenceMapFirstToSecond correspondence_map_1_to_2,
CorrespondenceMapSecondToFirst correspondence_map_2_to_1,
- typename graph_traits<Graph>::vertices_size_type subgraph_size) {
+ typename boost::graph_traits<Graph>::vertices_size_type subgraph_size) {
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename graph_traits<Graph>::edge_descriptor Edge;
+ typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
+ typedef typename boost::graph_traits<Graph>::edge_descriptor Edge;
typedef std::pair<Edge, bool> EdgeInfo;
- typedef typename property_map<Graph, vertex_index_t>::type VertexIndexMap;
- typedef typename property_map<Graph, vertex_name_t>::type VertexNameMap;
- typedef typename property_map<Graph, edge_name_t>::type EdgeNameMap;
+ typedef typename boost::property_map<Graph, boost::vertex_index_t>::type VertexIndexMap;
+ typedef typename boost::property_map<Graph, boost::vertex_name_t>::type VertexNameMap;
+ typedef typename boost::property_map<Graph, boost::edge_name_t>::type EdgeNameMap;
if (subgraph_size != num_vertices(m_common_subgraph)) {
return (true);
}
// Fill membership maps for both graphs
- typedef shared_array_property_map<bool, VertexIndexMap> MembershipMap;
+ typedef boost::shared_array_property_map<bool, VertexIndexMap> MembershipMap;
MembershipMap membership_map1(num_vertices(m_graph1),
- get(vertex_index, m_graph1));
+ get(boost::vertex_index, m_graph1));
MembershipMap membership_map2(num_vertices(m_graph2),
- get(vertex_index, m_graph2));
+ get(boost::vertex_index, m_graph2));
- fill_membership_map<Graph>(m_graph1, correspondence_map_1_to_2, membership_map1);
- fill_membership_map<Graph>(m_graph2, correspondence_map_2_to_1, membership_map2);
+ boost::fill_membership_map<Graph>(m_graph1, correspondence_map_1_to_2, membership_map1);
+ boost::fill_membership_map<Graph>(m_graph2, correspondence_map_2_to_1, membership_map2);
// Generate filtered graphs using membership maps
- typedef typename membership_filtered_graph_traits<Graph, MembershipMap>::graph_type
+ typedef typename boost::membership_filtered_graph_traits<Graph, MembershipMap>::graph_type
MembershipFilteredGraph;
MembershipFilteredGraph subgraph1 =
- make_membership_filtered_graph(m_graph1, membership_map1);
+ boost::make_membership_filtered_graph(m_graph1, membership_map1);
MembershipFilteredGraph subgraph2 =
- make_membership_filtered_graph(m_graph2, membership_map2);
+ boost::make_membership_filtered_graph(m_graph2, membership_map2);
- VertexIndexMap vindex_map1 = get(vertex_index, subgraph1);
- VertexIndexMap vindex_map2 = get(vertex_index, subgraph2);
+ VertexIndexMap vindex_map1 = get(boost::vertex_index, subgraph1);
+ VertexIndexMap vindex_map2 = get(boost::vertex_index, subgraph2);
- VertexNameMap vname_map_common = get(vertex_name, m_common_subgraph);
- VertexNameMap vname_map1 = get(vertex_name, subgraph1);
- VertexNameMap vname_map2 = get(vertex_name, subgraph2);
-
- EdgeNameMap ename_map_common = get(edge_name, m_common_subgraph);
- EdgeNameMap ename_map1 = get(edge_name, subgraph1);
- EdgeNameMap ename_map2 = get(edge_name, subgraph2);
+ VertexNameMap vname_map_common = get(boost::vertex_name, m_common_subgraph);
+ VertexNameMap vname_map1 = get(boost::vertex_name, subgraph1);
+ VertexNameMap vname_map2 = get(boost::vertex_name, subgraph2);
+
+ EdgeNameMap ename_map_common = get(boost::edge_name, m_common_subgraph);
+ EdgeNameMap ename_map1 = get(boost::edge_name, subgraph1);
+ EdgeNameMap ename_map2 = get(boost::edge_name, subgraph2);
// Verify that subgraph1 matches the supplied common subgraph
BGL_FORALL_VERTICES_T(vertex1, subgraph1, MembershipFilteredGraph) {
@@ -164,8 +162,8 @@
std::fstream file_subgraph("found_common_subgraph.dot", std::fstream::out);
write_graphviz(file_subgraph, subgraph1,
- make_label_writer(get(vertex_name, m_graph1)),
- make_label_writer(get(edge_name, m_graph1)));
+ make_label_writer(get(boost::vertex_name, m_graph1)),
+ make_label_writer(get(boost::edge_name, m_graph1)));
}
@@ -193,13 +191,13 @@
typename CorrespondenceMapSecondToFirst>
bool operator()(CorrespondenceMapFirstToSecond correspondence_map_1_to_2,
CorrespondenceMapSecondToFirst /*correspondence_map_2_to_1*/,
- typename graph_traits<Graph>::vertices_size_type /*subgraph_size*/) {
+ typename boost::graph_traits<Graph>::vertices_size_type /*subgraph_size*/) {
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
+ typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
- typedef typename property_map<Graph, vertex_index_t>::type VertexIndexMap;
- typedef typename property_map<Graph, vertex_name_t>::type VertexNameMap;
- typedef typename property_map<Graph, edge_name_t>::type EdgeNameMap;
+ typedef typename boost::property_map<Graph, boost::vertex_index_t>::type VertexIndexMap;
+ typedef typename boost::property_map<Graph, boost::vertex_name_t>::type VertexNameMap;
+ typedef typename boost::property_map<Graph, boost::edge_name_t>::type EdgeNameMap;
std::stringstream subgraph_string;
@@ -207,7 +205,7 @@
Vertex vertex2 = get(correspondence_map_1_to_2, vertex1);
- if (vertex2 != graph_traits<Graph>::null_vertex()) {
+ if (vertex2 != boost::graph_traits<Graph>::null_vertex()) {
subgraph_string << vertex1 << "," << vertex2 << " ";
}
@@ -231,7 +229,7 @@
int vertices_to_create, int max_edges_per_vertex,
VertexNameMap vname_map, EdgeNameMap ename_map) {
- typedef typename graph_traits<Graph>::vertex_descriptor Vertex;
+ typedef typename boost::graph_traits<Graph>::vertex_descriptor Vertex;
typedef std::vector<Vertex> VertexList;
VertexList new_vertices;
@@ -286,47 +284,47 @@
std::size_t random_seed = time(0);
if (argc > 1) {
- vertices_to_create = lexical_cast<int>(argv[1]);
+ vertices_to_create = boost::lexical_cast<int>(argv[1]);
}
if (argc > 2) {
- max_edges_per_vertex = lexical_cast<int>(argv[2]);
+ max_edges_per_vertex = boost::lexical_cast<int>(argv[2]);
}
if (argc > 3) {
- output_graphs = lexical_cast<bool>(argv[3]);
+ output_graphs = boost::lexical_cast<bool>(argv[3]);
}
if (argc > 4) {
- random_seed = lexical_cast<std::size_t>(argv[4]);
+ random_seed = boost::lexical_cast<std::size_t>(argv[4]);
}
- minstd_rand generator(random_seed);
+ boost::minstd_rand generator(random_seed);
// Using a vecS graph here so that we don't have to mess around with
// a vertex index map; it will be implicit.
- typedef adjacency_list<listS, vecS, directedS,
- property<vertex_name_t, unsigned int,
- property<vertex_index_t, unsigned int> >,
- property<edge_name_t, unsigned int> > Graph;
+ typedef boost::adjacency_list<boost::listS, boost::vecS, boost::directedS,
+ boost::property<boost::vertex_name_t, unsigned int,
+ boost::property<boost::vertex_index_t, unsigned int> >,
+ boost::property<boost::edge_name_t, unsigned int> > Graph;
- typedef graph_traits<Graph>::vertex_descriptor Vertex;
- typedef graph_traits<Graph>::edge_descriptor Edge;
+ typedef boost::graph_traits<Graph>::vertex_descriptor Vertex;
+ typedef boost::graph_traits<Graph>::edge_descriptor Edge;
- typedef property_map<Graph, vertex_name_t>::type VertexNameMap;
- typedef property_map<Graph, edge_name_t>::type EdgeNameMap;
+ typedef boost::property_map<Graph, boost::vertex_name_t>::type VertexNameMap;
+ typedef boost::property_map<Graph, boost::edge_name_t>::type EdgeNameMap;
// Generate a random common subgraph and then add random vertices
// and edges to the two parent graphs.
Graph common_subgraph, graph1, graph2;
- VertexNameMap vname_map_common = get(vertex_name, common_subgraph);
- VertexNameMap vname_map1 = get(vertex_name, graph1);
- VertexNameMap vname_map2 = get(vertex_name, graph2);
-
- EdgeNameMap ename_map_common = get(edge_name, common_subgraph);
- EdgeNameMap ename_map1 = get(edge_name, graph1);
- EdgeNameMap ename_map2 = get(edge_name, graph2);
+ VertexNameMap vname_map_common = get(boost::vertex_name, common_subgraph);
+ VertexNameMap vname_map1 = get(boost::vertex_name, graph1);
+ VertexNameMap vname_map2 = get(boost::vertex_name, graph2);
+
+ EdgeNameMap ename_map_common = get(boost::edge_name, common_subgraph);
+ EdgeNameMap ename_map1 = get(boost::edge_name, graph1);
+ EdgeNameMap ename_map2 = get(boost::edge_name, graph2);
for (int vindex = 0; vindex < vertices_to_create; ++vindex) {
put(vname_map_common, add_vertex(common_subgraph), generator());
@@ -344,11 +342,11 @@
}
}
- randomize_property<vertex_name_t>(common_subgraph, generator);
- randomize_property<edge_name_t>(common_subgraph, generator);
+ boost::randomize_property<boost::vertex_name_t>(common_subgraph, generator);
+ boost::randomize_property<boost::edge_name_t>(common_subgraph, generator);
- copy_graph(common_subgraph, graph1);
- copy_graph(common_subgraph, graph2);
+ boost::copy_graph(common_subgraph, graph1);
+ boost::copy_graph(common_subgraph, graph2);
// Randomly add vertices and edges to graph1 and graph2.
add_random_vertices(graph1, generator, vertices_to_create,
@@ -372,8 +370,8 @@
make_label_writer(ename_map2));
write_graphviz(file_common_subgraph, common_subgraph,
- make_label_writer(get(vertex_name, common_subgraph)),
- make_label_writer(get(edge_name, common_subgraph)));
+ make_label_writer(get(boost::vertex_name, common_subgraph)),
+ make_label_writer(get(boost::edge_name, common_subgraph)));
}
@@ -382,9 +380,9 @@
test_callback<Graph> user_callback(common_subgraph, graph1, graph2);
- mcgregor_common_subgraphs(graph1, graph2, true, user_callback,
- edges_equivalent(make_property_map_equivalent(ename_map1, ename_map2)).
- vertices_equivalent(make_property_map_equivalent(vname_map1, vname_map2)));
+ boost::mcgregor_common_subgraphs(graph1, graph2, true, user_callback,
+ boost::edges_equivalent(boost::make_property_map_equivalent(ename_map1, ename_map2)).
+ vertices_equivalent(boost::make_property_map_equivalent(vname_map1, vname_map2)));
BOOST_CHECK(was_common_subgraph_found);
@@ -392,8 +390,8 @@
Graph graph_simple1, graph_simple2;
simple_callback<Graph> user_callback_simple(graph_simple1);
- VertexNameMap vname_map_simple1 = get(vertex_name, graph_simple1);
- VertexNameMap vname_map_simple2 = get(vertex_name, graph_simple2);
+ VertexNameMap vname_map_simple1 = get(boost::vertex_name, graph_simple1);
+ VertexNameMap vname_map_simple2 = get(boost::vertex_name, graph_simple2);
put(vname_map_simple1, add_vertex(graph_simple1), 1);
put(vname_map_simple1, add_vertex(graph_simple1), 2);
@@ -415,9 +413,9 @@
// Unique subgraphs
std::cout << "Searching for unique subgraphs" << std::endl;
- mcgregor_common_subgraphs_unique(graph_simple1, graph_simple2,
+ boost::mcgregor_common_subgraphs_unique(graph_simple1, graph_simple2,
true, user_callback_simple,
- vertices_equivalent(make_property_map_equivalent(vname_map_simple1, vname_map_simple2)));
+ boost::vertices_equivalent(boost::make_property_map_equivalent(vname_map_simple1, vname_map_simple2)));
BOOST_CHECK(has_subgraph_string("0,0 1,1 "));
BOOST_CHECK(has_subgraph_string("0,0 1,1 2,2 "));
@@ -435,9 +433,9 @@
// Maximum subgraphs
std::cout << "Searching for maximum subgraphs" << std::endl;
- mcgregor_common_subgraphs_maximum(graph_simple1, graph_simple2,
+ boost::mcgregor_common_subgraphs_maximum(graph_simple1, graph_simple2,
true, user_callback_simple,
- vertices_equivalent(make_property_map_equivalent(vname_map_simple1, vname_map_simple2)));
+ boost::vertices_equivalent(boost::make_property_map_equivalent(vname_map_simple1, vname_map_simple2)));
BOOST_CHECK(has_subgraph_string("0,0 1,1 2,2 "));
@@ -452,9 +450,9 @@
// Maximum, unique subgraphs
std::cout << "Searching for maximum unique subgraphs" << std::endl;
- mcgregor_common_subgraphs_maximum_unique(graph_simple1, graph_simple2,
+ boost::mcgregor_common_subgraphs_maximum_unique(graph_simple1, graph_simple2,
true, user_callback_simple,
- vertices_equivalent(make_property_map_equivalent(vname_map_simple1, vname_map_simple2)));
+ boost::vertices_equivalent(boost::make_property_map_equivalent(vname_map_simple1, vname_map_simple2)));
BOOST_CHECK(simple_subgraph_list.size() == 1);
BOOST_CHECK(has_subgraph_string("0,0 1,1 2,2 "));
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk