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

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index d2ed3b7..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 TrackInSet
 {
-	const set<const Track *> &tracks;
+	const set<Track *> &tracks;
 
-	TrackInSet(const set<const Track *> &t): tracks(t) { }
+	TrackInSet(const set<Track *> &t): tracks(t) { }
 
-	bool operator()(const Track &t) const { return 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");
@@ -178,7 +179,7 @@ void Route::set_turnout(unsigned addr, unsigned path)
 void Route::update_turnouts()
 {
 	set<unsigned> found;
-	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)
 		if(unsigned tid = (*i)->get_turnout_id())
 		{
 			found.insert(tid);
@@ -237,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;
@@ -257,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);
@@ -283,39 +284,38 @@ 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);
 	}
 }
 
+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));
@@ -323,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)
@@ -380,17 +380,17 @@ 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, TrackInSet(to.get_tracks()));
 }
 
-Route *Route::find(const Track &from, unsigned ep, const set<const Track *> &to)
+Route *Route::find(Track &from, unsigned ep, const set<Track *> &to)
 {
 	return create_route(from, ep, TrackInSet(to));
 }
@@ -428,6 +428,8 @@ void Route::Loader::finish()
 					obj.add_track_chain(**i, k, turnouts);
 				break;
 			}
+
+		break;
 	}
 }