Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -rad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1 -r04752a0e09ff8a8a9e019d4c0d749a1d90f99043 --- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision ad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1) +++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 04752a0e09ff8a8a9e019d4c0d749a1d90f99043) @@ -24,7 +24,6 @@ using Riskeer.Common.Data; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Data.Probability; using Riskeer.Piping.Data.SoilProfile; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; using PipingDataResources = Riskeer.Piping.Data.Properties.Resources; @@ -44,7 +43,6 @@ public PipingFailureMechanism() : base(PipingDataResources.PipingFailureMechanism_DisplayName, PipingDataResources.PipingFailureMechanism_DisplayCode) { - ProbabilityAssessmentInput = new ProbabilityAssessmentInput(0.4, 300.0); GeneralInput = new GeneralPipingInput(); SurfaceLines = new PipingSurfaceLineCollection(); StochasticSoilModels = new PipingStochasticSoilModelCollection(); @@ -74,12 +72,6 @@ public GeneralPipingInput GeneralInput { get; } /// - /// Gets the general probabilistic assessment input parameters that apply to each calculation - /// in a semi-probabilistic assessment. - /// - public ProbabilityAssessmentInput ProbabilityAssessmentInput { get; } - - /// /// Gets or sets the . /// public PipingScenarioConfigurationType ScenarioConfigurationType { get; set; } Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs =================================================================== diff -u -rcf1e2da1638bc150ef79a330bc881267987364ca -r04752a0e09ff8a8a9e019d4c0d749a1d90f99043 --- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs (.../SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs) (revision cf1e2da1638bc150ef79a330bc881267987364ca) +++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs (.../SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs) (revision 04752a0e09ff8a8a9e019d4c0d749a1d90f99043) @@ -85,7 +85,7 @@ PipingScenarioConfigurationPerFailureMechanismSection sectionConfiguration = failureMechanism.ScenarioConfigurationsPerFailureMechanismSection.Single(c => ReferenceEquals(c.Section, sectionResult.Section)); - return Math.Min(1.0, probability * sectionConfiguration.GetN(failureMechanism.ProbabilityAssessmentInput.B)); + return Math.Min(1.0, probability * sectionConfiguration.GetN(failureMechanism.GeneralInput.B)); } } } \ No newline at end of file Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs =================================================================== diff -u -reb728162622b0ccce4373b2688d7ce2a0b5270ad -r04752a0e09ff8a8a9e019d4c0d749a1d90f99043 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision eb728162622b0ccce4373b2688d7ce2a0b5270ad) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision 04752a0e09ff8a8a9e019d4c0d749a1d90f99043) @@ -24,7 +24,6 @@ using NUnit.Framework; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; -using Riskeer.Common.Data.Probability; using Riskeer.Common.Data.TestUtil; using Riskeer.Piping.Data.TestUtil; @@ -47,10 +46,6 @@ Assert.IsNotNull(failureMechanism.GeneralInput); - ProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.ProbabilityAssessmentInput; - Assert.AreEqual(0.4, probabilityAssessmentInput.A); - Assert.AreEqual(300, probabilityAssessmentInput.B); - Assert.AreEqual("Berekeningen", failureMechanism.CalculationsGroup.Name); CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children); CollectionAssert.IsEmpty(failureMechanism.Sections);