Changeset 1909:2d806130e700 in lemon-0.x for lemon/max_matching.h

Timestamp:

01/26/06 16:42:13 (18 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2484

Message:

Undir -> U transition

File:

• lemon/max_matching.h (modified) (7 diffs)

lemon/max_matching.h

@@ -60 +60 @@
     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;
@@ -99 +99 @@
     ///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);
@@ -213 +213 @@
     } 
 
-    ///Reads a matching from an \c UndirEdge 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.
+
+    ///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
@@ -223 +223 @@
     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));
@@ -229 +229 @@
     } 
     
-    ///Writes the matching stored to an \c UndirEdge 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 matching stored to an \c UEdge valued \c Node map.
+
+    ///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
@@ -264 +264 @@
     template<typename EMapB>
     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);     
@@ -283 +283 @@
     template<typename EMapB>
     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<bool> todo(g,true);