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);
}
RoutingStep next(&step);
next.advance(dt);
TrainRouter &router = *train.info->router;
- if(router.is_destination(*train.track) && !router.is_destination(*next_track))
+ if(train.waypoint<0 && router.is_destination(*train.track) && !router.is_destination(*next_track))
{
next.trains[train_index].state = ARRIVED;
new_steps.push_back(next);
}
else
{
+ if(train.waypoint>=0 && router.is_waypoint(train.waypoint, *train.track) && !router.is_waypoint(train.waypoint, *next_track))
+ {
+ ++next.trains[train_index].waypoint;
+ if(next.trains[train_index].waypoint>=static_cast<int>(router.get_n_waypoints()))
+ next.trains[train_index].waypoint = -1;
+ }
+
next.trains[train_index].advance_track(0);
const TrackType::Endpoint &next_entry_ep = next_track.endpoint();
{
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()),
+ waypoint(info->router->get_n_waypoints() ? 0 : -1)
{
const Vehicle *veh = &info->train->get_vehicle(0);
- track = TrackIter(veh->get_track(), veh->get_entry());
// TODO margins
- offset = veh->get_offset()+veh->get_type().get_length()/2;
+ 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();
- float path_length = track->get_type().get_path_length(path);
- while(offset>path_length)
- {
- offset -= path_length;
- track = track.next();
- path = track->get_active_path();
- path_length = track->get_type().get_path_length(path);
- }
-
while(Vehicle *next = veh->get_link(1))
veh = next;
- back_offset = veh->get_offset()-veh->get_type().get_length()/2;
-
- TrackIter iter(veh->get_track(), veh->get_entry());
- while(back_offset<0)
- {
- TrackIter prev = iter.flip().reverse();
- if(!prev)
- break;
- iter = prev;
- back_offset += iter->get_type().get_path_length(iter->get_active_path());
- }
+ track_and_offs = veh->get_placement().get_position(VehiclePlacement::BACK_BUFFER);
+ back_offset = track_and_offs.offset();
+ TrackIter iter = track_and_offs.track_iter();
while(1)
{
occupied_tracks = new OccupiedTrack(*iter, iter->get_active_path(), occupied_tracks);
occupied_tracks(other.occupied_tracks),
offset(other.offset),
back_offset(other.back_offset),
- state(other.state)
+ state(other.state),
+ waypoint(other.waypoint)
{
++occupied_tracks->refcount;
}
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