diff -r d4d1f6ca5c23 -r 10681ee9d8ae lemon/full_graph.h --- a/lemon/full_graph.h Tue May 09 14:28:02 2006 +0000 +++ b/lemon/full_graph.h Fri May 12 09:51:45 2006 +0000 @@ -441,7 +441,7 @@ }; - typedef UGraphExtender > + typedef UGraphExtender > ExtendedFullUGraphBase; /// \ingroup graphs @@ -518,18 +518,18 @@ bool operator<(const Node i) const {return id> 1) * _bNodeNum; } - void nextOut(Edge& edge) const { + void nextFromANode(UEdge& edge) const { ++(edge.id); if (edge.id % _bNodeNum == 0) edge.id = -1; } - void firstIn(Edge& edge, const Node& node) const { + void firstFromBNode(UEdge& edge, const Node& node) const { LEMON_ASSERT((node.id & 1) == 1, NodeSetError()); edge.id = (node.id >> 1); } - void nextIn(Edge& edge) const { + void nextFromBNode(UEdge& edge) const { edge.id += _bNodeNum; if (edge.id >= _edgeNum) edge.id = -1; } @@ -604,13 +604,13 @@ _aNodeNum * 2 - 2 : _bNodeNum * 2 - 1; } - static int id(const Edge& edge) { + static int id(const UEdge& edge) { return edge.id; } - static Edge edgeFromId(int id) { - return Edge(id); + static UEdge uEdgeFromId(int id) { + return UEdge(id); } - int maxEdgeId() const { + int maxUEdgeId() const { return _edgeNum - 1; } @@ -634,10 +634,10 @@ return _bNodeNum; } - Node aNode(const Edge& edge) const { + Node aNode(const UEdge& edge) const { return Node((edge.id / _bNodeNum) << 1); } - Node bNode(const Edge& edge) const { + Node bNode(const UEdge& edge) const { return Node(((edge.id % _bNodeNum) << 1) + 1); } @@ -663,13 +663,12 @@ int bNodeNum() const { return _bNodeNum; } typedef True EdgeNumTag; - int edgeNum() const { return _edgeNum; } + int uEdgeNum() const { return _edgeNum; } }; - typedef BpUGraphExtender< BpUGraphBaseExtender< - FullBpUGraphBase> > ExtendedFullBpUGraphBase; + typedef BpUGraphExtender ExtendedFullBpUGraphBase; /// \ingroup graphs