X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=5b2c5ee2f768e962cbbe669fb6f46425f6185d9e;hb=e5c244baa4058dbfc0c5caee64e6c83523751924;hp=4b7e1bc9ca54395a3a9221c71230e93eb9832dec;hpb=0ac334781fcb5029e4ea9236a8e93f43169eb7f2;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index 4b7e1bc..5b2c5ee 100644 --- a/source/libr2c2/trainrouter.cpp +++ b/source/libr2c2/trainrouter.cpp @@ -15,7 +15,7 @@ namespace R2C2 { TrainRouter::TrainRouter(Train &t): TrainAI(t), priority(0), - arriving(0), + arrival(ON_THE_WAY), destination(0), destination_changed(false), metrics_stale(false), @@ -24,6 +24,7 @@ TrainRouter::TrainRouter(Train &t): { 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() @@ -84,10 +85,31 @@ const Route *TrainRouter::get_route() const void TrainRouter::route_changed() { - train.stop_at(0); - arriving = 0; BlockIter fncb = train.get_first_noncritical_block(); - train.refresh_blocks_from(*fncb); + + reserving_route = routes.begin(); + bool already_at_end = false; + if(!routes.empty()) + { + 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) + { + arrival = ON_THE_WAY; + train.stop_at(0); + train.refresh_blocks_from(*fncb); + } const Route *route = get_route(); signal_route_changed.emit(route); @@ -213,13 +235,13 @@ void TrainRouter::tick(const Time::TimeDelta &dt) 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); } @@ -238,6 +260,9 @@ void TrainRouter::save(list &st) const void TrainRouter::block_reserved(Block &block, Train *t) { + if(routes.empty()) + return; + if(t!=&train) { if(!t) @@ -265,35 +290,48 @@ void TrainRouter::block_reserved(Block &block, Train *t) } } - 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 so, set it to the proper 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(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)) + // Do we need to move to the next route? + for(; track; track=track.next((*reserving_route)->get_path(*track))) + { + if(!advance_to_track(reserving_route, *track)) { + arrival = RESERVED_TO_END; train.stop_at(&block); return; } + if(&track->get_block()!=&block) + break; + } - if(!sequence_points.empty()) - { - SequencePoint &sp = sequence_points.front(); - if(sp.block==b_iter_next.block() && !sp.is_cleared()) - train.stop_at(&block); - } + if(!sequence_points.empty()) + { + SequencePoint &sp = sequence_points.front(); + if(sp.block==&track->get_block() && !sp.is_cleared()) + train.stop_at(&block); } } @@ -301,27 +339,6 @@ 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) - { - Track &track = *b_iter.endpoint().track; - const Route *route = get_route(); - bool change_route = false; - if(route->is_loop()) - change_route = (*++routes.begin())->has_track(track); - else - change_route = !route->has_track(track); - - if(change_route) - { - routes.pop_front(); - route = get_route(); - // XXX Exceptions? - signal_route_changed.emit(route); - signal_event.emit(Message("route-changed", route)); - } - } - if(!waypoints.empty()) { const TrackChain &wp = *waypoints.front(); @@ -342,24 +359,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; + // Have we left some routes completely behind? + 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() @@ -406,26 +424,27 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target) 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(); - unsigned turnout_addr = block.get_turnout_address(); - for(; iter!=routes.end(); ++iter) - { - if(turnout_addr && (*iter)->get_turnout(turnout_addr)<0) - continue; - 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::start_planning(Layout &layout)