[Boost-commit] svn:boost r83845 - trunk/boost/graph

Subject: [Boost-commit] svn:boost r83845 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2013-04-11 13:19:39

Author: jewillco
Date: 2013-04-11 13:19:38 EDT (Thu, 11 Apr 2013)
New Revision: 83845
URL: http://svn.boost.org/trac/boost/changeset/83845

Log:
Flipped arguments to combine calls to match documentation; refs #8428
Text files modified: 
   trunk/boost/graph/johnson_all_pairs_shortest.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/graph/johnson_all_pairs_shortest.hpp
==============================================================================
--- trunk/boost/graph/johnson_all_pairs_shortest.hpp	(original)
+++ trunk/boost/graph/johnson_all_pairs_shortest.hpp	2013-04-11 13:19:38 EDT (Thu, 11 Apr 2013)
@@ -113,7 +113,7 @@
       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 @@
           (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));
           }
         }
       }