Add some shortcut functions for getting endpoints

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

diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp
index 6dc7ae51e13350efe01269c06c199fde829675f8..befaa6de9245a9dbe5d36f02a3a333f265c14fc1 100644 (file)
--- a/source/libmarklin/route.cpp
+++ b/source/libmarklin/route.cpp
@@ -24,21 +24,20 @@ typedef std::pair<Track *, unsigned> Key;
 
 struct Node
 {
-       Track *track;
-       unsigned ep;
+       TrackIter track;
        Node *prev;
        float dist;
 
        Node():
-               track(0), ep(0), prev(0), dist(0)
+               prev(0), dist(0)
        { }
 
-       Node(Track &t, unsigned e):
-               track(&t), ep(e), prev(0), dist(0)
+       Node(const TrackIter &t):
+               track(t), prev(0), dist(0)
        { }
 
-       Node(Track &t, unsigned e, Node &r, float d):
-               track(&t), ep(e), prev(&r), dist(prev->dist+d)
+       Node(const TrackIter &t, Node &r, float d):
+               track(t), prev(&r), dist(prev->dist+d)
        { }
 
        bool operator<(const Node &other) const
@@ -64,20 +63,20 @@ struct TrackInSet
 };
 
 template<typename Pred>
-list<Track *> dijkstra(Track &from, unsigned ep, const Pred &goal)
+list<Track *> dijkstra(const TrackIter &from, const Pred &goal)
 {
        map<Key, Node> track_nodes;
        priority_queue<Node> nodes;
        Node *final = 0;
 
-       nodes.push(Node(from, ep));
+       nodes.push(from);
 
        while(!nodes.empty())
        {
                Node lowest = nodes.top();
                nodes.pop();
 
-               Key key(lowest.track, lowest.ep);
+               Key key(lowest.track.track(), lowest.track.entry());
                if(track_nodes.count(key))
                        continue;
 
@@ -88,44 +87,37 @@ list<Track *> dijkstra(Track &from, unsigned ep, const Pred &goal)
                        break;
                }
 
-               const TrackType &type = lowest.track->get_type();
-               const vector<Endpoint> &eps = type.get_endpoints();
-               const vector<Track *> &links = lowest.track->get_links();
-               for(unsigned i=0; i<eps.size(); ++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 paths = lowest.track.endpoint().paths;
+               for(unsigned i=0; paths>>i; ++i)
+                       if(paths&(1<<i))
+                       {
+                               TrackIter next = lowest.track.next(i);
+                               if(!next)
+                                       continue;
 
-                       unsigned mask = eps[i].paths&eps[lowest.ep].paths;
-                       if(!mask)
-                               continue;
+                               if(track_nodes.count(Key(next.track(), next.entry())))
+                                       continue;
 
-                       unsigned path=0;
-                       for(; !(mask&1); ++path, mask>>=1) ;
-                       nodes.push(Node(*links[i], links[i]->get_endpoint_by_link(*lowest.track), ref, type.get_path_length(path)));
-               }
+                               nodes.push(Node(next, ref, lowest.track->get_type().get_path_length(i)));
+                       }
        }
 
-       if(!final)
-               throw InvalidParameterValue("Could not find a route");
-
        list<Track *> result;
        for(Node *node=final; node; node=node->prev)
-               result.push_front(node->track);
+               result.push_front(&*node->track);
 
        return result;
 }
 
 template<typename Pred>
-Route *create_route(Track &from, unsigned ep, const Pred &goal)
+Route *create_route(const TrackIter &from, const Pred &goal)
 {
-       list<Track *> tracks = dijkstra(from, ep, goal);
+       list<Track *> tracks = dijkstra(from, goal);
+
+       if(tracks.empty())
+               return 0;
 
-       Route *route = new Route(from.get_layout());
+       Route *route = new Route(from->get_layout());
        for(list<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
                route->add_track(**i);
 
@@ -184,7 +176,7 @@ void Route::update_turnouts()
                {
                        found.insert(tid);
 
-                       const vector<Endpoint> &endpoints = (*i)->get_type().get_endpoints();
+                       const vector<TrackType::Endpoint> &endpoints = (*i)->get_type().get_endpoints();
                        const vector<Track *> &links = (*i)->get_links();
 
                        // Build a combined path mask from linked endpoints
@@ -196,7 +188,7 @@ void Route::update_turnouts()
 
                                if(unsigned tid2 = links[j]->get_turnout_id())
                                {
-                                       const Endpoint &ep = links[j]->get_type().get_endpoints()[links[j]->get_endpoint_by_link(**i)];
+                                       const TrackType::Endpoint &ep = links[j]->get_type().get_endpoint(links[j]->get_endpoint_by_link(**i));
                                        int p = get_turnout(tid2);
                                        if(p>=0 && !(ep.paths&(1<<p)))
                                        {
@@ -238,6 +230,17 @@ int Route::get_turnout(unsigned id) const
        return -1;
 }
 
+unsigned Route::get_path(Track &trk) const
+{
+       if(unsigned tid = trk.get_turnout_id())
+       {
+               map<unsigned, int>::const_iterator i = turnouts.find(tid);
+               if(i!=turnouts.end())
+                       return i->second;
+       }
+       return trk.get_active_path();
+}
+
 void Route::add_track(Track &trk)
 {
        if(tracks.count(&trk))
@@ -333,7 +336,7 @@ unsigned Route::check_validity(Track &trk) const
                {
                        // Linked to an existing track - good
                        result |= 1;
-                       const vector<Endpoint> &endpoints = (*i)->get_type().get_endpoints();
+                       const vector<TrackType::Endpoint> &endpoints = (*i)->get_type().get_endpoints();
                        if(unsigned tid=(*i)->get_turnout_id())
                        {
                                int r = get_turnout(tid);
@@ -380,19 +383,19 @@ void Route::track_removed(Track &t)
        tracks.erase(&t);
 }
 
-Route *Route::find(Track &from, unsigned ep, Track &to)
+Route *Route::find(const TrackIter &from, Track &to)
 {
-       return create_route(from, ep, TrackMatch(to));
+       return create_route(from, TrackMatch(to));
 }
 
-Route *Route::find(Track &from, unsigned ep, const Route &to)
+Route *Route::find(const TrackIter &from, const Route &to)
 {
-       return create_route(from, ep, TrackInSet(to.get_tracks()));
+       return create_route(from, TrackInSet(to.get_tracks()));
 }
 
-Route *Route::find(Track &from, unsigned ep, const set<Track *> &to)
+Route *Route::find(const TrackIter &from, const set<Track *> &to)
 {
-       return create_route(from, ep, TrackInSet(to));
+       return create_route(from, TrackInSet(to));
 }
 
 
@@ -417,7 +420,7 @@ void Route::Loader::finish()
                        continue;
 
                unsigned path_mask = 1<<j->second;
-               const vector<Endpoint> &eps = (*i)->get_type().get_endpoints();
+               const vector<TrackType::Endpoint> &eps = (*i)->get_type().get_endpoints();
                for(unsigned k=0; k<eps.size(); ++k)
                        if(eps[k].paths&path_mask)
                        {