X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=2fac984f03eba6ba23ee1c1ffad0c735d755aaf1;hb=3de7ae761b9a1fd1c1cd40457cc7067f4cf57c36;hp=8b3433c3ec359f6d205d0d9110a789a4eb063732;hpb=df72b71642bbc5b9a4e5010ebca8643fbeea3ca8;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 8b3433c..2fac984 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -17,7 +17,8 @@ TrainRouter::TrainRouter(Train &t):
 	priority(0),
 	arriving(0),
 	destination(0),
-	update_pending(false)
+	destination_changed(false),
+	metrics_stale(false)
 {
 	train.get_layout().signal_block_reserved.connect(sigc::mem_fun(this, &TrainRouter::block_reserved));
 	train.signal_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_advanced));
@@ -60,36 +61,14 @@ bool TrainRouter::set_route(const Route *r)
 		routes.push_back(lead);
 	if(r)
 		routes.push_back(r);
-	train.stop_at(0);
-	arriving = 0;
 
-	/* TODO destination should also be cleared when manually setting a different
-	route, but not when the planner calls this. */
-	if(!r)
-	{
-		destination = 0;
-		waypoints.clear();
-	}
+	destination = 0;
+	waypoints.clear();
 	sequence_points.clear();
 	pending_sequence_checks.clear();
 	current_sequence = 0;
 
-	train.refresh_blocks_from(*fncb);
-
-	const Route *route = get_route();
-	signal_route_changed.emit(route);
-	signal_event.emit(Message("route-changed", route));
-
-	return true;
-}
-
-bool TrainRouter::add_route(const Route &r)
-{
-	if(routes.empty())
-		return set_route(&r);
-
-	// TODO Check that it can be reached from previous routes
-	routes.push_back(&r);
+	route_changed();
 
 	return true;
 }
@@ -101,23 +80,23 @@ const Route *TrainRouter::get_route() const
 	return routes.front();
 }
 
-void TrainRouter::add_sequence_point(Block &b, unsigned o)
+void TrainRouter::route_changed()
 {
-	sequence_points.push_back(SequencePoint(b, o));
-}
+	train.stop_at(0);
+	arriving = 0;
+	BlockIter fncb = train.get_first_noncritical_block();
+	train.refresh_blocks_from(*fncb);
 
-void TrainRouter::add_sequence_point(Block &b, Train &t, unsigned i, unsigned o)
-{
-	SequencePoint sp(b, o);
-	sp.preceding_train = &t;
-	sp.sequence_in = i;
-	sequence_points.push_back(sp);
+	const Route *route = get_route();
+	signal_route_changed.emit(route);
+	signal_event.emit(Message("route-changed", route));
 }
 
 void TrainRouter::set_destination(const TrackChain &d)
 {
 	destination = &d;
-	update_pending = true;
+	destination_changed = true;
+	metrics_stale = true;
 }
 
 bool TrainRouter::is_destination(Track &track) const
@@ -131,7 +110,8 @@ bool TrainRouter::is_destination(Track &track) const
 void TrainRouter::add_waypoint(const TrackChain &wp)
 {
 	waypoints.push_back(&wp);
-	update_pending = true;
+	destination_changed = true;
+	metrics_stale = true;
 }
 
 bool TrainRouter::is_waypoint(unsigned index, Track &track) const
@@ -146,7 +126,7 @@ const TrainRouteMetric &TrainRouter::get_metric(int index) const
 {
 	if(!destination)
 		throw logic_error("no metrics");
-	else if(update_pending)
+	else if(metrics_stale)
 		throw logic_error("metrics are stale");
 
 	if(index<0)
@@ -160,7 +140,7 @@ const TrainRouteMetric &TrainRouter::get_metric(int index) const
 void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
 {
 	delay = d;
-	update_pending = true;
+	destination_changed = true;
 }
 
 void TrainRouter::message(const Message &msg)
@@ -201,8 +181,28 @@ void TrainRouter::tick(const Time::TimeDelta &dt)
 			delay = Time::zero;
 	}
 
-	if(update_pending)
-		create_plans(train.get_layout());
+	if(destination_changed)
+	{
+		if(!planner)
+			start_planning(train.get_layout());
+		else if(planner->get_result()!=TrainRoutePlanner::PENDING)
+		{
+			destination_changed = false;
+			if(planner->get_result()==TrainRoutePlanner::COMPLETE)
+			{
+				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);
+				pending_sequence_checks.clear();
+				current_sequence = 0;
+
+				route_changed();
+			}
+			planner = 0;
+		}
+	}
 
 	for(list<SequencePoint *>::iterator i=pending_sequence_checks.begin(); i!=pending_sequence_checks.end(); ++i)
 		if((*i)->preceding_train->get_ai_of_type<TrainRouter>()->get_current_sequence()>=(*i)->sequence_in)
@@ -435,19 +435,23 @@ bool TrainRouter::is_on_route(const Block &block)
 	return advance_route(iter, block);
 }
 
-void TrainRouter::create_plans(Layout &layout)
+void TrainRouter::start_planning(Layout &layout)
 {
+	RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
+
 	const map<unsigned, Train *> &trains = layout.get_trains();
 	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
 		if(TrainRouter *router = i->second->get_ai_of_type<TrainRouter>())
 		{
-			if(router->update_pending)
+			if(router->metrics_stale)
+			{
 				router->create_metrics();
-			router->update_pending = false;
+				router->metrics_stale = false;
+			}
+			router->planner = planner;
 		}
 
-	TrainRoutePlanner planner(layout);
-	planner.plan();
+	planner->plan();
 }