X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=75d746b3c6dd103cd148ae233f90361a189c2328;hb=3dd660ffad729fbd6e75e6401f5c7f27b9013faf;hp=08d787805140610a41af21100c4894ea0870c615;hpb=100c7f252e145f095205c55a178ab57bb8da7e75;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 08d7878..75d746b 100644
--- a/source/libr2c2/trainrouteplanner.cpp
+++ b/source/libr2c2/trainrouteplanner.cpp
@@ -1,4 +1,5 @@
 #include <msp/core/maputils.h>
+#include <msp/time/utils.h>
 #include "catalogue.h"
 #include "layout.h"
 #include "route.h"
@@ -15,6 +16,7 @@ namespace R2C2 {
 
 TrainRoutePlanner::TrainRoutePlanner(Layout &layout):
 	goal(0),
+	timeout(10*Time::sec),
 	result(PENDING),
 	thread(0)
 {
@@ -36,6 +38,11 @@ TrainRoutePlanner::~TrainRoutePlanner()
 	}
 }
 
+void TrainRoutePlanner::set_timeout(const Time::TimeDelta &t)
+{
+	timeout = t;
+}
+
 TrainRoutePlanner::Result TrainRoutePlanner::plan()
 {
 	prepare_plan();
@@ -112,6 +119,8 @@ void TrainRoutePlanner::prepare_plan()
 
 void TrainRoutePlanner::create_plan()
 {
+	Time::TimeStamp timeout_stamp = Time::now()+timeout;
+	unsigned count = 0;
 	while(!queue.empty())
 	{
 		const RoutingStep &step = get_step();
@@ -122,6 +131,13 @@ void TrainRoutePlanner::create_plan()
 		}
 
 		add_steps(step);
+
+		if(++count>=1000)
+		{
+			if(Time::now()>timeout_stamp)
+				break;
+			count = 0;
+		}
 	}
 
 	result = FAILED;
@@ -214,18 +230,18 @@ void TrainRoutePlanner::finalize_plan()
 TrainRoutePlanner::TrainRoutingInfo::TrainRoutingInfo(Train &t):
 	train(&t),
 	speed(train->get_maximum_speed()),
-	first_noncritical(train->get_first_noncritical_block().block()),
+	first_noncritical(train->get_last_critical_block().next().block()),
 	router(train->get_ai_of_type<TrainRouter>()),
-	waypoints(router ? router->get_n_waypoints() : 0),
 	has_duration(false)
 {
-	if(!waypoints.empty())
+	if(unsigned n_wps = router->get_n_waypoints())
 	{
-		metrics.resize(waypoints.size());
-		for(unsigned i=0; i<waypoints.size(); ++i)
+		waypoints.reserve(n_wps),
+		metrics.reserve(n_wps);
+		for(unsigned i=0; i<n_wps; ++i)
 		{
-			waypoints[i] = &router->get_waypoint(i);
-			metrics[i] = &router->get_metric(i);
+			waypoints.push_back(router->get_waypoint(i));
+			metrics.push_back(&router->get_metric(i));
 		}
 		has_duration = router->get_trip_duration();
 	}
@@ -346,17 +362,18 @@ bool TrainRoutePlanner::TrainRoutingState::check_arrival()
 {
 	TrackIter next_track = track.next(path);
 
-	const TrackChain *wp_chain = info->waypoints[waypoint];
-	if(wp_chain->has_track(*track) && !wp_chain->has_track(*next_track))
-	{
-		if(waypoint+1<info->waypoints.size())
-			++waypoint;
-		else
+	const TrainRouter::Waypoint &wp = info->waypoints[waypoint];
+	if(wp.chain->has_track(*track) && !wp.chain->has_track(*next_track))
+		if(wp.direction==TrackChain::UNSPECIFIED || track==wp.chain->iter_for(*track, wp.direction))
 		{
-			state = ARRIVED;
-			return true;
+			if(waypoint+1<info->waypoints.size())
+				++waypoint;
+			else
+			{
+				state = ARRIVED;
+				return true;
+			}
 		}
-	}
 
 	if(info->first_noncritical->has_track(*track))
 		critical = false;
@@ -443,9 +460,18 @@ void TrainRoutePlanner::TrainRoutingState::advance_track(unsigned next_path)
 void TrainRoutePlanner::TrainRoutingState::update_estimate()
 {
 	TrackIter iter = track.reverse(path);
-	float distance = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
-	distance += track->get_type().get_path_length(path)-offset;
-	remaining_estimate = distance;
+	remaining_estimate = info->metrics[waypoint]->get_distance_from(*iter.track(), iter.entry());
+	if(remaining_estimate>=0)
+		remaining_estimate += track->get_type().get_path_length(path)-offset;
+}
+
+bool TrainRoutePlanner::TrainRoutingState::is_viable() const
+{
+	if(remaining_estimate<0)
+		return false;
+	if(critical && state==BLOCKED)
+		return false;
+	return true;
 }
 
 
@@ -488,10 +514,9 @@ void TrainRoutePlanner::RoutingStep::create_successors(list<RoutingStep> &new_st
 		return;
 	}
 
-	TrackIter next_track = train.track.next(train.path);
 	train.advance_track(0);
 
-	const TrackType::Endpoint &next_entry_ep = next_track.endpoint();
+	const TrackType::Endpoint &entry_ep = train.track.endpoint();
 	if(train.critical)
 	{
 		train.path = train.track->get_type().coerce_path(train.track.entry(), train.track->get_active_path());
@@ -502,8 +527,8 @@ void TrainRoutePlanner::RoutingStep::create_successors(list<RoutingStep> &new_st
 	}
 	else
 	{
-		for(unsigned i=0; next_entry_ep.paths>>i; ++i)
-			if(next_entry_ep.has_path(i))
+		for(unsigned i=0; entry_ep.paths>>i; ++i)
+			if(entry_ep.has_path(i))
 			{
 				train.path = i;
 				train.update_estimate();
@@ -520,7 +545,7 @@ void TrainRoutePlanner::RoutingStep::create_successors(list<RoutingStep> &new_st
 		i->update_estimate();
 	}
 
-	if(next_entry_ep.paths!=next_track->get_type().get_paths() && !train.critical)
+	if(entry_ep.paths!=train.track->get_type().get_paths() && !train.critical)
 	{
 		RoutingStep wait(this);
 		wait.advance(dt);
@@ -547,7 +572,11 @@ bool TrainRoutePlanner::RoutingStep::update_states()
 		{
 			i->blocked_by = get_occupant(*next_track);
 			if(i->blocked_by>=0)
+			{
+				if(i->info->first_noncritical->has_track(*next_track))
+					i->critical = false;
 				i->state = BLOCKED;
+			}
 			else if(i->state==BLOCKED)
 				i->state = MOVING;
 		}
@@ -631,7 +660,7 @@ void TrainRoutePlanner::RoutingStep::update_estimate()
 bool TrainRoutePlanner::RoutingStep::is_viable() const
 {
 	for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
-		if(i->remaining_estimate<0)
+		if(!i->is_viable())
 			return false;
 
 	for(vector<TrainRoutingState>::const_iterator i=trains.begin(); i!=trains.end(); ++i)