X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.cpp;h=6dc7ae51e13350efe01269c06c199fde829675f8;hb=2bb6ce8ada216c0b2caa48f4639d03f2c581098e;hp=6cd58413d61ee562231b70e00c2ef44f3ec0e510;hpb=707a611dae600333f3a9bd6421176f242fe49907;p=r2c2.git

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index 6cd5841..6dc7ae5 100644
--- a/source/libmarklin/route.cpp
+++ b/source/libmarklin/route.cpp
@@ -10,6 +10,7 @@ Distributed under the GPL
 #include "layout.h"
 #include "route.h"
 #include "track.h"
+#include "trackiter.h"
 #include "tracktype.h"
 
 using namespace std;
@@ -19,11 +20,11 @@ namespace {
 
 using namespace Marklin;
 
-typedef std::pair<const Track *, unsigned> Key;
+typedef std::pair<Track *, unsigned> Key;
 
 struct Node
 {
-	const Track *track;
+	Track *track;
 	unsigned ep;
 	Node *prev;
 	float dist;
@@ -32,11 +33,11 @@ struct Node
 		track(0), ep(0), prev(0), dist(0)
 	{ }
 
-	Node(const Track &t, unsigned e):
+	Node(Track &t, unsigned e):
 		track(&t), ep(e), prev(0), dist(0)
 	{ }
 
-	Node(const Track &t, unsigned e, Node &r, float d):
+	Node(Track &t, unsigned e, Node &r, float d):
 		track(&t), ep(e), prev(&r), dist(prev->dist+d)
 	{ }
 
@@ -46,24 +47,24 @@ struct Node
 
 struct TrackMatch
 {
-	const Track &track;
+	Track &track;
 
-	TrackMatch(const Track &t): track(t) { }
+	TrackMatch(Track &t): track(t) { }
 
-	bool operator()(const Track &t) const { return &t==&track; }
+	bool operator()(Track &t) const { return &t==&track; }
 };
 
-struct TrackInRoute
+struct TrackInSet
 {
-	const Route &route;
+	const set<Track *> &tracks;
 
-	TrackInRoute(const Route &r): route(r) { }
+	TrackInSet(const set<Track *> &t): tracks(t) { }
 
-	bool operator()(const Track &t) const { return route.get_tracks().count(&t); }
+	bool operator()(Track &t) const { return tracks.count(&t); }
 };
 
 template<typename Pred>
-list<const Track *> dijkstra(const Track &from, unsigned ep, const Pred &goal)
+list<Track *> dijkstra(Track &from, unsigned ep, const Pred &goal)
 {
 	map<Key, Node> track_nodes;
 	priority_queue<Node> nodes;
@@ -112,7 +113,7 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, const Pred &goal)
 	if(!final)
 		throw InvalidParameterValue("Could not find a route");
 
-	list<const Track *> result;
+	list<Track *> result;
 	for(Node *node=final; node; node=node->prev)
 		result.push_front(node->track);
 
@@ -120,12 +121,12 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, const Pred &goal)
 }
 
 template<typename Pred>
-Route *create_route(const Track &from, unsigned ep, const Pred &goal)
+Route *create_route(Track &from, unsigned ep, const Pred &goal)
 {
-	list<const Track *> tracks = dijkstra(from, ep, goal);
+	list<Track *> tracks = dijkstra(from, ep, goal);
 
 	Route *route = new Route(from.get_layout());
-	for(list<const Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(list<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		route->add_track(**i);
 
 	route->set_name("Pathfinder");
@@ -163,6 +164,72 @@ void Route::set_temporary(bool t)
 	temporary = t;
 }
 
+void Route::set_turnout(unsigned addr, unsigned path)
+{
+	if(!addr)
+		throw InvalidParameterValue("Invalid turnout address");
+	map<unsigned, int>::iterator i = turnouts.find(addr);
+	if(i==turnouts.end())
+		throw KeyError("Turnout is not in this route");
+	if(i->second>=0 && path!=static_cast<unsigned>(i->second))
+		throw InvalidState("Setting conflicts with route");
+	i->second = path;
+}
+
+void Route::update_turnouts()
+{
+	set<unsigned> found;
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if(unsigned tid = (*i)->get_turnout_id())
+		{
+			found.insert(tid);
+
+			const vector<Endpoint> &endpoints = (*i)->get_type().get_endpoints();
+			const vector<Track *> &links = (*i)->get_links();
+
+			// Build a combined path mask from linked endpoints
+			unsigned mask = 15;
+			for(unsigned j=0; j<endpoints.size(); ++j)
+			{
+				if(!tracks.count(links[j]))
+					continue;
+
+				if(unsigned tid2 = links[j]->get_turnout_id())
+				{
+					const Endpoint &ep = links[j]->get_type().get_endpoints()[links[j]->get_endpoint_by_link(**i)];
+					int p = get_turnout(tid2);
+					if(p>=0 && !(ep.paths&(1<<p)))
+					{
+						// The linked track is a turnout and has a path which is incompatible with this endpoint
+						mask &= ~endpoints[j].paths;
+						continue;
+					}
+				}
+				mask &= endpoints[j].paths;
+			}
+
+			if(mask && !(mask&(mask-1)))
+			{
+				// Exactly one possible choice, set the path accordingly
+				unsigned path = 0;
+				for(; (mask && !(mask&1)); mask>>=1, ++path) ;
+				turnouts[tid] = path;
+			}
+			else if(!turnouts.count(tid))
+				// More than one possible choice, and no existing entry - set as undecided
+				turnouts[tid] = -1;
+		}
+
+	// Remove any turnouts that do not exist in the route
+	for(map<unsigned, int>::iterator i=turnouts.begin(); i!=turnouts.end();)
+	{
+		if(!found.count(i->first))
+			turnouts.erase(i++);
+		else
+			++i;
+	}
+}
+
 int Route::get_turnout(unsigned id) const
 {
 	map<unsigned, int>::const_iterator i = turnouts.find(id);
@@ -171,7 +238,7 @@ int Route::get_turnout(unsigned id) const
 	return -1;
 }
 
-void Route::add_track(const Track &trk)
+void Route::add_track(Track &trk)
 {
 	if(tracks.count(&trk))
 		return;
@@ -191,17 +258,17 @@ void Route::add_track(const Track &trk)
 	update_turnouts();
 }
 
-void Route::add_tracks(const set<const Track *> &trks)
+void Route::add_tracks(const set<Track *> &trks)
 {
-	set<const Track *> pending;
-	for(set<const Track *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
+	set<Track *> pending;
+	for(set<Track *>::const_iterator i=trks.begin(); i!=trks.end(); ++i)
 		if(!tracks.count(*i))
 			pending.insert(*i);
 
 	while(!pending.empty())
 	{
 		bool found = false;
-		for(set<const Track *>::const_iterator i=pending.begin(); i!=pending.end(); ++i)
+		for(set<Track *>::const_iterator i=pending.begin(); i!=pending.end(); ++i)
 			if(tracks.empty() || check_validity(**i)==7)
 			{
 				tracks.insert(*i);
@@ -217,91 +284,36 @@ void Route::add_tracks(const set<const Track *> &trks)
 	update_turnouts();
 }
 
-void Route::add_track_chain(const Track &start, unsigned ep, const TurnoutMap &trnts)
+void Route::add_track_chain(Track &start, unsigned ep, const TurnoutMap &trnts)
 {
-	const Track *track = &start;
-	while(1)
+	TrackIter iter(&start, ep);
+	while(iter)
 	{
-		if(track->get_type().is_dead_end())
+		if(iter->get_type().is_dead_end())
 			break;
 
-		if(tracks.count(track))
+		if(has_track(*iter))
 			break;
 
 		int path = 0;
-		if(track->get_turnout_id())
+		if(iter->get_turnout_id())
 		{
-			TurnoutMap::const_iterator i = trnts.find(track->get_turnout_id());
+			TurnoutMap::const_iterator i = trnts.find(iter->get_turnout_id());
 			if(i==trnts.end())
 				break;
 
 			path = i->second;
 		}
 
-		add_track(*track);
+		add_track(*iter);
 
-		unsigned out_ep = track->traverse(ep, path);
-		Track *next = track->get_links()[out_ep];
-		if(!next)
-			break;
-
-		ep = next->get_endpoint_by_link(*track);
-		track = next;
+		iter = iter.next(path);
 	}
 }
 
-void Route::update_turnouts()
+bool Route::has_track(Track &t) const
 {
-	set<unsigned> found;
-	for(set<const Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(unsigned tid = (*i)->get_turnout_id())
-		{
-			found.insert(tid);
-
-			const vector<Endpoint> &endpoints = (*i)->get_type().get_endpoints();
-			const vector<Track *> &links = (*i)->get_links();
-
-			// Build a combined path mask from linked endpoints
-			unsigned mask = 15;
-			for(unsigned j=0; j<endpoints.size(); ++j)
-			{
-				if(!tracks.count(links[j]))
-					continue;
-
-				if(unsigned tid2 = links[j]->get_turnout_id())
-				{
-					const Endpoint &ep = links[j]->get_type().get_endpoints()[links[j]->get_endpoint_by_link(**i)];
-					int p = get_turnout(tid2);
-					if(p>=0 && !(ep.paths&(1<<p)))
-					{
-						// The linked track is a turnout and has a path which is incompatible with this endpoint
-						mask &= ~endpoints[j].paths;
-						continue;
-					}
-				}
-				mask &= endpoints[j].paths;
-			}
-
-			if(mask && !(mask&(mask-1)))
-			{
-				// Exactly one possible choice, set the path accordingly
-				unsigned path = 0;
-				for(; (mask && !(mask&1)); mask>>=1, ++path) ;
-				turnouts[tid] = path;
-			}
-			else if(!turnouts.count(tid))
-				// More than one possible choice, and no existing entry - set as undecided
-				turnouts[tid] = -1;
-		}
-
-	// Remove any turnouts that do not exist in the route
-	for(map<unsigned, int>::iterator i=turnouts.begin(); i!=turnouts.end();)
-	{
-		if(!found.count(i->first))
-			turnouts.erase(i++);
-		else
-			++i;
-	}
+	return tracks.count(&t);
 }
 
 void Route::save(list<DataFile::Statement> &st) const
@@ -311,10 +323,10 @@ void Route::save(list<DataFile::Statement> &st) const
 		st.push_back((DataFile::Statement("turnout"), i->first, i->second));
 }
 
-unsigned Route::check_validity(const Track &trk) const
+unsigned Route::check_validity(Track &trk) const
 {
 	unsigned result = 4;
-	for(set<const Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		int epi=(*i)->get_endpoint_by_link(trk);
 		if(epi>=0)
@@ -368,14 +380,19 @@ void Route::track_removed(Track &t)
 	tracks.erase(&t);
 }
 
-Route *Route::find(const Track &from, unsigned ep, const Track &to)
+Route *Route::find(Track &from, unsigned ep, Track &to)
 {
 	return create_route(from, ep, TrackMatch(to));
 }
 
-Route *Route::find(const Track &from, unsigned ep, const Route &to)
+Route *Route::find(Track &from, unsigned ep, const Route &to)
 {
-	return create_route(from, ep, TrackInRoute(to));
+	return create_route(from, ep, TrackInSet(to.get_tracks()));
+}
+
+Route *Route::find(Track &from, unsigned ep, const set<Track *> &to)
+{
+	return create_route(from, ep, TrackInSet(to));
 }
 
 
@@ -411,6 +428,8 @@ void Route::Loader::finish()
 					obj.add_track_chain(**i, k, turnouts);
 				break;
 			}
+
+		break;
 	}
 }