X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fblock.h;h=2aed9a40df680f3a769befd02cbe0357b30dd5fd;hb=e392d397f6b86a49a05e9738357ccbfc2a922f01;hp=3da5eec2dcc4e433aadf0182991aa648f5613640;hpb=98047057e4adae31aa449161ca845db1a6c2db77;p=r2c2.git

diff --git a/source/libmarklin/block.h b/source/libmarklin/block.h
index 3da5eec..2aed9a4 100644
--- a/source/libmarklin/block.h
+++ b/source/libmarklin/block.h
@@ -16,6 +16,7 @@ namespace Marklin {
 
 class Layout;
 class Route;
+class TrackIter;
 class Train;
 
 class Block
@@ -48,10 +49,10 @@ public:
 	unsigned get_sensor_id() const { return sensor_id; }
 	unsigned get_turnout_id() const { return turnout_id; }
 	const std::set<Track *> &get_tracks() const { return tracks; }
+	bool has_track(Track &) const;
 	const std::vector<Endpoint> &get_endpoints() const { return endpoints; }
-	int get_endpoint_by_link(const Block &) const;
-	unsigned traverse(unsigned, float * =0) const;
-	unsigned traverse(unsigned, const Route *, float * =0) const;
+	int get_endpoint_by_link(Block &) const;
+	float get_path_length(unsigned, const Route * = 0) const;
 	void check_link(Block &);
 	void break_link(Block &);
 	Block *get_link(unsigned) const;
@@ -59,7 +60,7 @@ public:
 	Train *get_train() const { return train; }
 	void print_debug();
 private:
-	void find_paths(Track &, unsigned, unsigned, std::set<Track *> &);
+	void find_paths(TrackIter, unsigned);
 	void determine_id();
 };