Consider train length when calculating wait time estimate

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

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 7d1b0c230292d66b48129ce0a60fb3f892d884fb..e42e61838d4fdc0c7dfa74fe2aa7b451211c8421 100644 (file)
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -237,6 +237,7 @@ void TrainRoutePlanner::finalize_plan()
 
 TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
        train(&t),
+       length(0),
        speed(train->get_maximum_speed()),
        first_noncritical(train->get_last_critical_block().next().block()),
        router(train->get_ai_of_type<TrainRouter>()),
@@ -254,6 +255,10 @@ TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
                has_duration = router->get_trip_duration();
        }
 
+       unsigned n_vehs = train->get_n_vehicles();
+       for(unsigned i=0; i<n_vehs; ++i)
+               length += train->get_vehicle(i).get_type().get_length();
+
        // If no maximum speed is specified, use a sensible default
        if(!speed)
                speed = 20*train->get_layout().get_catalogue().get_scale();
@@ -338,6 +343,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState
        distance_traveled(other.distance_traveled),
        remaining_estimate(other.remaining_estimate),
        wait_time(other.wait_time),
+       estimated_wait(other.estimated_wait),
        blocked_by(other.blocked_by)
 {
        ++occupied_tracks->refcount;
@@ -354,6 +360,26 @@ Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() c
        return ((track->get_type().get_path_length(path)-offset)/info->speed)*Time::sec+delay;
 }
 
+Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_pass(Track &trk) const
+{
+       if(is_occupying(trk))
+       {
+               float passed_length = 0;
+               for(const OccupiedTrack *occ=occupied_tracks; (occ && occ->track!=&trk); occ=occ->next)
+                       passed_length += occ->path_length;
+               return (max(info->length-passed_length, 0.0f)/info->speed)*Time::sec+delay;
+       }
+
+       for(unsigned wp=waypoint; wp<info->waypoints.size(); ++wp)
+       {
+               float distance = info->metrics[wp]->get_distance_from(trk);
+               if(distance>=0 && distance<remaining_estimate)
+                       return ((remaining_estimate-distance+info->length)/info->speed)*Time::sec+delay;
+       }
+
+       return Time::day;
+}
+
 bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const
 {
        if(state==ARRIVED && !duration && info->has_duration)
@@ -454,6 +480,9 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
        if(duration)
                duration = max(duration-secs*Time::sec, Time::zero);
 
+       if(estimated_wait)
+               estimated_wait = max(estimated_wait-secs*Time::sec, Time::zero);
+
        if(state==MOVING)
                advance(info->speed*secs);
        else if(state!=ARRIVED)
@@ -555,7 +584,16 @@ void TrainRoutePlanner::RoutingStep::create_successors(list<RoutingStep> &new_st
                RoutingStep wait(this);
                wait.advance(dt);
                wait.trains[train_index].state = WAITING;
-               wait.penalty += 15*Time::sec;
+
+               Time::TimeDelta estimated_wait = Time::day;
+               for(unsigned i=0; i<wait.trains.size(); ++i)
+                       if(i!=static_cast<unsigned>(train_index) && wait.trains[i].state!=ARRIVED)
+                       {
+                               Time::TimeDelta ttp = wait.trains[i].get_time_to_pass(*train.track);
+                               estimated_wait = min(estimated_wait, ttp);
+                       }
+               wait.trains[train_index].estimated_wait = estimated_wait;
+
                wait.update_estimate();
                if(wait.is_viable())
                        new_steps.push_back(wait);
@@ -594,12 +632,18 @@ bool TrainRoutePlanner::RoutingStep::update_states()
                                if(i->info->first_noncritical->has_track(*next_track))
                                        i->critical = false;
 
+                               if(i->state!=BLOCKED)
+                                       i->estimated_wait = trains[i->blocked_by].get_time_to_pass(*next_track);
+
                                /* Trains in the WAITING state will also transition to BLOCKED and
                                then to MOVING when the other train has passed. */
                                i->state = BLOCKED;
                        }
                        else if(i->state==BLOCKED)
+                       {
+                               i->estimated_wait = Time::zero;
                                i->state = MOVING;
+                       }
                }
                else
                        i->state = BLOCKED;
@@ -678,7 +722,7 @@ void TrainRoutePlanner::RoutingStep::update_estimate()
        cost_estimate = penalty;
        for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
                if(i->remaining_estimate>=0)
-                       cost_estimate += i->wait_time+((i->distance_traveled+i->remaining_estimate)/i->info->speed)*Time::sec;
+                       cost_estimate += i->wait_time+i->estimated_wait+((i->distance_traveled+i->remaining_estimate)/i->info->speed)*Time::sec;
 }
 
 bool TrainRoutePlanner::RoutingStep::is_viable() const