X-Git-Url: http://git.tdb.fi/?p=r2c2.git;a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=3d8b9d4b7b42a3c7ee3c69c84a81407232107107;hp=a1582fd65c64920346c1566f3a161d46b4df6dc8;hb=ecd7af790bd3ab7c7e768f68968379e1feea56a9;hpb=5c3d55f48318bb16865012c13619990004747090 diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index a1582fd..3d8b9d4 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) @@ -47,7 +46,6 @@ bool TrainRouter::set_route(const Route *r) create_lead_route(); } - destination = 0; waypoints.clear(); sequence_points.clear(); current_sequence = 0; @@ -65,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)) { - 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); @@ -113,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; } @@ -135,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) @@ -204,40 +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(); - 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(); - } - 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()) @@ -334,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); + } } } @@ -353,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)) @@ -390,17 +421,16 @@ 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]); } bool TrainRouter::create_lead_route() @@ -408,9 +438,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(); - if(!routes.front()->has_track(*next_track.flip())) + 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()) + { + if(routes.front()->has_track(*i)) + ++count; + else if(count>0) + { + if(count==routes.front()->get_tracks().size()) + last_track_rev = i; + break; + } + } + + 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) @@ -419,26 +464,23 @@ bool TrainRouter::create_lead_route() routes.push_front(pf); } - TrackIter first_track = train.get_block_allocator().first().track_iter(); - if(!routes.front()->has_track(*first_track)) + Route *lead = 0; + for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next()) { - Route *lead = new Route(train.get_layout()); - lead->set_name("Lead"); - lead->set_temporary(true); - - unsigned target_tracks = 0; - for(TrackIter i=first_track; (target_tracks<2 && i); i=i.next()) + if(!lead && !routes.front()->has_track(*i)) { - if(i->get_block().get_train()!=&train) - break; - if(routes.front()->has_track(*i)) - ++target_tracks; - else if(target_tracks>0) - break; - lead->add_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()); } - routes.push_front(lead); + if(lead) + lead->add_track(*i); } return true; @@ -467,14 +509,19 @@ bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter & return true; } -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) @@ -482,11 +529,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),