X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=7d52b8437a8bffe8c847c3b05e58142522fecf7f;hb=3dd660ffad729fbd6e75e6401f5c7f27b9013faf;hp=27fca7a56632c7bb1017844393f103192f1c634a;hpb=91131237203bffe734219ab8b82b9d17f5d7a87d;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index 27fca7a..7d52b84 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" @@ -67,6 +68,8 @@ void TrainRouter::use_planned_route() { if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE) return; + if(waypoints.empty()) + return; const list &planned_routes = planner->get_routes_for(train); @@ -83,22 +86,23 @@ void TrainRouter::use_planned_route() void TrainRouter::route_changed() { - BlockIter fncb = train.get_first_noncritical_block(); + BlockIter fncb = train.get_last_critical_block().next(); + arrival = ON_THE_WAY; 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(); + 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)) { - already_at_end = true; + arrival = (allocator.is_block_current(track->get_block()) ? ADVANCED_TO_END : RESERVED_TO_END); break; } if(&track->get_block()==fncb.block()) @@ -106,30 +110,34 @@ void TrainRouter::route_changed() 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(!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); + if(!sequence_points.empty()) + { + const SequencePoint &sp = sequence_points.front(); + if(sp.block==fncb.block() && sp.preceding_train) + { + arrival = WAITING_FOR_SEQUENCE; + sequence_check_pending = true; + } + } } - else if(!arrival) - { - /* If arrival wasn't set before (perhaps because we weren't on a route), - set it now. */ - arrival = RESERVED_TO_END; + + /* Refresh from the first non-critical block to pick up any changes in the + route. Set stop marker first in case an arrival condition was met within the + critical blocks. */ + if(arrival) train.stop_at(&*fncb.flip()); - train.refresh_blocks_from(*fncb); - } + train.refresh_blocks_from(*fncb); + // If no arrival condition was found, clear a possible previous stop marker. + if(!arrival) + train.stop_at(0); const Route *route = get_route(); signal_route_changed.emit(route); @@ -139,26 +147,26 @@ void TrainRouter::route_changed() void TrainRouter::set_destination(const TrackChain &d) { if(waypoints.empty()) - waypoints.push_back(&d); + waypoints.push_back(Waypoint(d)); else - waypoints.back() = &d; + 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); + waypoints.push_back(Waypoint(chain, dir)); waypoints_changed = true; metrics_stale = true; } -const TrackChain &TrainRouter::get_waypoint(unsigned index) const +const TrainRouter::Waypoint &TrainRouter::get_waypoint(unsigned index) const { if(index>=waypoints.size()) throw out_of_range("TrainRouter::is_waypoint"); - return *waypoints[index]; + return waypoints[index]; } const TrainRouteMetric &TrainRouter::get_metric(int index) const @@ -207,7 +215,12 @@ 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()); @@ -220,35 +233,42 @@ void TrainRouter::message(const Message &msg) void TrainRouter::tick(const Time::TimeDelta &dt) { - if(delay) - { - delay -= dt; - if(delaycheck()!=TrainRoutePlanner::PENDING) apply_plan(train.get_layout(), *planner); + Layout &layout = train.get_layout(); + if(!layout.get_driver().is_halted() && !layout.get_clock().is_stopped()) + { + if(delay) + { + delay -= dt; + if(delayget_block() && !sp.is_cleared()) + { + arrival = WAITING_FOR_SEQUENCE; train.stop_at(&block); + } } } void TrainRouter::train_advanced(Block &block) { - BlockIter b_iter = train.get_block_allocator().iter_for(block); - - if(waypoints.size()>1) + if(!waypoints.empty()) { // A waypoint is considered reached when the train has advanced through it. - const TrackChain &wp = *waypoints.front(); + 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()); - metrics_stale = true; - 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(arrival==RESERVED_TO_END) + arrival = 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; } } } @@ -407,8 +448,8 @@ void TrainRouter::create_metrics() if(waypoints.empty()) return; - 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()-1; i-->0; ) metrics[i]->chain_to(*metrics[i+1]); @@ -419,23 +460,24 @@ bool TrainRouter::create_lead_route() if(routes.empty() || !train.is_placed()) return false; - BlockIter fncb = train.get_first_noncritical_block(); - TrackIter next_track = fncb.track_iter(); + BlockIter lcb = train.get_last_critical_block(); + TrackIter last_track_rev = lcb.reverse().track_iter(); unsigned count = 0; - for(TrackIter i=next_track.flip(); (i && i->get_block().get_train()==&train); i=i.next()) + for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next()) { if(routes.front()->has_track(*i)) ++count; else if(count>0) { if(count==routes.front()->get_tracks().size()) - next_track = i.flip(); + last_track_rev = i; break; } } - if(!routes.front()->has_track(*next_track) && !routes.front()->has_track(*next_track.flip())) + TrackIter next_track = last_track_rev.flip(); + if(!routes.front()->has_track(*last_track_rev) && !routes.front()->has_track(*next_track)) { Route *pf = Route::find(next_track, *routes.front()); if(!pf) @@ -445,7 +487,7 @@ bool TrainRouter::create_lead_route() } Route *lead = 0; - for(TrackIter i=next_track.flip(); (i && i->get_block().get_train()==&train); i=i.next()) + for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next()) { if(!lead && !routes.front()->has_track(*i)) { @@ -466,27 +508,25 @@ bool TrainRouter::create_lead_route() return true; } -bool TrainRouter::is_valid_for_track(const Route &route, const TrackIter &track) const -{ - if(!route.has_track(*track)) - return false; - if(track->get_type().is_turnout() && route.get_turnout(track->get_turnout_address())<0 && route.has_track(*track.flip())) - return false; - return true; -} - bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &track) { - if(!is_valid_for_track(**route, track)) + 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) { - ++route; - if(route==routes.end()) - return false; - if(!is_valid_for_track(**route, track)) + 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 true; + return false; } void TrainRouter::get_routers(Layout &layout, vector &routers) @@ -519,6 +559,9 @@ void TrainRouter::start_planning(Layout &layout) 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); @@ -531,6 +574,12 @@ void TrainRouter::apply_plan(Layout &layout, TrainRoutePlanner &planner) } +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),