From db8e72f37e6e09130a41fa15a89028eb2ace2d89 Mon Sep 17 00:00:00 2001 From: ccremers Date: Mon, 3 Apr 2006 08:21:52 +0000 Subject: [PATCH] - Misc fixes to heuristic. --- src/binding.c | 2 +- src/cost.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/binding.c b/src/binding.c index 50f7226..ef687c7 100644 --- a/src/binding.c +++ b/src/binding.c @@ -597,7 +597,7 @@ countBindingsDone () int countDone (Binding b) { - if (b->done) + if ((!b->blocked) && b->done) { count++; } diff --git a/src/cost.c b/src/cost.c index 48459ff..4d025af 100644 --- a/src/cost.c +++ b/src/cost.c @@ -36,7 +36,7 @@ attackCost (const System sys) cost += 10 * selfInitiators (sys); cost += 7 * selfResponders (sys); - cost += 4 * sys->num_regular_runs; + cost += 10 * sys->num_regular_runs; cost += 3 * countInitiators (sys); cost += 2 * countBindingsDone (); cost += 1 * sys->num_intruder_runs;