Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs =================================================================== diff -u -r4cced5dc46fe7dd8896ad15d1ec190dec9b2358e -r747ff1aadc684e2bc3845c67cbc6580d34482160 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 4cced5dc46fe7dd8896ad15d1ec190dec9b2358e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs (.../PipingFailureMechanismResultView.cs) (revision 747ff1aadc684e2bc3845c67cbc6580d34482160) @@ -132,7 +132,7 @@ nameof(EnumDisplayWrapper.DisplayName)); DataGridViewControl.AddTextBoxColumn( - nameof(PipingFailureMechanismSectionResultRow.DetailedAssessment), + nameof(PipingFailureMechanismSectionResultRow.DetailedAssessmentProbability), RingtoetsCommonFormsResources.FailureMechanismResultView_DetailedAssessment_ColumnHeader, true); DataGridViewControl.AddTextBoxColumn( @@ -200,7 +200,7 @@ return; } - if (double.IsNaN(resultRow.DetailedAssessment)) + if (double.IsNaN(resultRow.DetailedAssessmentProbability)) { currentDataGridViewCell.ErrorText = RingtoetsCommonFormsResources.FailureMechanismResultView_DataGridViewCellFormatting_All_calculations_must_have_valid_output; return; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs =================================================================== diff -u -r40cbb4e66eedb0468bc0256f49b1d1c02a1b6086 -r747ff1aadc684e2bc3845c67cbc6580d34482160 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 40cbb4e66eedb0468bc0256f49b1d1c02a1b6086) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision 747ff1aadc684e2bc3845c67cbc6580d34482160) @@ -114,7 +114,7 @@ /// Gets the detailed assessment probability a of the . /// [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] - public double DetailedAssessment + public double DetailedAssessmentProbability { get { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionDetailedAssessmentResultExtensionsTest.cs =================================================================== diff -u -r40cbb4e66eedb0468bc0256f49b1d1c02a1b6086 -r747ff1aadc684e2bc3845c67cbc6580d34482160 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionDetailedAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSectionDetailedAssessmentResultExtensionsTest.cs) (revision 40cbb4e66eedb0468bc0256f49b1d1c02a1b6086) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionDetailedAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSectionDetailedAssessmentResultExtensionsTest.cs) (revision 747ff1aadc684e2bc3845c67cbc6580d34482160) @@ -146,10 +146,10 @@ }; // Call - double detailedAssessment = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); // Assert - Assert.AreEqual(0.028693041013187315, detailedAssessment); + Assert.AreEqual(0.028693041013187315, detailedAssessmentProbability); mocks.VerifyAll(); } @@ -167,12 +167,12 @@ var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); // Call - double detailedAssessment = failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), - failureMechanism, - assessmentSection); + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), + failureMechanism, + assessmentSection); // Assert - Assert.IsNaN(detailedAssessment); + Assert.IsNaN(detailedAssessmentProbability); mocks.VerifyAll(); } @@ -199,12 +199,12 @@ }; // Call - double detailedAssessment = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculationScenarios, - failureMechanism, - assessmentSection); + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculationScenarios, + failureMechanism, + assessmentSection); // Assert - Assert.IsNaN(detailedAssessment); + Assert.IsNaN(detailedAssessmentProbability); mocks.VerifyAll(); } @@ -224,13 +224,13 @@ PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); // Call - double detailedAssessment = failureMechanismSectionResult.GetDetailedAssessmentProbability(new[] + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(new[] { pipingCalculationScenario }, failureMechanism, assessmentSection); // Assert - Assert.IsNaN(detailedAssessment); + Assert.IsNaN(detailedAssessmentProbability); mocks.VerifyAll(); } @@ -267,10 +267,10 @@ }; // Call - double detailedAssessment = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); // Assert - Assert.IsNaN(detailedAssessment); + Assert.IsNaN(detailedAssessmentProbability); mocks.VerifyAll(); } @@ -297,14 +297,14 @@ var result = new PipingFailureMechanismSectionResult(section); // Call - double detailedAssessment = result.GetDetailedAssessmentProbability(new[] + double detailedAssessmentProbability = result.GetDetailedAssessmentProbability(new[] { scenarioA, scenarioB }, failureMechanism, assessmentSection); // Assert - Assert.IsNaN(detailedAssessment); + Assert.IsNaN(detailedAssessmentProbability); mocks.VerifyAll(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r40cbb4e66eedb0468bc0256f49b1d1c02a1b6086 -r747ff1aadc684e2bc3845c67cbc6580d34482160 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 40cbb4e66eedb0468bc0256f49b1d1c02a1b6086) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 747ff1aadc684e2bc3845c67cbc6580d34482160) @@ -63,11 +63,11 @@ Assert.AreEqual(row.SimpleAssessmentResult, result.SimpleAssessmentResult); Assert.AreEqual(result.GetDetailedAssessmentProbability(Enumerable.Empty(), failureMechanism, assessmentSection), - row.DetailedAssessment); + row.DetailedAssessmentProbability); Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( - nameof(PipingFailureMechanismSectionResultRow.DetailedAssessment)); + nameof(PipingFailureMechanismSectionResultRow.DetailedAssessmentProbability)); TestHelper.AssertTypeConverter( nameof(PipingFailureMechanismSectionResultRow.AssessmentLayerThree)); mocks.VerifyAll(); @@ -161,7 +161,7 @@ } [Test] - public void DetailedAssessment_RelevantScenariosDone_ResultOfSection() + public void DetailedAssessmentProbability_RelevantScenariosDone_ResultOfSection() { // Setup var failureMechanism = new PipingFailureMechanism(); @@ -181,14 +181,14 @@ }, failureMechanism, assessmentSection); // Call - double detailedAssessment = row.DetailedAssessment; + double detailedAssessmentProbability = row.DetailedAssessmentProbability; // Assert double expected = result.GetDetailedAssessmentProbability(new[] { scenario }, failureMechanism, assessmentSection); - Assert.AreEqual(expected, detailedAssessment, 1e-6); + Assert.AreEqual(expected, detailedAssessmentProbability, 1e-6); mocks.VerifyAll(); }