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

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index e38e29c..9befe47 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -83,7 +83,7 @@ void TrainRouter::use_planned_route()
 
 void TrainRouter::route_changed()
 {
-	BlockIter fncb = train.get_first_noncritical_block();
+	BlockIter fncb = train.get_last_critical_block().next();
 
 	arrival = ON_THE_WAY;
 	reserving_route = routes.begin();
@@ -92,13 +92,14 @@ void TrainRouter::route_changed()
 		/* 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;
+				arrival = (allocator.is_block_current(track->get_block()) ? ADVANCED_TO_END : RESERVED_TO_END);
 				break;
 			}
 			if(&track->get_block()==fncb.block())
@@ -252,7 +253,7 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 		sequence_check_pending = false;
 	}
 
-	if(arrival==RESERVED_TO_END && !train.get_speed())
+	if(arrival==ADVANCED_TO_END && !train.get_speed())
 	{
 		signal_arrived.emit(waypoints.back());
 		signal_event.emit(Message("arrived", waypoints.back()));
@@ -363,7 +364,7 @@ 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();
@@ -374,10 +375,18 @@ 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));
+					if(waypoints.size()==1)
+					{
+						if(arrival==RESERVED_TO_END)
+							arrival = ADVANCED_TO_END;
+					}
+					else
+					{
+						waypoints.erase(waypoints.begin());
+						metrics_stale = true;
+						signal_waypoint_reached.emit(&wp);
+						signal_event.emit(Message("waypoint-reached", &wp));
+					}
 					break;
 				}
 				else if(!block.has_track(*t_iter))
@@ -429,23 +438,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 +465,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,27 +486,25 @@ 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)