Changeset 2505:1bb471764ab8 in lemon-0.x for test/max_matching_test.cc

Timestamp:

10/30/07 21:21:10 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Redesign interface of MaxMatching? and UnionFindEnum?
New class ExtendFindEnum?

Faster MaxMatching?

File:

• test/max_matching_test.cc (modified) (6 diffs)

test/max_matching_test.cc

@@ -67 +67 @@
   
   MaxMatching<Graph> max_matching(g);
-  max_matching.runEdmonds(0);
+  max_matching.init();
+  max_matching.startDense();
   
   int s=0;
   Graph::NodeMap<Node> mate(g,INVALID);
-  max_matching.writeNMapNode(mate);
+  max_matching.mateMap(mate);
   for(NodeIt v(g); v!=INVALID; ++v) {
     if ( mate[v]!=INVALID ) ++s;
@@ -83 +84 @@
   check ( size == max_matching.size(), "mate() returns a different size matching than max_matching.size()" );
 
-  Graph::NodeMap<MaxMatching<Graph>::pos_enum> pos0(g);
-  max_matching.writePos(pos0);
+  Graph::NodeMap<MaxMatching<Graph>::DecompType> pos0(g);
+  max_matching.decomposition(pos0);
   
-  max_matching.resetMatching();
-  max_matching.runEdmonds(1);
+  max_matching.init();
+  max_matching.startSparse();
   s=0;
-  max_matching.writeNMapNode(mate);
+  max_matching.mateMap(mate);
   for(NodeIt v(g); v!=INVALID; ++v) {
     if ( mate[v]!=INVALID ) ++s;
@@ -95 +96 @@
   check ( int(s/2) == size, "The size does not equal!" );
 
-  Graph::NodeMap<MaxMatching<Graph>::pos_enum> pos1(g);
-  max_matching.writePos(pos1);
+  Graph::NodeMap<MaxMatching<Graph>::DecompType> pos1(g);
+  max_matching.decomposition(pos1);
 
   max_matching.run();
   s=0;
-  max_matching.writeNMapNode(mate);
+  max_matching.mateMap(mate);
   for(NodeIt v(g); v!=INVALID; ++v) {
     if ( mate[v]!=INVALID ) ++s;
@@ -106 +107 @@
   check ( int(s/2) == size, "The size does not equal!" ); 
   
-  Graph::NodeMap<MaxMatching<Graph>::pos_enum> pos2(g);
-  max_matching.writePos(pos2);
+  Graph::NodeMap<MaxMatching<Graph>::DecompType> pos2(g);
+  max_matching.decomposition(pos2);
 
-  max_matching.resetMatching();
   max_matching.run();
   s=0;
-  max_matching.writeNMapNode(mate);
+  max_matching.mateMap(mate);
   for(NodeIt v(g); v!=INVALID; ++v) {
     if ( mate[v]!=INVALID ) ++s;
@@ -118 +118 @@
   check ( int(s/2) == size, "The size does not equal!" ); 
   
-  Graph::NodeMap<MaxMatching<Graph>::pos_enum> pos(g);
-  max_matching.writePos(pos);
+  Graph::NodeMap<MaxMatching<Graph>::DecompType> pos(g);
+  max_matching.decomposition(pos);
    
   bool ismatching=true;
@@ -140 +140 @@
   bool noedge=true;
   for(UEdgeIt e(g); e!=INVALID; ++e) {
-   if ( (pos[g.target(e)]==max_matching.C && pos[g.source(e)]==max_matching.D) || 
-         (pos[g.target(e)]==max_matching.D && pos[g.source(e)]==max_matching.C) )
+   if ( (pos[g.target(e)]==max_matching.C && 
+         pos[g.source(e)]==max_matching.D) || 
+         (pos[g.target(e)]==max_matching.D && 
+          pos[g.source(e)]==max_matching.C) )
       noedge=false; 
   }