X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=266bc6fc3641f4e6a72c069771132cb734f0546b;hb=443cb39c7ca3b4e56eb561aa054fa48dd3cbc7d8;hp=ff3c66402ad98b84e830cbe04dd77cd0bc0d8cca;hpb=57e2b569e3a954f84dce5ba750dfae4c8faea952;p=r2c2.git diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp index ff3c664..266bc6f 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(); @@ -96,16 +77,25 @@ void TrainRouter::route_changed() 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(); + 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; break; } if(&track->get_block()==fncb.block()) break; + + if(seq_begin!=sequence_points.end() && seq_begin->block==&track->get_block()) + { + current_sequence = seq_begin->sequence_out; + ++seq_begin; + } } + + sequence_points.erase(sequence_points.begin(), seq_begin); } if(!already_at_end) @@ -234,20 +224,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; @@ -338,7 +316,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 +327,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; @@ -385,6 +363,7 @@ void TrainRouter::train_advanced(Block &block) if(!wp.has_track(*t_iter)) { waypoints.erase(waypoints.begin()); + metrics_stale = true; signal_waypoint_reached.emit(&wp); signal_event.emit(Message("waypoint-reached", &wp)); break; @@ -421,6 +400,8 @@ void TrainRouter::create_metrics() delete *i; metrics.clear(); + metrics_stale = false; + if(!destination) return; @@ -430,47 +411,70 @@ 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(); + + unsigned count = 0; + for(TrackIter i=next_track.flip(); (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()) + next_track = i.flip(); + break; + } } - unsigned target_tracks = 0; - for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next()) + if(!routes.front()->has_track(*next_track) && !routes.front()->has_track(*next_track.flip())) { - 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=next_track.flip(); (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); + + if(lead) + lead->add_track(*i); } - 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)) {