Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs
===================================================================
diff -u -r8db230c43dee4e0c11b63d77a4bbe61b5ca235a5 -r66218b3ae4fbf752980d643b65dad018ae92ce00
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 8db230c43dee4e0c11b63d77a4bbe61b5ca235a5)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 66218b3ae4fbf752980d643b65dad018ae92ce00)
@@ -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.MacroStabilityInwards.Data.Properties;
using Riskeer.MacroStabilityInwards.Data.SoilProfile;
using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources;
@@ -46,7 +45,6 @@
: base(Resources.MacroStabilityInwardsFailureMechanism_DisplayName, Resources.MacroStabilityInwardsFailureMechanism_Code)
{
GeneralInput = new GeneralMacroStabilityInwardsInput();
- ProbabilityAssessmentInput = new ProbabilityAssessmentInput(0.033, 50.0);
SurfaceLines = new MacroStabilityInwardsSurfaceLineCollection();
StochasticSoilModels = new MacroStabilityInwardsStochasticSoilModelCollection();
CalculationsGroup = new CalculationGroup
@@ -72,14 +70,8 @@
/// Gets the general calculation input parameters that apply to each macro stability inwards calculation.
///
public GeneralMacroStabilityInwardsInput GeneralInput { get; }
-
+
///
- /// Gets the general probabilistic assessment input parameters that apply to each calculation
- /// in a semi-probabilistic assessment.
- ///
- public ProbabilityAssessmentInput ProbabilityAssessmentInput { get; }
-
- ///
/// Gets an of .
///
public IObservableEnumerable ScenarioConfigurationsPerFailureMechanismSection =>
Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy.cs
===================================================================
diff -u -rf8337bdd0627f170f760ebf42bca623567cf440f -r66218b3ae4fbf752980d643b65dad018ae92ce00
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy.cs) (revision f8337bdd0627f170f760ebf42bca623567cf440f)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCalculateProbabilityStrategy.cs) (revision 66218b3ae4fbf752980d643b65dad018ae92ce00)
@@ -75,7 +75,7 @@
MacroStabilityInwardsScenarioConfigurationPerFailureMechanismSection sectionConfiguration =
failureMechanism.ScenarioConfigurationsPerFailureMechanismSection.Single(c => ReferenceEquals(sectionResult.Section, c.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/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs
===================================================================
diff -u -reb728162622b0ccce4373b2688d7ce2a0b5270ad -r66218b3ae4fbf752980d643b65dad018ae92ce00
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision eb728162622b0ccce4373b2688d7ce2a0b5270ad)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismTest.cs (.../MacroStabilityInwardsFailureMechanismTest.cs) (revision 66218b3ae4fbf752980d643b65dad018ae92ce00)
@@ -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;
namespace Riskeer.MacroStabilityInwards.Data.Test
@@ -46,9 +45,8 @@
Assert.IsNotNull(failureMechanism.GeneralInput);
- ProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.ProbabilityAssessmentInput;
- Assert.AreEqual(0.033, probabilityAssessmentInput.A);
- Assert.AreEqual(50, probabilityAssessmentInput.B);
+ GeneralMacroStabilityInwardsInput generalInput = failureMechanism.GeneralInput;
+ Assert.AreEqual(50, generalInput.B);
Assert.AreEqual("Berekeningen", failureMechanism.CalculationsGroup.Name);
CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children);