Store routing information in TrainRoutePlanner to avoid threading problems

[r2c2.git] / source / libr2c2 / trainrouter.cpp

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 9245774f605309d597591fa01e95eb60f8b20c38..6af6154c862a29af52fb0e59bccc09b0f97b1ff2 100644 (file)
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -137,14 +137,6 @@ void TrainRouter::set_destination(const TrackChain &d)
        metrics_stale = true;
 }
 
-bool TrainRouter::is_destination(Track &track) const
-{
-       if(destination)
-               return destination->has_track(track);
-       else
-               return false;
-}
-
 void TrainRouter::add_waypoint(const TrackChain &wp)
 {
        waypoints.push_back(&wp);
@@ -152,12 +144,12 @@ void TrainRouter::add_waypoint(const TrackChain &wp)
        metrics_stale = true;
 }
 
-bool TrainRouter::is_waypoint(unsigned index, Track &track) const
+const TrackChain &TrainRouter::get_waypoint(unsigned index) const
 {
        if(index>=waypoints.size())
                throw out_of_range("TrainRouter::is_waypoint");
 
-       return waypoints[index]->has_track(track);
+       return *waypoints[index];
 }
 
 const TrainRouteMetric &TrainRouter::get_metric(int index) const
@@ -438,6 +430,8 @@ void TrainRouter::create_metrics()
 
        for(unsigned i=metrics.size(); --i>0; )
                metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]);
+
+       metrics_stale = false;
 }
 
 Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
@@ -492,19 +486,20 @@ bool TrainRouter::advance_to_track(RouteList::iterator &route, Track &track)
 
 void TrainRouter::start_planning(Layout &layout)
 {
-       RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
-
+       vector<TrainRouter *> routers;
        const map<unsigned, Train *> &trains = layout.get_trains();
+       routers.reserve(trains.size());
        for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
                if(TrainRouter *router = i->second->get_ai_of_type<TrainRouter>())
-               {
-                       if(router->metrics_stale)
-                       {
-                               router->create_metrics();
-                               router->metrics_stale = false;
-                       }
-                       router->planner = planner;
-               }
+                       routers.push_back(router);
+
+       for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+               if((*i)->metrics_stale)
+                       (*i)->create_metrics();
+
+       RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
+       for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+               (*i)->planner = planner;
 
        planner->plan_async();
 }