- Misc fixes to heuristic.

This commit is contained in:
ccremers 2006-04-03 08:21:52 +00:00
parent d2058d937b
commit db8e72f37e
2 changed files with 2 additions and 2 deletions

View File

@ -597,7 +597,7 @@ countBindingsDone ()
int countDone (Binding b) int countDone (Binding b)
{ {
if (b->done) if ((!b->blocked) && b->done)
{ {
count++; count++;
} }

View File

@ -36,7 +36,7 @@ attackCost (const System sys)
cost += 10 * selfInitiators (sys); cost += 10 * selfInitiators (sys);
cost += 7 * selfResponders (sys); cost += 7 * selfResponders (sys);
cost += 4 * sys->num_regular_runs; cost += 10 * sys->num_regular_runs;
cost += 3 * countInitiators (sys); cost += 3 * countInitiators (sys);
cost += 2 * countBindingsDone (); cost += 2 * countBindingsDone ();
cost += 1 * sys->num_intruder_runs; cost += 1 * sys->num_intruder_runs;