X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblock.h;h=2f898b0992af7e14799fc576532265f8b808bff8;hb=d5d8ee8bb873ad9833be0729d9d7336c093fef4e;hp=f71ee29b63f6871ccc2a419e9638a02a22dc54e2;hpb=59bae8acd679127602cf35d22bcd37e316a5a056;p=r2c2.git

diff --git a/source/libr2c2/block.h b/source/libr2c2/block.h
index f71ee29..2f898b0 100644
--- a/source/libr2c2/block.h
+++ b/source/libr2c2/block.h
@@ -4,6 +4,7 @@
 #include <list>
 #include <set>
 #include "track.h"
+#include "trackchain.h"
 
 namespace R2C2 {
 
@@ -13,7 +14,7 @@ class TrackCircuit;
 class TrackIter;
 class Train;
 
-class Block
+class Block: public TrackChain
 {
 public:
 	struct Endpoint
@@ -21,7 +22,6 @@ public:
 		Track *track;
 		unsigned track_ep;
 		Block *link;
-		unsigned paths;
 
 		Endpoint(Track *, unsigned);
 
@@ -31,12 +31,11 @@ public:
 	sigc::signal<void, Train *> signal_reserved;
 
 private:
-	Layout &layout;
 	unsigned id;
-	unsigned sensor_id;
-	unsigned turnout_id;
+	unsigned sensor_addr;
+	unsigned turnout_addr;
+	bool conflict;
 	TrackCircuit *sensor;
-	std::set<Track *> tracks;
 	std::vector<Endpoint> endpoints;
 	Train *train;
 
@@ -44,12 +43,15 @@ public:
 	Block(Layout &, Track &);
 	~Block();
 
+private:
+	virtual void on_track_added(Track &);
+	virtual Validity check_validity(Track &) const;
+
+public:
 	unsigned get_id() const { return id; }
-	unsigned get_sensor_id() const { return sensor_id; }
-	unsigned get_turnout_id() const { return turnout_id; }
-	TrackCircuit &get_sensor() const { return *sensor; }
-	const std::set<Track *> &get_tracks() const { return tracks; }
-	bool has_track(Track &) const;
+	unsigned get_sensor_address() const { return sensor_addr; }
+	unsigned get_turnout_address() const { return turnout_addr; }
+	TrackCircuit *get_sensor() const { return sensor; }
 	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
 	const Endpoint &get_endpoint(unsigned) const;
 	int get_endpoint_by_link(Block &) const;
@@ -60,7 +62,6 @@ public:
 	bool reserve(Train *);
 	Train *get_train() const { return train; }
 private:
-	void find_paths(const TrackIter &, unsigned);
 	void determine_id();
 };