Update of /cvsroot/boost/boost/boost/graph
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26298/boost/graph
Modified Files:
isomorphism.hpp graph_test.hpp
Log Message:
Rename/remove some detail algorithms to avoid a conflict with the string
algorithms library
Index: isomorphism.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/isomorphism.hpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- isomorphism.hpp 12 Mar 2006 15:01:03 -0000 1.36
+++ isomorphism.hpp 31 May 2007 12:14:30 -0000 1.37
@@ -245,7 +245,7 @@
}
else {
- if (contains(adjacent_vertices(f[i], G2), f[j])) {
+ if (container_contains(adjacent_vertices(f[i], G2), f[j])) {
++num_edges_on_k;
if (match(next(iter), dfs_num_k))
return true;
Index: graph_test.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/graph/graph_test.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- graph_test.hpp 24 Mar 2005 15:06:43 -0000 1.20
+++ graph_test.hpp 31 May 2007 12:14:31 -0000 1.21
@@ -85,7 +85,7 @@
for (; p.first != p.second; ++p.first) {
edge_t e = *p.first;
BOOST_CHECK(source(e, g) == u);
- BOOST_CHECK(contains(adj, target(e, g)) == true);
+ BOOST_CHECK(container_contains(adj, target(e, g)) == true);
}
}
}
@@ -114,7 +114,7 @@
for (; p.first != p.second; ++p.first) {
edge_t e = *p.first;
BOOST_CHECK(target(e, g) == v);
- BOOST_CHECK(contains(inv_adj, source(e, g)) == true);
+ BOOST_CHECK(container_contains(inv_adj, source(e, g)) == true);
}
}
}
@@ -140,7 +140,7 @@
BOOST_CHECK(deg_size_t(std::distance(p.first, p.second)) ==
adj.size());
for (; p.first != p.second; ++p.first) {
vertex_t v = *p.first;
- BOOST_CHECK(contains(adj, v) == true);
+ BOOST_CHECK(container_contains(adj, v) == true);
}
}
}
@@ -155,7 +155,7 @@
BOOST_CHECK(n == num_vertices(g));
for (; p.first != p.second; ++p.first) {
vertex_t v = *p.first;
- BOOST_CHECK(contains(vertex_set, v) == true);
+ BOOST_CHECK(container_contains(vertex_set, v) == true);
}
}
@@ -172,8 +172,8 @@
for (; p.first != p.second; ++p.first) {
edge_t e = *p.first;
BOOST_CHECK(any_if(edge_set, connects(source(e, g), target(e, g), g)));
- BOOST_CHECK(contains(vertex_set, source(e, g)) == true);
- BOOST_CHECK(contains(vertex_set, target(e, g)) == true);
+ BOOST_CHECK(container_contains(vertex_set, source(e, g)) == true);
+ BOOST_CHECK(container_contains(vertex_set, target(e, g)) == true);
}
}
@@ -232,7 +232,7 @@
IsoMap iso_map(iso_vec.begin(), get(vertex_index, g));
copy_graph(g, cpy, orig_to_copy(iso_map));
- bool parallel_edge_exists = contains(adjacent_vertices(u, g), v);
+ bool parallel_edge_exists = container_contains(adjacent_vertices(u, g),
v);
std::pair<edge_t, bool> p = add_edge(u, v, g);
edge_t e = p.first;
@@ -249,7 +249,7 @@
if (p.second == true) { // edge added
BOOST_CHECK(num_edges(g) == num_edges(cpy) + 1);
- BOOST_CHECK(contains(out_edges(u, g), e) == true);
+ BOOST_CHECK(container_contains(out_edges(u, g), e) == true);
BOOST_CHECK((verify_isomorphism
(make_filtered_graph(g, ignore_edge(e)), cpy, iso_map)));
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
