cleanup code

tests/ReactorMaintenance.Simulation.Tests/ReactorMaintenance.Simulation.Tests.csproj

@@ -1,27 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <PropertyGroup>
+        <TargetFramework>net10.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
 
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageReference Include="xunit" Version="2.5.3"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
+    <ItemGroup>
+        <Using Include="Xunit"/>
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\ReactorMaintenance.Simulation\ReactorMaintenance.Simulation.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\ReactorMaintenance.Simulation\ReactorMaintenance.Simulation.csproj"/>
+    </ItemGroup>
 
 </Project>

tests/ReactorMaintenance.Simulation.Tests/SimulationEngineTests.cs

@@ -34,7 +34,7 @@ public sealed class SimulationEngineTests
     {
         var level = LevelState.Create("Leak", 6, 6);
         level = level.SetUnderground(new(2, 2), ECarrierType.Fuel, new() { State = EUndergroundState.Leaking, Amount = 5, Intensity = 5 }) with {
-            Leaks = [new LeakState { Carrier = ECarrierType.Fuel, UndergroundPosition = new(2, 2), AccessPosition = new(2, 2) }]
+            Leaks = [new() { Carrier = ECarrierType.Fuel, UndergroundPosition = new(2, 2), AccessPosition = new(2, 2) }]
         };
         level = level.SetProp(new(2, 2), new() { Type = EPropType.Flow, Carrier = ECarrierType.Fuel });
 
@@ -50,7 +50,7 @@ public sealed class SimulationEngineTests
         level = level.SetUnderground(new(2, 2), ECarrierType.Fuel, new() { State = EUndergroundState.Leaking, Amount = 5, Intensity = 5 });
         level = level.SetSurface(new(2, 2), new() { Fuel = 5 }) with {
             Robot = new() { Position = new(2, 2), FuelNeutralizers = 1 },
-            Leaks = [new LeakState { Carrier = ECarrierType.Fuel, UndergroundPosition = new(2, 2), AccessPosition = new(2, 2) }]
+            Leaks = [new() { Carrier = ECarrierType.Fuel, UndergroundPosition = new(2, 2), AccessPosition = new(2, 2) }]
         };
 
         var next = m_Engine.InteractLeak(level, ECarrierType.Fuel, true);
@@ -65,7 +65,7 @@ public sealed class SimulationEngineTests
     {
         var level = LevelState.Create("Door", 6, 6);
         level = level.SetSurface(new(2, 2), new() { Heat = 8 }) with {
-            Doors = [new DoorState { A = new(2, 2), B = new(3, 2), State = EDoorState.Closed }]
+            Doors = [new() { A = new(2, 2), B = new(3, 2), State = EDoorState.Closed }]
         };
 
         var next = m_Engine.AdvanceTurn(level);
@@ -155,11 +155,11 @@ public sealed class SimulationEngineTests
     {
         var level = LevelState.Create("Rule", 6, 6) with {
             RuleEvents = [
-                new RuleEventState {
+                new() {
                     Phase = ERuleEventPhase.EndOfTurn,
                     ForecastText = "containment failure",
-                    Predicates = [new RulePredicate { Kind = ERulePredicateKind.TurnAtLeast, Turn = 0 }],
-                    Effects = [new RuleEffect { Kind = ERuleEffectKind.MarkTerminalLoss, Message = "CONTAINMENT FAILURE" }]
+                    Predicates = [new() { Kind = ERulePredicateKind.TurnAtLeast, Turn = 0 }],
+                    Effects = [new() { Kind = ERuleEffectKind.MarkTerminalLoss, Message = "CONTAINMENT FAILURE" }]
                 }
             ]
         };
@@ -177,10 +177,10 @@ public sealed class SimulationEngineTests
         level = AddLine(level, ECarrierType.Fuel, new(2, 2), new(3, 2));
         level = level.SetProp(new(2, 2), new() { Type = EPropType.Flow, Carrier = ECarrierType.Fuel }) with {
             RuleEvents = [
-                new RuleEventState {
+                new() {
                     Phase = ERuleEventPhase.EndOfTurn,
-                    Predicates = [new RulePredicate { Kind = ERulePredicateKind.NetworkBandAt, Position = new(3, 2), Carrier = ECarrierType.Fuel, NetworkValue = ENetworkValueKind.Amount, Band = EBand.Critical }],
-                    Effects = [new RuleEffect { Kind = ERuleEffectKind.EmitWarning, Message = "fuel pressure high" }]
+                    Predicates = [new() { Kind = ERulePredicateKind.NetworkBandAt, Position = new(3, 2), Carrier = ECarrierType.Fuel, NetworkValue = ENetworkValueKind.Amount, Band = EBand.Critical }],
+                    Effects = [new() { Kind = ERuleEffectKind.EmitWarning, Message = "fuel pressure high" }]
                 }
             ]
         };
@@ -195,10 +195,10 @@ public sealed class SimulationEngineTests
     {
         var level = BuildReadyLevel() with {
             RuleEvents = [
-                new RuleEventState {
+                new() {
                     Phase = ERuleEventPhase.EndOfTurn,
-                    Predicates = [new RulePredicate { Kind = ERulePredicateKind.ReactorReadyIs, ReactorId = 1, BoolValue = true }],
-                    Effects = [new RuleEffect { Kind = ERuleEffectKind.EmitWarning, Message = "reactor ready rule" }]
+                    Predicates = [new() { Kind = ERulePredicateKind.ReactorReadyIs, ReactorId = 1, BoolValue = true }],
+                    Effects = [new() { Kind = ERuleEffectKind.EmitWarning, Message = "reactor ready rule" }]
                 }
             ]
         };
@@ -214,10 +214,10 @@ public sealed class SimulationEngineTests
         var level = LevelState.Create("Inventory rule", 6, 6) with {
             Robot = new() { Position = new(1, 1), FuelNeutralizers = 1 },
             RuleEvents = [
-                new RuleEventState {
+                new() {
                     Phase = ERuleEventPhase.StartOfSimulation,
-                    Predicates = [new RulePredicate { Kind = ERulePredicateKind.RobotInventoryAtLeast, Remedy = ERemedyType.FuelNeutralizer, InventoryCount = 1 }],
-                    Effects = [new RuleEffect { Kind = ERuleEffectKind.EmitWarning, Message = "fuel kit detected" }]
+                    Predicates = [new() { Kind = ERulePredicateKind.RobotInventoryAtLeast, Remedy = ERemedyType.FuelNeutralizer, InventoryCount = 1 }],
+                    Effects = [new() { Kind = ERuleEffectKind.EmitWarning, Message = "fuel kit detected" }]
                 }
             ]
         };
@@ -234,19 +234,19 @@ public sealed class SimulationEngineTests
         level = level.SetSurface(new(2, 2), new() { Fuel = 5, Heat = 5 }) with {
             Robot = new() { Position = new(1, 1), FuelNeutralizers = 2 },
             Doors = [
-                new DoorState { A = new(2, 2), B = new(1, 2), State = EDoorState.Closed },
-                new DoorState { A = new(2, 2), B = new(3, 2), State = EDoorState.Closed },
-                new DoorState { A = new(2, 2), B = new(2, 1), State = EDoorState.Closed },
-                new DoorState { A = new(2, 2), B = new(2, 3), State = EDoorState.Closed }
+                new() { A = new(2, 2), B = new(1, 2), State = EDoorState.Closed },
+                new() { A = new(2, 2), B = new(3, 2), State = EDoorState.Closed },
+                new() { A = new(2, 2), B = new(2, 1), State = EDoorState.Closed },
+                new() { A = new(2, 2), B = new(2, 3), State = EDoorState.Closed }
             ],
             RuleEvents = [
-                new RuleEventState {
+                new() {
                     Phase = ERuleEventPhase.StartOfSimulation,
-                    Predicates = [new RulePredicate { Kind = ERulePredicateKind.TurnAtLeast, Turn = 0 }],
+                    Predicates = [new() { Kind = ERulePredicateKind.TurnAtLeast, Turn = 0 }],
                     Effects = [
-                        new RuleEffect { Kind = ERuleEffectKind.RemoveSurfaceHazard, Position = new(2, 2), Carrier = ECarrierType.Fuel, Amount = 2 },
-                        new RuleEffect { Kind = ERuleEffectKind.RemoveHeat, Position = new(2, 2), Amount = 3 },
-                        new RuleEffect { Kind = ERuleEffectKind.RemoveInventory, Remedy = ERemedyType.FuelNeutralizer, Amount = 1 }
+                        new() { Kind = ERuleEffectKind.RemoveSurfaceHazard, Position = new(2, 2), Carrier = ECarrierType.Fuel, Amount = 2 },
+                        new() { Kind = ERuleEffectKind.RemoveHeat, Position = new(2, 2), Amount = 3 },
+                        new() { Kind = ERuleEffectKind.RemoveInventory, Remedy = ERemedyType.FuelNeutralizer, Amount = 1 }
                     ]
                 }
             ]
@@ -266,10 +266,10 @@ public sealed class SimulationEngineTests
         level = level.SetTerrain(new(2, 2), ECellTerrain.Wall);
         level = level.SetUnderground(new(2, 2), ECarrierType.Electricity, new() { State = EUndergroundState.Intact }) with {
             RuleEvents = [
-                new RuleEventState {
+                new() {
                     Phase = ERuleEventPhase.StartOfSimulation,
-                    Predicates = [new RulePredicate { Kind = ERulePredicateKind.TurnAtLeast, Turn = 0 }],
-                    Effects = [new RuleEffect { Kind = ERuleEffectKind.StartLeak, Position = new(2, 2), AccessPosition = new(2, 3), Carrier = ECarrierType.Electricity }]
+                    Predicates = [new() { Kind = ERulePredicateKind.TurnAtLeast, Turn = 0 }],
+                    Effects = [new() { Kind = ERuleEffectKind.StartLeak, Position = new(2, 2), AccessPosition = new(2, 3), Carrier = ECarrierType.Electricity }]
                 }
             ]
         };
@@ -287,11 +287,11 @@ public sealed class SimulationEngineTests
         var level = LevelState.Create("Invalid rules", 6, 6);
         level = level.SetTerrain(new(2, 2), ECellTerrain.Wall) with {
             RuleEvents = [
-                new RuleEventState {
-                    Predicates = [new RulePredicate { Kind = ERulePredicateKind.PropStateAt, Position = new(1, 1) }],
+                new() {
+                    Predicates = [new() { Kind = ERulePredicateKind.PropStateAt, Position = new(1, 1) }],
                     Effects = [
-                        new RuleEffect { Kind = ERuleEffectKind.AddSurfaceHazard, Position = new(2, 2), Carrier = ECarrierType.Fuel, Amount = 1 },
-                        new RuleEffect { Kind = ERuleEffectKind.RepairNetworkCell, Position = new(3, 3), Carrier = ECarrierType.Coolant }
+                        new() { Kind = ERuleEffectKind.AddSurfaceHazard, Position = new(2, 2), Carrier = ECarrierType.Fuel, Amount = 1 },
+                        new() { Kind = ERuleEffectKind.RepairNetworkCell, Position = new(3, 3), Carrier = ECarrierType.Coolant }
                     ]
                 }
             ]
@@ -312,7 +312,7 @@ public sealed class SimulationEngineTests
         level = level.SetTerrain(new(2, 2), ECellTerrain.Wall);
         level = level with {
             Surface = level.Surface.ToArray(),
-            Reactors = [new ReactorBinding { ControlPosition = new(3, 3), FuelConsumerPosition = new(1, 1), CoolantConsumerPosition = new(1, 1), ElectricityConsumerPosition = new(1, 1) }]
+            Reactors = [new() { ControlPosition = new(3, 3), FuelConsumerPosition = new(1, 1), CoolantConsumerPosition = new(1, 1), ElectricityConsumerPosition = new(1, 1) }]
         };
         level.Surface[level.Index(new(2, 2))] = new() { Heat = 1 };
 
@@ -367,7 +367,7 @@ public sealed class SimulationEngineTests
         return level with {
             Robot = new() { Position = new(5, 3) },
             Reactors = [
-                new ReactorBinding {
+                new() {
                     ReactorId = 1,
                     ControlPosition = new(5, 3),
                     FuelConsumerPosition = new(3, 2),