X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=1ada62104cee5724ac208be1e1e57cf7dd18946c;hb=2fb2e58685c521ea76aab9f6d7cffe1186c9814a;hp=e38e29c3ff95d92627877ce350917b36e3c70303;hpb=67cd1b26d2833903e51b91e167a3d1f7ae884a31;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index e38e29c..1ada621 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -1,3 +1,4 @@
+#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackiter.h"
@@ -15,11 +16,10 @@ namespace R2C2 {
 TrainRouter::TrainRouter(Train &t):
 	TrainAI(t),
 	priority(0),
-	arrival(ON_THE_WAY),
+	state(ON_THE_WAY),
 	waypoints_changed(false),
 	metrics_stale(false),
-	current_sequence(0),
-	sequence_check_pending(false)
+	current_sequence(0)
 {
 	train.get_layout().signal_block_reserved.connect(sigc::mem_fun(this, &TrainRouter::block_reserved));
 	train.signal_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_advanced));
@@ -48,8 +48,6 @@ bool TrainRouter::set_route(const Route *r)
 
 	waypoints.clear();
 	sequence_points.clear();
-	current_sequence = 0;
-	sequence_check_pending = false;
 
 	route_changed();
 
@@ -67,6 +65,8 @@ void TrainRouter::use_planned_route()
 {
 	if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE)
 		return;
+	if(waypoints.empty())
+		return;
 
 	const list<Route *> &planned_routes = planner->get_routes_for(train);
 
@@ -76,29 +76,29 @@ void TrainRouter::use_planned_route()
 
 	sequence_points = planner->get_sequence_for(train);
 	current_sequence = 0;
-	sequence_check_pending = false;
 
 	route_changed();
 }
 
 void TrainRouter::route_changed()
 {
-	BlockIter fncb = train.get_first_noncritical_block();
+	BlockIter fncb = train.get_last_critical_block().next();
 
-	arrival = ON_THE_WAY;
+	state = ON_THE_WAY;
 	reserving_route = routes.begin();
 	if(!routes.empty())
 	{
 		/* Find the route that should be used for the next allocated block.  We
 		can't rely on the resync code in block_reserved since we may need to
 		clear the stop marker to continue allocation. */
-		TrackIter track = train.get_block_allocator().first().track_iter();
+		const BlockAllocator &allocator = train.get_block_allocator();
+		TrackIter track = allocator.first().track_iter();
 		list<SequencePoint>::iterator seq_begin = sequence_points.begin();
 		for(; track; track=track.next())
 		{
 			if(!advance_to_track(reserving_route, track))
 			{
-				arrival = RESERVED_TO_END;
+				state = (allocator.is_block_current(track->get_block()) ? ADVANCED_TO_END : RESERVED_TO_END);
 				break;
 			}
 			if(&track->get_block()==fncb.block())
@@ -118,21 +118,18 @@ void TrainRouter::route_changed()
 		{
 			const SequencePoint &sp = sequence_points.front();
 			if(sp.block==fncb.block() && !sp.is_cleared())
-			{
-				arrival = WAITING_FOR_SEQUENCE;
-				sequence_check_pending = true;
-			}
+				state = SEQUENCE_CHECK_PENDING;
 		}
 	}
 
 	/* Refresh from the first non-critical block to pick up any changes in the
-	route.  Set stop marker first in case an arrival condition was met within the
+	route.  Set stop marker first in case a stopping state was set within the
 	critical blocks. */
-	if(arrival)
+	if(state!=ON_THE_WAY)
 		train.stop_at(&*fncb.flip());
 	train.refresh_blocks_from(*fncb);
-	// If no arrival condition was found, clear a possible previous stop marker.
-	if(!arrival)
+	// If we don't need to stop, clear a possible previous stop marker.
+	if(state==ON_THE_WAY)
 		train.stop_at(0);
 
 	const Route *route = get_route();
@@ -143,26 +140,26 @@ void TrainRouter::route_changed()
 void TrainRouter::set_destination(const TrackChain &d)
 {
 	if(waypoints.empty())
-		waypoints.push_back(&d);
+		waypoints.push_back(Waypoint(d));
 	else
-		waypoints.back() = &d;
+		waypoints.back() = Waypoint(d);
 	waypoints_changed = true;
 	metrics_stale = true;
 }
 
-void TrainRouter::add_waypoint(const TrackChain &wp)
+void TrainRouter::add_waypoint(const TrackChain &chain, TrackChain::Direction dir)
 {
-	waypoints.push_back(&wp);
+	waypoints.push_back(Waypoint(chain, dir));
 	waypoints_changed = true;
 	metrics_stale = true;
 }
 
-const TrackChain &TrainRouter::get_waypoint(unsigned index) const
+const TrainRouter::Waypoint &TrainRouter::get_waypoint(unsigned index) const
 {
 	if(index>=waypoints.size())
 		throw out_of_range("TrainRouter::is_waypoint");
 
-	return *waypoints[index];
+	return waypoints[index];
 }
 
 const TrainRouteMetric &TrainRouter::get_metric(int index) const
@@ -211,7 +208,12 @@ void TrainRouter::message(const Message &msg)
 	}
 	else if(msg.type=="add-waypoint")
 	{
-		if(msg.value.check_type<TrackChain *>())
+		if(msg.value.check_type<Waypoint>())
+		{
+			Waypoint wp = msg.value.value<Waypoint>();
+			add_waypoint(*wp.chain, wp.direction);
+		}
+		else if(msg.value.check_type<TrackChain *>())
 			add_waypoint(*msg.value.value<TrackChain *>());
 		else
 			add_waypoint(*msg.value.value<const TrackChain *>());
@@ -224,41 +226,46 @@ void TrainRouter::message(const Message &msg)
 
 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);
 
-	if(sequence_check_pending)
+	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(state==SEQUENCE_CHECK_PENDING)
 	{
 		if(sequence_points.front().is_cleared())
 		{
-			arrival = ON_THE_WAY;
+			state = ON_THE_WAY;
 			train.stop_at(0);
 		}
-		sequence_check_pending = false;
+		else
+			state = WAITING_FOR_SEQUENCE;
 	}
 
-	if(arrival==RESERVED_TO_END && !train.get_speed())
+	if(state==ADVANCED_TO_END && !train.get_speed())
 	{
-		signal_arrived.emit(waypoints.back());
-		signal_event.emit(Message("arrived", waypoints.back()));
-		arrival = ARRIVED;
+		signal_arrived.emit(waypoints.back().chain);
+		signal_event.emit(Message("arrived", waypoints.back().chain));
+		state = ARRIVED;
 	}
-	else if(arrival==ARRIVED && !train.get_block_allocator().is_active())
+	else if(state==ARRIVED && !train.get_block_allocator().is_active())
 		set_route(0);
 }
 
@@ -286,11 +293,14 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 			return;
 
 		// Are we waiting for the other train to pass a sequence point?
-		SequencePoint &sp = sequence_points.front();
-		if(sp.preceding_train==t && sp.block==&block)
-			/* The other train's router will advance its sequence on the same
-			signal and may not have handled it yet. */
-			sequence_check_pending = true;
+		if(state==WAITING_FOR_SEQUENCE)
+		{
+			SequencePoint &sp = sequence_points.front();
+			if(sp.preceding_train==t && sp.block==&block)
+				/* The other train's router will advance its sequence on the same
+				signal and may not have handled it yet. */
+				state = SEQUENCE_CHECK_PENDING;
+		}
 
 		return;
 	}
@@ -321,7 +331,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 	if(reserving_route==routes.end() || !(*reserving_route)->has_track(*track))
 	{
 		reserving_route = routes.begin();
-		arrival = ON_THE_WAY;
+		state = ON_THE_WAY;
 		track = t->get_block_allocator().first().track_iter();
 		for(; track; track=track.next())
 		{
@@ -339,7 +349,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 		if(!advance_to_track(reserving_route, track))
 		{
 			// We've reached the end of the route.  Stop here.
-			arrival = RESERVED_TO_END;
+			state = RESERVED_TO_END;
 			train.stop_at(&block);
 			return;
 		}
@@ -353,7 +363,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 		SequencePoint &sp = sequence_points.front();
 		if(sp.block==&track->get_block() && !sp.is_cleared())
 		{
-			arrival = WAITING_FOR_SEQUENCE;
+			state = SEQUENCE_CHECK_PENDING;
 			train.stop_at(&block);
 		}
 	}
@@ -361,27 +371,45 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 
 void TrainRouter::train_advanced(Block &block)
 {
-	BlockIter b_iter = train.get_block_allocator().iter_for(block);
-
-	if(waypoints.size()>1)
+	if(!waypoints.empty())
 	{
 		// A waypoint is considered reached when the train has advanced through it.
-		const TrackChain &wp = *waypoints.front();
+		BlockIter b_iter = train.get_block_allocator().iter_for(block);
+		const Waypoint &wp = waypoints.front();
 		TrackIter t_iter = b_iter.track_iter();
-		if(wp.has_track(*t_iter))
+		if(wp.chain->has_track(*t_iter))
 		{
-			for(; t_iter; t_iter=t_iter.next())
+			while(1)
 			{
-				if(!wp.has_track(*t_iter))
+				TrackIter next = t_iter.next();
+				if(!next)
+					break;
+
+				if(!wp.chain->has_track(*next))
 				{
-					waypoints.erase(waypoints.begin());
-					metrics_stale = true;
-					signal_waypoint_reached.emit(&wp);
-					signal_event.emit(Message("waypoint-reached", &wp));
+					if(wp.direction!=TrackChain::UNSPECIFIED)
+						if(t_iter!=wp.chain->iter_for(*t_iter, wp.direction))
+							break;
+
+					if(waypoints.size()==1)
+					{
+						if(state==RESERVED_TO_END)
+							state = ADVANCED_TO_END;
+					}
+					else
+					{
+						const TrackChain *chain = wp.chain;
+						waypoints.erase(waypoints.begin());
+						metrics_stale = true;
+						signal_waypoint_reached.emit(chain);
+						signal_event.emit(Message("waypoint-reached", chain));
+					}
 					break;
 				}
-				else if(!block.has_track(*t_iter))
+				else if(!block.has_track(*next))
 					break;
+
+				t_iter = next;
 			}
 		}
 	}
@@ -417,8 +445,8 @@ void TrainRouter::create_metrics()
 	if(waypoints.empty())
 		return;
 
-	for(vector<const TrackChain *>::const_iterator i=waypoints.begin(); i!=waypoints.end(); ++i)
-		metrics.push_back(new TrainRouteMetric(**i));
+	for(vector<Waypoint>::const_iterator i=waypoints.begin(); i!=waypoints.end(); ++i)
+		metrics.push_back(new TrainRouteMetric(*i->chain, i->direction));
 
 	for(unsigned i=metrics.size()-1; i-->0; )
 		metrics[i]->chain_to(*metrics[i+1]);
@@ -429,23 +457,24 @@ bool TrainRouter::create_lead_route()
 	if(routes.empty() || !train.is_placed())
 		return false;
 
-	BlockIter fncb = train.get_first_noncritical_block();
-	TrackIter next_track = fncb.track_iter();
+	BlockIter lcb = train.get_last_critical_block();
+	TrackIter last_track_rev = lcb.reverse().track_iter();
 
 	unsigned count = 0;
-	for(TrackIter i=next_track.flip(); (i && i->get_block().get_train()==&train); i=i.next())
+	for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next())
 	{
 		if(routes.front()->has_track(*i))
 			++count;
 		else if(count>0)
 		{
 			if(count==routes.front()->get_tracks().size())
-				next_track = i.flip();
+				last_track_rev = i;
 			break;
 		}
 	}
 
-	if(!routes.front()->has_track(*next_track) && !routes.front()->has_track(*next_track.flip()))
+	TrackIter next_track = last_track_rev.flip();
+	if(!routes.front()->has_track(*last_track_rev) && !routes.front()->has_track(*next_track))
 	{
 		Route *pf = Route::find(next_track, *routes.front());
 		if(!pf)
@@ -455,7 +484,7 @@ bool TrainRouter::create_lead_route()
 	}
 
 	Route *lead = 0;
-	for(TrackIter i=next_track.flip(); (i && i->get_block().get_train()==&train); i=i.next())
+	for(TrackIter i=last_track_rev; (i && i->get_block().get_train()==&train); i=i.next())
 	{
 		if(!lead && !routes.front()->has_track(*i))
 		{
@@ -476,36 +505,35 @@ bool TrainRouter::create_lead_route()
 	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::get_routers(Layout &layout, vector<TrainRouter *> &routers, TrainRoutePlanner *planner)
 {
 	const map<unsigned, Train *> &trains = layout.get_trains();
 	routers.reserve(trains.size());
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 		if(TrainRouter *router = i->second->get_ai_of_type<TrainRouter>())
-			routers.push_back(router);
+			if(!planner || router->planner.get()==planner)
+				routers.push_back(router);
 }
 
 void TrainRouter::start_planning(Layout &layout)
@@ -529,18 +557,31 @@ void TrainRouter::start_planning(Layout &layout)
 
 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);
+	get_routers(layout, routers, &planner);
 
+	/* Clear sequence counters first to avoid inconsistent state while applying
+	the plan. */
 	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
-		if((*i)->planner.get()==&planner)
-		{
-			(*i)->use_planned_route();
-			(*i)->planner = 0;
-		}
+		(*i)->current_sequence = 0;
+
+	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+	{
+		(*i)->use_planned_route();
+		(*i)->planner = 0;
+	}
 }
 
 
+TrainRouter::Waypoint::Waypoint(const TrackChain &c, TrackChain::Direction d):
+	chain(&c),
+	direction(d)
+{ }
+
+
 TrainRouter::SequencePoint::SequencePoint(Block &b, unsigned o):
 	block(&b),
 	preceding_train(0),