X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=1ada62104cee5724ac208be1e1e57cf7dd18946c;hb=2fb2e58685c521ea76aab9f6d7cffe1186c9814a;hp=508a7b19651a4835206a0c76f1b2d8e9c90eeaaa;hpb=b68d1d4f2be93a405170e7caca05760ca473dcc6;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index 508a7b1..1ada621 100644 --- a/source/libr2c2/trainrouter.cpp +++ b/source/libr2c2/trainrouter.cpp @@ -1,3 +1,4 @@ +#include "driver.h" #include "layout.h" #include "route.h" #include "trackiter.h" @@ -15,12 +16,14 @@ namespace R2C2 { TrainRouter::TrainRouter(Train &t): TrainAI(t), priority(0), - arriving(0), - destination(0), - update_pending(false) + state(ON_THE_WAY), + waypoints_changed(false), + metrics_stale(false), + current_sequence(0) { train.get_layout().signal_block_reserved.connect(sigc::mem_fun(this, &TrainRouter::block_reserved)); train.signal_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_advanced)); + train.signal_rear_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_rear_advanced)); } TrainRouter::~TrainRouter() @@ -36,123 +39,153 @@ void TrainRouter::set_priority(int p) bool TrainRouter::set_route(const Route *r) { - BlockIter fncb = train.get_first_noncritical_block(); - - Route *lead = 0; - if(r && train.is_placed()) - { - const BlockAllocator &allocator = train.get_block_allocator(); - TrackIter first = allocator.first().track_iter(); - TrackIter next = fncb.track_iter(); - if(!r->has_track(*next)) - { - lead = Route::find(next, *r); - if(!lead) - return false; - create_lead_route(lead, lead); - } - else if(!r->has_track(*first)) - lead = create_lead_route(0, r); - } - routes.clear(); - if(lead) - routes.push_back(lead); if(r) - routes.push_back(r); - train.stop_at(0); - arriving = 0; - - /* TODO destination should also be cleared when manually setting a different - route, but not when the planner calls this. */ - if(!r) { - destination = 0; - waypoints.clear(); + routes.push_back(r); + create_lead_route(); } - train.refresh_blocks_from(*fncb); + waypoints.clear(); + sequence_points.clear(); - const Route *route = get_route(); - signal_route_changed.emit(route); - signal_event.emit(Message("route-changed", route)); + route_changed(); return true; } -bool TrainRouter::add_route(const Route &r) +const Route *TrainRouter::get_route() const { if(routes.empty()) - return set_route(&r); - - // TODO Check that it can be reached from previous routes - routes.push_back(&r); - - return true; + return 0; + return routes.front(); } -void TrainRouter::add_wait(Block &block, Train *tr) +void TrainRouter::use_planned_route() { - Wait wait; - wait.block = █ - wait.train = tr; - waits.push_back(wait); -} + if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE) + return; + if(waypoints.empty()) + return; -const Route *TrainRouter::get_route() const -{ - if(routes.empty()) - return 0; - return routes.front(); + const list &planned_routes = planner->get_routes_for(train); + + routes.clear(); + routes.insert(routes.end(), planned_routes.begin(), planned_routes.end()); + create_lead_route(); + + sequence_points = planner->get_sequence_for(train); + current_sequence = 0; + + route_changed(); } -void TrainRouter::set_destination(const TrackChain &d) +void TrainRouter::route_changed() { - destination = &d; - update_pending = true; + BlockIter fncb = train.get_last_critical_block().next(); + + state = ON_THE_WAY; + reserving_route = routes.begin(); + if(!routes.empty()) + { + /* Find the route that should be used for the next allocated block. We + can't rely on the resync code in block_reserved since we may need to + clear the stop marker to continue allocation. */ + const BlockAllocator &allocator = train.get_block_allocator(); + TrackIter track = allocator.first().track_iter(); + list::iterator seq_begin = sequence_points.begin(); + for(; track; track=track.next()) + { + if(!advance_to_track(reserving_route, track)) + { + state = (allocator.is_block_current(track->get_block()) ? ADVANCED_TO_END : RESERVED_TO_END); + break; + } + if(&track->get_block()==fncb.block()) + break; + + if(seq_begin!=sequence_points.end() && seq_begin->block==&track->get_block()) + { + // Assume any sequence points within critical blocks to be cleared + current_sequence = seq_begin->sequence_out; + ++seq_begin; + } + } + + sequence_points.erase(sequence_points.begin(), seq_begin); + + if(!sequence_points.empty()) + { + const SequencePoint &sp = sequence_points.front(); + if(sp.block==fncb.block() && !sp.is_cleared()) + state = SEQUENCE_CHECK_PENDING; + } + } + + /* Refresh from the first non-critical block to pick up any changes in the + route. Set stop marker first in case a stopping state was set within the + critical blocks. */ + if(state!=ON_THE_WAY) + train.stop_at(&*fncb.flip()); + train.refresh_blocks_from(*fncb); + // If we don't need to stop, clear a possible previous stop marker. + if(state==ON_THE_WAY) + train.stop_at(0); + + const Route *route = get_route(); + signal_route_changed.emit(route); + signal_event.emit(Message("route-changed", route)); } -bool TrainRouter::is_destination(Track &track) const +void TrainRouter::set_destination(const TrackChain &d) { - if(destination) - return destination->has_track(track); + if(waypoints.empty()) + waypoints.push_back(Waypoint(d)); else - return false; + waypoints.back() = Waypoint(d); + waypoints_changed = true; + metrics_stale = true; } -void TrainRouter::add_waypoint(const TrackChain &wp) +void TrainRouter::add_waypoint(const TrackChain &chain, TrackChain::Direction dir) { - waypoints.push_back(&wp); - update_pending = true; + waypoints.push_back(Waypoint(chain, dir)); + waypoints_changed = true; + metrics_stale = true; } -bool TrainRouter::is_waypoint(unsigned index, Track &track) const +const TrainRouter::Waypoint &TrainRouter::get_waypoint(unsigned index) const { if(index>=waypoints.size()) throw out_of_range("TrainRouter::is_waypoint"); - return waypoints[index]->has_track(track); + return waypoints[index]; } const TrainRouteMetric &TrainRouter::get_metric(int index) const { - if(!destination) + if(waypoints.empty()) throw logic_error("no metrics"); - else if(update_pending) + else if(metrics_stale) throw logic_error("metrics are stale"); if(index<0) - return *metrics.front(); + return *metrics.back(); else if(static_cast(index)>=waypoints.size()) throw out_of_range("TrainRouter::get_metric"); else - return *metrics[index+1]; + return *metrics[index]; } void TrainRouter::set_departure_delay(const Time::TimeDelta &d) { delay = d; - update_pending = true; + waypoints_changed = true; +} + +void TrainRouter::set_trip_duration(const Time::TimeDelta &d) +{ + duration = d; } void TrainRouter::message(const Message &msg) @@ -175,34 +208,64 @@ void TrainRouter::message(const Message &msg) } else if(msg.type=="add-waypoint") { - if(msg.value.check_type()) + if(msg.value.check_type()) + { + Waypoint wp = msg.value.value(); + add_waypoint(*wp.chain, wp.direction); + } + else if(msg.value.check_type()) add_waypoint(*msg.value.value()); else add_waypoint(*msg.value.value()); } else if(msg.type=="set-departure-delay") set_departure_delay(msg.value.value()); + else if(msg.type=="set-trip-duration") + set_trip_duration(msg.value.value()); } void TrainRouter::tick(const Time::TimeDelta &dt) { - if(delay) + if(waypoints_changed && !planner) + start_planning(train.get_layout()); + + if(planner && planner->check()!=TrainRoutePlanner::PENDING) + apply_plan(train.get_layout(), *planner); + + Layout &layout = train.get_layout(); + if(!layout.get_driver().is_halted() && !layout.get_clock().is_stopped()) { - delay -= dt; - if(delay<=Time::zero) - delay = Time::zero; + if(delay) + { + delay -= dt; + if(delay &st) const void TrainRouter::block_reserved(Block &block, Train *t) { + if(routes.empty()) + return; + if(t!=&train) { - if(!waits.empty() && waits.front().block==&block) + if(!t) + return; + + // Are we waiting for the other train to pass a sequence point? + if(state==WAITING_FOR_SEQUENCE) { - train.stop_at(0); - waits.pop_front(); + SequencePoint &sp = sequence_points.front(); + if(sp.preceding_train==t && sp.block==&block) + /* The other train's router will advance its sequence on the same + signal and may not have handled it yet. */ + state = SEQUENCE_CHECK_PENDING; } + return; } - BlockIter b_iter = t->get_block_allocator().iter_for(block); - - RouteList::iterator route = routes.begin(); - if(advance_route(route, block)) + // Did we reach our next sequence point? + if(!sequence_points.empty()) { - // Check if the block is a turnout and set it to proper path - if(unsigned taddr = block.get_turnout_address()) + SequencePoint &sp = sequence_points.front(); + if(sp.block==&block) { - int path = (*route)->get_turnout(taddr); - if(path>=0) - b_iter.track_iter()->set_active_path(path); + current_sequence = sp.sequence_out; + sequence_points.pop_front(); } + } - // Check if the next block is still part of the designated route - BlockIter b_iter_next = b_iter.next(*route); + TrackIter track = train.get_block_allocator().iter_for(block).track_iter(); - RouteList::iterator next_route = route; - if(!advance_route(next_route, *b_iter_next)) + // Is the block a turnout? If it is, set it to the correct path. + if(unsigned taddr = block.get_turnout_address()) + { + int path = (*reserving_route)->get_turnout(taddr); + if(path>=0) + track->set_active_path(path); + } + + /* If the allocator has released blocks from the front, we may need to + resync reserving_route. */ + if(reserving_route==routes.end() || !(*reserving_route)->has_track(*track)) + { + reserving_route = routes.begin(); + state = ON_THE_WAY; + track = t->get_block_allocator().first().track_iter(); + for(; track; track=track.next()) { - train.stop_at(&block); - return; + if(!advance_to_track(reserving_route, track)) + throw logic_error("internal error (reservation outside of route)"); + else if(&track->get_block()==&block) + break; } + } - if(!waits.empty() && waits.front().block==b_iter_next.block()) + /* Keep reserving_route pointing to the route containing the block that is + expected to be allocated next. */ + for(; track; track=track.next((*reserving_route)->get_path(*track))) + { + if(!advance_to_track(reserving_route, track)) + { + // We've reached the end of the route. Stop here. + state = RESERVED_TO_END; train.stop_at(&block); + return; + } + if(&track->get_block()!=&block) + break; } -} - -void TrainRouter::train_advanced(Block &block) -{ - BlockIter b_iter = train.get_block_allocator().iter_for(block); - // Check if we've reached the next route - if(routes.size()>1) + // Do we need to wait for another train to pass? + if(!sequence_points.empty()) { - const Route &route = **++routes.begin(); - if(route.has_track(*b_iter.endpoint().track)) + SequencePoint &sp = sequence_points.front(); + if(sp.block==&track->get_block() && !sp.is_cleared()) { - routes.pop_front(); - const Route *r = get_route(); - // XXX Exceptions? - signal_route_changed.emit(r); - signal_event.emit(Message("route-changed", r)); + state = SEQUENCE_CHECK_PENDING; + train.stop_at(&block); } } +} +void TrainRouter::train_advanced(Block &block) +{ if(!waypoints.empty()) { - const TrackChain &wp = *waypoints.front(); + // A waypoint is considered reached when the train has advanced through it. + BlockIter b_iter = train.get_block_allocator().iter_for(block); + const Waypoint &wp = waypoints.front(); TrackIter t_iter = b_iter.track_iter(); - if(wp.has_track(*t_iter)) + if(wp.chain->has_track(*t_iter)) { - for(; t_iter; t_iter=t_iter.next()) + while(1) { - if(!wp.has_track(*t_iter)) + TrackIter next = t_iter.next(); + if(!next) + break; + + if(!wp.chain->has_track(*next)) { - waypoints.erase(waypoints.begin()); - signal_waypoint_reached.emit(&wp); - signal_event.emit(Message("waypoint-reached", &wp)); + if(wp.direction!=TrackChain::UNSPECIFIED) + if(t_iter!=wp.chain->iter_for(*t_iter, wp.direction)) + break; + + if(waypoints.size()==1) + { + if(state==RESERVED_TO_END) + state = ADVANCED_TO_END; + } + else + { + const TrackChain *chain = wp.chain; + waypoints.erase(waypoints.begin()); + metrics_stale = true; + signal_waypoint_reached.emit(chain); + signal_event.emit(Message("waypoint-reached", chain)); + } break; } - else if(!block.has_track(*t_iter)) + else if(!block.has_track(*next)) break; + + t_iter = next; } } } - - if(!routes.empty()) - { - b_iter = b_iter.next(); - if(b_iter && !is_on_route(*b_iter)) - arriving = 1; - } } -const Route *TrainRouter::get_route_for_block(const Block &block) const +void TrainRouter::train_rear_advanced(Block &block) { - const set &tracks = block.get_tracks(); - for(RouteList::const_iterator i=routes.begin(); i!=routes.end(); ++i) - for(set::const_iterator j=tracks.begin(); j!=tracks.end(); ++j) - if((*i)->has_track(**j)) - return *i; + Track &track = *train.get_block_allocator().iter_for(block).endpoint().track; - return 0; + // Drop any routes that are now completely behind the train. + for(RouteList::iterator i=routes.begin(); i!=routes.end(); ++i) + if((*i)->has_track(track)) + { + if(i!=routes.begin()) + { + routes.erase(routes.begin(), i); + const Route *route = get_route(); + signal_route_changed.emit(route); + signal_event.emit(Message("route-changed", route)); + } + break; + } } void TrainRouter::create_metrics() @@ -323,78 +440,164 @@ void TrainRouter::create_metrics() delete *i; metrics.clear(); - if(!destination) + metrics_stale = false; + + if(waypoints.empty()) return; - metrics.push_back(new TrainRouteMetric(*destination)); - for(vector::const_iterator i=waypoints.begin(); i!=waypoints.end(); ++i) - metrics.push_back(new TrainRouteMetric(**i)); + for(vector::const_iterator i=waypoints.begin(); i!=waypoints.end(); ++i) + metrics.push_back(new TrainRouteMetric(*i->chain, i->direction)); - for(unsigned i=metrics.size(); --i>0; ) - metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]); + for(unsigned i=metrics.size()-1; i-->0; ) + metrics[i]->chain_to(*metrics[i+1]); } -Route *TrainRouter::create_lead_route(Route *lead, const Route *target) +bool TrainRouter::create_lead_route() { - if(!lead) + if(routes.empty() || !train.is_placed()) + return false; + + BlockIter lcb = train.get_last_critical_block(); + TrackIter last_track_rev = lcb.reverse().track_iter(); + + unsigned count = 0; + for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next()) { - lead = new Route(train.get_layout()); - lead->set_name("Lead"); - lead->set_temporary(true); + if(routes.front()->has_track(*i)) + ++count; + else if(count>0) + { + if(count==routes.front()->get_tracks().size()) + last_track_rev = i; + break; + } } - set tracks; - for(BlockIter i=train.get_block_allocator().first(); (i && i->get_train()==&train); i=i.next()) + TrackIter next_track = last_track_rev.flip(); + if(!routes.front()->has_track(*last_track_rev) && !routes.front()->has_track(*next_track)) { - const set &btracks = i->get_tracks(); - for(set::const_iterator j=btracks.begin(); j!=btracks.end(); ++j) - if(!target || !target->has_track(**j)) - tracks.insert(*j); + Route *pf = Route::find(next_track, *routes.front()); + if(!pf) + return false; + + routes.push_front(pf); } - lead->add_tracks(tracks); + Route *lead = 0; + for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next()) + { + if(!lead && !routes.front()->has_track(*i)) + { + lead = new Route(train.get_layout()); + lead->set_name("Lead"); + lead->set_temporary(true); + routes.push_front(lead); + + TrackIter j = i.flip(); + lead->add_track(*j); + lead->add_track(*j.next()); + } + + if(lead) + lead->add_track(*i); + } - return lead; + return true; } -bool TrainRouter::advance_route(RouteList::iterator &iter, const Block &block) +bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &track) { - const set &tracks = block.get_tracks(); - for(; iter!=routes.end(); ++iter) - for(set::const_iterator j=tracks.begin(); j!=tracks.end(); ++j) - if((*iter)->has_track(**j)) - return true; + Track &prev_track = *track.flip(); + unsigned taddr = (track->get_type().is_turnout() ? track->get_turnout_address() : 0); + for(unsigned i=0; route!=routes.end(); ++i) + { + bool in_route = (*route)->has_track(*track); + bool prev_in_route = (*route)->has_track(prev_track); + bool known_path = (!taddr || (*route)->get_turnout(taddr)>=0); + + if(in_route && (known_path || !prev_in_route)) + return true; + else if(i==0 || prev_in_route) + ++route; + else + throw logic_error("internal error (routes are not continuous)"); + } return false; } -bool TrainRouter::is_on_route(const Block &block) -{ - RouteList::iterator iter = routes.begin(); - return advance_route(iter, block); -} - -void TrainRouter::create_plans(Layout &layout) +void TrainRouter::get_routers(Layout &layout, vector &routers, TrainRoutePlanner *planner) { const map &trains = layout.get_trains(); + routers.reserve(trains.size()); for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) if(TrainRouter *router = i->second->get_ai_of_type()) - { - if(router->update_pending) - router->create_metrics(); - router->update_pending = false; - } + if(!planner || router->planner.get()==planner) + routers.push_back(router); +} + +void TrainRouter::start_planning(Layout &layout) +{ + vector routers; + get_routers(layout, routers); - TrainRoutePlanner planner(layout); - planner.plan(); + for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) + if((*i)->metrics_stale) + (*i)->create_metrics(); + + RefPtr planner = new TrainRoutePlanner(layout); + for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) + { + (*i)->waypoints_changed = false; + (*i)->planner = planner; + } + + planner->plan_async(); } +void TrainRouter::apply_plan(Layout &layout, TrainRoutePlanner &planner) +{ + if(planner.get_result()==TrainRoutePlanner::FAILED) + layout.emergency(0, "Route planning failed"); + + vector routers; + get_routers(layout, routers, &planner); + + /* Clear sequence counters first to avoid inconsistent state while applying + the plan. */ + for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) + (*i)->current_sequence = 0; -TrainRouter::Wait::Wait(): - block(0), - train(0) + for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) + { + (*i)->use_planned_route(); + (*i)->planner = 0; + } +} + + +TrainRouter::Waypoint::Waypoint(const TrackChain &c, TrackChain::Direction d): + chain(&c), + direction(d) +{ } + + +TrainRouter::SequencePoint::SequencePoint(Block &b, unsigned o): + block(&b), + preceding_train(0), + sequence_in(0), + sequence_out(o) { } +bool TrainRouter::SequencePoint::is_cleared() const +{ + if(!preceding_train) + return true; + + TrainRouter *router = preceding_train->get_ai_of_type(); + return router->get_current_sequence()>=sequence_in; +} + TrainRouter::Loader::Loader(TrainRouter &r): DataFile::ObjectLoader(r)