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

remove unneeded output

Browse source
This commit is contained in:
Maximilian Keßler 2023-11-06 22:25:21 +01:00
parent e336686ddb
commit 8de09bb38d
Signed by: max
GPG key ID: BCC5A619923C0BA5
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/edmonds.cpp
View file

@ -121,7 +121,7 @@ __attribute__((noinline))
void augment(GraphAttributes & attrs, std::vector<NodeId> const & x_path, std::vector<NodeId> const & y_path, void augment(GraphAttributes & attrs, std::vector<NodeId> const & x_path, std::vector<NodeId> const & y_path,
std::stack<NodeId> & outer_unvisited_nodes) std::stack<NodeId> & outer_unvisited_nodes)
{ {
std::cout << "Augment" << std::endl; //std::cout << "Augment" << std::endl;
// Paths are disjoint -> augment // Paths are disjoint -> augment
attrs.mu[x_path.front()] = y_path.front(); attrs.mu[x_path.front()] = y_path.front();
attrs.mu[y_path.front()] = x_path.front(); attrs.mu[y_path.front()] = x_path.front();
@ -230,7 +230,7 @@ __attribute__((noinline))
void contract_blossom(GraphAttributes & attrs, std::vector<NodeId> const & x_path, std::vector<NodeId> const & y_path, void contract_blossom(GraphAttributes & attrs, std::vector<NodeId> const & x_path, std::vector<NodeId> const & y_path,
std::stack<NodeId> & outer_unvisited_nodes) std::stack<NodeId> & outer_unvisited_nodes)
{ {
std::cout << "Contract blossom" << std::endl; //std::cout << "Contract blossom" << std::endl;
std::tuple<NodeId, size_type, size_type> const blossom_root_description = find_blossom_root_id(attrs, x_path, y_path); std::tuple<NodeId, size_type, size_type> const blossom_root_description = find_blossom_root_id(attrs, x_path, y_path);
update_phialong_blossom_paths(attrs, x_path, y_path, blossom_root_description); update_phialong_blossom_paths(attrs, x_path, y_path, blossom_root_description);
@ -257,10 +257,9 @@ void maximum_matching_from_initial_matching(Graph const & graph, GraphAttributes
for(NodeId neighbor_id : graph.node(id).neighbors()) for(NodeId neighbor_id : graph.node(id).neighbors())
{ {
check_integrity(attrs); check_integrity(attrs);
std::cout << "Check passed" << std::endl; //std::cout << "Check passed" << std::endl;
if (attrs.is_out_of_forest(neighbor_id)) if (attrs.is_out_of_forest(neighbor_id))
{ {
std::cout << "Grow forest" << std::endl;
// Grow Forest // Grow Forest
attrs.phi[neighbor_id] = id; attrs.phi[neighbor_id] = id;
assert(attrs.mu[neighbor_id] != neighbor_id); assert(attrs.mu[neighbor_id] != neighbor_id);