Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r6590673d1544caea1d2d0fce2fe8eac2e75bdaf0 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs) (revision 6590673d1544caea1d2d0fce2fe8eac2e75bdaf0) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.IO/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; 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; @@ -41,8 +42,9 @@ /// Creates a new instance of . /// /// Thrown when is invalid. - public GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter(IEnumerable calculations, string filePath) - : base(calculations, new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter(filePath)) {} + public GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter( + IEnumerable calculations, string filePath, FailureMechanismContribution failureMechanismContribution) + : base(calculations, new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} protected override GrassCoverErosionOutwardsWaveConditionsCalculationConfiguration ToConfiguration(GrassCoverErosionOutwardsWaveConditionsCalculation calculation) { Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r4a08b4f9d63f6e4c164119077d624a05fd1a9b96 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 4a08b4f9d63f6e4c164119077d624a05fd1a9b96) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -247,15 +247,17 @@ }; yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo( - (context, filePath) => new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter(context.WrappedData.Children, filePath), + (context, filePath) => new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter( + context.WrappedData.Children, filePath, context.AssessmentSection.FailureMechanismContribution), context => context.WrappedData.Children.Any(), GetInquiryHelper()); yield return RiskeerExportInfoFactory.CreateCalculationConfigurationExportInfo( - (context, filePath) => new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter(new[] - { - context.WrappedData - }, filePath), + (context, filePath) => new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter( + new[] + { + context.WrappedData + }, filePath, context.AssessmentSection.FailureMechanismContribution), GetInquiryHelper()); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r6590673d1544caea1d2d0fce2fe8eac2e75bdaf0 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs) (revision 6590673d1544caea1d2d0fce2fe8eac2e75bdaf0) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Configurations/GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporterTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -25,6 +25,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; @@ -111,7 +112,7 @@ protected override GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) { - return new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter(calculations, filePath); + return new GrassCoverErosionOutwardsWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.1)); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -30,6 +30,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.FailureMechanism; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects; @@ -89,6 +90,7 @@ { // Setup var assessmentSection = mocks.Stub(); + assessmentSection.Stub(section => section.FailureMechanismContribution).Return(new FailureMechanismContribution(0.1, 0.1)); mocks.ReplayAll(); var random = new Random(21); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -29,6 +29,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.GrassCoverErosionOutwards.Data; using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects; using Riskeer.GrassCoverErosionOutwards.IO.Configurations; @@ -87,6 +88,7 @@ { // Setup var assessmentSection = mocks.Stub(); + assessmentSection.Stub(section => section.FailureMechanismContribution).Return(new FailureMechanismContribution(0.1, 0.1)); mocks.ReplayAll(); var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(new CalculationGroup(), Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs (.../WaveConditionsCalculationConfigurationExporter.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationExporter.cs (.../WaveConditionsCalculationConfigurationExporter.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; 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; @@ -43,15 +44,28 @@ where TWaveConditionsCalculationConfiguration : WaveConditionsCalculationConfiguration where TCalculation : class, ICalculation { + private readonly FailureMechanismContribution failureMechanismContribution; + /// /// Creates a new instance of . /// /// The hierarchy of calculations to export. /// The writer to use. - /// Thrown when is null. - protected WaveConditionsCalculationConfigurationExporter(IEnumerable calculations, TWaveConditionsCalculationConfigurationWriter writer) - : base(calculations, writer) {} + /// The to use. + /// Thrown when any parameter is null. + protected WaveConditionsCalculationConfigurationExporter(IEnumerable calculations, + TWaveConditionsCalculationConfigurationWriter writer, + FailureMechanismContribution failureMechanismContribution) + : base(calculations, writer) + { + if (failureMechanismContribution == null) + { + throw new ArgumentNullException(nameof(failureMechanismContribution)); + } + this.failureMechanismContribution = failureMechanismContribution; + } + /// /// Sets the properties of a to a . /// Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs (.../WaveConditionsCalculationConfigurationExporterTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs (.../WaveConditionsCalculationConfigurationExporterTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -19,10 +19,12 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using System.Xml; using NUnit.Framework; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.Common.IO.TestUtil; using Riskeer.Revetment.Data; using Riskeer.Revetment.Data.TestUtil; @@ -37,20 +39,33 @@ ICalculation, WaveConditionsCalculationConfiguration> { + [Test] + public void Constructor_FailureMechanismContributionNull_ThrowsArgumentNullException() + { + // Call + void Call() => new TestWaveConditionsCalculationConfigurationExporter(Array.Empty(), "filePath", null); + + // Assert + var exception = Assert.Throws(Call); + Assert.AreEqual("failureMechanismContribution", exception.ParamName); + } + protected override ICalculation CreateCalculation() { return new TestWaveConditionsCalculation(new TestWaveConditionsInput()); } - protected override WaveConditionsCalculationConfigurationExporter, WaveConditionsCalculationConfiguration, ICalculation> CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) + protected override WaveConditionsCalculationConfigurationExporter, WaveConditionsCalculationConfiguration, ICalculation> CallConfigurationFilePathConstructor( + IEnumerable calculations, string filePath) { - return new TestWaveConditionsCalculationConfigurationExporter(calculations, filePath); + return new TestWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.1)); } private class TestWaveConditionsCalculationConfigurationExporter : WaveConditionsCalculationConfigurationExporter, WaveConditionsCalculationConfiguration, ICalculation> { - public TestWaveConditionsCalculationConfigurationExporter(IEnumerable calculations, string filePath) - : base(calculations, new TestWaveConditionsCalculationConfigurationWriter(filePath)) {} + public TestWaveConditionsCalculationConfigurationExporter(IEnumerable calculations, string filePath, + FailureMechanismContribution failureMechanismContribution) + : base(calculations, new TestWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} protected override WaveConditionsCalculationConfiguration ToConfiguration(ICalculation calculation) { @@ -66,7 +81,7 @@ protected override int GetConfigurationVersion() { - return 1; + return 2; } } } Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -r00bc790abfa9cc1980a5eb114c11f03f88f8b943 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs) (revision 00bc790abfa9cc1980a5eb114c11f03f88f8b943) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.IO/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporter.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; 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; @@ -39,8 +40,9 @@ /// Creates a new instance of . /// /// Thrown when is invalid. - public StabilityStoneCoverWaveConditionsCalculationConfigurationExporter(IEnumerable calculations, string filePath) - : base(calculations, new StabilityStoneCoverWaveConditionsCalculationConfigurationWriter(filePath)) {} + public StabilityStoneCoverWaveConditionsCalculationConfigurationExporter( + IEnumerable calculations, string filePath, FailureMechanismContribution failureMechanismContribution) + : base(calculations, new StabilityStoneCoverWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} protected override StabilityStoneCoverWaveConditionsCalculationConfiguration ToConfiguration( ICalculation calculation) Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r4d3067180e9a289a93c0591c5492d51274719155 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 4d3067180e9a289a93c0591c5492d51274719155) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -232,15 +232,17 @@ }; yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo( - (context, filePath) => new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter(context.WrappedData.Children, filePath), + (context, filePath) => new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter( + context.WrappedData.Children, filePath, context.AssessmentSection.FailureMechanismContribution), context => context.WrappedData.Children.Any(), GetInquiryHelper()); yield return RiskeerExportInfoFactory.CreateCalculationConfigurationExportInfo( - (context, filePath) => new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter(new[] - { - context.WrappedData - }, filePath), + (context, filePath) => new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter( + new[] + { + context.WrappedData + }, filePath, context.AssessmentSection.FailureMechanismContribution), GetInquiryHelper()); } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.IO.Test/Configurations/StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../StabilityStoneCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -26,6 +26,7 @@ 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; @@ -111,7 +112,7 @@ protected override StabilityStoneCoverWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor( IEnumerable calculations, string filePath) { - return new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath); + return new StabilityStoneCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.1)); } } } \ No newline at end of file Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -30,6 +30,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.StabilityStoneCover.Data; using Riskeer.StabilityStoneCover.Forms.PresentationObjects; using Riskeer.StabilityStoneCover.IO.Configurations; @@ -88,6 +89,7 @@ { // Setup var assessmentSection = mocks.Stub(); + assessmentSection.Stub(section => section.FailureMechanismContribution).Return(new FailureMechanismContribution(0.1, 0.1)); mocks.ReplayAll(); var random = new Random(21); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs =================================================================== diff -u -r886b86a66f072735567285a3489923186c236c32 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 886b86a66f072735567285a3489923186c236c32) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -29,6 +29,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.StabilityStoneCover.Data; using Riskeer.StabilityStoneCover.Forms.PresentationObjects; using Riskeer.StabilityStoneCover.IO.Configurations; @@ -87,6 +88,7 @@ { // Setup var assessmentSection = mocks.Stub(); + assessmentSection.Stub(section => section.FailureMechanismContribution).Return(new FailureMechanismContribution(0.1, 0.1)); mocks.ReplayAll(); var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(new CalculationGroup(), Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs =================================================================== diff -u -rd111fbe5d7aa3bfb6f982ae4c9e25d2aa19c66bd -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs) (revision d111fbe5d7aa3bfb6f982ae4c9e25d2aa19c66bd) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.Revetment.IO.Configurations; using Riskeer.WaveImpactAsphaltCover.Data; @@ -40,8 +41,9 @@ /// Creates a new instance of . /// /// Thrown when is invalid. - public WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(IEnumerable calculations, string filePath) - : base(calculations, new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationWriter(filePath)) {} + public WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter( + IEnumerable calculations, string filePath, FailureMechanismContribution failureMechanismContribution) + : base(calculations, new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationWriter(filePath), failureMechanismContribution) {} protected override WaveConditionsCalculationConfiguration ToConfiguration( WaveImpactAsphaltCoverWaveConditionsCalculation calculation) Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -rdf6cc3b143ba55cadd0402678e8c1625a61cfbb4 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision df6cc3b143ba55cadd0402678e8c1625a61cfbb4) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -233,15 +233,17 @@ }; yield return RiskeerExportInfoFactory.CreateCalculationGroupConfigurationExportInfo( - (context, filePath) => new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(context.WrappedData.Children, filePath), + (context, filePath) => new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter( + context.WrappedData.Children, filePath, context.AssessmentSection.FailureMechanismContribution), context => context.WrappedData.Children.Any(), GetInquiryHelper()); yield return RiskeerExportInfoFactory.CreateCalculationConfigurationExportInfo( - (context, filePath) => new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(new[] - { - context.WrappedData - }, filePath), + (context, filePath) => new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter( + new[] + { + context.WrappedData + }, filePath, context.AssessmentSection.FailureMechanismContribution), GetInquiryHelper()); } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r889b379d6fc2e7b41da5d4cbed3f234fab35bdd3 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision 889b379d6fc2e7b41da5d4cbed3f234fab35bdd3) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.IO.Test/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporterTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -24,6 +24,7 @@ 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; @@ -100,7 +101,7 @@ protected override WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) { - return new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath); + return new WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationExporter(calculations, filePath, new FailureMechanismContribution(0.1, 0.1)); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs =================================================================== diff -u -rb0d5b2064fdd64495d932282a83fc5a77448a3f1 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision b0d5b2064fdd64495d932282a83fc5a77448a3f1) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -30,6 +30,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.IO.Configurations; @@ -88,6 +89,7 @@ { // Setup var assessmentSection = mocks.Stub(); + assessmentSection.Stub(section => section.FailureMechanismContribution).Return(new FailureMechanismContribution(0.1, 0.1)); mocks.ReplayAll(); var random = new Random(21); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs =================================================================== diff -u -rb0d5b2064fdd64495d932282a83fc5a77448a3f1 -r259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision b0d5b2064fdd64495d932282a83fc5a77448a3f1) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextConfigurationExportInfoTest.cs) (revision 259dc0e09ba2df0e0c252f7d9ab188d30efe4d2d) @@ -29,6 +29,7 @@ using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; +using Riskeer.Common.Data.Contribution; using Riskeer.WaveImpactAsphaltCover.Data; using Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.IO.Configurations; @@ -87,6 +88,7 @@ { // Setup var assessmentSection = mocks.Stub(); + assessmentSection.Stub(section => section.FailureMechanismContribution).Return(new FailureMechanismContribution(0.1, 0.1)); mocks.ReplayAll(); var context = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(new CalculationGroup(),