i->track_history[j] = 0;
}
+ map<Track *, SequencingInfo *> sequenced_tracks;
+ unsigned sequence = steps.size();
for(const RoutingStep *i=&goal; i; i=i->prev)
- {
for(vector<TrainRoutingState>::const_iterator j=i->trains.begin(); j!=i->trains.end(); ++j)
{
Track **history = j->info->track_history;
if(j->track.track()==history[0])
continue;
- if(j->state==WAITING || j->state==BLOCKED)
- j->info->waits.push_front(&*j);
-
Route *route = j->info->routes.front();
if(route->has_track(*j->track))
{
for(unsigned k=2; k>0; --k)
history[k] = history[k-1];
history[0] = j->track.track();
+
+ bool waitable = j->track.endpoint().paths!=j->track->get_type().get_paths();
+ map<Track *, SequencingInfo *>::iterator k = sequenced_tracks.find(j->track.track());
+ if(k!=sequenced_tracks.end())
+ {
+ if(!k->second->preceding)
+ {
+ k->second->preceding = j->info;
+ k->second->sequence_in = sequence;
+ }
+ j->info->sequence.push_front(SequencingInfo(j->track.track(), sequence));
+ if(waitable)
+ k->second = &j->info->sequence.front();
+ --sequence;
+ }
+ else if(waitable)
+ {
+ j->info->sequence.push_front(SequencingInfo(j->track.track(), sequence));
+ sequenced_tracks[j->track.track()] = &j->info->sequence.front();
+ --sequence;
+ }
}
- }
for(vector<TrainRoutingInfo>::iterator i=routed_trains.begin(); i!=routed_trains.end(); ++i)
{
for(list<Route *>::iterator j=i->routes.begin(); j!=i->routes.end(); ++j)
- i->router->add_route(**j);
- const TrainRoutingState *current_wait = 0;
- for(list<const TrainRoutingState *>::const_iterator j=i->waits.begin(); j!=i->waits.end(); ++j)
- if(!current_wait || (*j)->track.track()!=current_wait->track.track())
- {
- Block &block = (*j)->track.next()->get_block();
- i->router->add_wait(block, 0);
- current_wait = *j;
- }
+ {
+ if(j==i->routes.begin())
+ i->router->set_route(*j);
+ else
+ i->router->add_route(**j);
+ }
+
+ for(list<SequencingInfo>::iterator j=i->sequence.begin(); j!=i->sequence.end(); ++j)
+ {
+ if(j->preceding && j->preceding!=&*i)
+ i->router->add_sequence_point(j->track->get_block(), *j->preceding->train, j->sequence_in, j->sequence_out);
+ else
+ i->router->add_sequence_point(j->track->get_block(), j->sequence_out);
+ }
}
}
+TrainRoutePlanner::SequencingInfo::SequencingInfo(Track *t, unsigned o):
+ track(t),
+ preceding(0),
+ sequence_in(0),
+ sequence_out(o)
+{ }
+
+
TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
train(&t),
speed(train->get_maximum_speed()),
state(other.state),
delay(other.delay),
waypoint(other.waypoint),
+ distance_traveled(other.distance_traveled),
remaining_estimate(other.remaining_estimate),
+ wait_time(other.wait_time),
blocked_by(other.blocked_by)
{
++occupied_tracks->refcount;
--occupied_tracks->n_tracks;
}
+ distance_traveled += distance;
remaining_estimate -= distance;
}
+void TrainRoutePlanner::TrainRoutingState::advance(const Time::TimeDelta &dt)
+{
+ if(delay>=dt)
+ {
+ delay -= dt;
+ return;
+ }
+
+ float secs = dt/Time::sec;
+ if(delay)
+ {
+ secs -= delay/Time::sec;
+ delay = Time::zero;
+ }
+
+ if(state==MOVING)
+ advance(info->speed*secs);
+ else if(state!=ARRIVED)
+ wait_time += secs*Time::sec;
+}
+
void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
{
float distance = occupied_tracks->path_length-offset;
TrainRoutePlanner::RoutingStep::RoutingStep(const RoutingStep *p):
time(p->time),
- total_estimate(p->total_estimate),
+ cost_estimate(p->cost_estimate),
trains(p->trains),
prev(p)
{ }
{
time += dt;
for(vector<TrainRoutingState>::iterator i=trains.begin(); i!=trains.end(); ++i)
- {
- if(i->delay)
- {
- i->delay -= dt;
- if(i->delay>Time::zero)
- continue;
- i->delay = Time::zero;
- }
- else if(i->state==MOVING)
- i->advance(i->info->speed*(dt/Time::sec));
- }
+ i->advance(dt);
}
void TrainRoutePlanner::RoutingStep::update_estimate()
{
+ cost_estimate = Time::zero;
for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
- {
- Time::TimeDelta t = time+(i->remaining_estimate/i->info->speed)*Time::sec+i->delay;
- if(i==trains.begin() || t>total_estimate)
- total_estimate = t;
- }
+ if(i->remaining_estimate>=0)
+ cost_estimate += i->wait_time+((i->distance_traveled+i->remaining_estimate)/i->info->speed)*Time::sec;
}
bool TrainRoutePlanner::RoutingStep::is_viable() const
{
- if(total_estimate<Time::zero)
- return false;
-
for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
if(i->remaining_estimate<0)
return false;
bool TrainRoutePlanner::RoutingStep::operator<(const RoutingStep &other) const
{
- return total_estimate<other.total_estimate;
+ return cost_estimate<other.cost_estimate;
}
} // namespace R2C2