boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-02-02 21:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Merged r63654 and r63655 from trunk

Browse Source 
[SVN r63656]
This commit is contained in:
Jeremiah Willcock
2010-07-05 15:21:33 +00:00
parent 835b65bd17
commit 08f2f509b0
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/graph/kolmogorov_max_flow.hpp
View File

@@ -32,9 +32,11 @@
#ifndef BOOST_KOLMOGOROV_MAX_FLOW_HPP
#define BOOST_KOLMOGOROV_MAX_FLOW_HPP
#warning \
The kolmogorov_max_flow.hpp header is deprecated and will be removed \
in Boost 1.46. Use boykov_kolmogorov_max_flow.hpp instead.
#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
# pragma message ("The kolmogorov_max_flow.hpp header is deprecated and will be removed in Boost 1.46. Use boykov_kolmogorov_max_flow.hpp instead.")
#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
# warning "The kolmogorov_max_flow.hpp header is deprecated and will be removed in Boost 1.46. Use boykov_kolmogorov_max_flow.hpp instead."
#endif
#include <boost/config.hpp>
#include <cassert>

4
include/boost/graph/random_spanning_tree.hpp
View File

@@ -48,7 +48,9 @@ namespace boost {
if (get(color, v) != color_gen::white()) continue;
loop_erased_random_walk(g, v, next_edge, color, path);
for (typename std::vector<vertex_descriptor>::const_reverse_iterator i = path.rbegin();
boost::next(i) != path.rend(); ++i) {
boost::next(i) !=
(typename std::vector<vertex_descriptor>::const_reverse_iterator)path.rend();
++i) {
typename std::vector<vertex_descriptor>::const_reverse_iterator j = i;
++j;
assert (get(color, *j) == color_gen::gray());

2
test/random_spanning_tree_test.cpp
View File

@@ -56,7 +56,7 @@ int main(int, char**) {
BGL_FORALL_EDGES(e, g, graph_type) {put(weight, e, (1. + get(edge_index, g, e)) / num_edges(g));}
mt19937 gen;
boost::mt19937 gen;
random_spanning_tree(g, gen, predecessor_map(pred));
// write_spanning_tree(g, pred, constant_property_map<gt::edge_descriptor, double>(1.), "unweight_random_st.dot");
random_spanning_tree(g, gen, predecessor_map(pred));