If a train is not on the specified route, find a route to it

[r2c2.git] / source / libmarklin / route.cpp

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index 13f4e3efff012e57622d2e387ac25e8613ffc6bc..2ff6962fe67551a17be8bde9052595b6933bf171 100644 (file)
--- a/source/libmarklin/route.cpp
+++ b/source/libmarklin/route.cpp
@@ -48,11 +48,20 @@ struct TrackMatch
 
        TrackMatch(const Track &t): track(t) { }
 
-       bool operator()(const Track &t) { return &t==&track; }
+       bool operator()(const Track &t) const { return &t==&track; }
+};
+
+struct TrackInRoute
+{
+       const Route &route;
+
+       TrackInRoute(const Route &r): route(r) { }
+
+       bool operator()(const Track &t) const { return route.get_tracks().count(&t); }
 };
 
 template<typename Pred>
-list<const Track *> dijkstra(const Track &from, unsigned ep, Pred goal)
+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;
@@ -104,6 +113,20 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, Pred goal)
        return result;
 }
 
+unsigned count = 0;
+
+template<typename Pred>
+Route *create_route(const Track &from, unsigned ep, const Pred &goal)
+{
+       list<const Track *> tracks = dijkstra(from, ep, goal);
+
+       Route *route = new Route(from.get_layout(), format("-%d-", ++count));
+       for(list<const Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               route->add_track(**i);
+
+       return route;
+}
+
 }
 
 
@@ -295,15 +318,12 @@ void Route::track_removed(Track &t)
 
 Route *Route::find(const Track &from, unsigned ep, const Track &to)
 {
-       TrackMatch goal(to);
-       list<const Track *> tracks = dijkstra(from, ep, goal);
-
-       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);
+       return create_route(from, ep, TrackMatch(to));
+}
 
-       return route;
+Route *Route::find(const Track &from, unsigned ep, const Route &to)
+{
+       return create_route(from, ep, TrackInRoute(to));
 }