Extracted Houdini statistics into a record, and parametersied Houdini class with a statistics object. This means that if one runs multiple Houdini instances, each can record its own statistics.

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/ExecutionEngine/ExecutionEngine.cs b/Source/ExecutionEngine/ExecutionEngine.cs
index b83a7d52..79043832 100644
--- a/Source/ExecutionEngine/ExecutionEngine.cs
+++ b/Source/ExecutionEngine/ExecutionEngine.cs
@@ -1109,8 +1109,8 @@ namespace Microsoft.Boogie
       {

         return RunAbstractHoudini(program, stats, er);

       }

-

-      Houdini.Houdini houdini = new Houdini.Houdini(program);

+      Houdini.HoudiniSession.HoudiniStatistics houdiniStats = new Houdini.HoudiniSession.HoudiniStatistics();

+      Houdini.Houdini houdini = new Houdini.Houdini(program, houdiniStats);

       Houdini.HoudiniOutcome outcome = houdini.PerformHoudiniInference();

 

       if (CommandLineOptions.Clo.PrintAssignment)

@@ -1132,11 +1132,11 @@ namespace Microsoft.Boogie
         }

         Console.WriteLine("Number of true assignments = " + numTrueAssigns);

         Console.WriteLine("Number of false assignments = " + (outcome.assignment.Count - numTrueAssigns));

-        Console.WriteLine("Prover time = " + Houdini.HoudiniSession.proverTime.ToString("F2"));

-        Console.WriteLine("Unsat core prover time = " + Houdini.HoudiniSession.unsatCoreProverTime.ToString("F2"));

-        Console.WriteLine("Number of prover queries = " + Houdini.HoudiniSession.numProverQueries);

-        Console.WriteLine("Number of unsat core prover queries = " + Houdini.HoudiniSession.numUnsatCoreProverQueries);

-        Console.WriteLine("Number of unsat core prunings = " + Houdini.HoudiniSession.numUnsatCorePrunings);

+        Console.WriteLine("Prover time = " + houdiniStats.proverTime.ToString("F2"));

+        Console.WriteLine("Unsat core prover time = " + houdiniStats.unsatCoreProverTime.ToString("F2"));

+        Console.WriteLine("Number of prover queries = " + houdiniStats.numProverQueries);

+        Console.WriteLine("Number of unsat core prover queries = " + houdiniStats.numUnsatCoreProverQueries);

+        Console.WriteLine("Number of unsat core prunings = " + houdiniStats.numUnsatCorePrunings);

       }

 

       foreach (Houdini.VCGenOutcome x in outcome.implementationOutcomes.Values)