#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)
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