Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r546ca3cd23e573f8c4ba332eae501fc933617b9c --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision 546ca3cd23e573f8c4ba332eae501fc933617b9c) @@ -117,7 +117,7 @@ { return calculator.AssembleDetailedAssessment( failureMechanismSectionResult.DetailedAssessmentResult, - failureMechanismSectionResult.GetDetailedAssessmentProbability(calculationScenarios, failureMechanism, assessmentSection), + failureMechanismSectionResult.GetDetailedAssessmentProbability(calculationScenarios), CreateAssemblyCategoriesInput(failureMechanism, assessmentSection)); } catch (FailureMechanismSectionAssemblyCalculatorException e) Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs =================================================================== diff -u -r947260b82efa0fef4624bca8b241cfdbe6a94750 -r546ca3cd23e573f8c4ba332eae501fc933617b9c --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision 947260b82efa0fef4624bca8b241cfdbe6a94750) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.cs) (revision 546ca3cd23e573f8c4ba332eae501fc933617b9c) @@ -24,7 +24,6 @@ using System.Linq; using Core.Common.Base.Data; using Core.Common.Base.Geometry; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.Probability; @@ -41,16 +40,12 @@ /// /// The section result to get the detailed assessment probability for. /// All calculation scenarios in the failure mechanism. - /// The failure mechanism the section result belongs to. - /// The assessment section the section result belongs to. /// The calculated detailed assessment probability; or when there /// are no relevant calculations, when not all relevant calculations are performed or when the /// contribution of the relevant calculations don't add up to 1. /// Thrown when any parameter is null. public static double GetDetailedAssessmentProbability(this GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult, - IEnumerable calculationScenarios, - GrassCoverErosionInwardsFailureMechanism failureMechanism, - IAssessmentSection assessmentSection) + IEnumerable calculationScenarios) { if (sectionResult == null) { @@ -62,16 +57,6 @@ throw new ArgumentNullException(nameof(calculationScenarios)); } - if (failureMechanism == null) - { - throw new ArgumentNullException(nameof(failureMechanism)); - } - - if (assessmentSection == null) - { - throw new ArgumentNullException(nameof(assessmentSection)); - } - GrassCoverErosionInwardsCalculationScenario[] relevantScenarios = sectionResult.GetCalculationScenarios(calculationScenarios).ToArray(); if (relevantScenarios.Length == 0 || !relevantScenarios.All(s => s.HasOutput) || Math.Abs(sectionResult.GetTotalContribution(relevantScenarios) - 1.0) > 1e-6) Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r546ca3cd23e573f8c4ba332eae501fc933617b9c --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision 546ca3cd23e573f8c4ba332eae501fc933617b9c) @@ -156,7 +156,7 @@ /// Gets the value representing the result of the detailed assessment. /// [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] - public double DetailedAssessmentProbability => SectionResult.GetDetailedAssessmentProbability(calculationScenarios, failureMechanism, assessmentSection); + public double DetailedAssessmentProbability => SectionResult.GetDetailedAssessmentProbability(calculationScenarios); /// /// Gets or sets the value representing the tailor made assessment result. @@ -271,7 +271,7 @@ ColumnStateDefinitions[detailedAssessmentProbabilityIndex].ErrorText = FailureMechanismSectionResultRowHelper.GetDetailedAssessmentProbabilityError( SectionResult.GetCalculationScenarios(calculationScenarios).ToArray(), scenarios => SectionResult.GetTotalContribution(scenarios), - scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios, failureMechanism, assessmentSection)); + scenarios => SectionResult.GetDetailedAssessmentProbability(scenarios)); } } Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r546ca3cd23e573f8c4ba332eae501fc933617b9c --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 546ca3cd23e573f8c4ba332eae501fc933617b9c) @@ -220,7 +220,7 @@ failureMechanism, assessmentSection); // Assert - Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), failureMechanism, assessmentSection), + Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(Enumerable.Empty()), calculator.DetailedAssessmentProbabilityInput); Assert.AreEqual(sectionResult.DetailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput); AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.DetailedAssessmentAssemblyCategoriesInput); Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r546ca3cd23e573f8c4ba332eae501fc933617b9c --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensionsTest.cs) (revision 546ca3cd23e573f8c4ba332eae501fc933617b9c) @@ -25,8 +25,6 @@ using Core.Common.Base.Data; using Core.Common.Base.Geometry; using NUnit.Framework; -using Rhino.Mocks; -using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.FailureMechanism; using Riskeer.Common.Data.TestUtil; using Riskeer.GrassCoverErosionInwards.Data.TestUtil; @@ -39,89 +37,35 @@ [Test] public void GetDetailedAssessmentProbability_SectionResultNull_ThrowsArgumentNullException() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - // Call void Call() => GrassCoverErosionInwardsFailureMechanismSectionResultDetailedAssessmentExtensions.GetDetailedAssessmentProbability( - null, Enumerable.Empty(), new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); + null, Enumerable.Empty()); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("sectionResult", exception.ParamName); - mocks.VerifyAll(); } [Test] public void GetDetailedAssessmentProbability_CalculationScenariosNull_ThrowsArgumentNullException() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Call void Call() => failureMechanismSectionResult.GetDetailedAssessmentProbability( - null, new GrassCoverErosionInwardsFailureMechanism(), assessmentSection); + null); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("calculationScenarios", 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 - void Call() => failureMechanismSectionResult.GetDetailedAssessmentProbability( - Enumerable.Empty(), 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 - void Call() => failureMechanismSectionResult.GetDetailedAssessmentProbability( - Enumerable.Empty(), new GrassCoverErosionInwardsFailureMechanism(), null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("assessmentSection", exception.ParamName); - } - - [Test] public void GetDetailedAssessmentProbability_MultipleScenarios_ReturnsValueBasedOnRelevantScenarios() { // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); @@ -147,46 +91,30 @@ }; // Call - double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations); // Assert Assert.AreEqual(0.3973850177700996, detailedAssessmentProbability); - mocks.VerifyAll(); } [Test] public void GetDetailedAssessmentProbability_NoScenarios_ReturnsNaN() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); // Call - double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty(), - failureMechanism, - assessmentSection); + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(Enumerable.Empty()); // Assert Assert.IsNaN(detailedAssessmentProbability); - mocks.VerifyAll(); } [Test] public void GetDetailedAssessmentProbability_NoRelevantScenarios_ReturnsNaN() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); @@ -198,25 +126,16 @@ new[] { calculationScenario - }, - failureMechanism, - assessmentSection); + }); // Assert Assert.IsNaN(detailedAssessmentProbability); - mocks.VerifyAll(); } [Test] public void GetDetailedAssessmentProbability_ScenarioNotCalculated_ReturnsNaN() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); @@ -226,23 +145,16 @@ double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(new[] { calculationScenario - }, failureMechanism, assessmentSection); + }); // Assert Assert.IsNaN(detailedAssessmentProbability); - mocks.VerifyAll(); } [Test] public void GetDetailedAssessmentProbability_ScenarioWithNaNResults_ReturnsNaN() { // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - - var mocks = new MockRepository(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks); - mocks.ReplayAll(); - FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section); @@ -266,11 +178,10 @@ }; // Call - double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations, failureMechanism, assessmentSection); + double detailedAssessmentProbability = failureMechanismSectionResult.GetDetailedAssessmentProbability(calculations); // Assert Assert.IsNaN(detailedAssessmentProbability); - mocks.VerifyAll(); } [Test] @@ -280,11 +191,6 @@ public void GetDetailedAssessmentProbability_RelevantScenarioContributionsDoNotAddUpTo1_ReturnNaN(double contributionA, double contributionB) { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); GrassCoverErosionInwardsCalculationScenario scenarioA = GrassCoverErosionInwardsCalculationScenarioTestFactory.CreateNotCalculatedGrassCoverErosionInwardsCalculationScenario(section); GrassCoverErosionInwardsCalculationScenario scenarioB = GrassCoverErosionInwardsCalculationScenarioTestFactory.CreateNotCalculatedGrassCoverErosionInwardsCalculationScenario(section); @@ -298,11 +204,10 @@ { scenarioA, scenarioB - }, failureMechanism, assessmentSection); + }); // Assert Assert.IsNaN(detailedAssessmentProbability); - mocks.VerifyAll(); } [Test] Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r546ca3cd23e573f8c4ba332eae501fc933617b9c --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 546ca3cd23e573f8c4ba332eae501fc933617b9c) @@ -948,7 +948,7 @@ sectionResult, calculationScenarios, failureMechanism, assessmentSection, ConstructionProperties); // Assert - Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(calculationScenarios, failureMechanism, assessmentSection), resultRow.DetailedAssessmentProbability); + Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(calculationScenarios), resultRow.DetailedAssessmentProbability); Assert.IsEmpty(resultRow.ColumnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex].ErrorText); mocks.VerifyAll(); } @@ -1050,7 +1050,7 @@ failureMechanism, assessmentSection, ConstructionProperties); // Assert - Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(calculationScenarios, failureMechanism, assessmentSection), + Assert.AreEqual(sectionResult.GetDetailedAssessmentProbability(calculationScenarios), resultRow.DetailedAssessmentProbability); Assert.IsEmpty(resultRow.ColumnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex].ErrorText); mocks.VerifyAll();