From f7022495daa31b714a73d6bdf6640db7494f1f4c Mon Sep 17 00:00:00 2001 From: Alex Auvolat--bernstein Date: Wed, 4 Dec 2013 17:57:00 +0100 Subject: Added optimization to algo C. --- algos.c | 4 +++- graph.c | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/algos.c b/algos.c index 630a719..3d24558 100644 --- a/algos.c +++ b/algos.c @@ -53,8 +53,10 @@ void max_clique_b(const graph g, set k, set c, set a, set *mc) { // Il est donc de la responsabilité de l'appellant de vérifier qu'à // chaque appel les sets sont utilisables et cohérents void max_clique_c(const graph g, set k, set c, set a, set *mc) { + if (set_size(k) + set_size(c) <= set_size(*mc)) return; + if (is_set_empty(c)) { - if (set_size(k) > set_size(*mc)) { + if (set_size(k) > set_size(*mc)) { // useless condition delete_set(*mc); *mc = copy_set(k); printf("Found new max clique: "); dump_set(*mc); fflush(stdout); diff --git a/graph.c b/graph.c index a957136..4d3ba2a 100644 --- a/graph.c +++ b/graph.c @@ -65,7 +65,6 @@ graph load_graph_dimacs(FILE *stream) { } fscanf(stream, " %d %d\n", &a, &b); - fprintf(stderr, "Edge: (%d, %d)\n", a, b); a--; b--; set_add_ip(b, k->neighbour[a]); set_add_ip(a, k->neighbour[b]); -- cgit v1.2.3