Changeset 2512:371cf309fc3c in lemon-0.x for lemon/pr_bipartite_matching.h

Timestamp:

11/14/07 18:44:42 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Elevator: slight changes in elevator interface
LinkedElevator?: based on linked lists

File:

• lemon/pr_bipartite_matching.h (modified) (4 diffs)

lemon/pr_bipartite_matching.h

@@ -180 +180 @@
         if(nlevel<_node_num) {
           if(nlevel>=actlevel)
-            _levels.liftHighestActiveTo(nlevel+1);
+            _levels.liftHighestActive(nlevel+1);
           bact=_g.bNode(_matching[_g.aNode(bedge)]);
           if(--_cov[bact]<1) {
@@ -191 +191 @@
         }
         else {
-          if(_node_num>actlevel) 
-            _levels.liftHighestActiveTo(_node_num);
-          _levels.deactivate(act); 
-        }
-
-        if(_levels.onLevel(actlevel)==0)
+          _levels.liftHighestActiveToTop();
+        }
+
+        if(_levels.emptyLevel(actlevel))
           _levels.liftToTop(actlevel);
       }
@@ -247 +245 @@
         if(nlevel<_node_num) {
           if(nlevel>=actlevel)
-            _levels.liftHighestActiveTo(nlevel+1);
+            _levels.liftHighestActive(nlevel+1);
           bact=_g.bNode(_matching[_g.aNode(bedge)]);
           if(--_cov[bact]<1) {
@@ -258 +256 @@
         }
         else {
-          if(_node_num>actlevel) 
-            _levels.liftHighestActiveTo(_node_num);
-          _levels.deactivate(act); 
-        }
-
-        if(_levels.onLevel(actlevel)==0)
+          _levels.liftHighestActiveToTop();
+        }
+
+        if(_levels.emptyLevel(actlevel))
           _empty_level=actlevel;
           return false;