Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs =================================================================== diff -u -r6a8d4edb0f3b2d00d3958c48146c51487bd01247 -rf67fc935cc7113eed98fa3bb12ae61188bf59697 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision 6a8d4edb0f3b2d00d3958c48146c51487bd01247) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision f67fc935cc7113eed98fa3bb12ae61188bf59697) @@ -20,9 +20,7 @@ // All rights reserved. using System; -using System.ComponentModel; using System.IO; -using System.Security; using Core.Common.IO.Exceptions; using Core.Common.Utils; using log4net; @@ -32,7 +30,6 @@ using Ringtoets.DuneErosion.Service.Properties; using Ringtoets.HydraRing.Calculation.Calculator; using Ringtoets.HydraRing.Calculation.Calculator.Factory; -using Ringtoets.HydraRing.Calculation.Data.Input; using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; using Ringtoets.HydraRing.Calculation.Exceptions; @@ -154,11 +151,7 @@ /// public void Cancel() { - if (calculator != null) - { - calculator.Cancel(); - } - + calculator?.Cancel(); canceled = true; } @@ -250,7 +243,7 @@ double norm, string hydraulicBoundaryDatabaseFilePath) { - var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, norm, duneLocation.Orientation); + var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, norm); HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(dunesBoundaryConditionsCalculationInput, hydraulicBoundaryDatabaseFilePath); return dunesBoundaryConditionsCalculationInput; } Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs =================================================================== diff -u -r5fcfd3d73f28585c211086ad413fc5d177ecd6b2 -rf67fc935cc7113eed98fa3bb12ae61188bf59697 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 5fcfd3d73f28585c211086ad413fc5d177ecd6b2) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision f67fc935cc7113eed98fa3bb12ae61188bf59697) @@ -125,9 +125,9 @@ var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); var name = duneLocation.Name; - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", name), msgs[0]); + StringAssert.StartsWith($"Berekening van '{name}' gestart om: ", msgs[0]); Assert.AreEqual($"De berekening voor duinafslag '{duneLocation.Name}' is niet gelukt. De bijdrage van het toetsspoor moet een getal boven 0 zijn.", msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beƫindigd om: ", name), msgs[2]); + StringAssert.StartsWith($"Berekening van '{name}' beƫindigd om: ", msgs[2]); }); Assert.IsTrue(exceptionThrown); mocks.VerifyAll(); @@ -626,7 +626,7 @@ private static DunesBoundaryConditionsCalculationInput CreateInput(DuneLocation duneLocation, double norm) { - return new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, norm, duneLocation.Orientation); + return new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, norm); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs =================================================================== diff -u -ra131a156219bcec5b997f17b66db69dbd80b70a6 -rf67fc935cc7113eed98fa3bb12ae61188bf59697 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs (.../DunesBoundaryConditionsCalculationInput.cs) (revision a131a156219bcec5b997f17b66db69dbd80b70a6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInput.cs (.../DunesBoundaryConditionsCalculationInput.cs) (revision f67fc935cc7113eed98fa3bb12ae61188bf59697) @@ -26,43 +26,17 @@ /// public class DunesBoundaryConditionsCalculationInput : AssessmentLevelCalculationInput { - private readonly HydraRingSection section; - /// /// Creates a new instance of the class. /// /// The id of the section. /// The id of the hydraulic boundary location. /// The norm. - /// The normal of the section - public DunesBoundaryConditionsCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm, double sectionNormal) - : base(sectionId, hydraulicBoundaryLocationId, norm) - { - section = new HydraRingSection(1, double.NaN, sectionNormal); - } + public DunesBoundaryConditionsCalculationInput(int sectionId, long hydraulicBoundaryLocationId, double norm) + : base(sectionId, hydraulicBoundaryLocationId, norm) {} - public override HydraRingFailureMechanismType FailureMechanismType - { - get - { - return HydraRingFailureMechanismType.DunesBoundaryConditions; - } - } + public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.DunesBoundaryConditions; - public override int CalculationTypeId - { - get - { - return 2; - } - } - - public override HydraRingSection Section - { - get - { - return section; - } - } + public override int CalculationTypeId { get; } = 2; } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs =================================================================== diff -u -ra131a156219bcec5b997f17b66db69dbd80b70a6 -rf67fc935cc7113eed98fa3bb12ae61188bf59697 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision a131a156219bcec5b997f17b66db69dbd80b70a6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision f67fc935cc7113eed98fa3bb12ae61188bf59697) @@ -38,10 +38,9 @@ const double norm = 1.0/10000; const int sectionId = 1; const long hydraulicBoundaryLocationId = 1234; - const double orientation = 100; // Call - var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, norm, orientation); + var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, norm); // Assert double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); @@ -56,10 +55,10 @@ Assert.IsNull(dunesBoundaryConditionsCalculationInput.BreakWater); Assert.AreEqual(expectedBeta, dunesBoundaryConditionsCalculationInput.Beta); - var section = dunesBoundaryConditionsCalculationInput.Section; + HydraRingSection section = dunesBoundaryConditionsCalculationInput.Section; Assert.AreEqual(sectionId, section.SectionId); Assert.IsNaN(section.SectionLength); - Assert.AreEqual(orientation, section.CrossSectionNormal); + Assert.IsNaN(section.CrossSectionNormal); HydraRingVariable[] hydraRingVariables = dunesBoundaryConditionsCalculationInput.Variables.ToArray(); Assert.AreEqual(1, hydraRingVariables.Length); @@ -73,7 +72,7 @@ public void GetSubMechanismModelId_ReturnsExpectedValues() { // Call - var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, 1, 2.2, 3.3); + var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, 1, 2.2); // Assert Assert.IsNull(dunesBoundaryConditionsCalculationInput.GetSubMechanismModelId(1)); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r2a896243ca24205f8e98db1b61e8148d1d9b9062 -rf67fc935cc7113eed98fa3bb12ae61188bf59697 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 2a896243ca24205f8e98db1b61e8148d1d9b9062) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision f67fc935cc7113eed98fa3bb12ae61188bf59697) @@ -2050,7 +2050,7 @@ // Setup var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); - hydraRingConfigurationService.AddHydraRingCalculationInput(new DunesBoundaryConditionsCalculationInput(1, 700004, 1.0/10000, 360) + hydraRingConfigurationService.AddHydraRingCalculationInput(new DunesBoundaryConditionsCalculationInput(1, 700004, 1.0/10000) { DesignTablesSetting = new DesignTablesSetting(1.1, 2.2), NumericsSettings = new Dictionary @@ -2066,7 +2066,7 @@ "INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Sections];" + Environment.NewLine + - "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 360, 0);" + Environment.NewLine + + "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [SectionCalculationSchemes];" + Environment.NewLine + "INSERT INTO [SectionCalculationSchemes] VALUES (1, 1, 1);" + Environment.NewLine +