Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r81049 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2012-10-22 16:12:36


Author: jewillco
Date: 2012-10-22 16:12:34 EDT (Mon, 22 Oct 2012)
New Revision: 81049
URL: http://svn.boost.org/trac/boost/changeset/81049

Log:
Trying to fix issue reported by Jan Hudec
Text files modified:
   trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp | 11 ++++++-----
   1 files changed, 6 insertions(+), 5 deletions(-)

Modified: trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp
==============================================================================
--- trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp (original)
+++ trunk/boost/graph/dijkstra_shortest_paths_no_color_map.hpp 2012-10-22 16:12:34 EDT (Mon, 22 Oct 2012)
@@ -113,16 +113,17 @@
           distance_weight_combine, distance_compare);
   
         if (was_edge_relaxed) {
- vertex_queue.update(neighbor_vertex);
           visitor.edge_relaxed(current_edge, graph);
+ if (is_neighbor_undiscovered) {
+ visitor.discover_vertex(neighbor_vertex, graph);
+ vertex_queue.push(neighbor_vertex);
+ } else {
+ vertex_queue.update(neighbor_vertex);
+ }
         } else {
           visitor.edge_not_relaxed(current_edge, graph);
         }
   
- if (is_neighbor_undiscovered) {
- visitor.discover_vertex(neighbor_vertex, graph);
- vertex_queue.push(neighbor_vertex);
- }
       } // end out edge iteration
   
       visitor.finish_vertex(min_vertex, graph);


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