Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs =================================================================== diff -u -r5fcfd3d73f28585c211086ad413fc5d177ecd6b2 -ra9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 5fcfd3d73f28585c211086ad413fc5d177ecd6b2) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision a9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1) @@ -113,7 +113,7 @@ var sectionId = hydraRingCalculationInput.Section.SectionId; OutputDirectory = CreateWorkingDirectory(); - var hydraRingConfigurationService = new HydraRingConfigurationService(ringId, uncertaintiesType); + var hydraRingConfigurationService = new HydraRingConfigurationService(uncertaintiesType); hydraRingConfigurationService.AddHydraRingCalculationInput(hydraRingCalculationInput); var hydraRingInitializationService = new HydraRingInitializationService(hydraRingCalculationInput.FailureMechanismType, sectionId, hlcdDirectory, OutputDirectory); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r589249bddd12bd66da39205d408ff6e907220116 -ra9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 589249bddd12bd66da39205d408ff6e907220116) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision a9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1) @@ -64,44 +64,23 @@ private const double defaultHydraRingValue = 0.0; private readonly double? defaultHydraRingNullValue = null; - private readonly string ringId; - private readonly HydraRingUncertaintiesType uncertaintiesType; private readonly IList hydraRingInputs = new List(); private readonly FailureMechanismDefaultsProvider failureMechanismDefaultsProvider = new FailureMechanismDefaultsProvider(); private readonly VariableDefaultsProvider variableDefaultsProvider = new VariableDefaultsProvider(); /// /// Creates a new instance of the class. /// - /// The id of the ring to perform Hydra-Ring calculations for. /// The to use while performing Hydra-Ring calculations. - public HydraRingConfigurationService(string ringId, HydraRingUncertaintiesType uncertaintiesType) + public HydraRingConfigurationService(HydraRingUncertaintiesType uncertaintiesType) { - this.ringId = ringId; - this.uncertaintiesType = uncertaintiesType; + this.UncertaintiesType = uncertaintiesType; } /// - /// Gets the id of the ring to perform Hydra-Ring calculations for. - /// - public string RingId - { - get - { - return ringId; - } - } - - /// /// Gets the to use while performing Hydra-Ring calculations. /// - public HydraRingUncertaintiesType UncertaintiesType - { - get - { - return uncertaintiesType; - } - } + public HydraRingUncertaintiesType UncertaintiesType { get; } /// /// Adds Hydra-Ring calculation input to the configuration. Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924 -ra9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision a9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1) @@ -44,7 +44,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithAssessmentLevelCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); hydraRingConfigurationService.AddHydraRingCalculationInput(new AssessmentLevelCalculationInput(1, 700004, 1.0/10000) { @@ -129,7 +129,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithWaveHeightCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); hydraRingConfigurationService.AddHydraRingCalculationInput(new WaveHeightCalculationInput(1, 700004, 1.0/10000) { @@ -214,7 +214,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithOvertoppingCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -366,7 +366,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithDikeHeightCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -517,7 +517,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithOvertoppingRateCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -667,7 +667,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresOvertoppingCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -829,7 +829,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithWaveConditionsCosineCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; var forelandPoints = new List @@ -939,7 +939,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithWaveConditionsTrapezoidCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; var forelandPoints = new List @@ -1051,7 +1051,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresClosureFloodedCulvertCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -1173,7 +1173,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresClosureLowSillCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -1298,7 +1298,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresClosureVerticalWallCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -1424,7 +1424,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresStabilityPointFloodedCulvertLinearCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -1580,7 +1580,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresStabilityPointFloodedCulvertQuadraticCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -1736,7 +1736,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresStabilityPointLowSillLinearCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; var sectionNormal = 3.3; @@ -1892,7 +1892,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithStructuresStabilityPointLowSillQuadraticCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; @@ -2048,7 +2048,7 @@ public void WriteDatabaseCreationScript_HydraRingConfigurationWithDunesBoundaryConditionsCalculationInput_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.All); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.All); hydraRingConfigurationService.AddHydraRingCalculationInput(new DunesBoundaryConditionsCalculationInput(1, 700004, 1.0/10000) { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -r64ff18d2a822650da1a0e8a30656477c1c8cd58e -ra9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision a9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1) @@ -43,18 +43,17 @@ public void Constructor_ExpectedValues() { // Call - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.Model); // Assert - Assert.AreEqual("34-1", hydraRingConfigurationService.RingId); Assert.AreEqual(HydraRingUncertaintiesType.Model, hydraRingConfigurationService.UncertaintiesType); } [Test] public void AddHydraRingCalculationInput_DuplicateSectionId_ThrowsArgumentException() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.Model); var calculationInput1 = new HydraRingCalculationInputImplementation(1, 2); var calculationInput2 = new HydraRingCalculationInputImplementation(1, 3); @@ -71,7 +70,7 @@ [Test] public void AddHydraRingCalculationInput_MultipleFailureMechanismTypes_ThrowsNotSupportedException() { - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.Model); var calculationInput1 = new HydraRingCalculationInputImplementation(1, 2); var calculationInput2 = new HydraRingCalculationInputImplementation(2, 3); calculationInput2.SetFailureMechanismType(HydraRingFailureMechanismType.HydraulicLoads); @@ -91,7 +90,7 @@ public void WriteDatabaseCreationScript_SingleHydraRingCalculationInputAddedToConfiguration_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.Model); hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004) { @@ -197,7 +196,7 @@ public void WriteDatabaseCreationScript_MultipleHydraRingCalculationInputsAddedToConfiguration_WritesExpectedCreationScript() { // Setup - var hydraRingConfigurationService = new HydraRingConfigurationService("34-1", HydraRingUncertaintiesType.Model); + var hydraRingConfigurationService = new HydraRingConfigurationService(HydraRingUncertaintiesType.Model); hydraRingConfigurationService.AddHydraRingCalculationInput(new HydraRingCalculationInputImplementation(1, 700004) {