for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
TrainRoutingInfo info(*i->second);
- if(info.router && info.router->has_destination())
+ if(info.router && info.router->get_destination())
routed_trains.push_back(info);
}
{
i->route = new Route(i->train->get_layout());
i->route->set_name("Router");
+ i->route->set_temporary(true);
}
for(RoutingStep *i=&goal; i; i=i->prev)
TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
info(&inf),
occupied_tracks(0),
- state(MOVING)
+ state(MOVING),
+ delay(info->router->get_departure_delay())
{
const Vehicle *veh = &info->train->get_vehicle(0);
// TODO margins
- float half_length = veh->get_type().get_length()/2;
- TrackOffsetIter track_and_offs = veh->get_track_iter().advance(half_length);
+ TrackOffsetIter track_and_offs = veh->get_placement().get_position(VehiclePlacement::FRONT_BUFFER);
track = track_and_offs.track_iter();
offset = track_and_offs.offset();
path = track->get_active_path();
while(Vehicle *next = veh->get_link(1))
veh = next;
- track_and_offs = veh->get_track_iter().advance(-half_length);
+ track_and_offs = veh->get_placement().get_position(VehiclePlacement::BACK_BUFFER);
back_offset = track_and_offs.offset();
TrackIter iter = track_and_offs.track_iter();
Time::TimeDelta TrainRoutePlanner::TrainRoutingState::get_time_to_next_track() const
{
// TODO Consider the speed of the train
- return (track->get_type().get_path_length(path)-offset)*Time::sec;
+ return (track->get_type().get_path_length(path)-offset)*Time::sec+delay;
}
bool TrainRoutePlanner::TrainRoutingState::is_occupied(Track &trk) const
{
time += dt;
for(vector<TrainRoutingState>::iterator i=trains.begin(); i!=trains.end(); ++i)
- if(i->state==MOVING)
+ {
+ if(i->delay)
+ {
+ i->delay -= dt;
+ if(i->delay>Time::zero)
+ continue;
+ i->delay = Time::zero;
+ }
+ else if(i->state==MOVING)
{
float distance = dt/Time::sec;
i->advance(distance);
}
+ }
}
bool TrainRoutePlanner::RoutingStep::is_goal() const