X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=ff3c66402ad98b84e830cbe04dd77cd0bc0d8cca;hb=57e2b569e3a954f84dce5ba750dfae4c8faea952;hp=9245774f605309d597591fa01e95eb60f8b20c38;hpb=e8d2abb48b5236cc3455a035628292ae7908240e;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 9245774..ff3c664 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -137,14 +137,6 @@ void TrainRouter::set_destination(const TrackChain &d)
 	metrics_stale = true;
 }
 
-bool TrainRouter::is_destination(Track &track) const
-{
-	if(destination)
-		return destination->has_track(track);
-	else
-		return false;
-}
-
 void TrainRouter::add_waypoint(const TrackChain &wp)
 {
 	waypoints.push_back(&wp);
@@ -152,12 +144,12 @@ void TrainRouter::add_waypoint(const TrackChain &wp)
 	metrics_stale = true;
 }
 
-bool TrainRouter::is_waypoint(unsigned index, Track &track) const
+const TrackChain &TrainRouter::get_waypoint(unsigned index) const
 {
 	if(index>=waypoints.size())
 		throw out_of_range("TrainRouter::is_waypoint");
 
-	return waypoints[index]->has_track(track);
+	return *waypoints[index];
 }
 
 const TrainRouteMetric &TrainRouter::get_metric(int index) const
@@ -438,6 +430,8 @@ void TrainRouter::create_metrics()
 
 	for(unsigned i=metrics.size(); --i>0; )
 		metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]);
+
+	metrics_stale = false;
 }
 
 Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
@@ -449,7 +443,7 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 		lead->set_temporary(true);
 	}
 
-	bool target_tracks = 0;
+	unsigned target_tracks = 0;
 	for(TrackIter i=train.get_block_allocator().first().track_iter(); (target_tracks<2 && i); i=i.next())
 	{
 		if(i->get_block().get_train()!=&train)
@@ -492,19 +486,20 @@ bool TrainRouter::advance_to_track(RouteList::iterator &route, Track &track)
 
 void TrainRouter::start_planning(Layout &layout)
 {
-	RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
-
+	vector<TrainRouter *> routers;
 	const map<unsigned, Train *> &trains = layout.get_trains();
+	routers.reserve(trains.size());
 	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->metrics_stale)
-			{
-				router->create_metrics();
-				router->metrics_stale = false;
-			}
-			router->planner = planner;
-		}
+			routers.push_back(router);
+
+	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+		if((*i)->metrics_stale)
+			(*i)->create_metrics();
+
+	RefPtr<TrainRoutePlanner> planner = new TrainRoutePlanner(layout);
+	for(vector<TrainRouter *>::const_iterator i=routers.begin(); i!=routers.end(); ++i)
+		(*i)->planner = planner;
 
 	planner->plan_async();
 }