X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=a1582fd65c64920346c1566f3a161d46b4df6dc8;hb=5c3d55f48318bb16865012c13619990004747090;hp=9245774f605309d597591fa01e95eb60f8b20c38;hpb=e8d2abb48b5236cc3455a035628292ae7908240e;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index 9245774..a1582fd 100644 --- a/source/libr2c2/trainrouter.cpp +++ b/source/libr2c2/trainrouter.cpp @@ -40,31 +40,12 @@ 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(); @@ -98,7 +79,7 @@ void TrainRouter::route_changed() TrackIter track = train.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)) { already_at_end = true; break; @@ -137,14 +118,6 @@ void TrainRouter::set_destination(const TrackChain &d) metrics_stale = true; } -bool TrainRouter::is_destination(Track &track) const -{ - if(destination) - return destination->has_track(track); - else - return false; -} - void TrainRouter::add_waypoint(const TrackChain &wp) { waypoints.push_back(&wp); @@ -152,12 +125,12 @@ void TrainRouter::add_waypoint(const TrackChain &wp) metrics_stale = true; } -bool TrainRouter::is_waypoint(unsigned index, Track &track) const +const TrackChain &TrainRouter::get_waypoint(unsigned index) const { if(index>=waypoints.size()) throw out_of_range("TrainRouter::is_waypoint"); - return waypoints[index]->has_track(track); + return *waypoints[index]; } const TrainRouteMetric &TrainRouter::get_metric(int index) const @@ -242,20 +215,8 @@ void TrainRouter::tick(const Time::TimeDelta &dt) 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()); + routes.insert(routes.end(), planned_routes.begin(), planned_routes.end()); + create_lead_route(); sequence_points = planner->get_sequence_for(train); current_sequence = 0; @@ -346,7 +307,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; @@ -357,7 +318,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; @@ -438,45 +399,61 @@ void TrainRouter::create_metrics() for(unsigned i=metrics.size(); --i>0; ) metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]); + + metrics_stale = false; } -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 fncb = train.get_first_noncritical_block(); + TrackIter next_track = fncb.track_iter(); + if(!routes.front()->has_track(*next_track.flip())) { - lead = new Route(train.get_layout()); - lead->set_name("Lead"); - lead->set_temporary(true); + Route *pf = Route::find(next_track, *routes.front()); + if(!pf) + return false; + + routes.push_front(pf); } - bool target_tracks = 0; - for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next()) + TrackIter first_track = train.get_block_allocator().first().track_iter(); + if(!routes.front()->has_track(*first_track)) { - if(i->get_block().get_train()!=&train) - break; - if(target) + 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(target->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->add_track(*i); + + routes.push_front(lead); } - return lead; + return true; } -bool TrainRouter::is_valid_for_track(const Route &route, Track &track) const +bool TrainRouter::is_valid_for_track(const Route &route, const TrackIter &track) const { - if(!route.has_track(track)) + if(!route.has_track(*track)) return false; - if(track.get_type().is_turnout() && route.get_turnout(track.get_turnout_address())<0) + 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, Track &track) +bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &track) { if(!is_valid_for_track(**route, track)) { @@ -492,19 +469,20 @@ bool TrainRouter::advance_to_track(RouteList::iterator &route, Track &track) void TrainRouter::start_planning(Layout &layout) { - RefPtr planner = new TrainRoutePlanner(layout); - + 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()) - { - if(router->metrics_stale) - { - router->create_metrics(); - router->metrics_stale = false; - } - router->planner = planner; - } + routers.push_back(router); + + for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) + if((*i)->metrics_stale) + (*i)->create_metrics(); + + RefPtr planner = new TrainRoutePlanner(layout); + for(vector::const_iterator i=routers.begin(); i!=routers.end(); ++i) + (*i)->planner = planner; planner->plan_async(); }