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

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 2d6ab54..e38e29c 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -63,12 +63,30 @@ const Route *TrainRouter::get_route() const
 	return routes.front();
 }
 
+void TrainRouter::use_planned_route()
+{
+	if(!planner || planner->get_result()!=TrainRoutePlanner::COMPLETE)
+		return;
+
+	const list<Route *> &planned_routes = planner->get_routes_for(train);
+
+	routes.clear();
+	routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
+	create_lead_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();
 
+	arrival = ON_THE_WAY;
 	reserving_route = routes.begin();
-	bool already_at_end = false;
 	if(!routes.empty())
 	{
 		/* Find the route that should be used for the next allocated block.  We
@@ -80,7 +98,7 @@ void TrainRouter::route_changed()
 		{
 			if(!advance_to_track(reserving_route, track))
 			{
-				already_at_end = true;
+				arrival = RESERVED_TO_END;
 				break;
 			}
 			if(&track->get_block()==fncb.block())
@@ -88,30 +106,34 @@ void TrainRouter::route_changed()
 
 			if(seq_begin!=sequence_points.end() && seq_begin->block==&track->get_block())
 			{
+				// Assume any sequence points within critical blocks to be cleared
 				current_sequence = seq_begin->sequence_out;
 				++seq_begin;
 			}
 		}
 
 		sequence_points.erase(sequence_points.begin(), seq_begin);
-	}
 
-	if(!already_at_end)
-	{
-		// We are not at the end of the route now, but might have been before.
-		arrival = ON_THE_WAY;
-		train.refresh_blocks_from(*fncb);
-		if(!arrival)
-			train.stop_at(0);
+		if(!sequence_points.empty())
+		{
+			const SequencePoint &sp = sequence_points.front();
+			if(sp.block==fncb.block() && !sp.is_cleared())
+			{
+				arrival = WAITING_FOR_SEQUENCE;
+				sequence_check_pending = true;
+			}
+		}
 	}
-	else if(!arrival)
-	{
-		/* If arrival wasn't set before (perhaps because we weren't on a route),
-		set it now. */
-		arrival = RESERVED_TO_END;
+
+	/* 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
+	critical blocks. */
+	if(arrival)
 		train.stop_at(&*fncb.flip());
-		train.refresh_blocks_from(*fncb);
-	}
+	train.refresh_blocks_from(*fncb);
+	// If no arrival condition was found, clear a possible previous stop marker.
+	if(!arrival)
+		train.stop_at(0);
 
 	const Route *route = get_route();
 	signal_route_changed.emit(route);
@@ -218,29 +240,15 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 		start_planning(train.get_layout());
 
 	if(planner && planner->check()!=TrainRoutePlanner::PENDING)
-	{
-		waypoints_changed = false;
-		if(planner->get_result()==TrainRoutePlanner::COMPLETE)
-		{
-			const list<Route *> &planned_routes = planner->get_routes_for(train);
-
-			routes.clear();
-			routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
-			create_lead_route();
-
-			sequence_points = planner->get_sequence_for(train);
-			current_sequence = 0;
-			sequence_check_pending = false;
-
-			route_changed();
-		}
-		planner = 0;
-	}
+		apply_plan(train.get_layout(), *planner);
 
 	if(sequence_check_pending)
 	{
 		if(sequence_points.front().is_cleared())
+		{
+			arrival = ON_THE_WAY;
 			train.stop_at(0);
+		}
 		sequence_check_pending = false;
 	}
 
@@ -344,7 +352,10 @@ 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;
 			train.stop_at(&block);
+		}
 	}
 }
 
@@ -488,14 +499,19 @@ bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &
 	return true;
 }
 
-void TrainRouter::start_planning(Layout &layout)
+void TrainRouter::get_routers(Layout &layout, vector<TrainRouter *> &routers)
 {
-	vector<TrainRouter *> routers;
 	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);
+}
+
+void TrainRouter::start_planning(Layout &layout)
+{
+	vector<TrainRouter *> routers;
+	get_routers(layout, routers);
 
 	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
 		if((*i)->metrics_stale)
@@ -503,11 +519,27 @@ void TrainRouter::start_planning(Layout &layout)
 
 	RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
 	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+	{
+		(*i)->waypoints_changed = false;
 		(*i)->planner = planner;
+	}
 
 	planner->plan_async();
 }
 
+void TrainRouter::apply_plan(Layout &layout, TrainRoutePlanner &planner)
+{
+	vector<TrainRouter *> routers;
+	get_routers(layout, routers);
+
+	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+		if((*i)->planner.get()==&planner)
+		{
+			(*i)->use_planned_route();
+			(*i)->planner = 0;
+		}
+}
+
 
 TrainRouter::SequencePoint::SequencePoint(Block &b, unsigned o):
 	block(&b),