Performance improved by 25-30%

O2DESNet.UnitTests/O2DESNet.UnitTests.csproj

@@ -1,21 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-
+    <TargetFramework>net10.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
-    <PackageReference Include="nunit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="R.NET" Version="1.8.2" />
+    <PackageReference Include="NUnit" Version="4.*" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.*" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
   </ItemGroup>
 
   <ItemGroup>

O2DESNet.UnitTests/RandomVariableTests/Categorical/UniformTests.cs

@@ -1,15 +1,15 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Categorical;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Categorical
 {
-    [TestClass]
+    [TestFixture]
     public class UniformTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             List<int> numList = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -27,7 +27,7 @@ public void TestMeanAndVariacneConsistency()
             }
             PrintResult.CompareMeanAndVariance("uniform categorical", mean, stdev * stdev, rs.Mean(), rs.Variance());
         }
-        [TestMethod]
+        [Test]
         public void TestUniformRVCategoricalGenericObjectSampleMethod()
         {
             List<int> numList = new List<int>() { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -40,32 +40,28 @@ public void TestUniformRVCategoricalGenericObjectSampleMethod()
                 Debug.WriteLine(tmep);
             }
         }
-        [TestMethod]
+        [Test]
         public void TestUniformRVCategoricalCostumizedObjectSampleMethod()
         {
             Random rs = new Random();
-            List<student> students = new List<student>();
+            var students = new List<Student>();
             for (int i = 0; i < 20; i++)
             {
-                var s = new student();
-                s.id = i + 1;
-                s.name = "a" + Convert.ToString(i);
+                var s = new Student { Id = i + 1, Name = "a" + i };
                 students.Add(s);
             }
-            Uniform<student> uniform = new Uniform<student>();
-            uniform.Candidates = students;
+            var uniform = new Uniform<Student> { Candidates = students };
             for (int i = 0; i < 20; i++)
             {
                 var temp = uniform.Sample(rs);
-                Debug.WriteLine(temp.name + " " + temp.id);
+                Debug.WriteLine(temp.Name + " " + temp.Id);
             }
         }
     }
 }
 
-public class student
+public class Student
 {
-    public int id { get; set; }
-    public string name { get; set; }
-
+    public int Id { get; set; }
+    public string Name { get; set; } = string.Empty;
 }

O2DESNet.UnitTests/RandomVariableTests/Continuous/BetaTests.cs

@@ -1,13 +1,13 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Continuous;
 using System;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Continuous
 {
-    [TestClass]
+    [TestFixture]
     public class BetaTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;
@@ -30,7 +30,7 @@ public void TestMeanAndVariacneConsistency()
             PrintResult.CompareMeanAndVariance("Beta", mean, variance, rs.Mean(), rs.Variance());
         }
 
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency_Mean()
         {
             const int numSamples = 100000;

O2DESNet.UnitTests/RandomVariableTests/Continuous/ExponentialTests.cs

@@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Continuous;
 using System;
 using System.Collections.Generic;
@@ -7,10 +7,10 @@
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Continuous
 {
-    [TestClass]
+    [TestFixture]
     public class ExponentialTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;

O2DESNet.UnitTests/RandomVariableTests/Continuous/GammaTests.cs

@@ -1,13 +1,13 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using System;
 using O2DESNet.RandomVariables.Continuous;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Continuous
 {
-    [TestClass]
+    [TestFixture]
     public class GammaTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;
@@ -25,7 +25,7 @@ public void TestMeanAndVariacneConsistency()
             }
             PrintResult.CompareMeanAndVariance("gamma", mean, stdev * stdev, rs.Mean(), rs.Variance()); // TODO: result not consistent need to fix the bug
         }
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency_Shape()
         {
             const int numSamples = 100000;

O2DESNet.UnitTests/RandomVariableTests/Continuous/LogNormalTests.cs

@@ -1,13 +1,13 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Continuous;
 using System;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Continuous
 {
-    [TestClass]
+    [TestFixture]
     public class LogNormalTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;
@@ -28,7 +28,7 @@ public void TestMeanAndVariacneConsistency()
             PrintResult.CompareMeanAndVariance("logNormal", mean, stdev * stdev, rs.Mean(), rs.Variance());
         }
 
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency_MuSigma()
         {
             const int numSamples = 100000;

O2DESNet.UnitTests/RandomVariableTests/Continuous/NormalTests.cs

@@ -1,13 +1,13 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Continuous;
 using System;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Continuous
 {
-    [TestClass]
+    [TestFixture]
     public class NormalTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency_Std()
         {
             const int numSamples = 100000;
@@ -26,7 +26,7 @@ public void TestMeanAndVariacneConsistency_Std()
             }
             PrintResult.CompareMeanAndVariance("normal", mean, stdev * stdev, rs.Mean(), rs.Variance());
         }
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency_CV()
         {
             const int numSamples = 100000;

O2DESNet.UnitTests/RandomVariableTests/Continuous/TriangularTests.cs

@@ -1,13 +1,13 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Continuous;
 using System;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Continuous
 {
-    [TestClass]
+    [TestFixture]
     public class TriangularTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;

O2DESNet.UnitTests/RandomVariableTests/Continuous/UniformTests.cs

@@ -1,4 +1,4 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Continuous;
 using System;
 using System.Collections.Generic;
@@ -7,10 +7,10 @@
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Continuous
 {
-    [TestClass]
+    [TestFixture]
     public class UniformTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;
@@ -29,7 +29,7 @@ public void TestMeanAndVariacneConsistency()
             }
             PrintResult.CompareMeanAndVariance("uniform", mean, stdev * stdev, rs.Mean(), rs.Variance());
         }
-        [TestMethod]
+        [Test]
         public void IfLowerBoundLarger()
         {
             Random rs = new Random();

O2DESNet.UnitTests/RandomVariableTests/Discrete/PoissonTests.cs

@@ -1,13 +1,13 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Discrete;
 using System;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Discrete
 {
-    [TestClass]
+    [TestFixture]
     public class PoissonTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;

O2DESNet.UnitTests/RandomVariableTests/Discrete/UniformTests.cs

@@ -1,19 +1,14 @@
-using MathNet.Numerics.Distributions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Newtonsoft.Json.Bson;
+using NUnit.Framework;
 using O2DESNet.RandomVariables.Discrete;
-using RDotNet;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Text;
 
 namespace O2DESNet.UnitTests.RandomVariableTests.Discrete
 {
-    [TestClass]
+    [TestFixture]
     public class UniformTests
     {
-        [TestMethod]
+        [Test]
         public void TestMeanAndVariacneConsistency()
         {
             const int numSamples = 100000;
@@ -36,7 +31,7 @@ public void TestMeanAndVariacneConsistency()
             Assert.IsTrue(Math.Abs(stdev * stdev - rs.Variance()) < 0.1);
         }
 
-        [TestMethod]
+        [Test]
         public void TestGetterOfMeanAndVariance()
         {
             Uniform uniform = new Uniform();

O2DESNet/Demos/MMnQueue_Atomic.cs

@@ -1,4 +1,3 @@
-using O2DESNet;
 using O2DESNet.Distributions;
 using System;
 
@@ -7,15 +6,15 @@ namespace O2DESNet.Demos
     public class MMnQueue_Atomic : Sandbox, IMMnQueue
     {
         #region Static Properties
-        public double HourlyArrivalRate { get; private set; }
-        public double HourlyServiceRate { get; private set; }
-        public int NServers { get; private set; }
+        public double HourlyArrivalRate { get; }
+        public double HourlyServiceRate { get; }
+        public int NServers { get; }
         #endregion
 
-        #region Dynamic Properties / Methods
-        public double AvgNQueueing { get { return HC_InQueue.AverageCount; } }
-        public double AvgNServing { get { return HC_InServer.AverageCount; } }
-        public double AvgHoursInSystem { get { return HC_InSystem.AverageDuration.TotalHours; } }
+        #region Dynamic Properties
+        public double AvgNQueueing => HC_InQueue.AverageCount;
+        public double AvgNServing => HC_InServer.AverageCount;
+        public double AvgHoursInSystem => HC_InSystem.AverageDuration.TotalHours;
 
         private HourCounter HC_InServer { get; set; }
         private HourCounter HC_InQueue { get; set; }
@@ -70,7 +69,7 @@ public MMnQueue_Atomic(double hourlyArrivalRate, double hourlyServiceRate, int n
             HC_InQueue = AddHourCounter();
             HC_InSystem = AddHourCounter();
 
-            /// Initial event
+            // Initial event
             Arrive();
         }
     }