X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouteplanner.cpp;h=90d769140725fdc00a708a8c55318f6fb2ea12b2;hb=8776713b20fdc7cdd09f7e2363679ebd06665d32;hp=653cfda6d9f01fc1288722d8f1c6ca33e47634c6;hpb=6a351de12a65e5a005e73bca7e1bba26dbe4288f;p=r2c2.git

diff --git a/source/libr2c2/trainrouteplanner.cpp b/source/libr2c2/trainrouteplanner.cpp
index 653cfda..90d7691 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,7 +230,7 @@ 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)
@@ -443,9 +459,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;
 }
 
 
@@ -546,7 +571,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;
 		}
@@ -630,7 +659,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)