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)
create_lead_route();
}
- destination = 0;
waypoints.clear();
sequence_points.clear();
current_sequence = 0;
return routes.front();
}
+void TrainRouter::use_planned_route()
+{
+ if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE)
+ return;
+
+ const list<Route *> &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<SequencePoint>::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())
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.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);
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;
}
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<unsigned>(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)
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<Route *> &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())
{
SequencePoint &sp = sequence_points.front();
if(sp.block==&track->get_block() && !sp.is_cleared())
+ {
+ arrival = WAITING_FOR_SEQUENCE;
train.stop_at(&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));
+ 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))
metrics_stale = false;
- if(!destination)
+ if(waypoints.empty())
return;
- metrics.push_back(new TrainRouteMetric(*destination));
for(vector<const TrackChain *>::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()]);
+ for(unsigned i=metrics.size()-1; i-->0; )
+ metrics[i]->chain_to(*metrics[i+1]);
}
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)
}
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))
{
return true;
}
-void TrainRouter::start_planning(Layout &layout)
+void TrainRouter::get_routers(Layout &layout, vector<TrainRouter *> &routers)
{
- vector<TrainRouter *> routers;
const map<unsigned, Train *> &trains = layout.get_trains();
routers.reserve(trains.size());
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
if(TrainRouter *router = i->second->get_ai_of_type<TrainRouter>())
routers.push_back(router);
+}
+
+void TrainRouter::start_planning(Layout &layout)
+{
+ vector<TrainRouter *> routers;
+ get_routers(layout, routers);
for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
if((*i)->metrics_stale)
RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
for(vector<TrainRouter *>::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<TrainRouter *> routers;
+ get_routers(layout, routers);
+
+ for(vector<TrainRouter *>::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),
projects / r2c2.git / blobdiff