Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/max_matching.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

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

lemon/max_matching.h

@@ -356 +356 @@
   template <typename Graph>
   void MaxMatching<Graph>::lateShrink(Node v, typename Graph::template 
-                                      NodeMap<Node>& ear, UFE& blossom, UFE& tree) {
+                                      NodeMap<Node>& ear, UFE& blossom, 
+                                      UFE& tree) {
     //We have one tree which we grow, and also shrink but only if it cannot be
     //postponed. If we augment then we return to the "for" cycle of
@@ -373 +374 @@
         //growOrAugment grows if y is covered by the matching and
         //augments if not. In this latter case it returns 1.
-        if ( position[y]==C && growOrAugment(y, x, ear, blossom, tree, Q) ) return;
+        if ( position[y]==C && growOrAugment(y, x, ear, blossom, tree, Q) ) 
+          return;
       }
       R.push(x);
@@ -390 +392 @@
         
         while ( !Q.empty() ) {
-          Node x=Q.front();
+          Node z=Q.front();
           Q.pop();
-          for( IncEdgeIt e(g,x); e!= INVALID; ++e ) {
-            Node y=g.runningNode(e);
+          for( IncEdgeIt f(g,z); f!= INVALID; ++f ) {
+            Node w=g.runningNode(f);
             //growOrAugment grows if y is covered by the matching and
             //augments if not. In this latter case it returns 1.
-            if ( position[y]==C && growOrAugment(y, x, ear, blossom, tree, Q) ) return;
+            if ( position[w]==C && growOrAugment(w, z, ear, blossom, tree, Q) )
+              return;
           }
-          R.push(x);
+          R.push(z);
         }
       } //for e