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 6725a23e8c547510fe65fa1c7442e5a80ec6d5e3..e06d4fb04f50d8ccb1e581a363e2dce18d13d91a 100644 (file)
--- a/source/libr2c2/layout.h
+++ b/source/libr2c2/layout.h
@@ -1,9 +1,11 @@
 #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"
@@ -12,6 +14,7 @@
 namespace R2C2 {
 
 class ArticleNumber;
+class BeamGate;
 class Block;
 class Catalogue;
 class Driver;
@@ -29,17 +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 signal(ArticleNumber);
-               void track(ArticleNumber);
-               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();
        };
 
@@ -66,6 +70,14 @@ private:
                void del();
        };
 
+       struct BlockReservation
+       {
+               Block *block;
+               Train *train;
+
+               BlockReservation(Block &, Train *);
+       };
+
 public:
        typedef std::vector<Zone *> ZoneArray;
 
@@ -77,7 +89,7 @@ public:
        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;
@@ -89,7 +101,9 @@ private:
        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);
@@ -98,7 +112,7 @@ public:
        Catalogue &get_catalogue() const { return catalogue; }
        bool has_driver() const { return driver; }
        Driver &get_driver() const;
-       const Clock &get_clock() const { return clock; }
+       Clock &get_clock() { return clock; }
        const std::string &get_base() const { return base; }
 
        void add(Object &);
@@ -106,6 +120,7 @@ public:
        void add(TrackChain &);
        void add(Block &);
        void add(Sensor &);
+       void add(BeamGate &);
 
        template<typename T>
        const std::set<T *> &get_all() const;
@@ -117,8 +132,9 @@ public:
        void remove(Track &);
        void remove(TrackChain &);
        void remove(Sensor &);
+       void remove(BeamGate &);
 
-       unsigned allocate_turnout_id();
+       unsigned allocate_turnout_address();
 
        Block &get_block(unsigned) const;
        void create_blocks();
@@ -135,13 +151,17 @@ public:
        const std::map<unsigned, Train *> &get_trains() const { return trains; }
        void remove_train(Train &);
 
-       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