+#include "driver.h"
#include "layout.h"
#include "route.h"
#include "trackiter.h"
void TrainRouter::tick(const Time::TimeDelta &dt)
{
- if(delay)
- {
- delay -= dt;
- if(delay<Time::zero)
- {
- duration = max(duration+delay, Time::zero);
- delay = Time::zero;
- }
- }
- else if(duration)
- duration = max(duration-dt, Time::zero);
-
if(waypoints_changed && !planner)
start_planning(train.get_layout());
if(planner && planner->check()!=TrainRoutePlanner::PENDING)
apply_plan(train.get_layout(), *planner);
+ Layout &layout = train.get_layout();
+ if(!layout.get_driver().is_halted() && !layout.get_clock().is_stopped())
+ {
+ if(delay)
+ {
+ delay -= dt;
+ if(delay<Time::zero)
+ {
+ duration = max(duration+delay, Time::zero);
+ delay = Time::zero;
+ }
+ }
+ else if(duration)
+ duration = max(duration-dt, Time::zero);
+ }
+
if(sequence_check_pending)
{
if(sequence_points.front().is_cleared())
return true;
}
-bool TrainRouter::is_valid_for_track(const Route &route, const TrackIter &track) const
-{
- if(!route.has_track(*track))
- return false;
- if(track->get_type().is_turnout() && route.get_turnout(track->get_turnout_address())<0 && route.has_track(*track.flip()))
- return false;
- return true;
-}
-
bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &track)
{
- if(!is_valid_for_track(**route, track))
+ Track &prev_track = *track.flip();
+ unsigned taddr = (track->get_type().is_turnout() ? track->get_turnout_address() : 0);
+ for(unsigned i=0; route!=routes.end(); ++i)
{
- ++route;
- if(route==routes.end())
- return false;
- if(!is_valid_for_track(**route, track))
+ bool in_route = (*route)->has_track(*track);
+ bool prev_in_route = (*route)->has_track(prev_track);
+ bool known_path = (!taddr || (*route)->get_turnout(taddr)>=0);
+
+ if(in_route && (known_path || !prev_in_route))
+ return true;
+ else if(i==0 || prev_in_route)
+ ++route;
+ else
throw logic_error("internal error (routes are not continuous)");
}
- return true;
+ return false;
}
void TrainRouter::get_routers(Layout &layout, vector<TrainRouter *> &routers)
void TrainRouter::apply_plan(Layout &layout, TrainRoutePlanner &planner)
{
+ if(planner.get_result()==TrainRoutePlanner::FAILED)
+ layout.emergency(0, "Route planning failed");
+
vector<TrainRouter *> routers;
get_routers(layout, routers);