for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
TrainRoutingInfo info(*i->second);
- if(info.destination)
+ if(!info.waypoints.empty())
routed_trains.push_back(info);
}
}
TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
train(&t),
speed(train->get_maximum_speed()),
- first_noncritical(train->get_first_noncritical_block().block()),
+ first_noncritical(train->get_last_critical_block().next().block()),
router(train->get_ai_of_type<TrainRouter>()),
- destination(0),
+ waypoints(router ? router->get_n_waypoints() : 0),
has_duration(false)
{
- if(router)
+ if(!waypoints.empty())
{
- destination = router->get_destination();
- if(destination)
+ metrics.resize(waypoints.size());
+ for(unsigned i=0; i<waypoints.size(); ++i)
{
- waypoints.resize(router->get_n_waypoints());
- metrics.resize(waypoints.size()+1);
- metrics[0] = &router->get_metric(-1);
- for(unsigned i=0; i<waypoints.size(); ++i)
- {
- waypoints[i] = &router->get_waypoint(i);
- metrics[i+1] = &router->get_metric(i);
- }
- has_duration = router->get_trip_duration();
+ waypoints[i] = &router->get_waypoint(i);
+ metrics[i] = &router->get_metric(i);
}
+ has_duration = router->get_trip_duration();
}
// If no maximum speed is specified, use a sensible default
state(MOVING),
delay(info->router->get_departure_delay()),
duration(info->router->get_trip_duration()),
- waypoint(info->waypoints.empty() ? -1 : 0),
+ waypoint(0),
blocked_by(-1)
{
const Vehicle *veh = &info->train->get_vehicle(0);
{
TrackIter next_track = track.next(path);
- if(waypoint<0 && info->destination->has_track(*track) && !info->destination->has_track(*next_track))
- {
- state = ARRIVED;
- return true;
- }
- else if(waypoint>=0 && info->waypoints[waypoint]->has_track(*track) && !info->waypoints[waypoint]->has_track(*next_track))
+ const TrackChain *wp_chain = info->waypoints[waypoint];
+ if(wp_chain->has_track(*track) && !wp_chain->has_track(*next_track))
{
- ++waypoint;
- if(waypoint>=static_cast<int>(info->waypoints.size()))
- waypoint = -1;
+ if(waypoint+1<info->waypoints.size())
+ ++waypoint;
+ else
+ {
+ state = ARRIVED;
+ return true;
+ }
}
if(info->first_noncritical->has_track(*track))
void TrainRoutePlanner::TrainRoutingState::update_estimate()
{
TrackIter iter = track.reverse(path);
- float distance = info->metrics[waypoint+1]->get_distance_from(*iter.track(), iter.entry());
- distance += track->get_type().get_path_length(path)-offset;
- remaining_estimate = distance;
+ remaining_estimate = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
+ if(remaining_estimate>=0)
+ remaining_estimate += track->get_type().get_path_length(path)-offset;
+}
+
+bool TrainRoutePlanner::TrainRoutingState::is_viable() const
+{
+ if(remaining_estimate<0)
+ return false;
+ if(critical && state==BLOCKED)
+ return false;
+ return true;
}
return;
}
- TrackIter next_track = train.track.next(train.path);
train.advance_track(0);
- const TrackType::Endpoint &next_entry_ep = next_track.endpoint();
+ const TrackType::Endpoint &entry_ep = train.track.endpoint();
if(train.critical)
{
train.path = train.track->get_type().coerce_path(train.track.entry(), train.track->get_active_path());
}
else
{
- for(unsigned i=0; next_entry_ep.paths>>i; ++i)
- if(next_entry_ep.has_path(i))
+ for(unsigned i=0; entry_ep.paths>>i; ++i)
+ if(entry_ep.has_path(i))
{
train.path = i;
train.update_estimate();
i->update_estimate();
}
- if(next_entry_ep.paths!=next_track->get_type().get_paths() && !train.critical)
+ if(entry_ep.paths!=train.track->get_type().get_paths() && !train.critical)
{
RoutingStep wait(this);
wait.advance(dt);
{
i->blocked_by = get_occupant(*next_track);
if(i->blocked_by>=0)
+ {
+ if(i->info->first_noncritical->has_track(*next_track))
+ i->critical = false;
i->state = BLOCKED;
+ }
else if(i->state==BLOCKED)
i->state = MOVING;
}
bool TrainRoutePlanner::RoutingStep::is_viable() const
{
for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
- if(i->remaining_estimate<0)
+ if(!i->is_viable())
return false;
for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)