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

Subject: [Boost-commit] svn:boost r84102 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2013-05-01 13:42:44

Author: jewillco
Date: 2013-05-01 13:42:44 EDT (Wed, 01 May 2013)
New Revision: 84102
URL: http://svn.boost.org/trac/boost/changeset/84102

Log:
Added timeout support code from Brammert Ottens
Text files modified: 
   trunk/boost/graph/r_c_shortest_paths.hpp |     4 +++-                                    
   1 files changed, 3 insertions(+), 1 deletions(-)

Modified: trunk/boost/graph/r_c_shortest_paths.hpp
==============================================================================
--- trunk/boost/graph/r_c_shortest_paths.hpp	(original)
+++ trunk/boost/graph/r_c_shortest_paths.hpp	2013-05-01 13:42:44 EDT (Wed, 01 May 2013)
@@ -222,7 +222,7 @@
   std::vector<int> vec_last_valid_index_for_dominance( num_vertices( g ), 0 );
   std::vector<bool> 
     b_vec_vertex_already_checked_for_dominance( num_vertices( g ), false );
-  while( unprocessed_labels.size() )
+  while( !unprocessed_labels.empty()  && vis.on_enter_loop(unprocessed_labels, g) )
   {
     Splabel cur_label = unprocessed_labels.top();
     unprocessed_labels.pop();
@@ -458,6 +458,8 @@
   void on_label_dominated( const Label&, const Graph& ) {}
   template<class Label, class Graph>
   void on_label_not_dominated( const Label&, const Graph& ) {}
+  template<class Queue, class Graph>             
+  bool on_enter_loop(const Queue& queue, const Graph& graph) {return true;}
 }; // default_r_c_shortest_paths_visitor