X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Froute.cpp;h=befaa6de9245a9dbe5d36f02a3a333f265c14fc1;hb=9def58c4bbec8788430740a1e9afce64a496231f;hp=926dd28dd3a903ac468ea9f25f953c56b38f5b13;hpb=f79b3fd58999a73a4a28663b46fdd96c58167a18;p=r2c2.git diff --git a/source/libmarklin/route.cpp b/source/libmarklin/route.cpp index 926dd28..befaa6d 100644 --- a/source/libmarklin/route.cpp +++ b/source/libmarklin/route.cpp @@ -10,6 +10,7 @@ Distributed under the GPL #include "layout.h" #include "route.h" #include "track.h" +#include "trackiter.h" #include "tracktype.h" using namespace std; @@ -23,21 +24,20 @@ typedef std::pair 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 @@ -63,20 +63,20 @@ struct TrackInSet }; template -list dijkstra(Track &from, unsigned ep, const Pred &goal) +list dijkstra(const TrackIter &from, const Pred &goal) { map track_nodes; priority_queue 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; @@ -87,44 +87,37 @@ list dijkstra(Track &from, unsigned ep, const Pred &goal) break; } - const TrackType &type = lowest.track->get_type(); - const vector &eps = type.get_endpoints(); - const vector &links = lowest.track->get_links(); - for(unsigned i=0; iget_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<>=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 result; for(Node *node=final; node; node=node->prev) - result.push_front(node->track); + result.push_front(&*node->track); return result; } template -Route *create_route(Track &from, unsigned ep, const Pred &goal) +Route *create_route(const TrackIter &from, const Pred &goal) { - list tracks = dijkstra(from, ep, goal); + list tracks = dijkstra(from, goal); - Route *route = new Route(from.get_layout()); + if(tracks.empty()) + return 0; + + Route *route = new Route(from->get_layout()); for(list::iterator i=tracks.begin(); i!=tracks.end(); ++i) route->add_track(**i); @@ -183,7 +176,7 @@ void Route::update_turnouts() { found.insert(tid); - const vector &endpoints = (*i)->get_type().get_endpoints(); + const vector &endpoints = (*i)->get_type().get_endpoints(); const vector &links = (*i)->get_links(); // Build a combined path mask from linked endpoints @@ -195,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<::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)) @@ -285,37 +289,36 @@ void Route::add_tracks(const set &trks) void Route::add_track_chain(Track &start, unsigned ep, const TurnoutMap &trnts) { - Track *track = &start; - while(1) + TrackIter iter(&start, ep); + while(iter) { - if(track->get_type().is_dead_end()) + if(iter->get_type().is_dead_end()) break; - if(tracks.count(track)) + if(has_track(*iter)) break; int path = 0; - if(track->get_turnout_id()) + if(iter->get_turnout_id()) { - TurnoutMap::const_iterator i = trnts.find(track->get_turnout_id()); + TurnoutMap::const_iterator i = trnts.find(iter->get_turnout_id()); if(i==trnts.end()) break; path = i->second; } - add_track(*track); - - unsigned out_ep = track->traverse(ep, path); - Track *next = track->get_links()[out_ep]; - if(!next) - break; + add_track(*iter); - ep = next->get_endpoint_by_link(*track); - track = next; + iter = iter.next(path); } } +bool Route::has_track(Track &t) const +{ + return tracks.count(&t); +} + void Route::save(list &st) const { st.push_back((DataFile::Statement("name"), name)); @@ -333,7 +336,7 @@ unsigned Route::check_validity(Track &trk) const { // Linked to an existing track - good result |= 1; - const vector &endpoints = (*i)->get_type().get_endpoints(); + const vector &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 &to) +Route *Route::find(const TrackIter &from, const set &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<second; - const vector &eps = (*i)->get_type().get_endpoints(); + const vector &eps = (*i)->get_type().get_endpoints(); for(unsigned k=0; k