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

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index 13f4e3e..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,9 +20,11 @@ namespace {
 
 using namespace Marklin;
 
+typedef std::pair<Track *, unsigned> Key;
+
 struct Node
 {
-	const Track *track;
+	Track *track;
 	unsigned ep;
 	Node *prev;
 	float dist;
@@ -30,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)
 	{ }
 
@@ -44,18 +47,26 @@ struct Node
 
 struct TrackMatch
 {
-	const Track &track;
+	Track &track;
+
+	TrackMatch(Track &t): track(t) { }
+
+	bool operator()(Track &t) const { return &t==&track; }
+};
+
+struct TrackInSet
+{
+	const set<Track *> &tracks;
 
-	TrackMatch(const Track &t): track(t) { }
+	TrackInSet(const set<Track *> &t): tracks(t) { }
 
-	bool operator()(const Track &t) { return &t==&track; }
+	bool operator()(Track &t) const { return tracks.count(&t); }
 };
 
 template<typename Pred>
-list<const Track *> dijkstra(const Track &from, unsigned ep, Pred goal)
+list<Track *> dijkstra(Track &from, unsigned ep, const Pred &goal)
 {
-	// XXX Fails to find some routes - should use track+ep as key
-	map<const Track *, Node> track_nodes;
+	map<Key, Node> track_nodes;
 	priority_queue<Node> nodes;
 	Node *final = 0;
 
@@ -66,10 +77,11 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, Pred goal)
 		Node lowest = nodes.top();
 		nodes.pop();
 
-		if(track_nodes.count(lowest.track))
+		Key key(lowest.track, lowest.ep);
+		if(track_nodes.count(key))
 			continue;
 
-		Node &ref = track_nodes[lowest.track] = lowest;
+		Node &ref = track_nodes[key] = lowest;
 		if(goal(*lowest.track))
 		{
 			final = &ref;
@@ -81,7 +93,11 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, Pred goal)
 		const vector<Track *> &links = lowest.track->get_links();
 		for(unsigned i=0; i<eps.size(); ++i)
 		{
-			if(i==lowest.ep || !links[i] || track_nodes.count(links[i]))
+			if(i==lowest.ep || !links[i])
+				continue;
+
+			unsigned link_ep = links[i]->get_endpoint_by_link(*lowest.track);
+			if(track_nodes.count(Key(links[i], link_ep)))
 				continue;
 
 			unsigned mask = eps[i].paths&eps[lowest.ep].paths;
@@ -97,21 +113,36 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, 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);
 
 	return result;
 }
 
+template<typename Pred>
+Route *create_route(Track &from, unsigned ep, const Pred &goal)
+{
+	list<Track *> tracks = dijkstra(from, ep, goal);
+
+	Route *route = new Route(from.get_layout());
+	for(list<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		route->add_track(**i);
+
+	route->set_name("Pathfinder");
+	route->set_temporary(true);
+
+	return route;
+}
+
 }
 
 
 namespace Marklin {
 
-Route::Route(Layout &l, const string &n):
+Route::Route(Layout &l):
 	layout(l),
-	name(n)
+	temporary(false)
 {
 	layout.add_route(*this);
 	layout.signal_track_removed.connect(sigc::mem_fun(this, &Route::track_removed));
@@ -122,71 +153,34 @@ Route::~Route()
 	layout.remove_route(*this);
 }
 
-int Route::get_turnout(unsigned id) const
+void Route::set_name(const string &n)
 {
-	map<unsigned, int>::const_iterator i = turnouts.find(id);
-	if(i!=turnouts.end())
-		return i->second;
-	return -1;
-}
-
-void Route::add_track(const Track &trk)
-{
-	if(tracks.count(&trk))
-		return;
-
-	if(!tracks.empty())
-	{
-		unsigned valid = check_validity(trk);
-		if(!(valid&1))
-			throw Exception("Not linked to existing tracks");
-		else if(!(valid&2))
-			throw Exception("Branching routes not allowed");
-		else if(!(valid&4))
-			throw Exception("Route must be smooth");
-	}
-
-	tracks.insert(&trk);
-	update_turnouts();
+	name = n;
+	signal_name_changed.emit(name);
 }
 
-void Route::add_tracks(const set<const Track *> &trks)
+void Route::set_temporary(bool t)
 {
-	set<const Track *> pending;
-	for(set<const 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)
-			if(tracks.empty() || check_validity(**i)==7)
-			{
-				tracks.insert(*i);
-				pending.erase(*i);
-				found = true;
-				break;
-			}
-
-		if(!found)
-			throw Exception("Could not add all tracks to route");
-	}
-
-	update_turnouts();
+	temporary = t;
 }
 
-void Route::save(list<DataFile::Statement> &st) const
+void Route::set_turnout(unsigned addr, unsigned path)
 {
-	for(map<unsigned, int>::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i)
-		st.push_back((DataFile::Statement("turnout"), i->first, i->second));
+	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<const Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		if(unsigned tid=(*i)->get_turnout_id())
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if(unsigned tid = (*i)->get_turnout_id())
 		{
 			found.insert(tid);
 
@@ -200,7 +194,7 @@ void Route::update_turnouts()
 				if(!tracks.count(links[j]))
 					continue;
 
-				if(unsigned tid2=links[j]->get_turnout_id())
+				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);
@@ -236,10 +230,103 @@ void Route::update_turnouts()
 	}
 }
 
-unsigned Route::check_validity(const Track &trk) const
+int Route::get_turnout(unsigned id) const
+{
+	map<unsigned, int>::const_iterator i = turnouts.find(id);
+	if(i!=turnouts.end())
+		return i->second;
+	return -1;
+}
+
+void Route::add_track(Track &trk)
+{
+	if(tracks.count(&trk))
+		return;
+
+	if(!tracks.empty())
+	{
+		unsigned valid = check_validity(trk);
+		if(!(valid&1))
+			throw Exception("Not linked to existing tracks");
+		else if(!(valid&2))
+			throw Exception("Branching routes not allowed");
+		else if(!(valid&4))
+			throw Exception("Route must be smooth");
+	}
+
+	tracks.insert(&trk);
+	update_turnouts();
+}
+
+void Route::add_tracks(const set<Track *> &trks)
+{
+	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<Track *>::const_iterator i=pending.begin(); i!=pending.end(); ++i)
+			if(tracks.empty() || check_validity(**i)==7)
+			{
+				tracks.insert(*i);
+				pending.erase(*i);
+				found = true;
+				break;
+			}
+
+		if(!found)
+			throw Exception("Could not add all tracks to route");
+	}
+
+	update_turnouts();
+}
+
+void Route::add_track_chain(Track &start, unsigned ep, const TurnoutMap &trnts)
+{
+	TrackIter iter(&start, ep);
+	while(iter)
+	{
+		if(iter->get_type().is_dead_end())
+			break;
+
+		if(has_track(*iter))
+			break;
+
+		int path = 0;
+		if(iter->get_turnout_id())
+		{
+			TurnoutMap::const_iterator i = trnts.find(iter->get_turnout_id());
+			if(i==trnts.end())
+				break;
+
+			path = i->second;
+		}
+
+		add_track(*iter);
+
+		iter = iter.next(path);
+	}
+}
+
+bool Route::has_track(Track &t) const
+{
+	return tracks.count(&t);
+}
+
+void Route::save(list<DataFile::Statement> &st) const
+{
+	st.push_back((DataFile::Statement("name"), name));
+	for(map<unsigned, int>::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i)
+		st.push_back((DataFile::Statement("turnout"), i->first, i->second));
+}
+
+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)
@@ -293,29 +380,62 @@ 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)
 {
-	TrackMatch goal(to);
-	list<const Track *> tracks = dijkstra(from, ep, goal);
+	return create_route(from, ep, TrackMatch(to));
+}
 
-	static unsigned n = 0;
-	Route *route = new Route(from.get_layout(), format("Route::find %d", ++n));
-	for(list<const Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		route->add_track(**i);
+Route *Route::find(Track &from, unsigned ep, const Route &to)
+{
+	return create_route(from, ep, TrackInSet(to.get_tracks()));
+}
 
-	return route;
+Route *Route::find(Track &from, unsigned ep, const set<Track *> &to)
+{
+	return create_route(from, ep, TrackInSet(to));
 }
 
 
 Route::Loader::Loader(Route &r):
 	DataFile::BasicLoader<Route>(r)
 {
+	add("name",    &Route::name);
 	add("turnout", &Loader::turnout);
 }
 
+void Route::Loader::finish()
+{
+	const set<Track *> &ltracks = obj.layout.get_tracks();
+	for(set<Track *>::const_iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
+	{
+		unsigned tid = (*i)->get_turnout_id();
+		if(!tid)
+			continue;
+
+		TurnoutMap::iterator j = turnouts.find(tid);
+		if(j==turnouts.end())
+			continue;
+
+		unsigned path_mask = 1<<j->second;
+		const vector<Endpoint> &eps = (*i)->get_type().get_endpoints();
+		for(unsigned k=0; k<eps.size(); ++k)
+			if(eps[k].paths&path_mask)
+			{
+				Track *link = (*i)->get_link(k);
+				if(!obj.tracks.count(link))
+					obj.add_track_chain(*link, link->get_endpoint_by_link(**i), turnouts);
+				if(!obj.tracks.count(*i))
+					obj.add_track_chain(**i, k, turnouts);
+				break;
+			}
+
+		break;
+	}
+}
+
 void Route::Loader::turnout(unsigned id, unsigned path)
 {
-	obj.turnouts[id] = path;
+	turnouts[id] = path;
 }
 
 } // namespace Marklin