Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignValueFactory.cs
===================================================================
diff -u -r35bb3fb2239c0f3633155ccea59b2b3bad28f52d -r2303e33e596c2b329ade1c18ee24e6bfaa3d2dea
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignValueFactory.cs (.../MacroStabilityInwardsSemiProbabilisticDesignValueFactory.cs) (revision 35bb3fb2239c0f3633155ccea59b2b3bad28f52d)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSemiProbabilisticDesignValueFactory.cs (.../MacroStabilityInwardsSemiProbabilisticDesignValueFactory.cs) (revision 2303e33e596c2b329ade1c18ee24e6bfaa3d2dea)
@@ -19,9 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using Core.Common.Base.Data;
using Ringtoets.Common.Data.Probabilistics;
-using Ringtoets.MacroStabilityInwards.Primitives;
using Ringtoets.MacroStabilityInwards.Primitives.MacroStabilityInwardsSoilUnderSurfaceLine;
namespace Ringtoets.MacroStabilityInwards.Data
@@ -36,63 +34,87 @@
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetAbovePhreaticLevel(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(properties.AbovePhreaticLevel, 0.5);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(properties.AbovePhreaticLevel)
+ {
+ Percentile = 0.5
+ };
}
///
/// Creates the design variable for .
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetBelowPhreaticLevel(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(properties.BelowPhreaticLevel, 0.5);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(properties.BelowPhreaticLevel)
+ {
+ Percentile = 0.5
+ };
}
///
/// Creates the design variable for .
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetCohesion(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(properties.Cohesion, 0.05);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(properties.Cohesion)
+ {
+ Percentile = 0.05
+ };
}
///
/// Creates the design variable for .
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetFrictionAngle(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(properties.FrictionAngle, 0.05);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(properties.FrictionAngle)
+ {
+ Percentile = 0.05
+ };
}
///
/// Creates the design variable for .
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetShearStrengthRatio(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(properties.ShearStrengthRatio, 0.05);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(properties.ShearStrengthRatio)
+ {
+ Percentile = 0.05
+ };
}
///
/// Creates the design variable for .
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetStrengthIncreaseExponent(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(properties.StrengthIncreaseExponent, 0.05);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(properties.StrengthIncreaseExponent)
+ {
+ Percentile = 0.05
+ };
}
///
/// Creates the design variable for .
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetPop(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(properties.Pop, 0.05);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(properties.Pop)
+ {
+ Percentile = 0.05
+ };
}
///
/// Creates the design variable for .
///
public static VariationCoefficientLogNormalDistributionDesignVariable GetPreconsolidationStress(MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine preconsolidationStressUnderSurfaceLine)
{
- return SemiProbabilisticDesignValueFactory.CreateDesignVariable(preconsolidationStressUnderSurfaceLine.PreconsolidationStress, 0.05);
+ return new VariationCoefficientLogNormalDistributionDesignVariable(preconsolidationStressUnderSurfaceLine.PreconsolidationStress)
+ {
+ Percentile = 0.05
+ };
}
}
}
\ No newline at end of file