Use generic ObjectTypes in Catalogue

[r2c2.git] / source / libr2c2 / layout.cpp

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index 46a43a8353fffd8cccc266f418dbaa7bb117bcd3..598bf82bcf4c0a1763a22d9b78562b21c4d6e00e 100644 (file)
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -5,6 +5,7 @@
 #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"
@@ -104,6 +105,12 @@ void Layout::add(Sensor &s)
        }
 }
 
+void Layout::add(BeamGate &g)
+{
+       add(static_cast<Object &>(g));
+       add(static_cast<Sensor &>(g));
+}
+
 template<>
 const set<Object *> &Layout::get_all<Object>() const
 {
@@ -164,6 +171,12 @@ 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)
 {
@@ -208,6 +221,12 @@ void Layout::remove(Sensor &s)
        sensors.erase(s);
 }
 
+void Layout::remove(BeamGate &g)
+{
+       remove(static_cast<Object &>(g));
+       remove(static_cast<Sensor &>(g));
+}
+
 unsigned Layout::allocate_turnout_id()
 {
        set<unsigned> used_ids;
@@ -236,26 +255,31 @@ Block &Layout::get_block(unsigned id) const
 
 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);
 }
 
@@ -390,6 +414,14 @@ void Layout::save(const string &fn) const
                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)
        {
@@ -435,10 +467,7 @@ void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
 {
        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()));
        }
@@ -503,46 +532,36 @@ Layout::Loader::Loader(Layout &l):
        new_tracks(false)
 {
        add("base",  &Layout::base);
-       add("route", static_cast<void (Loader::*)()>(&Loader::route));
+       add("beamgate", &Loader::beamgate);
+       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("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::route()
+void Layout::Loader::beamgate()
 {
-       Route *rte = new Route(obj);
-       load_sub(*rte);
+       BeamGate *gate = new BeamGate(obj);
+       load_sub(*gate);
 }
 
-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)
-{
-       track(ArticleNumber(art_nr));
-}
-
 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>();
@@ -551,14 +570,9 @@ void Layout::Loader::track(ArticleNumber art_nr)
                        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);
 }