Changes in / [592:2ebfdb89ec66:595:16d7255a6849] in lemon-main

Files:

• doc/groups.dox (modified) (1 diff)
• lemon/Makefile.am (modified) (1 diff)
• lemon/matching.h (added)
• lemon/max_matching.h (deleted)
• test/CMakeLists.txt (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/matching_test.cc (added)
• test/max_matching_test.cc (deleted)
• tools/dimacs-solver.cc (modified) (1 diff)

doc/groups.dox

@@ -436 +436 @@
 \brief Algorithms for finding matchings in graphs and bipartite graphs.
 
-This group contains algorithm objects and functions to calculate
+This group contains the algorithms for calculating
 matchings in graphs and bipartite graphs. The general matching problem is
-finding a subset of the arcs which does not shares common endpoints.
+finding a subset of the edges for which each node has at most one incident
+edge.
 
 There are several different algorithms for calculate matchings in

lemon/Makefile.am

@@ -90 +90 @@
         lemon/list_graph.h \
         lemon/maps.h \
+        lemon/matching.h \
         lemon/math.h \
-        lemon/max_matching.h \
         lemon/min_cost_arborescence.h \
         lemon/nauty_reader.h \

test/CMakeLists.txt

@@ -30 +30 @@
   kruskal_test
   maps_test
-  max_matching_test
+  matching_test
   min_cost_arborescence_test
   path_test

test/Makefile.am

@@ -26 +26 @@
         test/kruskal_test \
         test/maps_test \
-        test/max_matching_test \
+        test/matching_test \
         test/min_cost_arborescence_test \
         test/path_test \
@@ -71 +71 @@
 test_maps_test_SOURCES = test/maps_test.cc
 test_mip_test_SOURCES = test/mip_test.cc
-test_max_matching_test_SOURCES = test/max_matching_test.cc
+test_matching_test_SOURCES = test/matching_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
 test_path_test_SOURCES = test/path_test.cc

tools/dimacs-solver.cc

@@ -43 +43 @@
 #include <lemon/dijkstra.h>
 #include <lemon/preflow.h>
-#include <lemon/max_matching.h>
+#include <lemon/matching.h>
 
 using namespace lemon;