Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -21,8 +21,8 @@ using System; using System.Collections.Generic; +using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.IO.Configurations.Converters; using Riskeer.Revetment.IO.Configurations; @@ -43,8 +43,8 @@ /// /// Thrown when is invalid. public GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter( - IEnumerable calculations, string filePath, FailureMechanismContribution failureMechanismContribution) - : base(calculations, new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} + IEnumerable calculations, string filePath, IAssessmentSection assessmentSection) + : base(calculations, new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter(filePath), assessmentSection) {} protected override GrassCoverErosionOutwardsWaveConditionsCalculationConfiguration ToConfiguration(GrassCoverErosionOutwardsWaveConditionsCalculation calculation) { Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -248,7 +248,7 @@ yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo( (context, filePath) => new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter( - context.WrappedData.Children, filePath, context.AssessmentSection.FailureMechanismContribution), + context.WrappedData.Children, filePath, context.AssessmentSection), context => context.WrappedData.Children.Any(), GetInquiryHelper()); @@ -257,7 +257,7 @@ new[] { context.WrappedData - }, filePath, context.AssessmentSection.FailureMechanismContribution), + }, filePath, context.AssessmentSection), GetInquiryHelper()); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -rede3473ef7c0d1edcebbf44947d553aa52187f35 -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs) (revision ede3473ef7c0d1edcebbf44947d553aa52187f35) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -24,7 +24,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.IO.TestUtil; @@ -104,7 +103,7 @@ protected override GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) { - return new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.002)); + return new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter(calculations, filePath, new AssessmentSectionStub()); } } } \ No newline at end of file Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r2e24568ad5168ebb132e3d399262c19b19c5157e -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs (.../WaveConditionsCalculationConfigurationExporter.cs) (revision 2e24568ad5168ebb132e3d399262c19b19c5157e) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs (.../WaveConditionsCalculationConfigurationExporter.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -21,8 +21,8 @@ using System; using System.Collections.Generic; +using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.IO.Configurations; using Riskeer.Common.IO.Configurations.Export; @@ -44,26 +44,26 @@ where TWaveConditionsCalculationConfiguration : WaveConditionsCalculationConfiguration where TCalculation : class, ICalculation { - private readonly FailureMechanismContribution failureMechanismContribution; + private readonly IAssessmentSection assessmentSection; /// /// Creates a new instance of . /// /// The hierarchy of calculations to export. /// The writer to use. - /// The to use. + /// The to use. /// Thrown when any parameter is null. protected WaveConditionsCalculationConfigurationExporter(IEnumerable calculations, TWaveConditionsCalculationConfigurationWriter writer, - FailureMechanismContribution failureMechanismContribution) + IAssessmentSection assessmentSection) : base(calculations, writer) { - if (failureMechanismContribution == null) + if (assessmentSection == null) { - throw new ArgumentNullException(nameof(failureMechanismContribution)); + throw new ArgumentNullException(nameof(assessmentSection)); } - this.failureMechanismContribution = failureMechanismContribution; + this.assessmentSection = assessmentSection; } /// @@ -111,22 +111,12 @@ private void SetConfigurationTargetProbabilityProperty(WaveConditionsCalculationConfiguration configuration, WaveConditionsInput input) { - switch (input.WaterLevelType) + if (input.WaterLevelType == WaveConditionsInputWaterLevelType.None) { - case WaveConditionsInputWaterLevelType.None: - return; - case WaveConditionsInputWaterLevelType.LowerLimit: - configuration.TargetProbability = failureMechanismContribution.LowerLimitNorm; - break; - case WaveConditionsInputWaterLevelType.Signaling: - configuration.TargetProbability = failureMechanismContribution.SignalingNorm; - break; - case WaveConditionsInputWaterLevelType.UserDefinedTargetProbability: - configuration.TargetProbability = input.CalculationsTargetProbability.TargetProbability; - break; - default: - throw new NotSupportedException(); + return; } + + configuration.TargetProbability = WaveConditionsInputHelper.GetTargetProbability(input, assessmentSection); } } } \ No newline at end of file Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r2e24568ad5168ebb132e3d399262c19b19c5157e -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs (.../WaveConditionsCalculationConfigurationExporterTest.cs) (revision 2e24568ad5168ebb132e3d399262c19b19c5157e) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs (.../WaveConditionsCalculationConfigurationExporterTest.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -25,9 +25,10 @@ using System.Xml; using Core.Common.TestUtil; using NUnit.Framework; +using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.Hydraulics; +using Riskeer.Common.Data.TestUtil; using Riskeer.Common.IO.Configurations.Export; using Riskeer.Common.IO.TestUtil; using Riskeer.Revetment.Data; @@ -44,14 +45,14 @@ WaveConditionsCalculationConfiguration> { [Test] - public void Constructor_FailureMechanismContributionNull_ThrowsArgumentNullException() + public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Call void Call() => new TestWaveConditionsCalculationConfigurationExporter(Array.Empty(), "filePath", null); // Assert var exception = Assert.Throws(Call); - Assert.AreEqual("failureMechanismContribution", exception.ParamName); + Assert.AreEqual("assessmentSection", exception.ParamName); } [Test] @@ -115,18 +116,18 @@ calculationGroup2 } }; - + string expectedXmlFilePath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Revetment.IO, Path.Combine( nameof(WaveConditionsCalculationConfigurationExporter, WaveConditionsCalculationConfiguration, ICalculation>), - "targetProbabilityConfiguration.xml")); + "targetProbabilityConfiguration.xml")); // Call & Assert WriteAndValidate(new[] { calculationGroup }, expectedXmlFilePath); } - + protected override ICalculation CreateCalculation() { return new TestWaveConditionsCalculation(new TestWaveConditionsInput()); @@ -135,14 +136,13 @@ protected override WaveConditionsCalculationConfigurationExporter, WaveConditionsCalculationConfiguration, ICalculation> CallConfigurationFilePathConstructor( IEnumerable calculations, string filePath) { - return new TestWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.05)); + return new TestWaveConditionsCalculationConfigurationExporter(calculations, filePath, new AssessmentSectionStub()); } private class TestWaveConditionsCalculationConfigurationExporter : WaveConditionsCalculationConfigurationExporter, WaveConditionsCalculationConfiguration, ICalculation> { - public TestWaveConditionsCalculationConfigurationExporter(IEnumerable calculations, string filePath, - FailureMechanismContribution failureMechanismContribution) - : base(calculations, new TestWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} + public TestWaveConditionsCalculationConfigurationExporter(IEnumerable calculations, string filePath, IAssessmentSection assessmentSection) + : base(calculations, new TestWaveConditionsCalculationConfigurationWriter(filePath), assessmentSection) {} protected override WaveConditionsCalculationConfiguration ToConfiguration(ICalculation calculation) { Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -21,8 +21,8 @@ using System; using System.Collections.Generic; +using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.Revetment.IO.Configurations; using Riskeer.StabilityStoneCover.Data; using Riskeer.StabilityStoneCover.IO.Configurations.Converters; @@ -41,8 +41,8 @@ /// /// Thrown when is invalid. public StabilityStoneCoverWaveConditionsCalculationConfigurationExporter( - IEnumerable calculations, string filePath, FailureMechanismContribution failureMechanismContribution) - : base(calculations, new StabilityStoneCoverWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} + IEnumerable calculations, string filePath, IAssessmentSection assessmentSection) + : base(calculations, new StabilityStoneCoverWaveConditionsCalculationConfigurationWriter(filePath), assessmentSection) {} protected override StabilityStoneCoverWaveConditionsCalculationConfiguration ToConfiguration( ICalculation calculation) Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -233,7 +233,7 @@ yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo( (context, filePath) => new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter( - context.WrappedData.Children, filePath, context.AssessmentSection.FailureMechanismContribution), + context.WrappedData.Children, filePath, context.AssessmentSection), context => context.WrappedData.Children.Any(), GetInquiryHelper()); @@ -242,7 +242,7 @@ new[] { context.WrappedData - }, filePath, context.AssessmentSection.FailureMechanismContribution), + }, filePath, context.AssessmentSection), GetInquiryHelper()); } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -rbec8e1a23e39b9833a38b2b48de77e354f93cf61 -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision bec8e1a23e39b9833a38b2b48de77e354f93cf61) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -26,7 +26,6 @@ using NUnit.Framework; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.IO.TestUtil; @@ -112,7 +111,7 @@ protected override StabilityStoneCoverWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor( IEnumerable calculations, string filePath) { - return new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.0065)); + return new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath, new AssessmentSectionStub()); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -21,8 +21,8 @@ using System; using System.Collections.Generic; +using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.Revetment.IO.Configurations; using Riskeer.WaveImpactAsphaltCover.Data; @@ -42,8 +42,8 @@ /// /// Thrown when is invalid. public WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter( - IEnumerable calculations, string filePath, FailureMechanismContribution failureMechanismContribution) - : base(calculations, new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} + IEnumerable calculations, string filePath, IAssessmentSection assessmentSection) + : base(calculations, new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationWriter(filePath), assessmentSection) {} protected override WaveConditionsCalculationConfiguration ToConfiguration( WaveImpactAsphaltCoverWaveConditionsCalculation calculation) Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -234,7 +234,7 @@ yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo( (context, filePath) => new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter( - context.WrappedData.Children, filePath, context.AssessmentSection.FailureMechanismContribution), + context.WrappedData.Children, filePath, context.AssessmentSection), context => context.WrappedData.Children.Any(), GetInquiryHelper()); @@ -243,7 +243,7 @@ new[] { context.WrappedData - }, filePath, context.AssessmentSection.FailureMechanismContribution), + }, filePath, context.AssessmentSection), GetInquiryHelper()); } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -rf79f8302e9fd720b34f446fd75b478d3a26cd1d8 -r9c2d171e8cf7930a75755608f3c01a22e7858ad0 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision f79f8302e9fd720b34f446fd75b478d3a26cd1d8) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision 9c2d171e8cf7930a75755608f3c01a22e7858ad0) @@ -24,7 +24,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.Calculation; -using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.IO.TestUtil; @@ -103,7 +102,7 @@ protected override WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) { - return new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.08)); + return new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath, new AssessmentSectionStub()); } } } \ No newline at end of file