X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=9befe4788c4b03114cfe4939f6ea7c02eee0fe06;hb=83c6923396fcfa42e6adf949b9476663f322748b;hp=6af6154c862a29af52fb0e59bccc09b0f97b1ff2;hpb=dd41422054c277b44059d5d2d127ce34a2c2119f;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index 6af6154..9befe47 100644 --- a/source/libr2c2/trainrouter.cpp +++ b/source/libr2c2/trainrouter.cpp @@ -16,8 +16,7 @@ TrainRouter::TrainRouter(Train &t): TrainAI(t), priority(0), arrival(ON_THE_WAY), - destination(0), - destination_changed(false), + waypoints_changed(false), metrics_stale(false), current_sequence(0), sequence_check_pending(false) @@ -40,33 +39,13 @@ 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); - // TODO Check if eclipsed by lead route if(r) + { routes.push_back(r); + create_lead_route(); + } - destination = 0; waypoints.clear(); sequence_points.clear(); current_sequence = 0; @@ -84,46 +63,78 @@ const Route *TrainRouter::get_route() const return routes.front(); } +void TrainRouter::use_planned_route() +{ + if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE) + return; + + 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; + sequence_check_pending = false; + + route_changed(); +} + 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)) + 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()) 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; + } } - } - 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); + 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()) + { + 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); @@ -132,15 +143,18 @@ void TrainRouter::route_changed() void TrainRouter::set_destination(const TrackChain &d) { - destination = &d; - destination_changed = true; + if(waypoints.empty()) + waypoints.push_back(&d); + else + waypoints.back() = &d; + waypoints_changed = true; metrics_stale = true; } void TrainRouter::add_waypoint(const TrackChain &wp) { waypoints.push_back(&wp); - destination_changed = true; + waypoints_changed = true; metrics_stale = true; } @@ -154,23 +168,23 @@ const TrackChain &TrainRouter::get_waypoint(unsigned index) const const TrainRouteMetric &TrainRouter::get_metric(int index) const { - if(!destination) + if(waypoints.empty()) throw logic_error("no metrics"); 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; - destination_changed = true; + waypoints_changed = true; } void TrainRouter::set_trip_duration(const Time::TimeDelta &d) @@ -223,52 +237,26 @@ void TrainRouter::tick(const Time::TimeDelta &dt) else if(duration) duration = max(duration-dt, Time::zero); - if(destination_changed && !planner) + if(waypoints_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; - } + apply_plan(train.get_layout(), *planner); if(sequence_check_pending) { if(sequence_points.front().is_cleared()) + { + arrival = ON_THE_WAY; train.stop_at(0); + } sequence_check_pending = false; } - if(arrival==RESERVED_TO_END && !train.get_speed()) + if(arrival==ADVANCED_TO_END && !train.get_speed()) { - signal_arrived.emit(destination); - signal_event.emit(Message("arrived", destination)); + signal_arrived.emit(waypoints.back()); + signal_event.emit(Message("arrived", waypoints.back())); arrival = ARRIVED; } else if(arrival==ARRIVED && !train.get_block_allocator().is_active()) @@ -338,7 +326,7 @@ void TrainRouter::block_reserved(Block &block, Train *t) track = t->get_block_allocator().first().track_iter(); for(; track; track=track.next()) { - if(!advance_to_track(reserving_route, *track)) + if(!advance_to_track(reserving_route, track)) throw logic_error("internal error (reservation outside of route)"); else if(&track->get_block()==&block) break; @@ -349,7 +337,7 @@ void TrainRouter::block_reserved(Block &block, Train *t) expected to be allocated next. */ for(; track; track=track.next((*reserving_route)->get_path(*track))) { - if(!advance_to_track(reserving_route, *track)) + if(!advance_to_track(reserving_route, track)) { // We've reached the end of the route. Stop here. arrival = RESERVED_TO_END; @@ -365,7 +353,10 @@ void TrainRouter::block_reserved(Block &block, Train *t) { SequencePoint &sp = sequence_points.front(); if(sp.block==&track->get_block() && !sp.is_cleared()) + { + arrival = WAITING_FOR_SEQUENCE; train.stop_at(&block); + } } } @@ -384,9 +375,18 @@ void TrainRouter::train_advanced(Block &block) { if(!wp.has_track(*t_iter)) { - waypoints.erase(waypoints.begin()); - signal_waypoint_reached.emit(&wp); - signal_event.emit(Message("waypoint-reached", &wp)); + if(waypoints.size()==1) + { + if(arrival==RESERVED_TO_END) + arrival = ADVANCED_TO_END; + } + else + { + waypoints.erase(waypoints.begin()); + metrics_stale = true; + signal_waypoint_reached.emit(&wp); + signal_event.emit(Message("waypoint-reached", &wp)); + } break; } else if(!block.has_track(*t_iter)) @@ -421,77 +421,105 @@ 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(unsigned i=metrics.size(); --i>0; ) - metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]); - - metrics_stale = false; + 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; + } } - bool target_tracks = 0; - for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next()) + TrackIter next_track = last_track_rev.flip(); + if(!routes.front()->has_track(*last_track_rev) && !routes.front()->has_track(*next_track)) { - if(i->get_block().get_train()!=&train) - break; - if(target) + Route *pf = Route::find(next_track, *routes.front()); + if(!pf) + return false; + + routes.push_front(pf); + } + + 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)) { - if(target->has_track(*i)) - ++target_tracks; - else if(target_tracks>0) - break; + 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()); } - lead->add_track(*i); - } - return lead; -} + if(lead) + lead->add_track(*i); + } -bool TrainRouter::is_valid_for_track(const Route &route, Track &track) const -{ - 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::advance_to_track(RouteList::iterator &route, Track &track) +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::start_planning(Layout &layout) +void TrainRouter::get_routers(Layout &layout, vector &routers) { - vector routers; 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()) routers.push_back(router); +} + +void TrainRouter::start_planning(Layout &layout) +{ + vector routers; + get_routers(layout, routers); for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) if((*i)->metrics_stale) @@ -499,11 +527,27 @@ void TrainRouter::start_planning(Layout &layout) 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) +{ + vector routers; + get_routers(layout, routers); + + for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) + if((*i)->planner.get()==&planner) + { + (*i)->use_planned_route(); + (*i)->planner = 0; + } +} + TrainRouter::SequencePoint::SequencePoint(Block &b, unsigned o): block(&b),