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 01205fa834a3fc5575a334be2f67ed8a47109cf4..6af6154c862a29af52fb0e59bccc09b0f97b1ff2 100644 (file)
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -62,6 +62,7 @@ bool TrainRouter::set_route(const Route *r)
        routes.clear();
        if(lead)
                routes.push_back(lead);
+       // TODO Check if eclipsed by lead route
        if(r)
                routes.push_back(r);
 
@@ -136,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);
@@ -151,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
@@ -180,6 +173,11 @@ void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
        destination_changed = true;
 }
 
+void TrainRouter::set_trip_duration(const Time::TimeDelta &d)
+{
+       duration = d;
+}
+
 void TrainRouter::message(const Message &msg)
 {
        if(msg.type=="set-route")
@@ -207,6 +205,8 @@ void TrainRouter::message(const Message &msg)
        }
        else if(msg.type=="set-departure-delay")
                set_departure_delay(msg.value.value<Time::TimeDelta>());
+       else if(msg.type=="set-trip-duration")
+               set_trip_duration(msg.value.value<Time::TimeDelta>());
 }
 
 void TrainRouter::tick(const Time::TimeDelta &dt)
@@ -214,22 +214,41 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
        if(delay)
        {
                delay -= dt;
-               if(delay<=Time::zero)
+               if(delay<Time::zero)
+               {
+                       duration = max(duration+delay, Time::zero);
                        delay = Time::zero;
+               }
        }
+       else if(duration)
+               duration = max(duration-dt, Time::zero);
 
        if(destination_changed && !planner)
                start_planning(train.get_layout());
 
-       if(planner && planner->get_result()!=TrainRoutePlanner::PENDING)
+       if(planner && planner->check()!=TrainRoutePlanner::PENDING)
        {
                destination_changed = false;
                if(planner->get_result()==TrainRoutePlanner::COMPLETE)
                {
                        const list<Route *> &planned_routes = planner->get_routes_for(train);
+
                        routes.clear();
-                       routes.push_back(create_lead_route(0, planned_routes.front()));
-                       routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
+                       Route *lead = create_lead_route(0, planned_routes.front());
+                       routes.push_back(lead);
+
+                       list<Route *>::const_iterator begin = planned_routes.begin();
+                       for(; begin!=planned_routes.end(); ++begin)
+                       {
+                               const Route::TrackSet &tracks = (*begin)->get_tracks();
+                               bool eclipsed = true;
+                               for(Route::TrackSet::const_iterator i=tracks.begin(); (eclipsed && i!=tracks.end()); ++i)
+                                       eclipsed = lead->has_track(**i);
+                               if(!eclipsed)
+                                       break;
+                       }
+                       routes.insert(routes.end(), begin, planned_routes.end());
+
                        sequence_points = planner->get_sequence_for(train);
                        current_sequence = 0;
                        sequence_check_pending = false;
@@ -411,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)
@@ -422,16 +443,16 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
                lead->set_temporary(true);
        }
 
-       bool target_reached = false;
-       for(TrackIter i=train.get_block_allocator().first().track_iter(); i; i=i.next())
+       bool target_tracks = 0;
+       for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next())
        {
                if(i->get_block().get_train()!=&train)
                        break;
                if(target)
                {
                        if(target->has_track(*i))
-                               target_reached = true;
-                       else if(target_reached)
+                               ++target_tracks;
+                       else if(target_tracks>0)
                                break;
                }
                lead->add_track(*i);
@@ -465,21 +486,22 @@ 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();
+       planner->plan_async();
 }