#include <msp/core/maputils.h>
+#include <msp/time/utils.h>
#include "catalogue.h"
#include "layout.h"
#include "route.h"
TrainRoutePlanner::TrainRoutePlanner(Layout &layout):
goal(0),
+ timeout(10*Time::sec),
result(PENDING),
thread(0)
{
}
}
+void TrainRoutePlanner::set_timeout(const Time::TimeDelta &t)
+{
+ timeout = t;
+}
+
TrainRoutePlanner::Result TrainRoutePlanner::plan()
{
prepare_plan();
void TrainRoutePlanner::create_plan()
{
+ Time::TimeStamp timeout_stamp = Time::now()+timeout;
+ unsigned count = 0;
while(!queue.empty())
{
const RoutingStep &step = get_step();
}
add_steps(step);
+
+ if(++count>=1000)
+ {
+ if(Time::now()>timeout_stamp)
+ break;
+ count = 0;
+ }
}
result = FAILED;
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>()),
- waypoints(router ? router->get_n_waypoints() : 0),
has_duration(false)
{
- if(!waypoints.empty())
+ if(unsigned n_wps = router->get_n_waypoints())
{
- metrics.resize(waypoints.size());
- for(unsigned i=0; i<waypoints.size(); ++i)
+ waypoints.reserve(n_wps),
+ metrics.reserve(n_wps);
+ for(unsigned i=0; i<n_wps; ++i)
{
- waypoints[i] = &router->get_waypoint(i);
- metrics[i] = &router->get_metric(i);
+ waypoints.push_back(router->get_waypoint(i));
+ metrics.push_back(&router->get_metric(i));
}
has_duration = router->get_trip_duration();
}
{
TrackIter next_track = track.next(path);
- const TrackChain *wp_chain = info->waypoints[waypoint];
- if(wp_chain->has_track(*track) && !wp_chain->has_track(*next_track))
- {
- if(waypoint+1<info->waypoints.size())
- ++waypoint;
- else
+ const TrainRouter::Waypoint &wp = info->waypoints[waypoint];
+ if(wp.chain->has_track(*track) && !wp.chain->has_track(*next_track))
+ if(wp.direction==TrackChain::UNSPECIFIED || track==wp.chain->iter_for(*track, wp.direction))
{
- state = ARRIVED;
- return true;
+ if(waypoint+1<info->waypoints.size())
+ ++waypoint;
+ else
+ {
+ state = ARRIVED;
+ return true;
+ }
}
- }
if(info->first_noncritical->has_track(*track))
critical = false;
void TrainRoutePlanner::TrainRoutingState::update_estimate()
{
TrackIter iter = track.reverse(path);
- float distance = info->metrics[waypoint]->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)