X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=bbb87eae116eb56326c911900eec1f0d09fe9303;hb=bf321305d7bf65aa5033a835f61370cd48f54619;hp=5b2c5ee2f768e962cbbe669fb6f46425f6185d9e;hpb=e5c244baa4058dbfc0c5caee64e6c83523751924;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 5b2c5ee..bbb87ea 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -62,6 +62,7 @@ bool TrainRouter::set_route(const Route *r)
 	routes.clear();
 	if(lead)
 		routes.push_back(lead);
+	// TODO Check if eclipsed by lead route
 	if(r)
 		routes.push_back(r);
 
@@ -91,6 +92,9 @@ void TrainRouter::route_changed()
 	bool already_at_end = false;
 	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();
 		for(; track; track=track.next())
 		{
@@ -106,8 +110,18 @@ void TrainRouter::route_changed()
 
 	if(!already_at_end)
 	{
+		// We are not at the end of the route now, but might have been before.
 		arrival = ON_THE_WAY;
-		train.stop_at(0);
+		train.refresh_blocks_from(*fncb);
+		if(!arrival)
+			train.stop_at(0);
+	}
+	else if(!arrival)
+	{
+		/* If arrival wasn't set before (perhaps because we weren't on a route),
+		set it now. */
+		arrival = RESERVED_TO_END;
+		train.stop_at(&*fncb.flip());
 		train.refresh_blocks_from(*fncb);
 	}
 
@@ -205,27 +219,39 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 			delay = Time::zero;
 	}
 
-	if(destination_changed)
+	if(destination_changed && !planner)
+		start_planning(train.get_layout());
+
+	if(planner && planner->check()!=TrainRoutePlanner::PENDING)
 	{
-		if(!planner)
-			start_planning(train.get_layout());
-		else if(planner->get_result()!=TrainRoutePlanner::PENDING)
+		destination_changed = false;
+		if(planner->get_result()==TrainRoutePlanner::COMPLETE)
 		{
-			destination_changed = false;
-			if(planner->get_result()==TrainRoutePlanner::COMPLETE)
+			const list<Route *> &planned_routes = planner->get_routes_for(train);
+
+			routes.clear();
+			Route *lead = create_lead_route(0, planned_routes.front());
+			routes.push_back(lead);
+
+			list<Route *>::const_iterator begin = planned_routes.begin();
+			for(; begin!=planned_routes.end(); ++begin)
 			{
-				const list<Route *> &planned_routes = planner->get_routes_for(train);
-				routes.clear();
-				routes.push_back(create_lead_route(0, planned_routes.front()));
-				routes.insert(routes.end(), planned_routes.begin(), planned_routes.end());
-				sequence_points = planner->get_sequence_for(train);
-				current_sequence = 0;
-				sequence_check_pending = false;
-
-				route_changed();
+				const Route::TrackSet &tracks = (*begin)->get_tracks();
+				bool eclipsed = true;
+				for(Route::TrackSet::const_iterator i=tracks.begin(); (eclipsed && i!=tracks.end()); ++i)
+					eclipsed = lead->has_track(**i);
+				if(!eclipsed)
+					break;
 			}
-			planner = 0;
+			routes.insert(routes.end(), begin, planned_routes.end());
+
+			sequence_points = planner->get_sequence_for(train);
+			current_sequence = 0;
+			sequence_check_pending = false;
+
+			route_changed();
 		}
+		planner = 0;
 	}
 
 	if(sequence_check_pending)
@@ -268,18 +294,17 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 		if(!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)
-		{
-			if(sp.is_cleared())
-				train.stop_at(0);
-			else
-				sequence_check_pending = true;
-		}
+			/* The other train's router will advance its sequence on the same
+			signal and may not have handled it yet. */
+			sequence_check_pending = true;
 
 		return;
 	}
 
+	// Did we reach our next sequence point?
 	if(!sequence_points.empty())
 	{
 		SequencePoint &sp = sequence_points.front();
@@ -292,7 +317,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 
 	TrackIter track = train.get_block_allocator().iter_for(block).track_iter();
 
-	// Is the block a turnout?  If so, set it to the proper path.
+	// Is the block a turnout?  If it is, set it to the correct path.
 	if(unsigned taddr = block.get_turnout_address())
 	{
 		int path = (*reserving_route)->get_turnout(taddr);
@@ -300,6 +325,8 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 			track->set_active_path(path);
 	}
 
+	/* If the allocator has released blocks from the front, we may need to
+	resync reserving_route. */
 	if(reserving_route==routes.end() || !(*reserving_route)->has_track(*track))
 	{
 		reserving_route = routes.begin();
@@ -314,11 +341,13 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 		}
 	}
 
-	// Do we need to move to the next route?
+	/* Keep reserving_route pointing to the route containing the block that is
+	expected to be allocated next. */
 	for(; track; track=track.next((*reserving_route)->get_path(*track)))
 	{
 		if(!advance_to_track(reserving_route, *track))
 		{
+			// We've reached the end of the route.  Stop here.
 			arrival = RESERVED_TO_END;
 			train.stop_at(&block);
 			return;
@@ -327,6 +356,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 			break;
 	}
 
+	// Do we need to wait for another train to pass?
 	if(!sequence_points.empty())
 	{
 		SequencePoint &sp = sequence_points.front();
@@ -341,6 +371,7 @@ void TrainRouter::train_advanced(Block &block)
 
 	if(!waypoints.empty())
 	{
+		// A waypoint is considered reached when the train has advanced through it.
 		const TrackChain &wp = *waypoints.front();
 		TrackIter t_iter = b_iter.track_iter();
 		if(wp.has_track(*t_iter))
@@ -365,7 +396,7 @@ void TrainRouter::train_rear_advanced(Block &block)
 {
 	Track &track = *train.get_block_allocator().iter_for(block).endpoint().track;
 
-	// Have we left some routes completely behind?
+	// Drop any routes that are now completely behind the train.
 	for(RouteList::iterator i=routes.begin(); i!=routes.end(); ++i)
 		if((*i)->has_track(track))
 		{
@@ -406,16 +437,16 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 		lead->set_temporary(true);
 	}
 
-	bool target_reached = false;
-	for(TrackIter i=train.get_block_allocator().first().track_iter(); i; i=i.next())
+	bool target_tracks = 0;
+	for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next())
 	{
 		if(i->get_block().get_train()!=&train)
 			break;
 		if(target)
 		{
 			if(target->has_track(*i))
-				target_reached = true;
-			else if(target_reached)
+				++target_tracks;
+			else if(target_tracks>0)
 				break;
 		}
 		lead->add_track(*i);
@@ -463,7 +494,7 @@ void TrainRouter::start_planning(Layout &layout)
 			router->planner = planner;
 		}
 
-	planner->plan();
+	planner->plan_async();
 }