diff -r e225719bde6b -r 2d806130e700 lemon/path.h --- a/lemon/path.h Thu Jan 26 06:44:22 2006 +0000 +++ b/lemon/path.h Thu Jan 26 15:42:13 2006 +0000 @@ -385,7 +385,7 @@ //! \todo Thoroughfully check all the range and consistency tests. /// \todo May we need just path for undirected graph instead of this. template - class UndirPath { + class UPath { public: /// Edge type of the underlying graph. typedef typename Graph::Edge GraphEdge; @@ -403,13 +403,13 @@ /// \param _G The graph in which the path is. /// - UndirPath(const Graph &_G) : gr(&_G) {} + UPath(const Graph &_G) : gr(&_G) {} /// \brief Subpath constructor. /// /// Subpath defined by two nodes. /// \warning It is an error if the two edges are not in order! - UndirPath(const UndirPath &P, const NodeIt &a, const NodeIt &b) { + UPath(const UPath &P, const NodeIt &a, const NodeIt &b) { gr = P.gr; edges.insert(edges.end(), P.edges.begin()+a.idx, P.edges.begin()+b.idx); } @@ -418,7 +418,7 @@ /// /// Subpath defined by two edges. Contains edges in [a,b) /// \warning It is an error if the two edges are not in order! - UndirPath(const UndirPath &P, const EdgeIt &a, const EdgeIt &b) { + UPath(const UPath &P, const EdgeIt &a, const EdgeIt &b) { gr = P.gr; edges.insert(edges.end(), P.edges.begin()+a.idx, P.edges.begin()+b.idx); } @@ -500,17 +500,17 @@ * Yes, it shouldn't. */ class EdgeIt { - friend class UndirPath; + friend class UPath; int idx; - const UndirPath *p; + const UPath *p; public: /// Default constructor EdgeIt() {} /// Invalid constructor EdgeIt(Invalid) : idx(-1), p(0) {} /// Constructor with starting point - EdgeIt(const UndirPath &_p, int _idx = 0) : + EdgeIt(const UPath &_p, int _idx = 0) : idx(_idx), p(&_p) { validate(); } ///Validity check @@ -547,17 +547,17 @@ * Yes, it shouldn't. */ class NodeIt { - friend class UndirPath; + friend class UPath; int idx; - const UndirPath *p; + const UPath *p; public: /// Default constructor NodeIt() {} /// Invalid constructor NodeIt(Invalid) : idx(-1), p(0) {} /// Constructor with starting point - NodeIt(const UndirPath &_p, int _idx = 0) : + NodeIt(const UPath &_p, int _idx = 0) : idx(_idx), p(&_p) { validate(); } ///Validity check @@ -600,17 +600,17 @@ * PathConcept) while the builder is active (after the first modifying * operation and until the commit()) the original Path is in a * "transitional" state (operations ot it have undefined result). But - * in the case of UndirPath the original path is unchanged until the + * in the case of UPath the original path is unchanged until the * commit. However we don't recomend that you use this feature. */ class Builder { - UndirPath &P; + UPath &P; Container front, back; public: ///\param _p the path you want to fill in. /// - Builder(UndirPath &_p) : P(_p) {} + Builder(UPath &_p) : P(_p) {} /// Sets the starting node of the path.