Improve statistic handling

 - Integrate statistic update into Resource
 - Refactor analysis and statistic collection
 - Add text output
 - Update samples

Author: abeham

Samples/KanbanControl.cs

@@ -24,7 +24,7 @@ public class KanbanControl {
     private Simulation env;
     private Resource kanban;
     private Resource server;
-    private ContinuousStatistics stockStat;
+    private TimeSeriesMonitor stockStat;
     private static readonly TimeSpan OrderArrivalTime = TimeSpan.FromMinutes(3.33);
     private static readonly TimeSpan ProcessingTime = TimeSpan.FromMinutes(2.5);
     private int completedOrders;
@@ -59,7 +59,7 @@ public void Simulate() {
       env.Log("== Kanban controlled production system ==");
       kanban = new Resource(env, capacity: 15);
       server = new Resource(env, capacity: 1);
-      stockStat = new ContinuousStatistics(env);
+      stockStat = new TimeSeriesMonitor(env);
       env.Process(Source());
       env.Run(TimeSpan.FromDays(180));
       Console.WriteLine("Stock: {0} ; {1:F3}±{2:F3} ; {3} (Min;Mean±StdDev;Max) kanbans ", stockStat.Min, stockStat.Mean, stockStat.StdDev, stockStat.Max);

Samples/MM1Queueing.cs

@@ -21,36 +21,21 @@ You should have received a copy of the GNU General Public License
 
 namespace SimSharp.Samples {
   public class MM1Queueing {
-    private Simulation env;
-    private Resource server;
-    private ContinuousStatistics wip, utilization;
-    private DiscreteStatistics waitingtime, leadtime;
     private static readonly TimeSpan OrderArrivalTime = TimeSpan.FromMinutes(3.33);
     private static readonly TimeSpan ProcessingTime = TimeSpan.FromMinutes(2.5);
 
-    private IEnumerable<Event> Source() {
+    private IEnumerable<Event> Source(Simulation env, Resource server) {
       while (true) {
         yield return env.TimeoutExponential(OrderArrivalTime);
-        env.Process(Order());
+        env.Process(Order(env, server));
       }
     }
 
-    private IEnumerable<Event> Order() {
-      var start = env.Now;
-      wip.Increase();
-      var req = server.Request();
-      yield return req;
-      utilization.UpdateTo(server.InUse / (double)server.Capacity);
-      waitingtime.Add((env.Now - start).TotalMinutes);
-      yield return env.Process(Produce(req));
-      wip.Decrease();
-      leadtime.Add((env.Now - start).TotalMinutes);
-    }
-
-    private IEnumerable<Event> Produce(Request req) {
-      yield return env.TimeoutExponential(ProcessingTime);
-      yield return server.Release(req);
-      utilization.UpdateTo(server.InUse / (double)server.Capacity);
+    private IEnumerable<Event> Order(Simulation env, Resource server) {
+      using (var req = server.Request()) {
+        yield return req;
+        yield return env.TimeoutExponential(ProcessingTime);
+      }
     }
 
     public void Simulate() {
@@ -61,12 +46,11 @@ public void Simulate() {
       var analyticLeadtime = 1 / (mu - lambda);
       var analyticWaitingtime = rho / (mu - lambda);
 
-      env = new Simulation(randomSeed: 1);
-      server = new Resource(env, capacity: 1);
-      wip = new ContinuousStatistics(env);
-      utilization = new ContinuousStatistics(env);
-      leadtime = new DiscreteStatistics();
-      waitingtime = new DiscreteStatistics();
+      var env = new Simulation(randomSeed: 1, defaultStep: TimeSpan.FromMinutes(1));
+      var utilization = new TimeSeriesMonitor(env);
+      var wip = new TimeSeriesMonitor(env, collect: true);
+      var leadtime = new SampleMonitor(collect: true);
+      var waitingtime = new SampleMonitor(collect: true);
 
       env.Log("Analytical results of this system:");
       env.Log("\tUtilization.Mean\tWIP.Mean\tLeadtime.Mean\tWaitingTime.Mean");
@@ -90,22 +74,37 @@ public void Simulate() {
         .Add("WaitingTime", waitingtime, Report.Measures.Mean)
         .SetOutput(env.Logger)
         .SetSeparator("\t")
-        .SetFinalUpdate(withHeaders: true) // creates a summary of the means at the end
+        .SetFinalUpdate(withHeaders: false) // creates a summary of the means at the end
         .Build();
 
-      env.Log("== m/m/1 queuing system (run 1) ==");
-      env.Process(Source());
-      env.Run(TimeSpan.FromDays(365));
-      
-      env.Reset(2); // reset environment
-      server = new Resource(env, capacity: 1); // reset resources
-      wip.Reset(); // reset statistics
-      utilization.Reset();
-      leadtime.Reset();
+      env.Log("Simulated results of this system:");
+      env.Log("");
+      summary.WriteHeader(); // write the header just once
+
+      for (var i = 0; i < 5; i++) {
+        env.Reset(i + 1); // reset environment
+        utilization.Reset(); // reset monitors
+        wip.Reset();
+        leadtime.Reset();
+        waitingtime.Reset();
+        var server = new Resource(env, capacity: 1) {
+          Utilization = utilization,
+          WIP = wip,
+          LeadTime = leadtime,
+          WaitingTime = waitingtime,
+        };
+
+        env.Process(Source(env, server));
+        env.Run(TimeSpan.FromDays(365));
+      }
 
-      env.Log("== m/m/1 queuing system (run 2) ==");
-      env.Process(Source());
-      env.Run(TimeSpan.FromDays(365));
+      env.Log("");
+      env.Log("Detailed results from the last run:");
+      env.Log("");
+      env.Log(utilization.Print("Utilization"));
+      env.Log(wip.Print("WIP"));
+      env.Log(leadtime.Print("Lead time"));
+      env.Log(waitingtime.Print("Waiting time"));
     }
   }
 }

SimSharp.sln

@@ -1,12 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29201.188
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples", "Samples\Samples.csproj", "{160EE4A5-D14D-4147-BE99-536F03A68CCB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5BC56A42-5229-4380-BF91-3A2EB70332C3}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 	EndProjectSection