X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=186f0f13d85b6103e59e546f376193678c2adc18;hb=aead7f2da831199fbb8f6950b067656b2965c2fa;hp=df3ed4a525444271c931d4dd02a6c4e70dd5d63b;hpb=78bc40c2d1a5fcc5715143bd2326716fbb143730;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index df3ed4a..186f0f1 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -1,5 +1,5 @@
-#ifndef MARKLIN_3D_SECTION_H_
-#define MARKLIN_3D_SECTION_H_
+#ifndef MARKLIN_3D_BLOCK_H_
+#define MARKLIN_3D_BLOCK_H_
 
 #include <list>
 #include <set>
@@ -15,32 +15,36 @@ class Block
 public:
 	struct Endpoint
 	{
-		Track *track;
-		const Track::Endpoint *track_ep;
-		Block  *link;
+		Track    *track;
+		unsigned track_ep;
+		Block    *link;
 		unsigned routes;
 
-		Endpoint(Track *, const Track::Endpoint *);
+		Endpoint(Track *, unsigned);
 	};
-	typedef std::list<Endpoint> EndpointSeq;
 
-	Block(TrafficManager &, Track *);
-	unsigned get_sensor_id() const { return sensor_id; }
-	const TrackSet &get_tracks() const { return tracks; }
-	const Endpoint *get_endpoint_by_link(const Block *) const;
-	const Endpoint *traverse(const Endpoint *) const;
-	void check_link(Block &);
-	bool reserve(const Train *);
-	void print_debug();
 private:
 	TrafficManager &trfc_mgr;
 	unsigned       id;
 	unsigned       sensor_id;
-	TrackSet       tracks;
-	EndpointSeq    endpoints;
+	std::set<Track *>     tracks;
+	std::vector<Endpoint> endpoints;
 	const Train    *train;
 
-	void find_routes(Track *, const Track::Endpoint *, unsigned, TrackSet &);
+public:
+	Block(TrafficManager &, Track &);
+	unsigned get_sensor_id() const { return sensor_id; }
+	const std::set<Track *> &get_tracks() const { return tracks; }
+	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
+	int get_endpoint_by_link(const Block &) const;
+	int traverse(unsigned) const;
+	void check_link(Block &);
+	Block *get_link(unsigned) const;
+	bool reserve(const Train *);
+	const Train *get_train() const { return train; }
+	void print_debug();
+private:
+	void find_routes(Track &, unsigned, unsigned, std::set<Track *> &);
 
 	static unsigned next_id;
 };