+#include "catalogue.h"
#include "layout.h"
#include "route.h"
#include "train.h"
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);
}
bool changes = false;
for(vector<TrainRoutingState>::iterator i=next.trains.begin(); i!=next.trains.end(); ++i)
{
+ if(i->state==ARRIVED)
+ continue;
+
TrainState old_state = i->state;
if(i->state==BLOCKED)
i->state = MOVING;
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();
TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
train(&t),
+ speed(train->get_maximum_speed()),
router(train->get_ai_of_type<TrainRouter>()),
route(0)
-{ }
+{
+ // If no maximum speed is specified, use a sensible default
+ if(!speed)
+ speed = 20*train->get_layout().get_catalogue().get_scale();
+}
TrainRoutePlanner::OccupiedTrack::OccupiedTrack(Track &t, unsigned p, OccupiedTrack *n):
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);
// TODO margins
occupied_tracks(other.occupied_tracks),
offset(other.offset),
back_offset(other.back_offset),
- state(other.state)
+ state(other.state),
+ delay(other.delay),
+ 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)/info->speed)*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)
{
- float distance = dt/Time::sec;
- i->advance(distance);
+ 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));
+ }
}
bool TrainRoutePlanner::RoutingStep::is_goal() const