bool operator()(const Track &t) const { return &t==&track; }
};
-struct TrackInRoute
+struct TrackInSet
{
- const Route &route;
+ const set<const Track *> &tracks;
- TrackInRoute(const Route &r): route(r) { }
+ TrackInSet(const set<const Track *> &t): tracks(t) { }
- bool operator()(const Track &t) const { return route.get_tracks().count(&t); }
+ bool operator()(const Track &t) const { return tracks.count(&t); }
};
template<typename Pred>
return result;
}
-unsigned count = 0;
-
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(), format("-%d-", ++count));
+ 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.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);
}
}
-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;
- }
-}
-
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));
}
Route *Route::find(const Track &from, unsigned ep, const Route &to)
{
- return create_route(from, ep, TrackInRoute(to));
+ return create_route(from, ep, TrackInSet(to.get_tracks()));
+}
+
+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);
}
projects / r2c2.git / blobdiff