From 67128ac6bfc39951122c45287daf8c22276e23ff Mon Sep 17 00:00:00 2001 From: Sebastian Buchwald Date: Wed, 3 Dec 2008 20:50:06 +0000 Subject: [PATCH] Apply BF recursively. [r24273] --- heuristical.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/heuristical.c b/heuristical.c index 48c7dc9e6..3c8196049 100644 --- a/heuristical.c +++ b/heuristical.c @@ -873,7 +873,7 @@ static unsigned get_minimal_alternative(pbqp *pbqp, pbqp_node *node) node_len = node_vec->len; for (node_index = 0; node_index < node_len; ++node_index) { - num value = node_vec->entries[node_index].data; + num value; /* Some node buckets and the edge bucket should be empty. */ assert(node_bucket_get_length(node_buckets[1]) == 0); @@ -885,15 +885,22 @@ static unsigned get_minimal_alternative(pbqp *pbqp, pbqp_node *node) pbqp_node_bucket *bucket_deg3 = node_bucket_deep_copy(node_buckets[3]); pbqp_node_bucket *bucket_red = node_bucket_deep_copy(reduced_bucket); - /* TODO */ + /* Select alternative and solve PBQP recursively. */ + select_alternative(node, node_index); apply_brute_force_reductions(pbqp); + value = determine_solution(pbqp->dump_file); + if (value < min) { min = value; min_index = node_index; } + + /* TODO Restore old PBQP state. */ + } - return 0; + + return min_index; } void apply_Brute_Force(pbqp *pbqp) -- 2.20.1