]> git.tdb.fi Git - r2c2.git/blobdiff - source/libmarklin/route.cpp
Add a timetable row type to wait for another train
[r2c2.git] / source / libmarklin / route.cpp
index 13f4e3efff012e57622d2e387ac25e8613ffc6bc..d2ed3b7c6fba23d4d0d0b200d619bb61e09dda81 100644 (file)
@@ -19,6 +19,8 @@ namespace {
 
 using namespace Marklin;
 
+typedef std::pair<const Track *, unsigned> Key;
+
 struct Node
 {
        const Track *track;
@@ -48,14 +50,22 @@ 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 TrackInSet
+{
+       const set<const Track *> &tracks;
+
+       TrackInSet(const set<const Track *> &t): tracks(t) { }
+
+       bool operator()(const Track &t) const { return 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;
+       map<Key, Node> track_nodes;
        priority_queue<Node> nodes;
        Node *final = 0;
 
@@ -66,10 +76,11 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, 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;
@@ -81,7 +92,11 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, 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;
@@ -104,14 +119,29 @@ list<const Track *> dijkstra(const Track &from, unsigned ep, Pred goal)
        return result;
 }
 
+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());
+       for(list<const Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               route->add_track(**i);
+
+       route->set_name("Pathfinder");
+       route->set_temporary(true);
+
+       return route;
+}
+
 }
 
 
 namespace Marklin {
 
-Route::Route(Layout &l, const string &n):
+Route::Route(Layout &l):
        layout(l),
-       name(n)
+       temporary(false)
 {
        layout.add_route(*this);
        layout.signal_track_removed.connect(sigc::mem_fun(this, &Route::track_removed));
@@ -122,6 +152,83 @@ Route::~Route()
        layout.remove_route(*this);
 }
 
+void Route::set_name(const string &n)
+{
+       name = n;
+       signal_name_changed.emit(name);
+}
+
+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);
@@ -176,66 +283,46 @@ 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;
 
-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);
+               if(tracks.count(track))
+                       break;
 
-                       const vector<Endpoint> &endpoints = (*i)->get_type().get_endpoints();
-                       const vector<Track *> &links = (*i)->get_links();
+               int path = 0;
+               if(track->get_turnout_id())
+               {
+                       TurnoutMap::const_iterator i = trnts.find(track->get_turnout_id());
+                       if(i==trnts.end())
+                               break;
 
-                       // 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;
+                       path = i->second;
+               }
 
-                               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;
-                       }
+               add_track(*track);
 
-                       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;
-               }
+               unsigned out_ep = track->traverse(ep, path);
+               Track *next = track->get_links()[out_ep];
+               if(!next)
+                       break;
 
-       // 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;
+               ep = next->get_endpoint_by_link(*track);
+               track = next;
        }
 }
 
+void Route::save(list<DataFile::Statement> &st) const
+{
+       st.push_back((DataFile::Statement("name"), name));
+       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;
@@ -295,27 +382,58 @@ 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);
+       return create_route(from, ep, TrackMatch(to));
+}
 
-       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);
+Route *Route::find(const Track &from, unsigned ep, const Route &to)
+{
+       return create_route(from, ep, TrackInSet(to.get_tracks()));
+}
 
-       return route;
+Route *Route::find(const Track &from, unsigned ep, const set<const Track *> &to)
+{
+       return create_route(from, ep, TrackInSet(to));
 }
 
 
 Route::Loader::Loader(Route &r):
        DataFile::BasicLoader<Route>(r)
 {
+       add("name",    &Route::name);
        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