Skip to content

Support NET8 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chen-tianhao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support NET8 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions O2DESNet.UnitTests/O2DESNet.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</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">
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
<PackageReference Include="nunit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="R.NET" Version="1.8.2" />
</ItemGroup>

Expand Down
32 changes: 20 additions & 12 deletions O2DESNet.UnitTests/PhaseTracker_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ public void PhaseTracer_at_MinDateTime()
pr.UpdPhase("Busy2", DateTime.MinValue.AddMinutes(2));
pr.UpdPhase("Idle", DateTime.MinValue.AddMinutes(2.5));
pr.UpdPhase("Busy2", DateTime.MinValue.AddMinutes(2.9));
if (Diff(pr.GetProportion("Idle", DateTime.MinValue.AddMinutes(3)), 1.6 / 3)) Assert.Fail();
if (Diff(pr.GetProportion("Busy1", DateTime.MinValue.AddMinutes(3)), 0.8 / 3)) Assert.Fail();
if (Diff(pr.GetProportion("Busy2", DateTime.MinValue.AddMinutes(3)), 0.6 / 3)) Assert.Fail();
if (Diff(pr.GetProportion("Other", DateTime.MinValue.AddMinutes(3)), 0)) Assert.Fail();

var checkpoint = DateTime.MinValue.AddMinutes(3);
AssertProportion(pr, "Idle", checkpoint, 1.6 / 3);
AssertProportion(pr, "Busy1", checkpoint, 0.8 / 3);
AssertProportion(pr, "Busy2", checkpoint, 0.6 / 3);
AssertProportion(pr, "Other", checkpoint, 0);
}

[Test]
Expand All @@ -27,9 +29,11 @@ public void PhaseTracer_at_Non_MinDateTime()
pr.UpdPhase("Busy2", DateTime.MinValue.AddMinutes(2));
pr.UpdPhase("Idle", DateTime.MinValue.AddMinutes(2.5));
pr.UpdPhase("Busy2", DateTime.MinValue.AddMinutes(2.9));
if (Diff(pr.GetProportion("Idle", DateTime.MinValue.AddMinutes(3)), 0.6 / 2)) Assert.Fail();
if (Diff(pr.GetProportion("Busy1", DateTime.MinValue.AddMinutes(3)), 0.8 / 2)) Assert.Fail();
if (Diff(pr.GetProportion("Busy2", DateTime.MinValue.AddMinutes(3)), 0.6 / 2)) Assert.Fail();

var checkpoint = DateTime.MinValue.AddMinutes(3);
AssertProportion(pr, "Idle", checkpoint, 0.6 / 2);
AssertProportion(pr, "Busy1", checkpoint, 0.8 / 2);
AssertProportion(pr, "Busy2", checkpoint, 0.6 / 2);
}

[Test]
Expand All @@ -41,14 +45,18 @@ public void PhaseTracer_with_WarmUp()
pr.UpdPhase("Busy2", DateTime.MinValue.AddMinutes(2));
pr.UpdPhase("Idle", DateTime.MinValue.AddMinutes(2.5));
pr.UpdPhase("Busy2", DateTime.MinValue.AddMinutes(2.9));
if (Diff(pr.GetProportion("Idle", DateTime.MinValue.AddMinutes(3)), 0.4 / 1.5)) Assert.Fail();
if (Diff(pr.GetProportion("Busy1", DateTime.MinValue.AddMinutes(3)), 0.5 / 1.5)) Assert.Fail();
if (Diff(pr.GetProportion("Busy2", DateTime.MinValue.AddMinutes(3)), 0.6 / 1.5)) Assert.Fail();

var checkpoint = DateTime.MinValue.AddMinutes(3);
AssertProportion(pr, "Idle", checkpoint, 0.4 / 1.5);
AssertProportion(pr, "Busy1", checkpoint, 0.5 / 1.5);
AssertProportion(pr, "Busy2", checkpoint, 0.6 / 1.5);
}

private static bool Diff(double x1, double x2, int decimals = 12)
private static void AssertProportion(PhaseTracer tracer, string phase, DateTime checkpoint, double expected)
{
return Math.Round(x1, decimals) != Math.Round(x2, decimals);
var actual = tracer.GetProportion(phase, checkpoint);
const double tolerance = 1e-9;
Assert.That(actual, Is.EqualTo(expected).Within(tolerance), $"{phase} proportion mismatch");
}
}
}
8 changes: 4 additions & 4 deletions O2DESNet/O2DESNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<PropertyGroup>
<Version Condition=" '$(BUILD_BUILDNUMBER)' == '' ">1.0.0.0</Version>
<Version Condition=" '$(BUILD_BUILDNUMBER)' != '' ">$(BUILD_BUILDNUMBER)</Version>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>9.0</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>latest</LangVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Li Haobin</Authors>
<Description>A framework for Object-Oriented Discrete Event Simulation</Description>
Expand All @@ -19,8 +19,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="4.8.1" />
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="System.Drawing.Common" Version="10.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down