X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=266bc6fc3641f4e6a72c069771132cb734f0546b;hb=443cb39c7ca3b4e56eb561aa054fa48dd3cbc7d8;hp=13b2970883535f99a9869939f83e32ab81ace7e0;hpb=462a04be004ab4b0ff3ce14c51a19b50271b17c7;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 13b2970..266bc6f 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -77,16 +77,25 @@ void TrainRouter::route_changed()
 		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();
+		list<SequencePoint>::iterator seq_begin = sequence_points.begin();
 		for(; track; track=track.next())
 		{
-			if(!advance_to_track(reserving_route, *track))
+			if(!advance_to_track(reserving_route, track))
 			{
 				already_at_end = true;
 				break;
 			}
 			if(&track->get_block()==fncb.block())
 				break;
+
+			if(seq_begin!=sequence_points.end() && seq_begin->block==&track->get_block())
+			{
+				current_sequence = seq_begin->sequence_out;
+				++seq_begin;
+			}
 		}
+
+		sequence_points.erase(sequence_points.begin(), seq_begin);
 	}
 
 	if(!already_at_end)
@@ -307,7 +316,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 		track = t->get_block_allocator().first().track_iter();
 		for(; track; track=track.next())
 		{
-			if(!advance_to_track(reserving_route, *track))
+			if(!advance_to_track(reserving_route, track))
 				throw logic_error("internal error (reservation outside of route)");
 			else if(&track->get_block()==&block)
 				break;
@@ -318,7 +327,7 @@ void TrainRouter::block_reserved(Block &block, Train *t)
 	expected to be allocated next. */
 	for(; track; track=track.next((*reserving_route)->get_path(*track)))
 	{
-		if(!advance_to_track(reserving_route, *track))
+		if(!advance_to_track(reserving_route, track))
 		{
 			// We've reached the end of the route.  Stop here.
 			arrival = RESERVED_TO_END;
@@ -354,6 +363,7 @@ void TrainRouter::train_advanced(Block &block)
 				if(!wp.has_track(*t_iter))
 				{
 					waypoints.erase(waypoints.begin());
+					metrics_stale = true;
 					signal_waypoint_reached.emit(&wp);
 					signal_event.emit(Message("waypoint-reached", &wp));
 					break;
@@ -390,6 +400,8 @@ void TrainRouter::create_metrics()
 		delete *i;
 	metrics.clear();
 
+	metrics_stale = false;
+
 	if(!destination)
 		return;
 
@@ -399,8 +411,6 @@ void TrainRouter::create_metrics()
 
 	for(unsigned i=metrics.size(); --i>0; )
 		metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]);
-
-	metrics_stale = false;
 }
 
 bool TrainRouter::create_lead_route()
@@ -410,7 +420,21 @@ bool TrainRouter::create_lead_route()
 
 	BlockIter fncb = train.get_first_noncritical_block();
 	TrackIter next_track = fncb.track_iter();
-	if(!routes.front()->has_track(*next_track.flip()))
+
+	unsigned count = 0;
+	for(TrackIter i=next_track.flip(); (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();
+			break;
+		}
+	}
+
+	if(!routes.front()->has_track(*next_track) && !routes.front()->has_track(*next_track.flip()))
 	{
 		Route *pf = Route::find(next_track, *routes.front());
 		if(!pf)
@@ -419,41 +443,38 @@ bool TrainRouter::create_lead_route()
 		routes.push_front(pf);
 	}
 
-	TrackIter first_track = train.get_block_allocator().first().track_iter();
-	if(!routes.front()->has_track(*first_track))
+	Route *lead = 0;
+	for(TrackIter i=next_track.flip(); (i && i->get_block().get_train()==&train); i=i.next())
 	{
-		Route *lead = new Route(train.get_layout());
-		lead->set_name("Lead");
-		lead->set_temporary(true);
-
-		unsigned target_tracks = 0;
-		for(TrackIter i=first_track; (target_tracks<2 && i); i=i.next())
+		if(!lead && !routes.front()->has_track(*i))
 		{
-			if(i->get_block().get_train()!=&train)
-				break;
-			if(routes.front()->has_track(*i))
-				++target_tracks;
-			else if(target_tracks>0)
-				break;
-			lead->add_track(*i);
+			lead = new Route(train.get_layout());
+			lead->set_name("Lead");
+			lead->set_temporary(true);
+			routes.push_front(lead);
+
+			TrackIter j = i.flip();
+			lead->add_track(*j);
+			lead->add_track(*j.next());
 		}
 
-		routes.push_front(lead);
+		if(lead)
+			lead->add_track(*i);
 	}
 
 	return true;
 }
 
-bool TrainRouter::is_valid_for_track(const Route &route, Track &track) const
+bool TrainRouter::is_valid_for_track(const Route &route, const TrackIter &track) const
 {
-	if(!route.has_track(track))
+	if(!route.has_track(*track))
 		return false;
-	if(track.get_type().is_turnout() && route.get_turnout(track.get_turnout_address())<0)
+	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, Track &track)
+bool TrainRouter::advance_to_track(RouteList::iterator &route, const TrackIter &track)
 {
 	if(!is_valid_for_track(**route, track))
 	{