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

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index 6cd5841..d2ed3b7 100644
--- a/source/libmarklin/route.cpp
+++ b/source/libmarklin/route.cpp
@@ -53,13 +53,13 @@ struct TrackMatch
 	bool operator()(const Track &t) const { return &t==&track; }
 };
 
-struct TrackInRoute
+struct TrackInSet
 {
-	const Route &route;
+	const set<const Track *> &tracks;
 
-	TrackInRoute(const Route &r): route(r) { }
+	TrackInSet(const set<const Track *> &t): tracks(t) { }
 
-	bool operator()(const Track &t) const { return route.get_tracks().count(&t); }
+	bool operator()(const Track &t) const { return tracks.count(&t); }
 };
 
 template<typename Pred>
@@ -163,6 +163,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<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;
+	}
+}
+
 int Route::get_turnout(unsigned id) const
 {
 	map<unsigned, int>::const_iterator i = turnouts.find(id);
@@ -250,60 +316,6 @@ void Route::add_track_chain(const Track &start, unsigned ep, const TurnoutMap &t
 	}
 }
 
-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())
-		{
-			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;
-	}
-}
-
 void Route::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("name"), name));
@@ -375,7 +387,12 @@ Route *Route::find(const Track &from, unsigned ep, const Track &to)
 
 Route *Route::find(const 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(const Track &from, unsigned ep, const set<const Track *> &to)
+{
+	return create_route(from, ep, TrackInSet(to));
 }