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);
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
destination_changed = true;
}
+void TrainRouter::set_trip_duration(const Time::TimeDelta &d)
+{
+ duration = d;
+}
+
void TrainRouter::message(const Message &msg)
{
if(msg.type=="set-route")
}
else if(msg.type=="set-departure-delay")
set_departure_delay(msg.value.value<Time::TimeDelta>());
+ else if(msg.type=="set-trip-duration")
+ set_trip_duration(msg.value.value<Time::TimeDelta>());
}
void TrainRouter::tick(const Time::TimeDelta &dt)
if(delay)
{
delay -= dt;
- if(delay<=Time::zero)
+ if(delay<Time::zero)
+ {
+ duration = max(duration+delay, Time::zero);
delay = Time::zero;
+ }
}
+ else if(duration)
+ duration = max(duration-dt, Time::zero);
if(destination_changed && !planner)
start_planning(train.get_layout());
- if(planner && planner->get_result()!=TrainRoutePlanner::PENDING)
+ if(planner && planner->check()!=TrainRoutePlanner::PENDING)
{
destination_changed = false;
if(planner->get_result()==TrainRoutePlanner::COMPLETE)
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)
lead->set_temporary(true);
}
- bool target_reached = false;
- for(TrackIter i=train.get_block_allocator().first().track_iter(); i; i=i.next())
+ unsigned target_tracks = 0;
+ for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next())
{
if(i->get_block().get_train()!=&train)
break;
if(target)
{
if(target->has_track(*i))
- target_reached = true;
- else if(target_reached)
+ ++target_tracks;
+ else if(target_tracks>0)
break;
}
lead->add_track(*i);
void TrainRouter::start_planning(Layout &layout)
{
- RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
-
+ 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>())
- {
- if(router->metrics_stale)
- {
- router->create_metrics();
- router->metrics_stale = false;
- }
- router->planner = planner;
- }
+ routers.push_back(router);
+
+ for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+ if((*i)->metrics_stale)
+ (*i)->create_metrics();
+
+ RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
+ for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+ (*i)->planner = planner;
- planner->plan();
+ planner->plan_async();
}