X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=a6a47c0b5b13a291e30096795c87d2f8c1908628;hb=c796e17cef61ad2e3f476b6037892d7bc6c52680;hp=6bd94fccf81dc3faed4fa816a0e5ada19789efdc;hpb=0aa9976c7ee8752a47decd8e162161b0b824af57;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index 6bd94fc..a6a47c0 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -3,6 +3,7 @@
 #include "trackiter.h"
 #include "train.h"
 #include "trackchain.h"
+#include "trainroutemetric.h"
 #include "trainrouteplanner.h"
 #include "trainrouter.h"
 
@@ -22,6 +23,12 @@ TrainRouter::TrainRouter(Train &t):
 	train.signal_advanced.connect(sigc::mem_fun(this, &TrainRouter::train_advanced));
 }
 
+TrainRouter::~TrainRouter()
+{
+	for(vector<TrainRouteMetric *>::iterator i=metrics.begin(); i!=metrics.end(); ++i)
+		delete *i;
+}
+
 void TrainRouter::set_priority(int p)
 {
 	priority = p;
@@ -73,6 +80,17 @@ bool TrainRouter::set_route(const Route *r)
 	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);
+
+	return true;
+}
+
 void TrainRouter::add_wait(Block &block, Train *tr)
 {
 	Wait wait;
@@ -116,6 +134,21 @@ bool TrainRouter::is_waypoint(unsigned index, Track &track) const
 	return waypoints[index]->has_track(track);
 }
 
+const TrainRouteMetric &TrainRouter::get_metric(int index) const
+{
+	if(!destination)
+		throw logic_error("no metrics");
+	else if(update_pending)
+		throw logic_error("metrics are stale");
+
+	if(index<0)
+		return *metrics.front();
+	else if(static_cast<unsigned>(index)>=waypoints.size())
+		throw out_of_range("TrainRouter::get_metric");
+	else
+		return *metrics[index+1];
+}
+
 void TrainRouter::set_departure_delay(const Time::TimeDelta &d)
 {
 	delay = d;
@@ -233,12 +266,21 @@ void TrainRouter::train_advanced(Block &block)
 	// Check if we've reached the next route
 	if(routes.size()>1)
 	{
-		const Route &route = **++routes.begin();
-		if(route.has_track(*b_iter.endpoint().track))
+		Track &track = *b_iter.endpoint().track;
+		const Route *route = get_route();
+		bool change_route = false;
+		if(route->is_loop())
+			change_route = (*++routes.begin())->has_track(track);
+		else
+			change_route = !route->has_track(track);
+
+		if(change_route)
 		{
 			routes.pop_front();
+			route = get_route();
 			// XXX Exceptions?
-			signal_event.emit(Message("route-changed", get_route()));
+			signal_route_changed.emit(route);
+			signal_event.emit(Message("route-changed", route));
 		}
 	}
 
@@ -253,6 +295,8 @@ void TrainRouter::train_advanced(Block &block)
 				if(!wp.has_track(*t_iter))
 				{
 					waypoints.erase(waypoints.begin());
+					signal_waypoint_reached.emit(&wp);
+					signal_event.emit(Message("waypoint-reached", &wp));
 					break;
 				}
 				else if(!block.has_track(*t_iter))
@@ -280,6 +324,23 @@ const Route *TrainRouter::get_route_for_block(const Block &block) const
 	return 0;
 }
 
+void TrainRouter::create_metrics()
+{
+	for(vector<TrainRouteMetric *>::iterator i=metrics.begin(); i!=metrics.end(); ++i)
+		delete *i;
+	metrics.clear();
+
+	if(!destination)
+		return;
+
+	metrics.push_back(new TrainRouteMetric(*destination));
+	for(vector<const TrackChain *>::const_iterator i=waypoints.begin(); i!=waypoints.end(); ++i)
+		metrics.push_back(new TrainRouteMetric(**i));
+
+	for(unsigned i=metrics.size(); --i>0; )
+		metrics[i]->chain_to(*metrics[(i+1)%metrics.size()]);
+}
+
 Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 {
 	if(!lead)
@@ -289,17 +350,21 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 		lead->set_temporary(true);
 	}
 
-	set<Track *> tracks;
-	for(BlockIter i=train.get_block_allocator().first(); (i && i->get_train()==&train); i=i.next())
+	bool target_reached = false;
+	for(TrackIter i=train.get_block_allocator().first().track_iter(); i; i=i.next())
 	{
-		const set<Track *> &btracks = i->get_tracks();
-		for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)
-			if(!target || !target->has_track(**j))
-				tracks.insert(*j);
+		if(i->get_block().get_train()!=&train)
+			break;
+		if(target)
+		{
+			if(target->has_track(*i))
+				target_reached = true;
+			else if(target_reached)
+				break;
+		}
+		lead->add_track(*i);
 	}
 
-	lead->add_tracks(tracks);
-
 	return lead;
 }
 
@@ -322,13 +387,17 @@ bool TrainRouter::is_on_route(const Block &block)
 
 void TrainRouter::create_plans(Layout &layout)
 {
-	TrainRoutePlanner planner(layout);
-	planner.plan();
-
 	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)
+				router->create_metrics();
 			router->update_pending = false;
+		}
+
+	TrainRoutePlanner planner(layout);
+	planner.plan();
 }