X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=bbb87eae116eb56326c911900eec1f0d09fe9303;hb=bf321305d7bf65aa5033a835f61370cd48f54619;hp=508a7b19651a4835206a0c76f1b2d8e9c90eeaaa;hpb=b68d1d4f2be93a405170e7caca05760ca473dcc6;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index 508a7b1..bbb87ea 100644 --- a/source/libr2c2/trainrouter.cpp +++ b/source/libr2c2/trainrouter.cpp @@ -15,12 +15,16 @@ namespace R2C2 { TrainRouter::TrainRouter(Train &t): TrainAI(t), priority(0), - arriving(0), + arrival(ON_THE_WAY), destination(0), - update_pending(false) + destination_changed(false), + metrics_stale(false), + current_sequence(0), + sequence_check_pending(false) { 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() @@ -58,58 +62,79 @@ bool TrainRouter::set_route(const Route *r) routes.clear(); if(lead) routes.push_back(lead); + // TODO Check if eclipsed by lead route 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(); - } + destination = 0; + waypoints.clear(); + sequence_points.clear(); + current_sequence = 0; + sequence_check_pending = false; - train.refresh_blocks_from(*fncb); - - 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::route_changed() { - Wait wait; - wait.block = █ - wait.train = tr; - waits.push_back(wait); -} + BlockIter fncb = train.get_first_noncritical_block(); -const Route *TrainRouter::get_route() const -{ - if(routes.empty()) - return 0; - return routes.front(); + reserving_route = routes.begin(); + bool already_at_end = false; + 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. */ + TrackIter track = train.get_block_allocator().first().track_iter(); + for(; track; track=track.next()) + { + if(!advance_to_track(reserving_route, *track)) + { + already_at_end = true; + break; + } + if(&track->get_block()==fncb.block()) + break; + } + } + + if(!already_at_end) + { + // We are not at the end of the route now, but might have been before. + arrival = ON_THE_WAY; + train.refresh_blocks_from(*fncb); + if(!arrival) + train.stop_at(0); + } + else if(!arrival) + { + /* If arrival wasn't set before (perhaps because we weren't on a route), + set it now. */ + arrival = RESERVED_TO_END; + train.stop_at(&*fncb.flip()); + train.refresh_blocks_from(*fncb); + } + + const Route *route = get_route(); + signal_route_changed.emit(route); + signal_event.emit(Message("route-changed", route)); } void TrainRouter::set_destination(const TrackChain &d) { destination = &d; - update_pending = true; + destination_changed = true; + metrics_stale = true; } bool TrainRouter::is_destination(Track &track) const @@ -123,7 +148,8 @@ bool TrainRouter::is_destination(Track &track) const void TrainRouter::add_waypoint(const TrackChain &wp) { waypoints.push_back(&wp); - update_pending = true; + destination_changed = true; + metrics_stale = true; } bool TrainRouter::is_waypoint(unsigned index, Track &track) const @@ -138,7 +164,7 @@ const TrainRouteMetric &TrainRouter::get_metric(int index) const { if(!destination) throw logic_error("no metrics"); - else if(update_pending) + else if(metrics_stale) throw logic_error("metrics are stale"); if(index<0) @@ -152,7 +178,7 @@ const TrainRouteMetric &TrainRouter::get_metric(int index) const void TrainRouter::set_departure_delay(const Time::TimeDelta &d) { delay = d; - update_pending = true; + destination_changed = true; } void TrainRouter::message(const Message &msg) @@ -193,16 +219,55 @@ void TrainRouter::tick(const Time::TimeDelta &dt) delay = Time::zero; } - if(update_pending) - create_plans(train.get_layout()); + if(destination_changed && !planner) + start_planning(train.get_layout()); + + if(planner && planner->check()!=TrainRoutePlanner::PENDING) + { + destination_changed = false; + if(planner->get_result()==TrainRoutePlanner::COMPLETE) + { + const list &planned_routes = planner->get_routes_for(train); + + routes.clear(); + Route *lead = create_lead_route(0, planned_routes.front()); + routes.push_back(lead); + + list::const_iterator begin = planned_routes.begin(); + for(; begin!=planned_routes.end(); ++begin) + { + const Route::TrackSet &tracks = (*begin)->get_tracks(); + bool eclipsed = true; + for(Route::TrackSet::const_iterator i=tracks.begin(); (eclipsed && i!=tracks.end()); ++i) + eclipsed = lead->has_track(**i); + if(!eclipsed) + break; + } + routes.insert(routes.end(), begin, planned_routes.end()); + + sequence_points = planner->get_sequence_for(train); + current_sequence = 0; + sequence_check_pending = false; + + route_changed(); + } + planner = 0; + } + + if(sequence_check_pending) + { + if(sequence_points.front().is_cleared()) + train.stop_at(0); + sequence_check_pending = false; + } - if(arriving==1 && !train.get_speed()) + if(arrival==RESERVED_TO_END && !train.get_speed()) { signal_arrived.emit(destination); signal_event.emit(Message("arrived", destination)); - arriving = 2; + arrival = ARRIVED; } - else if(arriving==2 && !train.get_block_allocator().is_active()) + else if(arrival==ARRIVED && !train.get_block_allocator().is_active()) set_route(0); } @@ -221,40 +286,81 @@ void TrainRouter::save(list &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? + 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. */ + sequence_check_pending = true; + + return; + } + + // Did we reach our next sequence point? + if(!sequence_points.empty()) + { + SequencePoint &sp = sequence_points.front(); + if(sp.block==&block) { - train.stop_at(0); - waits.pop_front(); + current_sequence = sp.sequence_out; + sequence_points.pop_front(); } - return; } - BlockIter b_iter = t->get_block_allocator().iter_for(block); + TrackIter track = train.get_block_allocator().iter_for(block).track_iter(); + + // 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); + } - RouteList::iterator route = routes.begin(); - if(advance_route(route, block)) + /* 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)) { - // Check if the block is a turnout and set it to proper path - if(unsigned taddr = block.get_turnout_address()) + reserving_route = routes.begin(); + arrival = ON_THE_WAY; + track = t->get_block_allocator().first().track_iter(); + for(; track; track=track.next()) { - int path = (*route)->get_turnout(taddr); - if(path>=0) - b_iter.track_iter()->set_active_path(path); + if(!advance_to_track(reserving_route, *track)) + throw logic_error("internal error (reservation outside of route)"); + else if(&track->get_block()==&block) + break; } + } - // Check if the next block is still part of the designated route - BlockIter b_iter_next = b_iter.next(*route); - - RouteList::iterator next_route = route; - if(!advance_route(next_route, *b_iter_next)) + /* 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. + arrival = RESERVED_TO_END; train.stop_at(&block); return; } + if(&track->get_block()!=&block) + break; + } - if(!waits.empty() && waits.front().block==b_iter_next.block()) + // Do we need to wait for another train to pass? + if(!sequence_points.empty()) + { + SequencePoint &sp = sequence_points.front(); + if(sp.block==&track->get_block() && !sp.is_cleared()) train.stop_at(&block); } } @@ -263,22 +369,9 @@ 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) - { - const Route &route = **++routes.begin(); - if(route.has_track(*b_iter.endpoint().track)) - { - routes.pop_front(); - const Route *r = get_route(); - // XXX Exceptions? - signal_route_changed.emit(r); - signal_event.emit(Message("route-changed", r)); - } - } - if(!waypoints.empty()) { + // A waypoint is considered reached when the train has advanced through it. const TrackChain &wp = *waypoints.front(); TrackIter t_iter = b_iter.track_iter(); if(wp.has_track(*t_iter)) @@ -297,24 +390,25 @@ void TrainRouter::train_advanced(Block &block) } } } - - 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() @@ -343,58 +437,83 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target) lead->set_temporary(true); } - set tracks; - for(BlockIter i=train.get_block_allocator().first(); (i && i->get_train()==&train); i=i.next()) + bool target_tracks = 0; + for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next()) { - 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); + if(i->get_block().get_train()!=&train) + break; + if(target) + { + if(target->has_track(*i)) + ++target_tracks; + else if(target_tracks>0) + break; + } + lead->add_track(*i); } - lead->add_tracks(tracks); - return lead; } -bool TrainRouter::advance_route(RouteList::iterator &iter, const Block &block) +bool TrainRouter::is_valid_for_track(const Route &route, Track &track) const { - 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; - - return false; + if(!route.has_track(track)) + return false; + if(track.get_type().is_turnout() && route.get_turnout(track.get_turnout_address())<0) + return false; + return true; } -bool TrainRouter::is_on_route(const Block &block) +bool TrainRouter::advance_to_track(RouteList::iterator &route, Track &track) { - RouteList::iterator iter = routes.begin(); - return advance_route(iter, block); + if(!is_valid_for_track(**route, track)) + { + ++route; + if(route==routes.end()) + return false; + if(!is_valid_for_track(**route, track)) + throw logic_error("internal error (routes are not continuous)"); + } + + return true; } -void TrainRouter::create_plans(Layout &layout) +void TrainRouter::start_planning(Layout &layout) { + RefPtr planner = new TrainRoutePlanner(layout); + const map &trains = layout.get_trains(); for(map::const_iterator i=trains.begin(); i!=trains.end(); ++i) if(TrainRouter *router = i->second->get_ai_of_type()) { - if(router->update_pending) + if(router->metrics_stale) + { router->create_metrics(); - router->update_pending = false; + router->metrics_stale = false; + } + router->planner = planner; } - TrainRoutePlanner planner(layout); - planner.plan(); + planner->plan_async(); } -TrainRouter::Wait::Wait(): - block(0), - train(0) +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)