#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 "route.h"
#include "signal.h"
#include "signaltype.h"
+#include "terrain.h"
#include "track.h"
#include "trackcircuit.h"
#include "tracktype.h"
Layout::Layout(Catalogue &c, Driver *d):
catalogue(c),
driver(d),
- next_turnout_id(0x800)
+ next_turnout_addr(0x800)
{
clock.set_rate(60);
}
}
}
+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<Vehicle>();
}
+template<>
+const set<Terrain *> &Layout::get_all<Terrain>() const
+{
+ return objects.get<Terrain>();
+}
+
template<>
const set<TrackChain *> &Layout::get_all<TrackChain>() 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))
- if(t->collide_ray(ray))
- return t;
+ {
+ float d = -1;
+ if(t->collide_ray(ray, &d))
+ if(!closest || d<distance)
+ {
+ closest = t;
+ distance = d;
+ }
+ }
- return 0;
+ return closest;
}
template Object *Layout::pick<Object>(const Ray &);
sensors.erase(s);
}
-unsigned Layout::allocate_turnout_id()
+void Layout::remove(BeamGate &g)
+{
+ remove(static_cast<Object &>(g));
+ remove(static_cast<Sensor &>(g));
+}
+
+unsigned Layout::allocate_turnout_address()
{
- set<unsigned> used_ids;
+ 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_turnout_id())
- used_ids.insert((*i)->get_turnout_id());
+ if((*i)->get_type().is_turnout())
+ used_addrs.insert((*i)->get_turnout_address());
- unsigned result = next_turnout_id;
- while(used_ids.count(result))
+ unsigned result = next_turnout_addr;
+ while(used_addrs.count(result))
++result;
- next_turnout_id = result+1;
+ next_turnout_addr = result+1;
return result;
}
void Layout::create_blocks()
{
- set<Track *> used_tracks;
+ 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);
}
- const set<Track *> &tracks = objects.get<Track>();
- 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);
+ }
+
+ // The previously obtained set has been invalidated by creating new blocks
blocks = &track_chains.get<Block>();
- for(set<Block *>::iterator i=blocks->begin(); i!=blocks->end(); ++i)
- for(set<Block *>::iterator j=i; j!=blocks->end(); ++j)
- if(j!=i)
+ 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);
}
dt = t-last_tick;
last_tick = t;
- clock.tick(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);
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
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((*i)->get_type().get_article_number());
+ (*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)
{
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(unsigned tid = (*i)->get_turnout_id())
- writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path()));
+ if((*i)->get_type().is_turnout())
+ writer.write((DataFile::Statement("turnout"), (*i)->get_turnout_address(), (*i)->get_active_path()));
for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
{
{
if(state==Sensor::ACTIVE)
{
- Block *block = 0;
- if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
- block = &tc->get_block();
-
+ Block *block = sensor.get_block();
if(block && !block->get_train())
- emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+ emergency(block, "Unreserved sensor triggered");
}
}
Layout::Loader::Loader(Layout &l):
- DataFile::ObjectLoader<Layout>(l),
- new_tracks(false)
+ DataFile::ObjectLoader<Layout>(l)
{
add("base", &Layout::base);
- add("route", static_cast<void (Loader::*)()>(&Loader::route));
+ add("beamgate", &Loader::beamgate);
+ add("clock", &Loader::clock);
+ add("route", &Loader::route);
add("signal", &Loader::signal);
- add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
- add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned, const std::string &)>(&Loader::train));
+ 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));
+void Layout::Loader::beamgate()
+{
+ BeamGate *gate = new BeamGate(obj);
+ load_sub(*gate);
}
-void Layout::Loader::route()
+void Layout::Loader::clock()
{
- Route *rte = new Route(obj);
- load_sub(*rte);
+ load_sub(obj.clock);
}
-void Layout::Loader::route(const string &n)
+void Layout::Loader::route()
{
Route *rte = new Route(obj);
- rte->set_name(n);
load_sub(*rte);
}
void Layout::Loader::signal(ArticleNumber art_nr)
{
- Signal *sig = new Signal(obj, obj.catalogue.get_signal(art_nr));
+ Signal *sig = new Signal(obj, obj.catalogue.get<SignalType>(art_nr));
load_sub(*sig);
}
-void Layout::Loader::track(unsigned art_nr)
+void Layout::Loader::terrain(ArticleNumber art_nr)
{
- track(ArticleNumber(art_nr));
+ Terrain *ter = new Terrain(obj, obj.catalogue.get<TerrainType>(art_nr));
+ load_sub(*ter);
}
void Layout::Loader::track(ArticleNumber art_nr)
{
- Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
+ Track *trk = new Track(obj, obj.catalogue.get<TrackType>(art_nr));
load_sub(*trk);
- new_tracks = true;
const set<Track *> &tracks = obj.objects.get<Track>();
for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
if(*i!=trk)
trk->link_to(**i);
}
-void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)
-{
- train(ArticleNumber(art_nr), addr, proto);
-}
-
void Layout::Loader::train(ArticleNumber art_nr, unsigned addr, const std::string &proto)
{
- Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr, proto);
+ Train *trn = new Train(obj, obj.catalogue.get<VehicleType>(art_nr), addr, proto);
load_sub(*trn);
}
projects / r2c2.git / blobdiff