-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#include <algorithm>
+#include <msp/core/maputils.h>
+#include <msp/core/raii.h>
#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include <msp/datafile/writer.h>
#include <msp/io/print.h>
#include <msp/time/utils.h>
+#include "beamgate.h"
#include "block.h"
#include "catalogue.h"
#include "driver.h"
#include "layout.h"
#include "route.h"
+#include "signal.h"
+#include "signaltype.h"
+#include "terrain.h"
#include "track.h"
+#include "trackcircuit.h"
#include "tracktype.h"
#include "train.h"
+#include "vehicle.h"
#include "vehicletype.h"
#include "zone.h"
Layout::Layout(Catalogue &c, Driver *d):
catalogue(c),
driver(d),
- next_turnout_id(0x800)
+ next_turnout_addr(0x800),
+ emitting_block_reserved(false)
{
- if(driver)
- driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event));
+ clock.set_rate(60);
}
Layout::~Layout()
{
delete driver;
+ driver = 0;
+
while(!trains.empty())
delete trains.begin()->second;
- while(!routes.empty())
- delete *routes.begin();
- while(!tracks.empty())
- delete *tracks.begin();
- while(!blocks.empty())
- delete *blocks.begin();
+ track_chains.del<Route>();
+ track_chains.del<Zone>();
+ objects.del<Signal>();
+ objects.del<Track>();
+ track_chains.del<Block>();
}
Driver &Layout::get_driver() const
{
if(!driver)
- throw InvalidState("No driver");
+ throw logic_error("!driver");
return *driver;
}
-void Layout::add_track(Track &t)
+void Layout::add(Object &o)
+{
+ if(objects.insert(o))
+ {
+ try
+ {
+ signal_object_added.emit(o);
+ }
+ catch(...)
+ {
+ objects.erase(o);
+ throw;
+ }
+ }
+}
+
+void Layout::add(Track &t)
+{
+ if(objects.insert(t))
+ {
+ try
+ {
+ // Blocks must be recreated first
+ create_blocks();
+ signal_object_added.emit(t);
+ }
+ catch(...)
+ {
+ objects.erase(t);
+ create_blocks();
+ throw;
+ }
+ }
+}
+
+void Layout::add(TrackChain &g)
+{
+ if(track_chains.insert(g))
+ {
+ try
+ {
+ signal_track_chain_added.emit(g);
+ }
+ catch(...)
+ {
+ track_chains.erase(g);
+ throw;
+ }
+ }
+}
+
+void Layout::add(Block &b)
+{
+ if(track_chains.insert(b))
+ {
+ sigc::connection conn = b.signal_reserved.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_reserved), sigc::ref(b)));
+ try
+ {
+ signal_track_chain_added.emit(b);
+ }
+ catch(...)
+ {
+ track_chains.erase(b);
+ conn.disconnect();
+ throw;
+ }
+ }
+}
+
+void Layout::add(Sensor &s)
{
- if(tracks.insert(&t).second)
+ if(sensors.insert(s))
{
- create_blocks();
- signal_track_added.emit(t);
+ s.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::sensor_state_changed), sigc::ref(s)));
+ s.signal_state_changed.connect(sigc::bind<0>(signal_sensor_state_changed, sigc::ref(s)));
}
}
-void Layout::remove_track(Track &t)
+void Layout::add(BeamGate &g)
+{
+ add(static_cast<Object &>(g));
+ add(static_cast<Sensor &>(g));
+}
+
+template<>
+const set<Object *> &Layout::get_all<Object>() const
+{
+ return objects.get();
+}
+
+template<>
+const set<Track *> &Layout::get_all<Track>() const
+{
+ return objects.get<Track>();
+}
+
+template<>
+const set<Signal *> &Layout::get_all<Signal>() const
+{
+ return objects.get<Signal>();
+}
+
+template<>
+const set<Vehicle *> &Layout::get_all<Vehicle>() const
{
- if(tracks.erase(&t))
+ return objects.get<Vehicle>();
+}
+
+template<>
+const set<Terrain *> &Layout::get_all<Terrain>() const
+{
+ return objects.get<Terrain>();
+}
+
+template<>
+const set<TrackChain *> &Layout::get_all<TrackChain>() const
+{
+ return track_chains.get();
+}
+
+template<>
+const set<Block *> &Layout::get_all<Block>() const
+{
+ return track_chains.get<Block>();
+}
+
+template<>
+const set<Route *> &Layout::get_all<Route>() const
+{
+ return track_chains.get<Route>();
+}
+
+template<>
+const set<Zone *> &Layout::get_all<Zone>() const
+{
+ return track_chains.get<Zone>();
+}
+
+template<>
+const set<Sensor *> &Layout::get_all<Sensor>() const
+{
+ return sensors.get<Sensor>();
+}
+
+template<>
+const set<TrackCircuit *> &Layout::get_all<TrackCircuit>() const
+{
+ return sensors.get<TrackCircuit>();
+}
+
+template<>
+const set<BeamGate *> &Layout::get_all<BeamGate>() const
+{
+ return sensors.get<BeamGate>();
+}
+
+template<typename T>
+T *Layout::pick(const Ray &ray)
+{
+ const set<Object *> &objs = objects.get();
+ T *closest = 0;
+ float distance = -1;
+ for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+ if(T *t = dynamic_cast<T *>(*i))
+ {
+ float d = -1;
+ if(t->collide_ray(ray, &d))
+ if(!closest || d<distance)
+ {
+ closest = t;
+ distance = d;
+ }
+ }
+
+ return closest;
+}
+
+template Object *Layout::pick<Object>(const Ray &);
+template Track *Layout::pick<Track>(const Ray &);
+template Signal *Layout::pick<Signal>(const Ray &);
+template Vehicle *Layout::pick<Vehicle>(const Ray &);
+
+void Layout::remove(Object &o)
+{
+ if(objects.erase(o))
+ signal_object_removed.emit(o);
+}
+
+void Layout::remove(Track &t)
+{
+ if(objects.erase(t))
{
+ // Blocks must be recreated first
create_blocks(t);
- signal_track_removed.emit(t);
+ signal_object_removed.emit(t);
}
}
-unsigned Layout::allocate_turnout_id()
+void Layout::remove(TrackChain &g)
{
- set<unsigned> used_ids;
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if((*i)->get_turnout_id())
- used_ids.insert((*i)->get_turnout_id());
+ if(track_chains.erase(g))
+ signal_track_chain_removed.emit(g);
+}
- unsigned result = next_turnout_id;
- while(used_ids.count(result))
- ++result;
- next_turnout_id = result+1;
+void Layout::remove(Sensor &s)
+{
+ sensors.erase(s);
+}
- return result;
+void Layout::remove(BeamGate &g)
+{
+ remove(static_cast<Object &>(g));
+ remove(static_cast<Sensor &>(g));
}
-void Layout::add_block(Block &b)
+unsigned Layout::allocate_turnout_address()
{
- blocks.insert(&b);
+ set<unsigned> used_addrs;
+ const set<Track *> &tracks = objects.get<Track>();
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ if((*i)->get_type().is_turnout())
+ used_addrs.insert((*i)->get_turnout_address());
+
+ unsigned result = next_turnout_addr;
+ while(used_addrs.count(result))
+ ++result;
+ next_turnout_addr = result+1;
+
+ return result;
}
Block &Layout::get_block(unsigned id) const
{
+ const set<Block *> &blocks = track_chains.get<Block>();
for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
if((*i)->get_id()==id)
return **i;
- throw KeyError("Unknown block", lexical_cast(id));
+ throw key_error(id);
}
void Layout::create_blocks()
{
- set<Track *> used_tracks;
- for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+ set<Track *> loose_tracks = objects.get<Track>();
+ const set<Block *> *blocks = &track_chains.get<Block>();
+ for(set<Block *>::const_iterator i=blocks->begin(); i!=blocks->end(); ++i)
{
const set<Track *> &btracks = (*i)->get_tracks();
- used_tracks.insert(btracks.begin(), btracks.end());
+ for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)
+ loose_tracks.erase(*j);
}
- for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
- if(used_tracks.count(*i)==0)
- {
- Block *block = new Block(*this, **i);
- used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end());
- }
+ list<Block *> created_blocks;
+ while(!loose_tracks.empty())
+ {
+ Block *block = new Block(*this, **loose_tracks.begin());
+ created_blocks.push_back(block);
+
+ const set<Track *> &btracks = block->get_tracks();
+ for(set<Track *>::const_iterator i=btracks.begin(); i!=btracks.end(); ++i)
+ loose_tracks.erase(*i);
+ }
- for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- for(set<Block *>::iterator j=i; j!=blocks.end(); ++j)
- if(j!=i)
+ // The previously obtained set has been invalidated by creating new blocks
+ blocks = &track_chains.get<Block>();
+ for(list<Block *>::iterator i=created_blocks.begin(); i!=created_blocks.end(); ++i)
+ for(set<Block *>::const_iterator j=blocks->begin(); j!=blocks->end(); ++j)
+ if(*j!=*i)
(*i)->check_link(**j);
}
create_blocks();
}
-void Layout::remove_block(Block &b)
-{
- blocks.erase(&b);
-}
-
-void Layout::add_route(Route &r)
-{
- if(routes.insert(&r).second)
- signal_route_added.emit(r);
-}
-
Route &Layout::get_route(const string &name) const
{
+ const set<Route *> &routes = track_chains.get<Route>();
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
if((*i)->get_name()==name)
return **i;
- throw KeyError("Unknown route", name);
+ throw key_error(name);
}
void Layout::update_routes()
{
+ const set<Route *> &routes = track_chains.get<Route>();
for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
(*i)->update_turnouts();
}
-void Layout::remove_route(Route &r)
-{
- if(routes.erase(&r))
- signal_route_removed.emit(r);
-}
-
-void Layout::add_zone(Zone &z)
-{
- if(zones.insert(&z).second)
- signal_zone_added.emit(z);
-}
-
Layout::ZoneArray Layout::get_zones(const string &group) const
{
ZoneArray result;
- for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+ const set<Zone *> &zones = track_chains.get<Zone>();
+ for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
if((*i)->get_group()==group)
result.push_back(*i);
Zone &Layout::get_zone(const string &group, unsigned num) const
{
- for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+ const set<Zone *> &zones = track_chains.get<Zone>();
+ for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
if((*i)->get_group()==group && (*i)->get_number()==num)
return **i;
- throw KeyError("Unknown zone", format("%s %d", group, num));
-}
-
-void Layout::remove_zone(Zone &z)
-{
- if(zones.erase(&z))
- signal_zone_removed.emit(z);
+ throw key_error(format("%s %d", group, num));
}
void Layout::add_train(Train &t)
{
- if(trains.count(t.get_address()))
- throw KeyError("Duplicate train address", lexical_cast(t.get_address()));
-
- trains[t.get_address()] = &t;
+ insert_unique(trains, t.get_address(), &t);
signal_train_added.emit(t);
}
Train &Layout::get_train(unsigned addr) const
{
- map<unsigned, Train *>::const_iterator i = trains.find(addr);
- if(i==trains.end())
- throw KeyError("Unknown train", lexical_cast(addr));
- return *i->second;
+ return *get_item(trains, addr);
}
void Layout::remove_train(Train &t)
signal_train_removed.emit(t);
}
-void Layout::add_vehicle(Vehicle &v)
-{
- if(vehicles.insert(&v).second)
- signal_vehicle_added.emit(v);
-}
-
-void Layout::remove_vehicle(Vehicle &v)
-{
- if(vehicles.erase(&v))
- signal_vehicle_removed.emit(v);
-}
-
-void Layout::tick()
+void Layout::tick(float speed)
{
if(driver)
driver->tick();
dt = t-last_tick;
last_tick = t;
+ dt *= speed;
+ unsigned count = dt/(10*Time::msec)+1;
+ dt /= count;
+ while(count--)
+ step(dt);
+}
+
+void Layout::step(const Time::TimeDelta &dt)
+{
+ if(!driver || !driver->is_halted())
+ clock.tick(dt);
+
+ for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
+ (*i)->tick(dt);
+ const set<Signal *> &signals = objects.get<Signal>();
+ for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
+ (*i)->tick(dt);
for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
- i->second->tick(t, dt);
+ i->second->tick(dt);
}
-void Layout::emergency(const string &msg)
+void Layout::emergency(Block *block, const string &msg)
{
if(driver)
driver->halt(true);
- IO::print("Emergency: %s\n", msg);
- signal_emergency.emit(msg);
+ if(block)
+ IO::print("Emergency at %s: %s\n", block->get_name(), msg);
+ else
+ IO::print("Emergency: %s\n", msg);
+ signal_emergency.emit(block, msg);
}
void Layout::save(const string &fn) const
if(!base.empty())
writer.write((DataFile::Statement("base"), base));
+ const set<Track *> &tracks = objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
DataFile::Statement st("track");
- st.append((*i)->get_type().get_article_number());
+ st.append(catalogue.get_name(&(*i)->get_type()));
+ (*i)->save(st.sub);
+ writer.write(st);
+ }
+
+ const set<Signal *> &signals = objects.get<Signal>();
+ for(set<Signal *>::const_iterator i=signals.begin(); i!=signals.end(); ++i)
+ {
+ DataFile::Statement st("signal");
+ st.append(catalogue.get_name(&(*i)->get_type()));
+ (*i)->save(st.sub);
+ writer.write(st);
+ }
+
+ const set<Terrain *> &terrains = objects.get<Terrain>();
+ for(set<Terrain *>::const_iterator i=terrains.begin(); i!=terrains.end(); ++i)
+ {
+ DataFile::Statement st("terrain");
+ st.append(catalogue.get_name(&(*i)->get_type()));
(*i)->save(st.sub);
writer.write(st);
}
+ const set<BeamGate *> &gates = objects.get<BeamGate>();
+ for(set<BeamGate *>::const_iterator i=gates.begin(); i!=gates.end(); ++i)
+ {
+ DataFile::Statement st("beamgate");
+ (*i)->save(st.sub);
+ writer.write(st);
+ }
+
+ const set<Route *> &routes = track_chains.get<Route>();
for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
{
if((*i)->is_temporary())
writer.write(st);
}
- for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+ const set<Zone *> &zones = track_chains.get<Zone>();
+ for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
{
DataFile::Statement st("zone");
(*i)->save(st.sub);
}
}
-void Layout::save_trains(const string &fn) const
+void Layout::save_dynamic(const string &fn) const
{
IO::BufferedFile out(fn, IO::M_WRITE);
DataFile::Writer writer(out);
+ {
+ DataFile::Statement st("clock");
+ clock.save(st.sub);
+ writer.write(st);
+ }
+
+ const set<Track *> &tracks = objects.get<Track>();
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ if((*i)->get_type().is_turnout())
+ {
+ DataFile::Statement st("turnout");
+ st.append((*i)->get_turnout_address());
+ (*i)->save_dynamic(st.sub);
+ writer.write(st);
+ }
+
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
DataFile::Statement st("train");
- st.append(i->second->get_locomotive_type().get_article_number());
+ st.append(catalogue.get_name(&i->second->get_locomotive_type()));
st.append(i->second->get_address());
st.append(i->second->get_protocol());
i->second->save(st.sub);
}
}
-void Layout::sensor_event(unsigned addr, bool state)
+void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
{
- if(state)
+ if(state==Sensor::ACTIVE)
{
- for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if((*i)->get_sensor_id()==addr)
- {
- if(!(*i)->get_train())
- emergency(format("Unreserved sensor %d triggered", addr));
- break;
- }
+ Block *block = sensor.get_block();
+ if(block && !block->get_train())
+ emergency(block, "Unreserved sensor triggered");
+ }
+}
+
+void Layout::block_reserved(Block &block, Train *train)
+{
+ if(emitting_block_reserved)
+ {
+ if(!train)
+ {
+ for(deque<BlockReservation>::iterator i=block_reserve_queue.end(); i!=block_reserve_queue.begin(); )
+ if((--i)->block==&block)
+ {
+ block_reserve_queue.erase(i);
+ return;
+ }
+ }
+
+ block_reserve_queue.push_back(BlockReservation(block, train));
+ }
+ else
+ {
+ SetFlag setf(emitting_block_reserved);
+ signal_block_reserved.emit(block, train);
+ while(!block_reserve_queue.empty())
+ {
+ BlockReservation br = block_reserve_queue.front();
+ block_reserve_queue.pop_front();
+ signal_block_reserved.emit(*br.block, br.train);
+ }
}
}
+template<typename B>
+Layout::Storage<B>::~Storage()
+{
+ while(!base.empty())
+ delete *base.begin();
+}
+
+template<typename B>
+bool Layout::Storage<B>::insert(B &b)
+{
+ bool result = base.insert(&b).second;
+ if(result)
+ caches.clear();
+ return result;
+}
+
+template<typename B>
+bool Layout::Storage<B>::erase(B &b)
+{
+ bool result = base.erase(&b);
+ if(result)
+ caches.clear();
+ return result;
+}
+
+template<typename B>
+template<typename T>
+const set<T *> &Layout::Storage<B>::get() const
+{
+ for(list<Variant>::const_iterator i=caches.begin(); i!=caches.end(); ++i)
+ if(i->check_type<set<T *> >())
+ return i->value<set<T *> >();
+
+ caches.push_back(set<T *>());
+ set<T *> &result = caches.back().value<set<T *> >();
+ for(typename set<B *>::const_iterator i=base.begin(); i!=base.end(); ++i)
+ if(T *t = dynamic_cast<T *>(*i))
+ result.insert(t);
+
+ return result;
+}
+
+template<typename B>
+template<typename T>
+void Layout::Storage<B>::del()
+{
+ set<T *> ts = get<T>();
+ for(typename set<T *>::iterator i=ts.begin(); i!=ts.end(); ++i)
+ if(base.count(*i))
+ delete *i;
+}
+
+
+Layout::BlockReservation::BlockReservation(Block &b, Train *t):
+ block(&b),
+ train(t)
+{ }
+
+
Layout::Loader::Loader(Layout &l):
- DataFile::BasicLoader<Layout>(l),
- new_tracks(false)
+ DataFile::ObjectLoader<Layout>(l)
{
add("base", &Layout::base);
- add("route", static_cast<void (Loader::*)()>(&Loader::route));
- add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
- add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
+ add("beamgate", &Loader::beamgate);
+ add("clock", &Loader::clock);
+ add("route", &Loader::route);
+ add("signal", &Loader::signal);
+ add("terrain", &Loader::terrain);
+ add("track", &Loader::track);
+ add("train", &Loader::train);
+ add("turnout", &Loader::turnout);
add("zone", &Loader::zone);
- // Deprecated aliases
- add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
- add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
- add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
+ // Deprecated
+ add("turnout", &Loader::turnout2);
+}
+
+void Layout::Loader::beamgate()
+{
+ BeamGate *gate = new BeamGate(obj);
+ load_sub(*gate);
}
-void Layout::Loader::finish()
+void Layout::Loader::clock()
{
- for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
- (*i)->check_slope();
+ load_sub(obj.clock);
}
void Layout::Loader::route()
load_sub(*rte);
}
-void Layout::Loader::route(const string &n)
+void Layout::Loader::signal(const string &n)
{
- Route *rte = new Route(obj);
- rte->set_name(n);
- load_sub(*rte);
+ Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(n));
+ load_sub(*sig);
}
-void Layout::Loader::track(unsigned art_nr)
+void Layout::Loader::terrain(const string &n)
{
- track(ArticleNumber(art_nr));
+ Terrain *ter = new Terrain(obj, obj.catalogue.get<TerrainType>(n));
+ load_sub(*ter);
}
-void Layout::Loader::track(ArticleNumber art_nr)
+void Layout::Loader::track(const string &n)
{
- Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
+ Track *trk = new Track(obj, obj.catalogue.get<TrackType>(n));
load_sub(*trk);
- new_tracks = true;
- for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
+ const set<Track *> &tracks = obj.objects.get<Track>();
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if(*i!=trk)
- trk->snap_to(**i, true);
+ trk->link_to(**i);
}
-void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)
+void Layout::Loader::train(const string &n, unsigned addr, const std::string &proto)
{
- train(ArticleNumber(art_nr), addr, proto);
+ Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(n), addr, proto);
+ load_sub(*trn);
}
-void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
+void Layout::Loader::turnout(unsigned addr)
{
- Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);
- load_sub(*trn);
+ /* Kinda slow, but maintaining a map of turnouts seems more trouble than
+ it's worth at this point. */
+ const set<Track *> &tracks = obj.objects.get<Track>();
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ if((*i)->get_turnout_address()==addr)
+ {
+ load_sub(**i);
+ return;
+ }
+
+ throw key_error(addr);
+}
+
+void Layout::Loader::turnout2(unsigned addr, unsigned path)
+{
+ // XXX Discrepancy between ids and addresses
+ if(obj.driver)
+ obj.driver->set_turnout(addr, path);
}
void Layout::Loader::zone()
projects / r2c2.git / blobdiff