gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Rename max_matching.h to matching.h (#265)
2 4 2
default
8 files changed with 6 insertions and 6 deletions:
↑ Collapse diff ↑
Ignore white space 24 line context
... ...
@@ -80,26 +80,26 @@
80 80
	lemon/grid_graph.h \
81 81
	lemon/hypercube_graph.h \
82 82
	lemon/kruskal.h \
83 83
	lemon/hao_orlin.h \
84 84
	lemon/lgf_reader.h \
85 85
	lemon/lgf_writer.h \
86 86
	lemon/list_graph.h \
87 87
	lemon/lp.h \
88 88
	lemon/lp_base.h \
89 89
	lemon/lp_skeleton.h \
90 90
	lemon/list_graph.h \
91 91
	lemon/maps.h \
92
	lemon/matching.h \
92 93
	lemon/math.h \
93
	lemon/max_matching.h \
94 94
	lemon/min_cost_arborescence.h \
95 95
	lemon/nauty_reader.h \
96 96
	lemon/path.h \
97 97
	lemon/preflow.h \
98 98
	lemon/radix_sort.h \
99 99
	lemon/random.h \
100 100
	lemon/smart_graph.h \
101 101
	lemon/soplex.h \
102 102
	lemon/suurballe.h \
103 103
	lemon/time_measure.h \
104 104
	lemon/tolerance.h \
105 105
	lemon/unionfind.h \
Ignore white space 24 line context
file renamed from lemon/max_matching.h to lemon/matching.h
Ignore white space 24 line context
... ...
@@ -20,25 +20,25 @@
20 20
  dim_test
21 21
  edge_set_test
22 22
  error_test
23 23
  euler_test
24 24
  gomory_hu_test
25 25
  graph_copy_test
26 26
  graph_test
27 27
  graph_utils_test
28 28
  hao_orlin_test
29 29
  heap_test
30 30
  kruskal_test
31 31
  maps_test
32
  max_matching_test
32
  matching_test
33 33
  min_cost_arborescence_test
34 34
  path_test
35 35
  preflow_test
36 36
  radix_sort_test
37 37
  random_test
38 38
  suurballe_test
39 39
  time_measure_test
40 40
  unionfind_test)
41 41

	
42 42
IF(HAVE_LP)
43 43
  ADD_EXECUTABLE(lp_test lp_test.cc)
44 44
  IF(HAVE_GLPK)
Ignore white space 24 line context
... ...
@@ -16,25 +16,25 @@
16 16
	test/dim_test \
17 17
	test/edge_set_test \
18 18
	test/error_test \
19 19
	test/euler_test \
20 20
	test/gomory_hu_test \
21 21
	test/graph_copy_test \
22 22
	test/graph_test \
23 23
	test/graph_utils_test \
24 24
	test/hao_orlin_test \
25 25
	test/heap_test \
26 26
	test/kruskal_test \
27 27
	test/maps_test \
28
	test/max_matching_test \
28
	test/matching_test \
29 29
	test/min_cost_arborescence_test \
30 30
	test/path_test \
31 31
	test/preflow_test \
32 32
	test/radix_sort_test \
33 33
	test/random_test \
34 34
	test/suurballe_test \
35 35
	test/test_tools_fail \
36 36
	test/test_tools_pass \
37 37
	test/time_measure_test \
38 38
	test/unionfind_test
39 39

	
40 40
test_test_tools_pass_DEPENDENCIES = demo
... ...
@@ -61,23 +61,23 @@
61 61
test_error_test_SOURCES = test/error_test.cc
62 62
test_euler_test_SOURCES = test/euler_test.cc
63 63
test_gomory_hu_test_SOURCES = test/gomory_hu_test.cc
64 64
test_graph_copy_test_SOURCES = test/graph_copy_test.cc
65 65
test_graph_test_SOURCES = test/graph_test.cc
66 66
test_graph_utils_test_SOURCES = test/graph_utils_test.cc
67 67
test_heap_test_SOURCES = test/heap_test.cc
68 68
test_kruskal_test_SOURCES = test/kruskal_test.cc
69 69
test_hao_orlin_test_SOURCES = test/hao_orlin_test.cc
70 70
test_lp_test_SOURCES = test/lp_test.cc
71 71
test_maps_test_SOURCES = test/maps_test.cc
72 72
test_mip_test_SOURCES = test/mip_test.cc
73
test_max_matching_test_SOURCES = test/max_matching_test.cc
73
test_matching_test_SOURCES = test/matching_test.cc
74 74
test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
75 75
test_path_test_SOURCES = test/path_test.cc
76 76
test_preflow_test_SOURCES = test/preflow_test.cc
77 77
test_radix_sort_test_SOURCES = test/radix_sort_test.cc
78 78
test_suurballe_test_SOURCES = test/suurballe_test.cc
79 79
test_random_test_SOURCES = test/random_test.cc
80 80
test_test_tools_fail_SOURCES = test/test_tools_fail.cc
81 81
test_test_tools_pass_SOURCES = test/test_tools_pass.cc
82 82
test_time_measure_test_SOURCES = test/time_measure_test.cc
83 83
test_unionfind_test_SOURCES = test/unionfind_test.cc
Ignore white space 24 line context
... ...
@@ -13,25 +13,25 @@
13 13
 * This software is provided "AS IS" with no warranty of any kind,
14 14
 * express or implied, and with no claim as to its suitability for any
15 15
 * purpose.
16 16
 *
17 17
 */
18 18

	
19 19
#include <iostream>
20 20
#include <sstream>
21 21
#include <vector>
22 22
#include <queue>
23 23
#include <cstdlib>
24 24

	
25
#include <lemon/max_matching.h>
25
#include <lemon/matching.h>
26 26
#include <lemon/smart_graph.h>
27 27
#include <lemon/concepts/graph.h>
28 28
#include <lemon/concepts/maps.h>
29 29
#include <lemon/lgf_reader.h>
30 30
#include <lemon/math.h>
31 31

	
32 32
#include "test_tools.h"
33 33

	
34 34
using namespace std;
35 35
using namespace lemon;
36 36

	
37 37
GRAPH_TYPEDEFS(SmartGraph);
Ignore white space 24 line context
... ...
@@ -33,25 +33,25 @@
33 33
#include <cstring>
34 34

	
35 35
#include <lemon/smart_graph.h>
36 36
#include <lemon/dimacs.h>
37 37
#include <lemon/lgf_writer.h>
38 38
#include <lemon/time_measure.h>
39 39

	
40 40
#include <lemon/arg_parser.h>
41 41
#include <lemon/error.h>
42 42

	
43 43
#include <lemon/dijkstra.h>
44 44
#include <lemon/preflow.h>
45
#include <lemon/max_matching.h>
45
#include <lemon/matching.h>
46 46

	
47 47
using namespace lemon;
48 48
typedef SmartDigraph Digraph;
49 49
DIGRAPH_TYPEDEFS(Digraph);
50 50
typedef SmartGraph Graph;
51 51

	
52 52
template<class Value>
53 53
void solve_sp(ArgParser &ap, std::istream &is, std::ostream &,
54 54
              DimacsDescriptor &desc)
55 55
{
56 56
  bool report = !ap.given("q");
57 57
  Digraph g;
0 comments (0 inline)