X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=5ee30e033161030fa31a8f558f50e7f4a3b9aaea;hb=f86223ef906cad5c492c95d069550f262f5b3dff;hp=38ea9f681d77da64f10600b369124c27724aca59;hpb=1fc9750d1886c0a7822965700e6501090f92f4cc;p=r2c2.git diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp index 38ea9f6..5ee30e0 100644 --- a/source/libr2c2/route.cpp +++ b/source/libr2c2/route.cpp @@ -128,37 +128,16 @@ Route *create_route(const TrackIter &from, const Pred &goal) namespace R2C2 { -string bad_route::get_message(RouteValidityMask valid) -{ - const char *reasons[3]; - unsigned i = 0; - if(!(valid&1)) - reasons[i++] = "unlinked"; - if(!(valid&2)) - reasons[i++] = "branching"; - if(!(valid&4)) - reasons[i++] = "not smooth"; - return join(reasons, reasons+i, ", "); -} - - Route::Route(Layout &l): - layout(l), + TrackChain(l), temporary(false) { - layout.add_route(*this); - layout.signal_track_removed.connect(sigc::mem_fun(this, &Route::track_removed)); + layout.add(*this); } Route::~Route() { - layout.remove_route(*this); -} - -void Route::set_name(const string &n) -{ - name = n; - signal_name_changed.emit(name); + layout.remove(*this); } void Route::set_temporary(bool t) @@ -166,58 +145,14 @@ void Route::set_temporary(bool t) temporary = t; } -void Route::set_turnout(unsigned addr, unsigned path) -{ - if(!addr) - throw invalid_argument("Route::set_turnout"); - int &state = get_item(turnouts, addr); - if(state>=0 && path!=static_cast(state)) - throw logic_error("route conflict"); - state = path; -} - void Route::update_turnouts() { set found; for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - if(unsigned tid = (*i)->get_turnout_id()) + if((*i)->get_type().is_turnout()) { - found.insert(tid); - - const vector &endpoints = (*i)->get_type().get_endpoints(); - const vector &links = (*i)->get_links(); - - // Build a combined path mask from linked endpoints - unsigned mask = (*i)->get_type().get_paths(); - for(unsigned j=0; jget_turnout_id()) - { - const TrackType::Endpoint &ep = links[j]->get_type().get_endpoint(links[j]->get_link_slot(**i)); - int p = get_turnout(tid2); - if(p>=0 && !ep.has_path(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; + found.insert((*i)->get_turnout_address()); + update_turnout(**i); } // Remove any turnouts that do not exist in the route @@ -230,6 +165,46 @@ void Route::update_turnouts() } } +void Route::update_turnout(Track &track) +{ + if(!track.get_type().is_turnout()) + return; + + // Build a combined path mask from linked endpoints + unsigned nls = track.get_n_link_slots(); + unsigned mask = track.get_type().get_paths(); + for(unsigned i=0; iget_type().is_turnout()) + { + const TrackType::Endpoint &link_ep = link->get_type().get_endpoint(link->get_link_slot(track)); + int p = get_turnout(link->get_turnout_address()); + if(p>=0 && !link_ep.has_path(p)) + // The linked track is a turnout and has a path which is incompatible with this endpoint + ep_mask = ~ep_mask; + } + + mask &= ep_mask; + } + + unsigned taddr = track.get_turnout_address(); + if(mask && !(mask&(mask-1))) + { + // Exactly one possible choice, set the path accordingly + unsigned path = 0; + for(; (mask && !(mask&1)); mask>>=1, ++path) ; + turnouts[taddr] = path; + } + else if(!turnouts.count(taddr)) + // More than one possible choice, and no existing entry - set as undecided + turnouts[taddr] = -1; +} + int Route::get_turnout(unsigned id) const { map::const_iterator i = turnouts.find(id); @@ -240,93 +215,39 @@ int Route::get_turnout(unsigned id) const unsigned Route::get_path(Track &trk) const { - if(unsigned tid = trk.get_turnout_id()) + if(trk.get_type().is_turnout()) { - map::const_iterator i = turnouts.find(tid); - if(i!=turnouts.end()) + map::const_iterator i = turnouts.find(trk.get_turnout_address()); + if(i!=turnouts.end() && i->second>=0) return i->second; } return trk.get_active_path(); } -void Route::add_track(Track &trk) -{ - if(tracks.count(&trk)) - return; - - if(!tracks.empty()) - { - RouteValidityMask valid = check_validity(trk); - if(valid!=ROUTE_VALID) - throw bad_route(valid); - } - - tracks.insert(&trk); - update_turnouts(); -} - -void Route::add_tracks(const set &trks) -{ - set pending; - for(set::const_iterator i=trks.begin(); i!=trks.end(); ++i) - if(!tracks.count(*i)) - pending.insert(*i); - - if(tracks.empty()) - { - set::iterator i = pending.begin(); - tracks.insert(*i); - pending.erase(i); - } - - while(!pending.empty()) - { - RouteValidityMask valid = ROUTE_INVALID; - for(set::iterator i=pending.begin(); i!=pending.end(); ++i) - if((valid=check_validity(**i))==ROUTE_VALID) - { - tracks.insert(*i); - pending.erase(i); - break; - } - - if(valid!=ROUTE_VALID) - throw bad_route(valid); - } - - update_turnouts(); -} - -void Route::add_track_chain(Track &start, unsigned ep, const TurnoutMap &trnts) +void Route::add_turnout(Track &track, unsigned path) { - TrackIter iter(&start, ep); - while(iter) - { - if(iter->get_type().is_dead_end()) - break; - - if(has_track(*iter)) - break; - - int path = 0; - if(iter->get_turnout_id()) + TrackSet tracks_to_add; + tracks_to_add.insert(&track); + unsigned nls = track.get_n_link_slots(); + for(unsigned i=0; iget_turnout_id()); - if(i==trnts.end()) - break; - - path = i->second; + TrackIter iter = TrackIter(&track, i).flip(); + for(; (iter && !iter->get_type().is_turnout()); iter=iter.next()) + tracks_to_add.insert(&*iter); } - add_track(*iter); - - iter = iter.next(path); - } + add_tracks(tracks_to_add); } -bool Route::has_track(Track &t) const +void Route::on_track_added(Track &track) { - return tracks.count(&t); + update_turnout(track); + unsigned nls = track.get_n_link_slots(); + for(unsigned i=0; i &st) const @@ -336,72 +257,9 @@ void Route::save(list &st) const st.push_back((DataFile::Statement("turnout"), i->first, i->second)); } -RouteValidityMask Route::check_validity(Track &trk) const +DataFile::Statement Route::save_reference() const { - unsigned result = ROUTE_SMOOTH; - const vector &links = trk.get_links(); - for(vector::const_iterator i=links.begin(); i!=links.end(); ++i) - { - if(!*i) - continue; - if(!tracks.count(*i)) - continue; - - // Linked to an existing track - good - result |= ROUTE_LINKED; - - if(unsigned tid = (*i)->get_turnout_id()) - { - const TrackType::Endpoint &ep = (*i)->get_type().get_endpoint((*i)->get_link_slot(trk)); - int path = get_turnout(tid); - if(path>=0) - { - // Linking to a turnout with path set is only good if we're continuing that path - if(ep.has_path(path)) - result |= ROUTE_LINEAR; - } - else - { - // Linked to a turnout with no path set - check other linked tracks - const vector &tlinks = (*i)->get_links(); - unsigned count = 0; - for(unsigned j=0; jget_turnout_id(); - if(tid2) - { - const TrackType::Endpoint &ep2 = tlinks[j]->get_type().get_endpoint(tlinks[j]->get_link_slot(**i)); - path = get_turnout(tid2); - // Ignore a linked turnout with some other path set - if(path>=0 && !ep2.has_path(path)) - continue; - } - - ++count; - - const TrackType::Endpoint &ep2 = (*i)->get_type().get_endpoint(j); - if(!ep.has_common_paths(ep2)) - // Impossible path through the turnout - not good - result &= ~ROUTE_SMOOTH; - } - - // Only good if at most one other track is linked to the turnout - if(count<=1) - result |= ROUTE_LINEAR; - } - } - else - // Linked to something linear - good - result |= ROUTE_LINEAR; - } - - return static_cast(result); -} - -void Route::track_removed(Track &t) -{ - tracks.erase(&t); + return (DataFile::Statement("route"), name); } Route *Route::find(const TrackIter &from, Track &to) @@ -428,39 +286,40 @@ Route *Route::find(const TrackIter &from, const set &to) Route::Loader::Loader(Route &r): DataFile::ObjectLoader(r) { - add("name", &Route::name); + add("name", &Loader::name); add("turnout", &Loader::turnout); } void Route::Loader::finish() { - const set <racks = obj.layout.get_tracks(); + const set <racks = obj.layout.get_all(); + map turnout_tracks; for(set::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; - - const vector &eps = (*i)->get_type().get_endpoints(); - for(unsigned k=0; ksecond)) - { - Track *link = (*i)->get_link(k); - if(!obj.tracks.count(link)) - obj.add_track_chain(*link, link->get_link_slot(**i), turnouts); - if(!obj.tracks.count(*i)) - obj.add_track_chain(**i, k, turnouts); - break; - } + if((*i)->get_type().is_turnout()) + { + TurnoutMap::iterator j = turnouts.find((*i)->get_turnout_address()); + if(j!=turnouts.end()) + turnout_tracks[*i] = j->second; + } - break; + for(map::iterator i=turnout_tracks.begin(); i!=turnout_tracks.end(); ) + { + if(obj.check_validity(*i->first)==VALID) + { + obj.add_turnout(*i->first, i->second); + turnout_tracks.erase(i); + i = turnout_tracks.begin(); + } + else + ++i; } } +void Route::Loader::name(const string &n) +{ + obj.name = n; +} + void Route::Loader::turnout(unsigned id, unsigned path) { turnouts[id] = path;