Avoid negative values of wait_time

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index d9eedd2d4daccd0d33224548325c594859c7777a..476d102617ff1045658d80391f73cf1f4ccedfee 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -308,6 +308,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
        delay(info->router->get_departure_delay()),
        duration(info->router->get_trip_duration()),
        waypoint(0),
+       distance_traveled(0),
        blocked_by(-1)
 {
        const Vehicle *veh = &info->train->get_vehicle(0);
@@ -331,6 +332,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 +349,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),
@@ -363,7 +367,7 @@ TrainRoutePlanner::TrainRoutingState::~TrainRoutingState()
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
 {
-       return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
+       return ((occupied_tracks->path_length-offset)/info->speed)*Time::sec+delay;
 }
 
 Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_pass(Track &trk) const
@@ -463,8 +467,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 +480,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;
@@ -489,28 +493,53 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
        if(estimated_wait)
                estimated_wait = max(estimated_wait-secs*Time::sec, Time::zero);
 
-       if(state==MOVING)
+       float distance = info->speed*secs;
+       float remaining_on_track = occupied_tracks->path_length-offset;
+       if(state==MOVING || distance<remaining_on_track)
                advance(info->speed*secs);
        else if(state!=ARRIVED)
-               wait_time += secs*Time::sec;
+       {
+               if(remaining_on_track>0)
+               {
+                       advance(remaining_on_track);
+                       wait_time += (secs-remaining_on_track/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)
+{
+       path = p;
+       OccupiedTrack *next_occ = occupied_tracks->next;
+       if(!--occupied_tracks->refcount)
+               delete occupied_tracks;
+       occupied_tracks = new OccupiedTrack(*track, path, next_occ);
+       update_estimate();
 }
 
 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 += track->get_type().get_path_length(path)-offset;
+               remaining_estimate += (occupied_tracks->path_length-offset)*travel_multiplier;
 }
 
 bool TrainRoutePlanner::TrainRoutingState::is_viable() const
@@ -542,7 +571,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;
 
@@ -559,7 +588,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)
@@ -604,8 +639,7 @@ void TrainRoutePlanner::RoutingStep::create_successor(RoutingStep &next, unsigne
 {
        TrainRoutingState &train = next.trains[train_index];
 
-       train.path = path;
-       train.update_estimate();
+       train.set_path(path);
        next.update_estimate();
        if(next.is_viable())
                new_steps.push_back(next);
@@ -694,10 +728,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)