Fisheye: Tag 2303e33e596c2b329ade1c18ee24e6bfaa3d2dea refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/SemiProbabilisticDesignValueFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -r99c3360a6f1f976b6243f0ba02e731c8af063280 -r2303e33e596c2b329ade1c18ee24e6bfaa3d2dea --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 99c3360a6f1f976b6243f0ba02e731c8af063280) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 2303e33e596c2b329ade1c18ee24e6bfaa3d2dea) @@ -91,7 +91,6 @@ - Fisheye: Tag 2303e33e596c2b329ade1c18ee24e6bfaa3d2dea refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/SemiProbabilisticDesignValueFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj =================================================================== diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r2303e33e596c2b329ade1c18ee24e6bfaa3d2dea --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision a1fa1538918813373bcc864f0bce092bf28fd0ce) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision 2303e33e596c2b329ade1c18ee24e6bfaa3d2dea) @@ -99,7 +99,6 @@ - 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 Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs =================================================================== diff -u -r6a5a5c3c47792446311ea872b8626382aecaad11 -r2303e33e596c2b329ade1c18ee24e6bfaa3d2dea --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (.../PipingSemiProbabilisticDesignValueFactory.cs) (revision 6a5a5c3c47792446311ea872b8626382aecaad11) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (.../PipingSemiProbabilisticDesignValueFactory.cs) (revision 2303e33e596c2b329ade1c18ee24e6bfaa3d2dea) @@ -28,27 +28,6 @@ /// public static class PipingSemiProbabilisticDesignValueFactory { - private static DesignVariable CreateDesignVariable(NormalDistribution distribution, double percentile) - { - return new NormalDistributionDesignVariable(distribution) - { - Percentile = percentile - }; - } - - private static DesignVariable CreateDesignVariable(LogNormalDistribution distribution, double percentile) - { - return new LogNormalDistributionDesignVariable(distribution) - { - Percentile = percentile - }; - } - - private static DesignVariable CreateDeterministicDesignVariable(LogNormalDistribution distribution, double deterministicValue) - { - return new DeterministicDesignVariable(distribution, deterministicValue); - } - #region General parameters /// @@ -58,9 +37,13 @@ { if (double.IsNaN(parameters.ThicknessCoverageLayer.Mean)) { - return CreateDeterministicDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer, 0); + return new DeterministicDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer); } - return CreateDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer, 0.05); + + return new LogNormalDistributionDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer) + { + Percentile = 0.05 + }; } /// @@ -70,9 +53,13 @@ { if (double.IsNaN(parameters.ThicknessCoverageLayer.Mean)) { - return CreateDeterministicDesignVariable(parameters.ThicknessCoverageLayer, 0); + return new DeterministicDesignVariable(parameters.ThicknessCoverageLayer); } - return CreateDesignVariable(parameters.ThicknessCoverageLayer, 0.05); + + return new LogNormalDistributionDesignVariable(parameters.ThicknessCoverageLayer) + { + Percentile = 0.05 + }; } /// @@ -82,25 +69,35 @@ { if (double.IsNaN(parameters.ThicknessCoverageLayer.Mean)) { - return CreateDeterministicDesignVariable(parameters.EffectiveThicknessCoverageLayer, 0); + return new DeterministicDesignVariable(parameters.EffectiveThicknessCoverageLayer); } - return CreateDesignVariable(parameters.EffectiveThicknessCoverageLayer, 0.05); + + return new LogNormalDistributionDesignVariable(parameters.EffectiveThicknessCoverageLayer) + { + Percentile = 0.05 + }; } /// /// Creates the design variable for . /// public static DesignVariable GetPhreaticLevelExit(PipingInput parameters) { - return CreateDesignVariable(parameters.PhreaticLevelExit, 0.05); + return new NormalDistributionDesignVariable(parameters.PhreaticLevelExit) + { + Percentile = 0.05 + }; } /// /// Creates the design variable for . /// public static DesignVariable GetDampingFactorExit(PipingInput parameters) { - return CreateDesignVariable(parameters.DampingFactorExit, 0.95); + return new LogNormalDistributionDesignVariable(parameters.DampingFactorExit) + { + Percentile = 0.95 + }; } #endregion @@ -112,31 +109,43 @@ /// public static VariationCoefficientDesignVariable GetSeepageLength(PipingInput parameters) { - return SemiProbabilisticDesignValueFactory.CreateDesignVariable(parameters.SeepageLength, 0.05); + return new VariationCoefficientLogNormalDistributionDesignVariable(parameters.SeepageLength) + { + Percentile = 0.05 + }; } /// /// Creates the design variable for . /// public static VariationCoefficientDesignVariable GetDiameter70(PipingInput parameters) { - return SemiProbabilisticDesignValueFactory.CreateDesignVariable(parameters.Diameter70, 0.05); + return new VariationCoefficientLogNormalDistributionDesignVariable(parameters.Diameter70) + { + Percentile = 0.05 + }; } /// /// Creates the design variable for . /// public static VariationCoefficientDesignVariable GetDarcyPermeability(PipingInput parameters) { - return SemiProbabilisticDesignValueFactory.CreateDesignVariable(parameters.DarcyPermeability, 0.95); + return new VariationCoefficientLogNormalDistributionDesignVariable(parameters.DarcyPermeability) + { + Percentile = 0.95 + }; } /// /// Creates the design variable for . /// public static DesignVariable GetThicknessAquiferLayer(PipingInput parameters) { - return CreateDesignVariable(parameters.ThicknessAquiferLayer, 0.95); + return new LogNormalDistributionDesignVariable(parameters.ThicknessAquiferLayer) + { + Percentile = 0.95 + }; } #endregion