iteration count is now statistics

Author: kroening

regression/cbmc-cover/branch3/test.desc

@@ -3,6 +3,6 @@ main.c
 --cover branch --unwind 6
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 23 of 23 covered (100.0%), using .* iterations$
+^\*\* 23 of 23 covered (100.0%)$
 --
 ^warning: ignoring

regression/cbmc-cover/branch4/test.desc

@@ -3,6 +3,6 @@ main.c
 --cover branch
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 1 of 1 covered (100.0%), using 1 iteration$
+^\*\* 1 of 1 covered (100.0%)$
 --
 ^warning: ignoring

regression/cbmc-cover/cover1/test.desc

@@ -6,6 +6,6 @@ main.c
 ^\[main.coverage.1] file main.c line 8 function main condition .*: SATISFIED$
 ^\[main.coverage.2] file main.c line 9 function main condition .*: SATISFIED$
 ^\[main.coverage.3] file main.c line 13 function main condition .*: FAILED$
-^\*\* 2 of 3 covered (66.7%), using .* iterations$
+^\*\* 2 of 3 covered (66.7%)$
 --
 ^warning: ignoring

regression/cbmc-cover/decision1/test.desc

@@ -3,6 +3,6 @@ main.c
 --cover decision
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* 2 of 2 covered (100.0%), using 2 iterations$
+^\*\* 2 of 2 covered (100.0%)$
 --
 ^warning: ignoring

regression/cbmc-cover/mcdc1/test.desc

@@ -3,6 +3,7 @@ main.c
 --cover mcdc
 ^EXIT=0$
 ^SIGNAL=0$
-^\*\* .* of .* covered (100.0%), using 6 iterations$
+^\*\* .* of .* covered (100.0%)$
+^\*\* Used 6 iterations$
 --
 ^warning: ignoring

src/cbmc/bmc_cover.cpp

@@ -468,10 +468,12 @@ bool bmc_covert::operator()()
            << " of " << goal_map.size() << " covered ("
            << std::fixed << std::setw(1) << std::setprecision(1)
            << (goal_map.empty()?100.0:100.0*goals_covered/goal_map.size())
-           << "%), using "
-           << cover_goals.iterations() << " iteration"
-           << (cover_goals.iterations()==1?"":"s")
-           << eom;
+           << "%)" << eom;
+           
+  statistics() << "** Used "
+               << cover_goals.iterations() << " iteration"
+               << (cover_goals.iterations()==1?"":"s")
+               << eom;
 
   if(bmc.ui==ui_message_handlert::PLAIN)
   {