max/edmonds-matching-algorithm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: output matching, not whole graph

Browse Source
This commit is contained in:
Maximilian Keßler 2023-11-05 13:16:16 +01:00
parent 354d96774d
commit eb1e7e8dc8
Signed by: max
GPG Key ID: BCC5A619923C0BA5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/edmonds.cpp
View File

@ -43,7 +43,7 @@ NodeId find_outer_vertex(Graph const & graph)
return invalid_node_id; return invalid_node_id;
} }
Graph maximum_matching_from_initial_matching(Graph & graph) void maximum_matching_from_initial_matching(Graph & graph)
{ {
graph.reset_forest(); graph.reset_forest();
NodeId id; NodeId id;
@ -81,7 +81,7 @@ Graph maximum_matching_from_initial_matching(Graph & graph)
} }
// Note that since this is tail-recursion, this will not generate // Note that since this is tail-recursion, this will not generate
// new stack frames in OPT mode // new stack frames in OPT mode
return maximum_matching(graph); maximum_matching(graph);
} }
else else
{ {
@ -139,7 +139,6 @@ Graph maximum_matching_from_initial_matching(Graph & graph)
} }
graph.node(id).scanned = true; graph.node(id).scanned = true;
} }
return graph;
}; };
void find_greedy_matching(Graph & graph) void find_greedy_matching(Graph & graph)
@ -162,7 +161,17 @@ void find_greedy_matching(Graph & graph)
Graph maximum_matching(Graph & graph) { Graph maximum_matching(Graph & graph) {
find_greedy_matching(graph); find_greedy_matching(graph);
return maximum_matching_from_initial_matching(graph); maximum_matching_from_initial_matching(graph);
ED::Graph matching = ED::Graph(graph.num_nodes());
for (NodeId id = 0; id < graph.num_nodes(); ++id)
{
if (graph.matched_neighbor(id) > id)
{
matching.add_edge(id, graph.matched_neighbor(id));
}
}
return matching;
} }
} }