diff -r e225719bde6b -r 2d806130e700 lemon/max_matching.h --- a/lemon/max_matching.h Thu Jan 26 06:44:22 2006 +0000 +++ b/lemon/max_matching.h Thu Jan 26 15:42:13 2006 +0000 @@ -59,8 +59,8 @@ typedef typename Graph::Node Node; typedef typename Graph::Edge Edge; - typedef typename Graph::UndirEdge UndirEdge; - typedef typename Graph::UndirEdgeIt UndirEdgeIt; + typedef typename Graph::UEdge UEdge; + typedef typename Graph::UEdgeIt UEdgeIt; typedef typename Graph::NodeIt NodeIt; typedef typename Graph::IncEdgeIt IncEdgeIt; @@ -98,7 +98,7 @@ ///2*number of nodes), and a heuristical Edmonds' algorithm with a ///heuristic of postponing shrinks for dense graphs. void run() { - if ( countUndirEdges(g) < HEUR_density*countNodes(g) ) { + if ( countUEdges(g) < HEUR_density*countNodes(g) ) { greedyMatching(); runEdmonds(0); } else runEdmonds(1); @@ -212,26 +212,26 @@ } } - ///Reads a matching from an \c UndirEdge valued \c Node map. + ///Reads a matching from an \c UEdge valued \c Node map. - ///Reads a matching from an \c UndirEdge valued \c Node map. \c - ///map[v] must be an \c UndirEdge incident to \c v. This map must + ///Reads a matching from an \c UEdge valued \c Node map. \c + ///map[v] must be an \c UEdge incident to \c v. This map must ///have the property that if \c g.oppositeNode(u,map[u])==v then ///\c \c g.oppositeNode(v,map[v])==u holds, and now some edge ///joining \c u to \c v will be an edge of the matching. template void readNMapEdge(NMapE& map) { for(NodeIt v(g); v!=INVALID; ++v) { - UndirEdge e=map[v]; + UEdge e=map[v]; if ( e!=INVALID ) _mate.set(v,g.oppositeNode(v,e)); } } - ///Writes the matching stored to an \c UndirEdge valued \c Node map. + ///Writes the matching stored to an \c UEdge valued \c Node map. - ///Writes the stored matching to an \c UndirEdge valued \c Node - ///map. \c map[v] will be an \c UndirEdge incident to \c v. This + ///Writes the stored matching to an \c UEdge valued \c Node + ///map. \c map[v] will be an \c UEdge incident to \c v. This ///map will have the property that if \c g.oppositeNode(u,map[u]) ///== v then \c map[u]==map[v] holds, and now this edge is an edge ///of the matching. @@ -263,7 +263,7 @@ ///map[e]==true form the matching. template void readEMapBool(EMapB& map) { - for(UndirEdgeIt e(g); e!=INVALID; ++e) { + for(UEdgeIt e(g); e!=INVALID; ++e) { if ( map[e] ) { Node u=g.source(e); Node v=g.target(e); @@ -282,7 +282,7 @@ ///edges \c e with \c map[e]==true form the matching. template void writeEMapBool (EMapB& map) const { - for(UndirEdgeIt e(g); e!=INVALID; ++e) map.set(e,false); + for(UEdgeIt e(g); e!=INVALID; ++e) map.set(e,false); typename Graph::template NodeMap todo(g,true); for(NodeIt v(g); v!=INVALID; ++v) {