From 0c02a3ff7229f7b25afac407ae979a5039f445d4 Mon Sep 17 00:00:00 2001 From: Sebastian Buchwald Date: Mon, 16 Aug 2010 07:49:35 +0000 Subject: [PATCH] delete_edge now handle reordering of incident nodes. [r27928] --- optimal.c | 10 ---------- pbqp_edge.c | 3 +++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/optimal.c b/optimal.c index 0768356ba..c93ad9c3e 100644 --- a/optimal.c +++ b/optimal.c @@ -417,8 +417,6 @@ static void merge_source_into_target(pbqp *pbqp, pbqp_edge *edge) add_edge_costs(pbqp, tgt_node->index, other_node->index, new_matrix); delete_edge(old_edge); - reorder_node(src_node); - reorder_node(other_node); new_edge = get_edge(pbqp, tgt_node->index, other_node->index); insert_into_rm_bucket(new_edge); @@ -576,8 +574,6 @@ static void merge_target_into_source(pbqp *pbqp, pbqp_edge *edge) add_edge_costs(pbqp, src_node->index, other_node->index, new_matrix); delete_edge(old_edge); - reorder_node(tgt_node); - reorder_node(other_node); new_edge = get_edge(pbqp, src_node->index, other_node->index); insert_into_rm_bucket(new_edge); @@ -722,8 +718,6 @@ void simplify_edge(pbqp *pbqp, pbqp_edge *edge) #endif delete_edge(edge); - reorder_node(src_node); - reorder_node(tgt_node); } } @@ -1256,8 +1250,6 @@ static void select_column(pbqp_edge *edge, unsigned col_index) } delete_edge(edge); - reorder_node(src_node); - reorder_node(tgt_node); } static void select_row(pbqp_edge *edge, unsigned row_index) @@ -1311,8 +1303,6 @@ static void select_row(pbqp_edge *edge, unsigned row_index) } delete_edge(edge); - reorder_node(src_node); - reorder_node(tgt_node); } void select_alternative(pbqp_node *node, unsigned selected_index) diff --git a/pbqp_edge.c b/pbqp_edge.c index 31b902850..d2d273041 100644 --- a/pbqp_edge.c +++ b/pbqp_edge.c @@ -91,6 +91,9 @@ void delete_edge(pbqp_edge *edge) disconnect_edge(src_node, edge); disconnect_edge(tgt_node, edge); + + reorder_node(src_node); + reorder_node(tgt_node); } pbqp_edge *pbqp_edge_deep_copy(pbqp *pbqp, pbqp_edge *edge, -- 2.20.1