Merge branch 'master' into update/error_messages

Author: ankushdesai

Src/PChecker/CheckerCore/SystematicTesting/TestReport.cs

@@ -241,13 +241,12 @@ public string GetText(CheckerConfiguration checkerConfiguration, string prefix =
                 totalExploredSchedules,
                 totalExploredSchedules == 1 ? string.Empty : "s");
 
-            // Comment out this part until feedback strategy error is fixed
-            // report.AppendLine();
-            // report.AppendFormat(
-            //     "{0} Explored {1} timeline{2}",
-            //     prefix.Equals("...") ? "....." : prefix,
-            //     ExploredTimelines.Count,
-            //     ExploredTimelines.Count == 1 ? string.Empty : "s");
+            report.AppendLine();
+            report.AppendFormat(
+                "{0} Explored {1} timeline{2}",
+                prefix.Equals("...") ? "....." : prefix,
+                ExploredTimelines.Count,
+                ExploredTimelines.Count == 1 ? string.Empty : "s");
 
             if (totalExploredSchedules > 0 &&
                 NumOfFoundBugs > 0)

Src/PChecker/CheckerCore/SystematicTesting/TestingEngine.cs

@@ -642,10 +642,6 @@ private void RunNextIteration(int schedule)
                 if (ShouldPrintIteration(schedule))
                 {
                     var seconds = watch.Elapsed.TotalSeconds;
-                    if (Strategy is IFeedbackGuidedStrategy s)
-                    {
-                        s.DumpStats(Logger);
-                    }
                 }
 
                 if (!IsReplayModeEnabled && _checkerConfiguration.PerformFullExploration && runtime.Scheduler.BugFound)

Tst/CorrectLogs/bugs2/Main_0_0.txt

@@ -12,5 +12,6 @@
 <StrategyLog> Found 1 bug.
 <StrategyLog> Scheduling statistics:
 <StrategyLog> Explored 1 schedule
+<StrategyLog> Explored 1 timeline
 <StrategyLog> Found 100.00% buggy schedules.
 <StrategyLog> Number of scheduling points in terminating schedules: 2 (min), 2 (avg), 2 (max).