X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.cpp;h=cdbcf1dc4c8cc778f4183277dae9c6b65616f572;hb=f409cd39a687900724d987c9db629cbff0dd49be;hp=2ff6962fe67551a17be8bde9052595b6933bf171;hpb=306cf0a8709a781b3031aa05a7b353a9b3a308e5;p=r2c2.git

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index 2ff6962..cdbcf1d 100644
--- a/source/libmarklin/route.cpp
+++ b/source/libmarklin/route.cpp
@@ -19,6 +19,8 @@ namespace {
 
 using namespace Marklin;
 
+typedef std::pair<const Track *, unsigned> Key;
+
 struct Node
 {
 	const Track *track;
@@ -63,8 +65,7 @@ struct TrackInRoute
 template<typename Pred>
 list<const Track *> dijkstra(const 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;
 
@@ -75,10 +76,11 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, const 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;
@@ -90,7 +92,11 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, const 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;
@@ -124,6 +130,8 @@ Route *create_route(const Track &from, unsigned ep, const Pred &goal)
 	for(list<const Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		route->add_track(**i);
 
+	route->set_temporary(true);
+
 	return route;
 }
 
@@ -134,7 +142,8 @@ namespace Marklin {
 
 Route::Route(Layout &l, const string &n):
 	layout(l),
-	name(n)
+	name(n),
+	temporary(false)
 {
 	layout.add_route(*this);
 	layout.signal_track_removed.connect(sigc::mem_fun(this, &Route::track_removed));
@@ -145,6 +154,11 @@ Route::~Route()
 	layout.remove_route(*this);
 }
 
+void Route::set_temporary(bool t)
+{
+	temporary = t;
+}
+
 int Route::get_turnout(unsigned id) const
 {
 	map<unsigned, int>::const_iterator i = turnouts.find(id);
@@ -199,17 +213,44 @@ void Route::add_tracks(const set<const Track *> &trks)
 	update_turnouts();
 }
 
-void Route::save(list<DataFile::Statement> &st) const
+void Route::add_track_chain(const Track &start, unsigned ep, const TurnoutMap &trnts)
 {
-	for(map<unsigned, int>::const_iterator i=turnouts.begin(); i!=turnouts.end(); ++i)
-		st.push_back((DataFile::Statement("turnout"), i->first, i->second));
+	const Track *track = &start;
+	while(1)
+	{
+		if(track->get_type().is_dead_end())
+			break;
+
+		if(tracks.count(track))
+			break;
+
+		int path = 0;
+		if(track->get_turnout_id())
+		{
+			TurnoutMap::const_iterator i = trnts.find(track->get_turnout_id());
+			if(i==trnts.end())
+				break;
+
+			path = i->second;
+		}
+
+		add_track(*track);
+
+		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;
+	}
 }
 
 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())
+		if(unsigned tid = (*i)->get_turnout_id())
 		{
 			found.insert(tid);
 
@@ -223,7 +264,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);
@@ -259,6 +300,12 @@ void Route::update_turnouts()
 	}
 }
 
+void Route::save(list<DataFile::Statement> &st) const
+{
+	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(const Track &trk) const
 {
 	unsigned result = 4;
@@ -333,9 +380,37 @@ Route::Loader::Loader(Route &r):
 	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;
+			}
+	}
+}
+
 void Route::Loader::turnout(unsigned id, unsigned path)
 {
-	obj.turnouts[id] = path;
+	turnouts[id] = path;
 }
 
 } // namespace Marklin