merging ActorRuntime with ControlledRuntime

Src/PChecker/CheckerCore/Actors/ActorId.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.Runtime.Serialization;
+using PChecker.SystematicTesting;
 
 namespace PChecker.Actors
 {
@@ -62,7 +63,7 @@ public sealed class ActorId : IEquatable<ActorId>, IComparable<ActorId>
         /// <summary>
         /// Initializes a new instance of the <see cref="ActorId"/> class.
         /// </summary>
-        internal ActorId(Type type, string name, ActorRuntime runtime, bool useNameForHashing = false)
+        internal ActorId(Type type, string name, ControlledRuntime runtime, bool useNameForHashing = false)
         {
             Runtime = runtime;
             Endpoint = string.Empty;
@@ -97,7 +98,7 @@ internal ActorId(Type type, string name, ActorRuntime runtime, bool useNameForHa
         /// <summary>
         /// Bind the actor id.
         /// </summary>
-        internal void Bind(ActorRuntime runtime)
+        internal void Bind(ControlledRuntime runtime)
         {
             Runtime = runtime;
         }

Src/PChecker/CheckerCore/Actors/Logging/JsonWriter.cs

@@ -557,7 +557,7 @@ public JsonWriter()
 
         /// <summary>
         /// Enum representing the different log types the JSON error trace logs.
-        /// Referenced from PLogFormatter.cs and ActorRuntimeLogTextFormatter.cs
+        /// Referenced from PLogFormatter.cs and PCheckerLogTextFormatter.cs
         /// to see what those formatter logs. Check IActorRuntimeLog.cs to see
         /// each log types' description and when they are invoked.
         /// </summary>

Src/PChecker/CheckerCore/Actors/Logging/LogWriter.cs

@@ -549,7 +549,7 @@ internal TextWriter SetLogger(TextWriter logger)
             {
                 Logger = TextWriter.Null;
 
-                var textLog = GetLogsOfType<ActorRuntimeLogTextFormatter>().FirstOrDefault();
+                var textLog = GetLogsOfType<PCheckerLogTextFormatter>().FirstOrDefault();
                 if (textLog != null)
                 {
                     textLog.Logger = Logger;
@@ -573,17 +573,17 @@ internal TextWriter SetLogger(TextWriter logger)
         /// <param name="jsonLogger">The jsonLogger instance created from runtime before running tests.</param>
         internal void SetJsonLogger(JsonWriter jsonLogger) => JsonLogger = jsonLogger;
 
-        private ActorRuntimeLogTextFormatter GetOrCreateTextLog()
+        private PCheckerLogTextFormatter GetOrCreateTextLog()
         {
-            var textLog = GetLogsOfType<ActorRuntimeLogTextFormatter>().FirstOrDefault();
+            var textLog = GetLogsOfType<PCheckerLogTextFormatter>().FirstOrDefault();
             if (textLog == null)
             {
                 if (Logger == null)
                 {
                     Logger = new ConsoleLogger();
                 }
 
-                textLog = new ActorRuntimeLogTextFormatter
+                textLog = new PCheckerLogTextFormatter
                 {
                     Logger = Logger
                 };
@@ -605,9 +605,9 @@ internal void RegisterLog(IActorRuntimeLog log)
             }
 
             // Make sure we only have one text logger
-            if (log is ActorRuntimeLogTextFormatter a)
+            if (log is PCheckerLogTextFormatter a)
             {
-                var textLog = GetLogsOfType<ActorRuntimeLogTextFormatter>().FirstOrDefault();
+                var textLog = GetLogsOfType<PCheckerLogTextFormatter>().FirstOrDefault();
                 if (textLog != null)
                 {
                     Logs.Remove(textLog);
@@ -619,9 +619,9 @@ internal void RegisterLog(IActorRuntimeLog log)
                 }
             }
 
-            // If log is or of subclass ActorRuntimeLogJsonFormatter (i.e. when log is PJsonFormatter),
+            // If log is or of subclass PCheckerLogJsonFormatter (i.e. when log is PJsonFormatter),
             // update the Writer reference to the JsonLogger instance defined within LogWriter.cs
-            if (log is ActorRuntimeLogJsonFormatter tempJsonFormatter)
+            if (log is PCheckerLogJsonFormatter tempJsonFormatter)
             {
                 tempJsonFormatter.Writer = JsonLogger;
             }

Src/PChecker/CheckerCore/Actors/Logging/ActorRuntimeLogJsonFormatter.cs → Src/PChecker/CheckerCore/Actors/Logging/PCheckerLogJsonFormatter.cs

@@ -9,17 +9,17 @@ namespace PChecker.Actors.Logging
     /// <summary>
     /// This class implements IActorRuntimeLog and generates log output in an XML format.
     /// </summary>
-    public class ActorRuntimeLogJsonFormatter : IActorRuntimeLog
+    public class PCheckerLogJsonFormatter : IActorRuntimeLog
     {
         /// <summary>
         /// Get or set the JsonWriter to write to.
         /// </summary>
         public JsonWriter Writer { get; set; }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ActorRuntimeLogJsonFormatter"/> class.
+        /// Initializes a new instance of the <see cref="PCheckerLogJsonFormatter"/> class.
         /// </summary>
-        protected ActorRuntimeLogJsonFormatter()
+        protected PCheckerLogJsonFormatter()
         {
             Writer = new JsonWriter();
         }

Src/PChecker/CheckerCore/Actors/Logging/ActorRuntimeLogTextFormatter.cs → Src/PChecker/CheckerCore/Actors/Logging/PCheckerLogTextFormatter.cs

@@ -12,17 +12,17 @@ namespace PChecker.Actors.Logging
     /// <summary>
     /// This class implements IActorRuntimeLog and generates output in a a human readable text format.
     /// </summary>
-    public class ActorRuntimeLogTextFormatter : IActorRuntimeLog
+    public class PCheckerLogTextFormatter : IActorRuntimeLog
     {
         /// <summary>
         /// Get or set the TextWriter to write to.
         /// </summary>
         public TextWriter Logger { get; set; }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ActorRuntimeLogTextFormatter"/> class.
+        /// Initializes a new instance of the <see cref="PCheckerLogTextFormatter"/> class.
         /// </summary>
-        public ActorRuntimeLogTextFormatter()
+        public PCheckerLogTextFormatter()
         {
             Logger = new ConsoleLogger();
         }

Src/PChecker/CheckerCore/Actors/Logging/ActorRuntimeLogXmlFormatter.cs → Src/PChecker/CheckerCore/Actors/Logging/PCheckerLogXmlFormatter.cs

@@ -12,12 +12,12 @@ namespace PChecker.Actors.Logging
     /// <summary>
     /// This class implements IActorRuntimeLog and generates log output in an XML format.
     /// </summary>
-    internal class ActorRuntimeLogXmlFormatter : IActorRuntimeLog
+    internal class PCheckerLogXmlFormatter : IActorRuntimeLog
     {
         private readonly XmlWriter Writer;
         private bool Closed;
 
-        public ActorRuntimeLogXmlFormatter(XmlWriter writer)
+        public PCheckerLogXmlFormatter(XmlWriter writer)
         {
             Writer = writer;
             Writer.WriteStartElement("Log");

Src/PChecker/CheckerCore/Actors/StateMachine.cs

@@ -20,6 +20,7 @@
 using PChecker.Actors.StateTransitions;
 using PChecker.Exceptions;
 using PChecker.IO.Debugging;
+using PChecker.SystematicTesting;
 using EventInfo = PChecker.Actors.Events.EventInfo;
 
 
@@ -34,7 +35,7 @@ public abstract class StateMachine
         /// <summary>
         /// The runtime that executes this state machine.
         /// </summary>
-        internal ActorRuntime Runtime { get; private set; }
+        internal ControlledRuntime Runtime { get; private set; }
 
         /// <summary>
         /// Unique id that identifies this state machine.
@@ -155,7 +156,7 @@ protected StateMachine()
         /// <summary>
         /// Configures the state machine.
         /// </summary>
-        internal void Configure(ActorRuntime runtime, ActorId id, IStateMachineManager manager, IEventQueue inbox)
+        internal void Configure(ControlledRuntime runtime, ActorId id, IStateMachineManager manager, IEventQueue inbox)
         {
             Runtime = runtime;
             Id = id;

Src/PChecker/CheckerCore/PRuntime/PJsonFormatter.cs

@@ -14,7 +14,7 @@ namespace PChecker.PRuntime
     /// <summary>
     /// This class implements IActorRuntimeLog and generates log output in an XML format.
     /// </summary>
-    public class PJsonFormatter : ActorRuntimeLogJsonFormatter
+    public class PJsonFormatter : PCheckerLogJsonFormatter
     {
 
         /// <summary>

Src/PChecker/CheckerCore/PRuntime/PLogFormatter.cs

@@ -10,7 +10,7 @@ namespace PChecker.PRuntime
     /// <summary>
     ///     Formatter for the runtime log.
     /// </summary>
-    public class PLogFormatter : ActorRuntimeLogTextFormatter
+    public class PLogFormatter : PCheckerLogTextFormatter
     {
         public PLogFormatter() : base()
         {

Src/PChecker/CheckerCore/Runtime/RuntimeFactory.cs

@@ -3,6 +3,8 @@
 
 using PChecker.Actors;
 using PChecker.Random;
+using PChecker.SystematicTesting;
+using PChecker.SystematicTesting.Strategies.Probabilistic;
 
 namespace PChecker.Runtime
 {
@@ -66,7 +68,7 @@ private static CoyoteRuntime CreateWithConfiguration(CheckerConfiguration checke
             }
 
             var valueGenerator = new RandomValueGenerator(checkerConfiguration);
-            return new ActorRuntime(checkerConfiguration, valueGenerator);
+            return new ControlledRuntime(checkerConfiguration, valueGenerator);
         }
     }
 }

Src/PChecker/CheckerCore/Specifications/Monitor.cs

@@ -16,6 +16,7 @@
 using PChecker.Actors.Logging;
 using PChecker.Actors.StateTransitions;
 using PChecker.Exceptions;
+using PChecker.SystematicTesting;
 
 namespace PChecker.Specifications.Monitors
 {
@@ -61,7 +62,7 @@ public abstract class Monitor
         /// <summary>
         /// The runtime that executes this monitor.
         /// </summary>
-        private ActorRuntime Runtime;
+        private ControlledRuntime Runtime;
 
         /// <summary>
         /// The active monitor state.
@@ -172,7 +173,7 @@ protected Monitor()
         /// Initializes this monitor.
         /// </summary>
         /// <param name="runtime">The runtime that executes this monitor.</param>
-        internal void Initialize(ActorRuntime runtime)
+        internal void Initialize(ControlledRuntime runtime)
         {
             Runtime = runtime;
         }