Tweak the picking of the next train to process

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index ad97cf79f77c0255f23b9c1be7ed5cf0cfe58e69..c07f9e8c188aeeb70fef0fe8be1b29dff155eaef 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -331,6 +331,8 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
                iter = iter.next();
        }
 
+       travel_multiplier = info->metrics[waypoint]->get_travel_multiplier(*track, track.reverse(path).entry());
+
        update_estimate();
 }
 
@@ -346,6 +348,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState
        delay(other.delay),
        duration(other.duration),
        waypoint(other.waypoint),
+       travel_multiplier(other.travel_multiplier),
        distance_traveled(other.distance_traveled),
        remaining_estimate(other.remaining_estimate),
        wait_time(other.wait_time),
@@ -463,8 +466,8 @@ void TrainRoutePlanner::TrainRoutingState::advance(float distance)
                occupied_tracks->n_tracks -= count_to_free;
        }
 
-       distance_traveled += distance;
-       remaining_estimate -= distance;
+       distance_traveled += distance*travel_multiplier;
+       remaining_estimate -= distance*travel_multiplier;
 }
 
 void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
@@ -476,7 +479,7 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
        }
 
        float secs = dt/Time::sec;
-       // There may be negative delay remaining after previous step.
+       // There may be some delay remaining.
        if(delay)
        {
                secs -= delay/Time::sec;
@@ -492,17 +495,29 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
        if(state==MOVING)
                advance(info->speed*secs);
        else if(state!=ARRIVED)
-               wait_time += secs*Time::sec;
+       {
+               float remaining_distance = occupied_tracks->path_length-offset;
+               if(remaining_distance>0)
+               {
+                       advance(remaining_distance);
+                       wait_time += (secs-remaining_distance/info->speed)*Time::sec;
+               }
+               else
+                       wait_time += secs*Time::sec;
+       }
 }
 
 void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
 {
        float distance = occupied_tracks->path_length-offset;
+
        track = track.next(path);
        path = next_path;
        occupied_tracks = new OccupiedTrack(*track, path, occupied_tracks);
+
        advance(distance);
        offset = 0;
+       travel_multiplier = info->metrics[waypoint]->get_travel_multiplier(*track, track.reverse(path).entry());
 }
 
 void TrainRoutePlanner::TrainRoutingState::set_path(unsigned p)
@@ -518,9 +533,11 @@ void TrainRoutePlanner::TrainRoutingState::set_path(unsigned p)
 void TrainRoutePlanner::TrainRoutingState::update_estimate()
 {
        TrackIter iter = track.reverse(path);
-       remaining_estimate = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
+       const TrainRouteMetric *metric = info->metrics[waypoint];
+       remaining_estimate = metric->get_distance_from(*iter, iter.entry());
+       travel_multiplier = metric->get_travel_multiplier(*iter, iter.entry());
        if(remaining_estimate>=0)
-               remaining_estimate += occupied_tracks->path_length-offset;
+               remaining_estimate += (occupied_tracks->path_length-offset)*travel_multiplier;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_viable() const
@@ -552,7 +569,7 @@ void TrainRoutePlanner::RoutingStep::create_successors(list<RoutingStep> &new_st
        if(next.update_states() && next.check_deadlocks())
                return;
 
-       int train_index = find_next_train();
+       int train_index = next.find_next_train();
        if(train_index<0)
                return;
 
@@ -569,7 +586,13 @@ void TrainRoutePlanner::RoutingStep::create_successors(list<RoutingStep> &new_st
                return;
        }
 
-       train.advance_track(0);
+       if(train.state==MOVING)
+               train.advance_track(0);
+       else
+       {
+               new_steps.push_back(next);
+               return;
+       }
 
        const TrackType::Endpoint &entry_ep = train.track.endpoint();
        if(train.critical)
@@ -703,10 +726,13 @@ int TrainRoutePlanner::RoutingStep::get_occupant(Track &track) const
 
 int TrainRoutePlanner::RoutingStep::find_next_train() const
 {
+       /* Pick a moving train with the lowest time to next track.  A train that
+       just became blocked can still travel until the end of its current track,
+       so consider those too. */
        Time::TimeDelta min_dt;
        int next_train = -1;
        for(unsigned i=0; i<trains.size(); ++i)
-               if(trains[i].state==MOVING)
+               if(trains[i].state==MOVING || (trains[i].state==BLOCKED && prev && prev->trains[i].state==MOVING))
                {
                        Time::TimeDelta dt = trains[i].get_time_to_next_track();
                        if(dt<min_dt || next_train<0)