Changeset 1158:29961fa390a3 in lemon-0.x for src/lemon/max_matching.h

Timestamp:

02/20/05 02:02:07 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Graph and UndirGraph? concept modifications.

• For incidence iterators ({In,Out,Inc}EdgeIt?) there is now baseNode and runningNode functions in graph interface
• For Edge in undir graphs: Edge(UndirGraph? const &, UndirEdge?, Node) constructor. Same for IncEdgeIt?
• Edge(UndirEdge?, bool) constructor is no more in the public interface. (But we need it in the developpers interface).

File:

• src/lemon/max_matching.h (modified) (6 diffs)

src/lemon/max_matching.h

@@ -181 +181 @@
           Node u=_mate[v];
           for(IncEdgeIt e(g,v); e!=INVALID; ++e) {
-            if ( g.target(e) == u ) {
+            if ( g.runningNode(e) == u ) {
               map.set(u,e);
               map.set(v,e);
@@ -228 +228 @@
           Node u=_mate[v];
           for(IncEdgeIt e(g,v); e!=INVALID; ++e) {
-            if ( g.target(e) == u ) {
+            if ( g.runningNode(e) == u ) {
               map.set(e,true);
               todo.set(u,false);
@@ -333 +333 @@
         
       for( IncEdgeIt e(g,x); e!=INVALID ; ++e ) {
-        Node y=g.target(e);
+        Node y=g.runningNode(e);
 
         if ( position[y] == D && blossom.find(x) != blossom.find(y) ) { 
@@ -389 +389 @@
         
       for( IncEdgeIt e(g,x); e!=INVALID; ++e ) {
-        Node y=g.target(e);
+        Node y=g.runningNode(e);
               
         switch ( position[y] ) {
@@ -454 +454 @@
       if ( _mate[v]==INVALID ) {
         for( IncEdgeIt e(g,v); e!=INVALID ; ++e ) {
-          Node y=g.target(e);
+          Node y=g.runningNode(e);
           if ( _mate[y]==INVALID && y!=v ) {
             _mate.set(v,y);
@@ -485 +485 @@
                                         UFE& blossom, UFE& tree, std::queue<Node>& Q) {
     for( IncEdgeIt e(g,x); e!= INVALID; ++e ) {
-      Node y=g.target(e);
+      Node y=g.runningNode(e);
         
       if ( position[y]==C ) {