TrainRoutePlanner::~TrainRoutePlanner()
{
- delete thread;
+ if(thread)
+ {
+ thread->join();
+ delete thread;
+ }
}
TrainRoutePlanner::Result TrainRoutePlanner::plan()
{
if(result==PENDING && goal)
{
+ if(thread)
+ {
+ thread->join();
+ delete thread;
+ thread = 0;
+ }
finalize_plan();
- delete thread;
- thread = 0;
}
return result;
TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
train(&t),
speed(train->get_maximum_speed()),
+ first_noncritical(train->get_first_noncritical_block().block()),
router(train->get_ai_of_type<TrainRouter>()),
destination(0),
has_duration(false)
if(router)
{
destination = router->get_destination();
- 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)
+ if(destination)
{
- waypoints[i] = &router->get_waypoint(i);
- metrics[i+1] = &router->get_metric(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();
}
- has_duration = router->get_trip_duration();
}
// If no maximum speed is specified, use a sensible default
TrainRoutePlanner::TrainRoutingState::TrainRoutingState(TrainRoutingInfo &inf):
info(&inf),
+ critical(true),
occupied_tracks(0),
state(MOVING),
delay(info->router->get_departure_delay()),
info(other.info),
track(other.track),
path(other.path),
+ critical(other.critical),
occupied_tracks(other.occupied_tracks),
offset(other.offset),
back_offset(other.back_offset),
waypoint = -1;
}
+ if(info->first_noncritical->has_track(*track))
+ critical = false;
+
return false;
}
offset += distance;
back_offset += distance;
- OccupiedTrack *last_occ = occupied_tracks;
- for(unsigned n=occupied_tracks->n_tracks; n>1; --n)
- last_occ = last_occ->next;
+ unsigned count_to_free = 0;
+ unsigned last_sensor_addr = 0;
+ float distance_after_sensor = 0;
+ OccupiedTrack *occ = occupied_tracks;
+ for(unsigned n=occupied_tracks->n_tracks; n>0; --n)
+ {
+ if(unsigned saddr = occ->track->get_sensor_address())
+ {
+ if(saddr!=last_sensor_addr)
+ {
+ count_to_free = 0;
+ distance_after_sensor = 0;
+ }
+ last_sensor_addr = saddr;
+ }
- // XXX What if there's multiple tracks to remove?
- if(back_offset>last_occ->path_length)
+ ++count_to_free;
+ distance_after_sensor += occ->path_length;
+
+ occ = occ->next;
+ }
+
+ if(count_to_free && back_offset>distance_after_sensor)
{
- back_offset -= last_occ->path_length;
+ back_offset -= distance_after_sensor;
if(occupied_tracks->refcount>1)
{
--occupied_tracks->refcount;
occupied_tracks = new OccupiedTrack(*occupied_tracks);
}
- --occupied_tracks->n_tracks;
+ occupied_tracks->n_tracks -= count_to_free;
}
distance_traveled += distance;
train.advance_track(0);
const TrackType::Endpoint &next_entry_ep = next_track.endpoint();
- for(unsigned i=0; next_entry_ep.paths>>i; ++i)
- if(next_entry_ep.has_path(i))
- {
- train.path = i;
- train.update_estimate();
- next.update_estimate();
- if(next.is_viable())
- new_steps.push_back(next);
- }
+ if(train.critical)
+ {
+ train.path = train.track->get_type().coerce_path(train.track.entry(), train.track->get_active_path());
+ train.update_estimate();
+ next.update_estimate();
+ if(next.is_viable())
+ new_steps.push_back(next);
+ }
+ else
+ {
+ for(unsigned i=0; next_entry_ep.paths>>i; ++i)
+ if(next_entry_ep.has_path(i))
+ {
+ train.path = i;
+ train.update_estimate();
+ next.update_estimate();
+ if(next.is_viable())
+ new_steps.push_back(next);
+ }
+ }
new_steps.sort();
for(list<RoutingStep>::iterator i=new_steps.begin(); ++i!=new_steps.end(); )
i->update_estimate();
}
- if(next_entry_ep.paths!=next_track->get_type().get_paths())
+ if(next_entry_ep.paths!=next_track->get_type().get_paths() && !train.critical)
{
RoutingStep wait(this);
wait.advance(dt);