Remove a queued block reservation if the block is released

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

diff --git a/source/libr2c2/layout.h b/source/libr2c2/layout.h
index f9a2ba1bd5f7cf73f06dbd39956c0afa4166cffb..e06d4fb04f50d8ccb1e581a363e2dce18d13d91a 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,16 +1,20 @@
 #ifndef LIBR2C2_LAYOUT_H_
 #define LIBR2C2_LAYOUT_H_
 
+#include <deque>
 #include <set>
 #include <sigc++/sigc++.h>
 #include <msp/datafile/objectloader.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/timestamp.h>
 #include "geometry.h"
 #include "sensor.h"
+#include "clock.h"
 
 namespace R2C2 {
 
 class ArticleNumber;
+class BeamGate;
 class Block;
 class Catalogue;
 class Driver;
@@ -18,6 +22,7 @@ class Object;
 class Route;
 class Signal;
 class Track;
+class TrackChain;
 class Train;
 class Vehicle;
 class Zone;
@@ -27,20 +32,18 @@ class Layout
 public:
        class Loader: public Msp::DataFile::ObjectLoader<Layout>
        {
-       private:
-               bool new_tracks;
-
        public:
                Loader(Layout &);
        private:
+               void beamgate();
+               void clock();
                void route();
-               void route(const std::string &);
-               void signal(ArticleNumber);
-               void track(unsigned);
-               void track(ArticleNumber);
-               void train(unsigned, unsigned, const std::string &);
-               void train(ArticleNumber, unsigned, const std::string &);
-               void turnout(unsigned, unsigned);
+               void signal(const std::string &);
+               void terrain(const std::string &);
+               void track(const std::string &);
+               void train(const std::string &, unsigned, const std::string &);
+               void turnout(unsigned);
+               void turnout2(unsigned, unsigned);
                void zone();
        };
 
@@ -67,34 +70,40 @@ private:
                void del();
        };
 
+       struct BlockReservation
+       {
+               Block *block;
+               Train *train;
+
+               BlockReservation(Block &, Train *);
+       };
+
 public:
-       typedef std::set<Zone *> ZoneSet;
        typedef std::vector<Zone *> ZoneArray;
 
        sigc::signal<void, Object &> signal_object_added;
        sigc::signal<void, Object &> signal_object_removed;
-       sigc::signal<void, Route &> signal_route_added;
-       sigc::signal<void, Route &> signal_route_removed;
-       sigc::signal<void, Zone &> signal_zone_added;
-       sigc::signal<void, Zone &> signal_zone_removed;
+       sigc::signal<void, TrackChain &> signal_track_chain_added;
+       sigc::signal<void, TrackChain &> signal_track_chain_removed;
        sigc::signal<void, Train &> signal_train_added;
        sigc::signal<void, Train &> signal_train_removed;
        sigc::signal<void, Block &, Train *> signal_block_reserved;
        sigc::signal<void, Sensor &, Sensor::State> signal_sensor_state_changed;
-       sigc::signal<void, const std::string &> signal_emergency;
+       sigc::signal<void, Block *, const std::string &> signal_emergency;
 
 private:
        Catalogue &catalogue;
        Driver *driver;
+       Clock clock;
        std::string base;
        Storage<Object> objects;
-       std::set<Route *> routes;
-       ZoneSet zones;
-       std::set<Block *> blocks;
-       std::set<Sensor *> sensors;
+       Storage<TrackChain> track_chains;
+       Storage<Sensor> sensors;
        std::map<unsigned, Train *> trains;
        Msp::Time::TimeStamp last_tick;
-       unsigned next_turnout_id;
+       unsigned next_turnout_addr;
+       bool emitting_block_reserved;
+       std::deque<BlockReservation> block_reserve_queue;
 
 public:
        Layout(Catalogue &, Driver * = 0);
@@ -103,10 +112,15 @@ public:
        Catalogue &get_catalogue() const { return catalogue; }
        bool has_driver() const { return driver; }
        Driver &get_driver() const;
+       Clock &get_clock() { return clock; }
        const std::string &get_base() const { return base; }
 
        void add(Object &);
        void add(Track &);
+       void add(TrackChain &);
+       void add(Block &);
+       void add(Sensor &);
+       void add(BeamGate &);
 
        template<typename T>
        const std::set<T *> &get_all() const;
@@ -116,43 +130,38 @@ public:
 
        void remove(Object &);
        void remove(Track &);
+       void remove(TrackChain &);
+       void remove(Sensor &);
+       void remove(BeamGate &);
 
-       unsigned allocate_turnout_id();
+       unsigned allocate_turnout_address();
 
-       void add_block(Block &);
        Block &get_block(unsigned) const;
-       const std::set<Block *> &get_blocks() const { return blocks; }
        void create_blocks();
        void create_blocks(Track &);
-       void remove_block(Block &);
 
-       void add_route(Route &);
-       const std::set<Route *> &get_routes() const { return routes; }
        Route &get_route(const std::string &) const;
        void update_routes();
-       void remove_route(Route &);
 
-       void add_zone(Zone &);
-       const ZoneSet &get_zones() const { return zones; }
        ZoneArray get_zones(const std::string &) const;
        Zone &get_zone(const std::string &, unsigned) const;
-       void remove_zone(Zone &);
 
        void add_train(Train &);
        Train &get_train(unsigned) const;
        const std::map<unsigned, Train *> &get_trains() const { return trains; }
        void remove_train(Train &);
 
-       void add_sensor(Sensor &);
-       void remove_sensor(Sensor &);
-
-       void tick();
-       void emergency(const std::string &);
+       void tick(float = 1.0f);
+private:
+       void step(const Msp::Time::TimeDelta &);
+public:
+       void emergency(Block *, const std::string &);
 
        void save(const std::string &) const;
        void save_dynamic(const std::string &) const;
 private:
        void sensor_state_changed(Sensor &, Sensor::State);
+       void block_reserved(Block &, Train *);
 };
 
 } // namespace R2C2