boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-01-31 08:12:14 +00:00
Code Issues Projects Releases Wiki Activity

Flipped arguments to combine calls to match documentation; refs #8428

Browse Source 
[SVN r83845]
This commit is contained in:
Jeremiah Willcock
2013-04-11 17:19:38 +00:00
parent 44912cc2be
commit 65c9ef22c6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ namespace boost {
for (boost::tie(e, e_end) = edges(g2); e != e_end; ++e) {
typename Traits2::vertex_descriptor a = source(*e, g2),
b = target(*e, g2);
put(w_hat, *e, combine(get(w, *e), (get(h, a) - get(h, b))));
put(w_hat, *e, combine((get(h, a) - get(h, b)), get(w, *e)));
}
for (boost::tie(u, u_end) = vertices(g2); u != u_end; ++u) {
dijkstra_visitor<> dvis;
@@ -121,7 +121,7 @@ namespace boost {
(g2, *u, pred, d, w_hat, id2, compare, combine, inf, zero,dvis);
for (boost::tie(v, v_end) = vertices(g2); v != v_end; ++v) {
if (*u != s && *v != s) {
D[get(id2, *u)-1][get(id2, *v)-1] = combine(get(d, *v), (get(h, *v) - get(h, *u)));
D[get(id2, *u)-1][get(id2, *v)-1] = combine((get(h, *v) - get(h, *u)), get(d, *v));
}
}
}