Store routing information in TrainRoutePlanner to avoid threading problems

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 99700699c452a21a81ef51bdad8dd25b5cab8e5e..163bb281eacd019997e8975802f670a0d904ce6f 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -22,7 +22,7 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout):
        for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
        {
                TrainRoutingInfo info(*i->second);
-               if(info.router && info.router->get_destination())
+               if(info.destination)
                        routed_trains.push_back(info);
        }
 }
@@ -206,8 +206,24 @@ void TrainRoutePlanner::finalize_plan()
 TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
        train(&t),
        speed(train->get_maximum_speed()),
-       router(train->get_ai_of_type<TrainRouter>())
+       router(train->get_ai_of_type<TrainRouter>()),
+       destination(0),
+       has_duration(false)
 {
+       if(router)
+       {
+               destination = router->get_destination();
+               waypoints.resize(router->get_n_waypoints());
+               metrics.resize(waypoints.size()+1);
+               metrics[0] = &router->get_metric(-1);
+               for(unsigned i=0; i<waypoints.size(); ++i)
+               {
+                       waypoints[i] = &router->get_waypoint(i);
+                       metrics[i+1] = &router->get_metric(i);
+               }
+               has_duration = router->get_trip_duration();
+       }
+
        // If no maximum speed is specified, use a sensible default
        if(!speed)
                speed = 20*train->get_layout().get_catalogue().get_scale();
@@ -249,7 +265,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
        state(MOVING),
        delay(info->router->get_departure_delay()),
        duration(info->router->get_trip_duration()),
-       waypoint(info->router->get_n_waypoints() ? 0 : -1),
+       waypoint(info->waypoints.empty() ? -1 : 0),
        blocked_by(-1)
 {
        const Vehicle *veh = &info->train->get_vehicle(0);
@@ -308,7 +324,7 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c
 
 bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const
 {
-       if(state==ARRIVED && !duration && info->router->get_trip_duration())
+       if(state==ARRIVED && !duration && info->has_duration)
                return false;
 
        OccupiedTrack *occ = occupied_tracks;
@@ -320,18 +336,17 @@ bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const
 
 bool TrainRoutePlanner::TrainRoutingState::check_arrival()
 {
-       TrainRouter &router = *info->router;
        TrackIter next_track = track.next(path);
 
-       if(waypoint<0 && router.is_destination(*track) && !router.is_destination(*next_track))
+       if(waypoint<0 && info->destination->has_track(*track) && !info->destination->has_track(*next_track))
        {
                state = ARRIVED;
                return true;
        }
-       else if(waypoint>=0 && router.is_waypoint(waypoint, *track) && !router.is_waypoint(waypoint, *next_track))
+       else if(waypoint>=0 && info->waypoints[waypoint]->has_track(*track) && !info->waypoints[waypoint]->has_track(*next_track))
        {
                ++waypoint;
-               if(waypoint>=static_cast<int>(router.get_n_waypoints()))
+               if(waypoint>=static_cast<int>(info->waypoints.size()))
                        waypoint = -1;
        }
 
@@ -400,7 +415,7 @@ void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
 void TrainRoutePlanner::TrainRoutingState::update_estimate()
 {
        TrackIter iter = track.reverse(path);
-       float distance = info->router->get_metric(waypoint).get_distance_from(*iter.track(), iter.entry());
+       float distance = info->metrics[waypoint+1]->get_distance_from(*iter.track(), iter.entry());
        distance += track->get_type().get_path_length(path)-offset;
        remaining_estimate = distance;
 }