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))
+ bool start_new_route = route->has_track(*j->track);
+ if(!start_new_route)
+ {
+ unsigned nls = j->track->get_n_link_slots();
+ for(unsigned k=0; (!start_new_route && k<nls); ++k)
+ {
+ Track *link = j->track->get_link(k);
+ start_new_route = (link && link!=history[0] && route->has_track(*link));
+ }
+ }
+
+ if(start_new_route)
{
route = new Route(j->info->train->get_layout());
route->set_name("Router");
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)
{
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;
- }
+ 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()),