Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs =================================================================== diff -u -r6f13804bd7731f68a54aecc1805577344470ef20 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision 6f13804bd7731f68a54aecc1805577344470ef20) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (.../ClosingStructuresFailureMechanismResultView.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -165,7 +165,7 @@ DataGridViewCell currentDataGridViewCell = DataGridViewControl.GetCell(e.RowIndex, e.ColumnIndex); StructuresCalculation normativeCalculation = resultRow.GetSectionResultCalculation(); - FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(currentDataGridViewCell, + FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(currentDataGridViewCell, resultRow.AssessmentLayerOne, resultRow.AssessmentLayerTwoA, normativeCalculation); Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/FailureMechanismSectionResultRowHelper.cs (.../FailureMechanismSectionResultRowHelper.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -35,18 +35,18 @@ public static class FailureMechanismSectionResultRowHelper { /// - /// Sets the when layer 2a assessment fails. + /// Sets the when the detailed assessment fails. /// /// The current data grid view cell. - /// The value representing whether the section passed the layer 0 assessment. - /// The value representing the result of the layer 2a assessment. + /// The value representing whether the section passed the simple assessment. + /// The value representing the result of the detailed assessment. /// The set for the /// section result. May be null if the section result does not have a calculation set. /// Thrown when is null. - public static void SetAssessmentLayerTwoAError(DataGridViewCell dataGridViewCell, - AssessmentLayerOneState passedAssessmentLayerOne, - double assessmentLayerTwoA, - ICalculation normativeCalculation) + public static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell, + AssessmentLayerOneState passedAssessmentLayerOne, + double assessmentLayerTwoA, + ICalculation normativeCalculation) { if (dataGridViewCell == null) { @@ -59,22 +59,22 @@ return; } - SetAssessmentLayerTwoAError(dataGridViewCell, assessmentLayerTwoA, normativeCalculation); + SetDetailedAssessmentError(dataGridViewCell, assessmentLayerTwoA, normativeCalculation); } /// - /// Sets the when layer 2a assessment fails. + /// Sets the when the detailed assessment fails. /// /// The current data grid view cell. /// The value representing whether the simple assessment result. /// The value representing the result of the layer 2a assessment. /// The set for the /// section result. May be null if the section result does not have a calculation set. /// Thrown when is null. - public static void SetAssessmentLayerTwoAError(DataGridViewCell dataGridViewCell, - SimpleAssessmentResultValidityOnlyType simpleAssessmentResult, - double assessmentLayerTwoA, - ICalculation normativeCalculation) + public static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell, + SimpleAssessmentResultValidityOnlyType simpleAssessmentResult, + double assessmentLayerTwoA, + ICalculation normativeCalculation) { if (dataGridViewCell == null) { @@ -87,12 +87,12 @@ return; } - SetAssessmentLayerTwoAError(dataGridViewCell, assessmentLayerTwoA, normativeCalculation); + SetDetailedAssessmentError(dataGridViewCell, assessmentLayerTwoA, normativeCalculation); } - private static void SetAssessmentLayerTwoAError(DataGridViewCell dataGridViewCell, - double assessmentLayerTwoA, - ICalculation normativeCalculation) + private static void SetDetailedAssessmentError(DataGridViewCell dataGridViewCell, + double assessmentLayerTwoA, + ICalculation normativeCalculation) { if (normativeCalculation == null) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs (.../FailureMechanismSectionResultRowHelperTest.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -36,15 +36,15 @@ public class FailureMechanismSectionResultRowHelperTest { [Test] - public void ShowAssessmentLayerTwoAErrors_WithAssessmentLayerOneAndDataGridViewCellNull_ThrowsArgumentNullException() + public void SetDetailedAssessmentError_WithAssessmentLayerOneAndDataGridViewCellNull_ThrowsArgumentNullException() { // Setup var mockRepository = new MockRepository(); var calculation = mockRepository.Stub(); mockRepository.ReplayAll(); // Call - TestDelegate call = () => FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(null, + TestDelegate call = () => FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(null, AssessmentLayerOneState.Sufficient, 0.0, calculation); @@ -60,14 +60,14 @@ [TestCaseSource(nameof(AssessmentLayerOneStateIsNotSufficientAndCalculationNull))] [TestCaseSource(nameof(AssessmentLayerOneStateIsNotSufficientAndCalculationWithoutOutput))] [TestCaseSource(nameof(AssessmentLayerOneStateIsNotSufficientAndCalculationWithOutput))] - public void SetAssessmentLayerTwoAError_WithAssessmentLayerOne_SetsErrorText(DataGridViewCell dataGridViewCell, + public void SetDetailedAssessmentError_WithAssessmentLayerOne_SetsErrorText(DataGridViewCell dataGridViewCell, AssessmentLayerOneState passedAssessmentLayerOne, double assessmentLayerTwoA, ICalculation normativeCalculation, string expectedErrorText) { // Call - FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(dataGridViewCell, + FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(dataGridViewCell, passedAssessmentLayerOne, assessmentLayerTwoA, normativeCalculation); @@ -77,15 +77,15 @@ } [Test] - public void ShowAssessmentLayerTwoAErrors_WithSimpleAssessmentValidityOnlyAndDataGridViewCellNull_ThrowsArgumentNullException() + public void SetDetailedAssessmentError_WithSimpleAssessmentValidityOnlyAndDataGridViewCellNull_ThrowsArgumentNullException() { // Setup var mockRepository = new MockRepository(); var calculation = mockRepository.Stub(); mockRepository.ReplayAll(); // Call - TestDelegate call = () => FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(null, + TestDelegate call = () => FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(null, SimpleAssessmentResultValidityOnlyType.NotApplicable, 0.0, calculation); @@ -108,7 +108,7 @@ string expectedErrorText) { // Call - FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(dataGridViewCell, + FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(dataGridViewCell, simpleAssessmentResult, assessmentLayerTwoA, normativeCalculation); Fisheye: Tag c7425b8f799095f2dc812351e14103931c672fba refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSection2aAssessmentResultExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensions.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensions.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensions.cs (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -0,0 +1,73 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.Probability; + +namespace Ringtoets.GrassCoverErosionInwards.Data +{ + /// + /// Extension methods for obtaining detailed assessment probabilities from output for an assessment of the + /// grass cover erosion inwards failure mechanism. + /// + public static class GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensions + { + /// + /// Gets the value for the detailed assessment of safety per failure mechanism section as a probability. + /// + /// The section result to get the detailed assessment probability for. + /// The failure mechanism the calculations belong to. + /// The assessment section the calculations belong to. + /// The calculated detailed assessment probability or when there is no + /// calculation assigned to the section result or the calculation is not performed. + /// Thrown when any parameter is null. + public static double GetDetailedAssessmentProbability(this GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult, + GrassCoverErosionInwardsFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) + { + if (sectionResult == null) + { + throw new ArgumentNullException(nameof(sectionResult)); + } + + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } + + if (assessmentSection == null) + { + throw new ArgumentNullException(nameof(assessmentSection)); + } + + if (sectionResult.Calculation == null || !sectionResult.Calculation.HasOutput) + { + return double.NaN; + } + + ProbabilityAssessmentOutput derivedOutput = GrassCoverErosionInwardsProbabilityAssessmentOutputFactory.Create(sectionResult.Calculation.Output.OvertoppingOutput, + failureMechanism, assessmentSection); + + return derivedOutput.Probability; + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -rad479a80b6db7879b935aecaca743c39615ec977 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision ad479a80b6db7879b935aecaca743c39615ec977) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -20,10 +20,13 @@ // All rights reserved. using System; +using System.Collections.Generic; using Ringtoets.AssemblyTool.Data; using Ringtoets.AssemblyTool.KernelWrapper.Calculators; using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly; using Ringtoets.AssemblyTool.KernelWrapper.Kernels; +using Ringtoets.Common.Data.AssemblyTool; +using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Exceptions; namespace Ringtoets.GrassCoverErosionInwards.Data @@ -64,5 +67,56 @@ throw new AssemblyFactoryException(e.Message, e); } } + + /// + /// Assembles the detailed assessment result. + /// + /// The failure mechanism section result to + /// assemble the detailed assembly for. + /// The failure mechanism. + /// The . + /// A . + /// Thrown when any parameter is null. + /// Thrown when + /// cannot be assembled. + public static FailureMechanismSectionAssembly AssembleDetailedAssembly( + GrassCoverErosionInwardsFailureMechanismSectionResult failureMechanismSectionResult, + GrassCoverErosionInwardsFailureMechanism failureMechanism, + IAssessmentSection assessmentSection) + { + if (failureMechanismSectionResult == null) + { + throw new ArgumentNullException(nameof(failureMechanismSectionResult)); + } + + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } + + if (assessmentSection == null) + { + throw new ArgumentNullException(nameof(assessmentSection)); + } + + IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance; + IFailureMechanismSectionAssemblyCalculator calculator = calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance); + + try + { + IEnumerable categories = AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories( + assessmentSection.FailureMechanismContribution.SignalingNorm, + assessmentSection.FailureMechanismContribution.LowerLimitNorm, + failureMechanism.Contribution, + failureMechanism.GeneralInput.N); + + return calculator.AssembleDetailedAssessment(failureMechanismSectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), + categories); + } + catch (FailureMechanismSectionAssemblyCalculatorException e) + { + throw new AssemblyFactoryException(e.Message, e); + } + } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.csproj) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.csproj) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -12,7 +12,7 @@ - + Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs =================================================================== diff -u -r87ad62ce6aca2a109eb0357098687c3a7d95c0b5 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision 87ad62ce6aca2a109eb0357098687c3a7d95c0b5) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismResultView.cs (.../GrassCoverErosionInwardsFailureMechanismResultView.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -40,7 +40,7 @@ public class GrassCoverErosionInwardsFailureMechanismResultView : FailureMechanismResultView { - private const int assessmentLayerTwoAIndex = 2; + private const int detailedAssessmentIndex = 2; private readonly IAssessmentSection assessmentSection; private readonly RecursiveObserver calculationInputObserver; private readonly RecursiveObserver calculationOutputObserver; @@ -127,7 +127,7 @@ nameof(EnumDisplayWrapper.DisplayName)); DataGridViewControl.AddTextBoxColumn( - nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.AssessmentLayerTwoA), + nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.DetailedAssessmentProbability), RingtoetsCommonFormsResources.FailureMechanismResultView_DetailedAssessment_ColumnHeader, true); DataGridViewControl.AddTextBoxColumn( @@ -154,7 +154,7 @@ private void ShowAssessmentLayerErrors(object sender, DataGridViewCellFormattingEventArgs e) { - if (e.ColumnIndex != assessmentLayerTwoAIndex) + if (e.ColumnIndex != detailedAssessmentIndex) { return; } @@ -163,10 +163,10 @@ DataGridViewCell currentDataGridViewCell = DataGridViewControl.GetCell(e.RowIndex, e.ColumnIndex); GrassCoverErosionInwardsCalculation normativeCalculation = resultRow.GetSectionResultCalculation(); - FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(currentDataGridViewCell, - resultRow.SimpleAssessmentResult, - resultRow.AssessmentLayerTwoA, - normativeCalculation); + FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(currentDataGridViewCell, + resultRow.SimpleAssessmentResult, + resultRow.DetailedAssessmentProbability, + normativeCalculation); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -rad479a80b6db7879b935aecaca743c39615ec977 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision ad479a80b6db7879b935aecaca743c39615ec977) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -100,14 +100,14 @@ } /// - /// Gets the value representing the result of the layer 2a assessment. + /// Gets the value representing the result of the detailed assessment. /// [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] - public double AssessmentLayerTwoA + public double DetailedAssessmentProbability { get { - return SectionResult.GetAssessmentLayerTwoA(failureMechanism, assessmentSection); + return SectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection); } } Fisheye: Tag c7425b8f799095f2dc812351e14103931c672fba refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSection2aAssessmentResultExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensionsTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensionsTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensionsTest.cs (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -0,0 +1,157 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; + +namespace Ringtoets.GrassCoverErosionInwards.Data.Test +{ + [TestFixture] + public class GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensionsTest + { + [Test] + public void GetDetailedAssessmentProbability_SectionResultNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + // Call + TestDelegate call = () => GrassCoverErosionInwardsFailureMechanismSectionDetailedAssessmentProbabilityResultExtensions.GetDetailedAssessmentProbability(null, + new GrassCoverErosionInwardsFailureMechanism(), + assessmentSection); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("sectionResult", exception.ParamName); + mocks.VerifyAll(); + } + + [Test] + public void GetDetailedAssessmentProbability_FailureMechanismNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); + + // Call + TestDelegate call = () => failureMechanismSectionResult.GetDetailedAssessmentProbability(null, assessmentSection); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("failureMechanism", exception.ParamName); + mocks.VerifyAll(); + } + + [Test] + public void GetDetailedAssessmentProbability_AssessmentSectionNull_ThrowsArgumentNullException() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); + + // Call + TestDelegate call = () => failureMechanismSectionResult.GetDetailedAssessmentProbability(new GrassCoverErosionInwardsFailureMechanism(), null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("assessmentSection", exception.ParamName); + } + + [Test] + public void GetDetailedAssessmentProbability_SectionResultWithoutCalculation_ReturnsNaN() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); + + // Call + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); + + // Assert + Assert.IsNaN(detailedAssessmentProbability); + mocks.VerifyAll(); + } + + [Test] + public void GetDetailedAssessmentProbability_CalculationWithoutOutput_ReturnsNaN() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) + { + Calculation = new GrassCoverErosionInwardsCalculation() + }; + + // Call + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); + + // Assert + Assert.IsNaN(detailedAssessmentProbability); + mocks.VerifyAll(); + } + + [Test] + public void GetDetailedAssessmentProbability_CalculationWithOutput_ReturnsDerivedProbability() + { + // Setup + var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); + + var mocks = new MockRepository(); + IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); + mocks.ReplayAll(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) + { + Calculation = new GrassCoverErosionInwardsCalculation + { + Output = new TestGrassCoverErosionInwardsOutput() + } + }; + + // Call + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection); + + // Assert + Assert.AreEqual(0.5, detailedAssessmentProbability); + mocks.VerifyAll(); + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj =================================================================== diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -20,7 +20,7 @@ - + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -rad479a80b6db7879b935aecaca743c39615ec977 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision ad479a80b6db7879b935aecaca743c39615ec977) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -48,7 +48,7 @@ { private const int nameColumnIndex = 0; private const int simpleAssessmentIndex = 1; - private const int assessmentLayerTwoAIndex = 2; + private const int detailedAssessmentIndex = 2; private const int assessmentLayerThreeIndex = 3; private Form testForm; @@ -110,14 +110,14 @@ var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; Assert.AreEqual(4, dataGridView.ColumnCount); - Assert.IsTrue(dataGridView.Columns[assessmentLayerTwoAIndex].ReadOnly); + Assert.IsTrue(dataGridView.Columns[detailedAssessmentIndex].ReadOnly); Assert.IsInstanceOf(dataGridView.Columns[simpleAssessmentIndex]); - Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerTwoAIndex]); + Assert.IsInstanceOf(dataGridView.Columns[detailedAssessmentIndex]); Assert.IsInstanceOf(dataGridView.Columns[assessmentLayerThreeIndex]); Assert.AreEqual("Eenvoudige toets", dataGridView.Columns[simpleAssessmentIndex].HeaderText); - Assert.AreEqual("Gedetailleerde toets per vak", dataGridView.Columns[assessmentLayerTwoAIndex].HeaderText); + Assert.AreEqual("Gedetailleerde toets per vak", dataGridView.Columns[detailedAssessmentIndex].HeaderText); Assert.AreEqual("Toets op maat", dataGridView.Columns[assessmentLayerThreeIndex].HeaderText); Assert.AreEqual(DataGridViewAutoSizeColumnsMode.AllCells, dataGridView.AutoSizeColumnsMode); @@ -141,14 +141,14 @@ Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentIndex].Value); - Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); cells = rows[1].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 2", cells[nameColumnIndex].FormattedValue); Assert.AreEqual(SimpleAssessmentResultValidityOnlyType.None, cells[simpleAssessmentIndex].Value); - Assert.AreEqual("-", cells[assessmentLayerTwoAIndex].FormattedValue); + Assert.AreEqual("-", cells[detailedAssessmentIndex].FormattedValue); Assert.AreEqual("-", cells[assessmentLayerThreeIndex].FormattedValue); } } @@ -175,25 +175,25 @@ DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(4, cells.Count); Assert.AreEqual("Section 1", cells[nameColumnIndex].FormattedValue); - DataGridViewCell cellAssessmentLayerTwoA = cells[assessmentLayerTwoAIndex]; + DataGridViewCell cellDetailedAssessment = cells[detailedAssessmentIndex]; DataGridViewCell cellAssessmentLayerThree = cells[assessmentLayerThreeIndex]; DataGridViewCell dataGridViewCell = cells[simpleAssessmentIndex]; Assert.AreEqual(simpleAssessmentResult, dataGridViewCell.Value); - Assert.AreEqual("-", cellAssessmentLayerTwoA.FormattedValue); + Assert.AreEqual("-", cellDetailedAssessment.FormattedValue); Assert.AreEqual("-", cellAssessmentLayerThree.FormattedValue); Assert.IsEmpty(dataGridViewCell.ErrorText); if (simpleAssessmentResult == SimpleAssessmentResultValidityOnlyType.NotApplicable) { - DataGridViewTestHelper.AssertCellIsDisabled(cellAssessmentLayerTwoA); + DataGridViewTestHelper.AssertCellIsDisabled(cellDetailedAssessment); DataGridViewTestHelper.AssertCellIsDisabled(cellAssessmentLayerThree); Assert.IsTrue(cellAssessmentLayerThree.ReadOnly); } else { - DataGridViewTestHelper.AssertCellIsEnabled(cellAssessmentLayerTwoA, true); + DataGridViewTestHelper.AssertCellIsEnabled(cellDetailedAssessment, true); DataGridViewTestHelper.AssertCellIsEnabled(cellAssessmentLayerThree); Assert.IsFalse(cellAssessmentLayerThree.ReadOnly); @@ -267,7 +267,7 @@ [Test] [TestCase(SimpleAssessmentResultValidityOnlyType.None)] [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)] - public void GivenSectionResultWithoutCalculation_ThenLayerTwoAErrorTooltip(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) + public void GivenSectionResultWithoutCalculation_ThenDetailedAssessmentErrorTooltip(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Given var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSimpleFailureMechanismSection()) @@ -284,7 +284,7 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerTwoAIndex]; + DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[detailedAssessmentIndex]; // When object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. @@ -298,7 +298,7 @@ [Test] [TestCase(SimpleAssessmentResultValidityOnlyType.None)] [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)] - public void GivenSectionResultAndCalculationNotCalculated_ThenLayerTwoAErrorTooltip( + public void GivenSectionResultAndCalculationNotCalculated_ThenDetailedAssessmentErrorTooltip( SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Given @@ -317,7 +317,7 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerTwoAIndex]; + DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[detailedAssessmentIndex]; // When object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. @@ -331,7 +331,7 @@ [Test] [TestCase(SimpleAssessmentResultValidityOnlyType.None)] [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)] - public void GivenSectionResultAndFailedCalculation_ThenLayerTwoAErrorTooltip(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) + public void GivenSectionResultAndFailedCalculation_ThenDetailedAssessmentErrorTooltip(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Given var calculation = new GrassCoverErosionInwardsCalculation @@ -356,7 +356,7 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerTwoAIndex]; + DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[detailedAssessmentIndex]; // When object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. @@ -370,7 +370,7 @@ [Test] [TestCase(SimpleAssessmentResultValidityOnlyType.None)] [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)] - public void GivenSectionResultAndSuccessfulCalculation_ThenLayerTwoANoError(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) + public void GivenSectionResultAndSuccessfulCalculation_ThenDetailedAssessmentNoError(SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Given var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSimpleFailureMechanismSection()) @@ -392,7 +392,7 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerTwoAIndex]; + DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[detailedAssessmentIndex]; // When object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. @@ -405,7 +405,7 @@ [Test] [TestCaseSource(nameof(SimpleAssessmentResultIsSufficientVariousSectionResults))] - public void GivenSectionResultAndAssessmentSimpleAssessmentNotApplicable_ThenLayerTwoANoError( + public void GivenSectionResultAndAssessmentSimpleAssessmentNotApplicable_ThenDetailedAssessmentNoError( GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult, string expectedValue) { // Given @@ -418,7 +418,7 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerTwoAIndex]; + DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[detailedAssessmentIndex]; // When object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. @@ -432,7 +432,7 @@ [Test] [TestCase(SimpleAssessmentResultValidityOnlyType.None)] [TestCase(SimpleAssessmentResultValidityOnlyType.Applicable)] - public void GivenSectionResultAndSuccessfulCalculation_WhenChangingCalculationToFailed_ThenLayerTwoAHasError( + public void GivenSectionResultAndSuccessfulCalculation_WhenChangingCalculationToFailed_ThenDetailedAssessmentHasError( SimpleAssessmentResultValidityOnlyType simpleAssessmentResult) { // Given @@ -456,7 +456,7 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[assessmentLayerTwoAIndex]; + DataGridViewCell dataGridViewCell = dataGridView.Rows[0].Cells[detailedAssessmentIndex]; // Precondition object formattedValue = dataGridViewCell.FormattedValue; // Need to do this to fire the CellFormatting event. Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -rad479a80b6db7879b935aecaca743c39615ec977 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision ad479a80b6db7879b935aecaca743c39615ec977) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -59,11 +59,11 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult); - Assert.AreEqual(result.GetAssessmentLayerTwoA(failureMechanism, assessmentSection), row.AssessmentLayerTwoA); + Assert.AreEqual(result.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), row.DetailedAssessmentProbability); Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( - nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.AssessmentLayerTwoA)); + nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.DetailedAssessmentProbability)); TestHelper.AssertTypeConverter( nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.AssessmentLayerThree)); mocks.VerifyAll(); @@ -136,7 +136,7 @@ } [Test] - public void AssessmentLayerTwoA_NoCalculationSet_ReturnNaN() + public void DetailedAssessmentProbability_NoCalculationSet_ReturnNaN() { // Setup var mocks = new MockRepository(); @@ -154,17 +154,17 @@ var resultRow = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult, failureMechanism, assessmentSection); // Call - double assessmentLayerTwoA = resultRow.AssessmentLayerTwoA; + double detailedAssessmentProbability = resultRow.DetailedAssessmentProbability; // Assert - Assert.IsNaN(assessmentLayerTwoA); + Assert.IsNaN(detailedAssessmentProbability); mocks.VerifyAll(); } [Test] [TestCase(CalculationScenarioStatus.Failed)] [TestCase(CalculationScenarioStatus.NotCalculated)] - public void AssessmentLayerTwoA_CalculationNotDone_ReturnNaN(CalculationScenarioStatus status) + public void DetailedAssessmentProbability_CalculationNotDone_ReturnNaN(CalculationScenarioStatus status) { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -190,15 +190,15 @@ var resultRow = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult, failureMechanism, assessmentSection); // Call - double assessmentLayerTwoA = resultRow.AssessmentLayerTwoA; + double detailedAssessmentProbability = resultRow.DetailedAssessmentProbability; // Assert - Assert.IsNaN(assessmentLayerTwoA); + Assert.IsNaN(detailedAssessmentProbability); mocks.VerifyAll(); } [Test] - public void AssessmentLayerTwoA_CalculationSuccessful_ReturnAssessmentLayerTwoA() + public void DetailedAssessmentProbability_CalculationSuccessful_ReturnDetailedAssessmentProbability() { // Setup var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -223,10 +223,10 @@ var resultRow = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult, failureMechanism, assessmentSection); // Call - double assessmentLayerTwoA = resultRow.AssessmentLayerTwoA; + double detailedAssessmentProbability = resultRow.DetailedAssessmentProbability; // Assert - Assert.AreEqual(0.17105612630848185, assessmentLayerTwoA); + Assert.AreEqual(0.17105612630848185, detailedAssessmentProbability); mocks.VerifyAll(); } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs =================================================================== diff -u -ra493758b8df1196d55fc8e4552e271eafddbbefe -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision a493758b8df1196d55fc8e4552e271eafddbbefe) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismResultView.cs (.../HeightStructuresFailureMechanismResultView.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -170,10 +170,10 @@ DataGridViewCell currentDataGridViewCell = DataGridViewControl.GetCell(e.RowIndex, e.ColumnIndex); StructuresCalculation normativeCalculation = resultRow.GetSectionResultCalculation(); - FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(currentDataGridViewCell, - resultRow.AssessmentLayerOne, - resultRow.AssessmentLayerTwoA, - normativeCalculation); + FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(currentDataGridViewCell, + resultRow.AssessmentLayerOne, + resultRow.AssessmentLayerTwoA, + normativeCalculation); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionDetailedAssessmentResultExtensions.cs =================================================================== diff -u -re5aeb6eac84e0b295dd48c7b356d0d132e344e1b -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionDetailedAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSectionDetailedAssessmentResultExtensions.cs) (revision e5aeb6eac84e0b295dd48c7b356d0d132e344e1b) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionDetailedAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSectionDetailedAssessmentResultExtensions.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -31,7 +31,7 @@ namespace Ringtoets.MacroStabilityInwards.Data { /// - /// Extension methods for obtaining detailed assessment results from output for an assessment of + /// Extension methods for obtaining detailed assessment probabilities from output for an assessment of /// the macro stability inwards failure mechanism. /// public static class MacroStabilityInwardsFailureMechanismSectionDetailedAssessmentResultExtensions Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionDetailedAssessmentResultExtensions.cs =================================================================== diff -u -re5aeb6eac84e0b295dd48c7b356d0d132e344e1b -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionDetailedAssessmentResultExtensions.cs (.../PipingFailureMechanismSectionDetailedAssessmentResultExtensions.cs) (revision e5aeb6eac84e0b295dd48c7b356d0d132e344e1b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionDetailedAssessmentResultExtensions.cs (.../PipingFailureMechanismSectionDetailedAssessmentResultExtensions.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -31,7 +31,7 @@ namespace Ringtoets.Piping.Data { /// - /// Extension methods for obtaining detailed assessment results from output for an assessment of the piping failure mechanism. + /// Extension methods for obtaining detailed assessment probabilities from output for an assessment of the piping failure mechanism. /// public static class PipingFailureMechanismSectionDetailedAssessmentResultExtensions { Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs =================================================================== diff -u -r6e59a4f91d0acc68c0dc768b8f740a610d4fbde3 -rc7425b8f799095f2dc812351e14103931c672fba --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision 6e59a4f91d0acc68c0dc768b8f740a610d4fbde3) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismResultView.cs (.../StabilityPointStructuresFailureMechanismResultView.cs) (revision c7425b8f799095f2dc812351e14103931c672fba) @@ -170,10 +170,10 @@ DataGridViewCell currentDataGridViewCell = DataGridViewControl.GetCell(e.RowIndex, e.ColumnIndex); StructuresCalculation normativeCalculation = resultRow.GetSectionResultCalculation(); - FailureMechanismSectionResultRowHelper.SetAssessmentLayerTwoAError(currentDataGridViewCell, - resultRow.AssessmentLayerOne, - resultRow.AssessmentLayerTwoA, - normativeCalculation); + FailureMechanismSectionResultRowHelper.SetDetailedAssessmentError(currentDataGridViewCell, + resultRow.AssessmentLayerOne, + resultRow.AssessmentLayerTwoA, + normativeCalculation); } } } \ No newline at end of file