using namespace Marklin;
+typedef std::pair<const Track *, unsigned> Key;
+
struct Node
{
const Track *track;
template<typename Pred>
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;
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;
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;