X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=e42e61838d4fdc0c7dfa74fe2aa7b451211c8421;hb=54cb832334a83fc266b59e2c9b60ee936db7118f;hp=dbe6035499c9e61663b2f6337448c35e5518b9d2;hpb=9976acc82d98c8aecde0152a72be8cc8882e35ff;p=r2c2.git diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp index dbe6035..e42e618 100644 --- a/source/libr2c2/trainrouteplanner.cpp +++ b/source/libr2c2/trainrouteplanner.cpp @@ -1,4 +1,5 @@ #include +#include #include "catalogue.h" #include "layout.h" #include "route.h" @@ -15,6 +16,7 @@ namespace R2C2 { TrainRoutePlanner::TrainRoutePlanner(Layout &layout): goal(0), + timeout(10*Time::sec), result(PENDING), thread(0) { @@ -22,14 +24,23 @@ TrainRoutePlanner::TrainRoutePlanner(Layout &layout): for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) { TrainRoutingInfo info(*i->second); - if(info.destination) + if(!info.waypoints.empty()) routed_trains.push_back(info); } } TrainRoutePlanner::~TrainRoutePlanner() { - delete thread; + if(thread) + { + thread->join(); + delete thread; + } +} + +void TrainRoutePlanner::set_timeout(const Time::TimeDelta &t) +{ + timeout = t; } TrainRoutePlanner::Result TrainRoutePlanner::plan() @@ -55,9 +66,13 @@ TrainRoutePlanner::Result TrainRoutePlanner::check() { if(result==PENDING && goal) { + if(thread) + { + thread->join(); + delete thread; + thread = 0; + } finalize_plan(); - delete thread; - thread = 0; } return result; @@ -104,6 +119,8 @@ void TrainRoutePlanner::prepare_plan() void TrainRoutePlanner::create_plan() { + Time::TimeStamp timeout_stamp = Time::now()+timeout; + unsigned count = 0; while(!queue.empty()) { const RoutingStep &step = get_step(); @@ -114,6 +131,13 @@ void TrainRoutePlanner::create_plan() } add_steps(step); + + if(++count>=1000) + { + if(Time::now()>timeout_stamp) + break; + count = 0; + } } result = FAILED; @@ -143,6 +167,7 @@ void TrainRoutePlanner::finalize_plan() for(vector::const_iterator j=i->trains.begin(); j!=i->trains.end(); ++j) { Track **history = j->info->track_history; + // Don't process the same track again. if(j->track.track()==history[0]) continue; @@ -150,6 +175,8 @@ void TrainRoutePlanner::finalize_plan() bool start_new_route = true; if(!j->info->routes.empty()) { + /* If we already have a route and this track or any linked track is + in it, start a new one to avoid loops. */ route = j->info->routes.front(); start_new_route = route->has_track(*j->track); if(!start_new_route) @@ -168,6 +195,8 @@ void TrainRoutePlanner::finalize_plan() route = new Route(j->info->train->get_layout()); route->set_name("Router"); route->set_temporary(true); + /* Have the routes overlap by two tracks to ensure that turnout + paths can be deduced. */ for(unsigned k=0; (k<2 && history[k]); ++k) route->add_track(*history[k]); j->info->routes.push_front(route); @@ -181,6 +210,7 @@ void TrainRoutePlanner::finalize_plan() map::iterator k = sequenced_tracks.find(j->track.track()); if(k!=sequenced_tracks.end()) { + // Add a sequence point if another train uses this track afterwards. if(!k->second->preceding_train) { k->second->preceding_train = j->info->train; @@ -193,6 +223,8 @@ void TrainRoutePlanner::finalize_plan() } else if(waitable) { + /* Create a sequence point if it's possible to wait and let another + train past. */ j->info->sequence.push_front(TrainRouter::SequencePoint(j->track->get_block(), sequence)); sequenced_tracks[j->track.track()] = &j->info->sequence.front(); --sequence; @@ -205,25 +237,28 @@ 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()), - destination(0), has_duration(false) { - if(router) + if(unsigned n_wps = router->get_n_waypoints()) { - 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; iget_waypoint(i); - metrics[i+1] = &router->get_metric(i); + waypoints.push_back(router->get_waypoint(i)); + metrics.push_back(&router->get_metric(i)); } has_duration = router->get_trip_duration(); } + unsigned n_vehs = train->get_n_vehicles(); + for(unsigned i=0; iget_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(); @@ -261,11 +296,12 @@ TrainRoutePlanner::OccupiedTrack::~OccupiedTrack() TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf): info(&inf), + critical(true), occupied_tracks(0), state(MOVING), delay(info->router->get_departure_delay()), duration(info->router->get_trip_duration()), - waypoint(info->waypoints.empty() ? -1 : 0), + waypoint(0), blocked_by(-1) { const Vehicle *veh = &info->train->get_vehicle(0); @@ -296,6 +332,7 @@ TrainRoutePlanner::TrainRoutingState::TrainRoutingState(const TrainRoutingState info(other.info), track(other.track), path(other.path), + critical(other.critical), occupied_tracks(other.occupied_tracks), offset(other.offset), back_offset(other.back_offset), @@ -306,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; @@ -322,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; wpwaypoints.size(); ++wp) + { + float distance = info->metrics[wp]->get_distance_from(trk); + if(distance>=0 && distancelength)/info->speed)*Time::sec+delay; + } + + return Time::day; +} + bool TrainRoutePlanner::TrainRoutingState::is_occupying(Track &trk) const { if(state==ARRIVED && !duration && info->has_duration) @@ -338,17 +396,23 @@ bool TrainRoutePlanner::TrainRoutingState::check_arrival() { TrackIter next_track = track.next(path); - if(waypoint<0 && info->destination->has_track(*track) && !info->destination->has_track(*next_track)) - { - state = ARRIVED; - return true; - } - else if(waypoint>=0 && info->waypoints[waypoint]->has_track(*track) && !info->waypoints[waypoint]->has_track(*next_track)) - { - ++waypoint; - if(waypoint>=static_cast(info->waypoints.size())) - waypoint = -1; - } + // Check if we're about the exit the current waypoint's tracks. + const TrainRouter::Waypoint &wp = info->waypoints[waypoint]; + if(wp.chain->has_track(*track) && !wp.chain->has_track(*next_track)) + if(wp.direction==TrackChain::UNSPECIFIED || track==wp.chain->iter_for(*track, wp.direction)) + { + if(waypoint+1waypoints.size()) + ++waypoint; + else + { + state = ARRIVED; + return true; + } + } + + // If we're entering the first non-critical block, clear the critical flag. + if(info->first_noncritical->has_track(*next_track)) + critical = false; return false; } @@ -358,20 +422,39 @@ void TrainRoutePlanner::TrainRoutingState::advance(float distance) offset += distance; back_offset += distance; - OccupiedTrack *last_occ = occupied_tracks; - for(unsigned n=occupied_tracks->n_tracks; n>1; --n) - last_occ = last_occ->next; + // See if the tail end of the train has passed any sensors. + unsigned count_to_free = 0; + unsigned last_sensor_addr = 0; + float distance_after_sensor = 0; + OccupiedTrack *occ = occupied_tracks; + for(unsigned n=occupied_tracks->n_tracks; n>0; --n) + { + if(unsigned saddr = occ->track->get_sensor_address()) + { + if(saddr!=last_sensor_addr) + { + count_to_free = 0; + distance_after_sensor = 0; + } + last_sensor_addr = saddr; + } + + ++count_to_free; + distance_after_sensor += occ->path_length; - // XXX What if there's multiple tracks to remove? - if(back_offset>last_occ->path_length) + occ = occ->next; + } + + // Free the last passed sensor and any tracks behind it. + if(count_to_free && back_offset>distance_after_sensor) { - back_offset -= last_occ->path_length; + back_offset -= distance_after_sensor; if(occupied_tracks->refcount>1) { --occupied_tracks->refcount; occupied_tracks = new OccupiedTrack(*occupied_tracks); } - --occupied_tracks->n_tracks; + occupied_tracks->n_tracks -= count_to_free; } distance_traveled += distance; @@ -387,6 +470,7 @@ void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt) } float secs = dt/Time::sec; + // There may be negative delay remaining after previous step. if(delay) { secs -= delay/Time::sec; @@ -396,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) @@ -415,9 +502,18 @@ void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path) void TrainRoutePlanner::TrainRoutingState::update_estimate() { TrackIter iter = track.reverse(path); - 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; + remaining_estimate = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry()); + if(remaining_estimate>=0) + remaining_estimate += track->get_type().get_path_length(path)-offset; +} + +bool TrainRoutePlanner::TrainRoutingState::is_viable() const +{ + if(remaining_estimate<0) + return false; + if(critical && state==BLOCKED) + return false; + return true; } @@ -436,14 +532,8 @@ TrainRoutePlanner::RoutingStep::RoutingStep(const RoutingStep *p): void TrainRoutePlanner::RoutingStep::create_successors(list &new_steps) const { RoutingStep next(this); - if(next.update_states()) - { - if(next.check_deadlocks()) - return; - - new_steps.push_back(next); + if(next.update_states() && next.check_deadlocks()) return; - } int train_index = find_next_train(); if(train_index<0) @@ -454,25 +544,31 @@ void TrainRoutePlanner::RoutingStep::create_successors(list &new_st Time::TimeDelta dt = train.get_time_to_next_track(); next.advance(dt); + /* Check arrival after the train has advanced to the end of its current track + so travel time and occupied tracks will be correct. */ if(train.check_arrival()) { new_steps.push_back(next); return; } - TrackIter next_track = train.track.next(train.path); train.advance_track(0); - const TrackType::Endpoint &next_entry_ep = next_track.endpoint(); - for(unsigned i=0; next_entry_ep.paths>>i; ++i) - if(next_entry_ep.has_path(i)) - { - train.path = i; - train.update_estimate(); - next.update_estimate(); - if(next.is_viable()) - new_steps.push_back(next); - } + const TrackType::Endpoint &entry_ep = train.track.endpoint(); + if(train.critical) + { + /* Only create a successor step matching the currently set path for a + critical track. */ + unsigned critical_path = train.track->get_type().coerce_path(train.track.entry(), train.track->get_active_path()); + create_successor(next, train_index, critical_path, new_steps); + } + else + { + // Create successor steps for all possible paths through the new track. + for(unsigned i=0; entry_ep.paths>>i; ++i) + if(entry_ep.has_path(i)) + create_successor(next, train_index, i, new_steps); + } new_steps.sort(); for(list::iterator i=new_steps.begin(); ++i!=new_steps.end(); ) @@ -481,18 +577,40 @@ void TrainRoutePlanner::RoutingStep::create_successors(list &new_st i->update_estimate(); } - if(next_entry_ep.paths!=next_track->get_type().get_paths()) + if(entry_ep.paths!=train.track->get_type().get_paths() && !train.critical) { + /* Create a waiting state before the track if there's at least one path + that doesn't pass through the entry endpoint. */ 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(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); } } +void TrainRoutePlanner::RoutingStep::create_successor(RoutingStep &next, unsigned train_index, unsigned path, list &new_steps) +{ + TrainRoutingState &train = next.trains[train_index]; + + train.path = path; + train.update_estimate(); + next.update_estimate(); + if(next.is_viable()) + new_steps.push_back(next); +} + bool TrainRoutePlanner::RoutingStep::update_states() { bool changes = false; @@ -508,9 +626,24 @@ bool TrainRoutePlanner::RoutingStep::update_states() { i->blocked_by = get_occupant(*next_track); if(i->blocked_by>=0) + { + /* If the train is still traversing its last critical track, the + flag needs to be cleared here to pass viability test. */ + 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; @@ -529,9 +662,12 @@ bool TrainRoutePlanner::RoutingStep::check_deadlocks() const if(i->state!=BLOCKED) continue; + // A train blocked by end of track is always considered a deadlock. if(i->blocked_by<0) return true; + /* Use the tortoise and hare algorithm to check if trains are blocked + cyclically (A blocks B, which blocks ..., which blocks A). */ int slow = i->blocked_by; int fast = trains[slow].blocked_by; while(fast>=0 && trains[fast].blocked_by>=0) @@ -586,13 +722,13 @@ void TrainRoutePlanner::RoutingStep::update_estimate() cost_estimate = penalty; for(vector::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 { for(vector::const_iterator i=trains.begin(); i!=trains.end(); ++i) - if(i->remaining_estimate<0) + if(!i->is_viable()) return false; for(vector::const_iterator i=trains.begin(); i!=trains.end(); ++i)