Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rc7c07e0937c3148b6223ebdad64fe7d326d1625f -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c7c07e0937c3148b6223ebdad64fe7d326d1625f) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -1631,6 +1631,15 @@ } /// + /// Looks up a localized string similar to Parameter '{0}' is niet lognormaal verdeeld.. + /// + public static string SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution { + get { + return ResourceManager.GetString("SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De segmenten van de geometrie van de laag vormen geen lus.. /// public static string SoilLayer2D_CheckValidLoop_Loop_contains_disconnected_segments { Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -rc7c07e0937c3148b6223ebdad64fe7d326d1625f -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision c7c07e0937c3148b6223ebdad64fe7d326d1625f) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -883,4 +883,7 @@ {0} Deze ondergrondschematisatie wordt overgeslagen. + + Parameter '{0}' is niet lognormaal verdeeld. + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -322,6 +322,60 @@ } /// + /// Looks up a localized string similar to Onverzadigd gewicht. + /// + public static string SoilLayerProperties_AbovePhreaticLevelDistribution_Description { + get { + return ResourceManager.GetString("SoilLayerProperties_AbovePhreaticLevelDistribution_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cohesie. + /// + public static string SoilLayerProperties_CohesionDistribution_Description { + get { + return ResourceManager.GetString("SoilLayerProperties_CohesionDistribution_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Wrijvingshoek. + /// + public static string SoilLayerProperties_FrictionAngleDistribution_Description { + get { + return ResourceManager.GetString("SoilLayerProperties_FrictionAngleDistribution_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to POP. + /// + public static string SoilLayerProperties_PopDistribution_Description { + get { + return ResourceManager.GetString("SoilLayerProperties_PopDistribution_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Schuifsterkte ratio S. + /// + public static string SoilLayerProperties_ShearStrengthRatioDistribution_Description { + get { + return ResourceManager.GetString("SoilLayerProperties_ShearStrengthRatioDistribution_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sterkte toename exponent. + /// + public static string SoilLayerProperties_StrengthIncreaseExponentDistribution_Description { + get { + return ResourceManager.GetString("SoilLayerProperties_StrengthIncreaseExponentDistribution_Description", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Kon geen stochastische ondergrondmodellen verkrijgen uit de database.. /// public static string StochasticSoilModelDatabaseReader_Failed_to_read_database { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx =================================================================== diff -u -rb04ee63f77708d3e30dd18f07dbb8ab31d548edb -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision b04ee63f77708d3e30dd18f07dbb8ab31d548edb) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -240,4 +240,22 @@ Karakteristiek punt '{0}' is niet gedefiniëerd. + + Onverzadigd gewicht + + + Cohesie + + + Wrijvingshoek + + + POP + + + Schuifsterkte ratio S + + + Sterkte toename exponent + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs =================================================================== diff -u -r602aa9de93c40ec9ca76e79530d13e7e32b45151 -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs (.../MacroStabilityInwardsSoilLayerTransformer.cs) (revision 602aa9de93c40ec9ca76e79530d13e7e32b45151) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs (.../MacroStabilityInwardsSoilLayerTransformer.cs) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -22,7 +22,9 @@ using System; using Ringtoets.Common.IO.Exceptions; using Ringtoets.Common.IO.SoilProfile; +using Ringtoets.MacroStabilityInwards.IO.Properties; using Ringtoets.MacroStabilityInwards.Primitives; +using RingtoetsCommonResources = Ringtoets.Common.IO.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.IO.SoilProfiles { @@ -49,6 +51,8 @@ throw new ArgumentNullException(nameof(soilLayer)); } + ValidateStochasticParameters(soilLayer); + var layer = new MacroStabilityInwardsSoilLayer1D(soilLayer.Top) { Properties = @@ -63,19 +67,14 @@ BelowPhreaticLevelDeviation = soilLayer.BelowPhreaticLevelDeviation, CohesionMean = soilLayer.CohesionMean, CohesionDeviation = soilLayer.CohesionDeviation, - CohesionShift = soilLayer.CohesionShift, FrictionAngleMean = soilLayer.FrictionAngleMean, FrictionAngleDeviation = soilLayer.FrictionAngleDeviation, - FrictionAngleShift = soilLayer.FrictionAngleShift, ShearStrengthRatioMean = soilLayer.ShearStrengthRatioMean, ShearStrengthRatioDeviation = soilLayer.ShearStrengthRatioDeviation, - ShearStrengthRatioShift = soilLayer.ShearStrengthRatioShift, StrengthIncreaseExponentMean = soilLayer.StrengthIncreaseExponentMean, StrengthIncreaseExponentDeviation = soilLayer.StrengthIncreaseExponentDeviation, - StrengthIncreaseExponentShift = soilLayer.StrengthIncreaseExponentShift, PopMean = soilLayer.PopMean, - PopDeviation = soilLayer.PopDeviation, - PopShift = soilLayer.PopShift + PopDeviation = soilLayer.PopDeviation } }; @@ -92,6 +91,51 @@ } /// + /// Validates whether the values of the distribution and shift for the stochastic parameters + /// are correct for creating a soil layer. + /// + /// Thrown when any of the distributions of the + /// stochastic parameters is not defined as lognormal or is shifted when it should not be. + private static void ValidateStochasticParameters(SoilLayerBase soilLayer) + { + ValidateIsNonShiftedLogNormal( + soilLayer.CohesionDistribution, + soilLayer.CohesionShift, + Resources.SoilLayerProperties_CohesionDistribution_Description); + + ValidateIsNonShiftedLogNormal( + soilLayer.FrictionAngleDistribution, + soilLayer.FrictionAngleShift, + Resources.SoilLayerProperties_FrictionAngleDistribution_Description); + + ValidateIsNonShiftedLogNormal( + soilLayer.ShearStrengthRatioDistribution, + soilLayer.ShearStrengthRatioShift, + Resources.SoilLayerProperties_ShearStrengthRatioDistribution_Description); + + ValidateIsNonShiftedLogNormal( + soilLayer.StrengthIncreaseExponentDistribution, + soilLayer.StrengthIncreaseExponentShift, + Resources.SoilLayerProperties_StrengthIncreaseExponentDistribution_Description); + + ValidateIsNonShiftedLogNormal( + soilLayer.PopDistribution, + soilLayer.PopShift, + Resources.SoilLayerProperties_PopDistribution_Description); + } + + private static void ValidateIsNonShiftedLogNormal(long? distribution, double shift, string incorrectDistibutionParameter) + { + if (distribution.HasValue && (distribution.Value != SoilLayerConstants.LogNormalDistributionValue + || Math.Abs(shift) > 1e-6)) + { + throw new ImportedDataTransformException(string.Format( + RingtoetsCommonResources.SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution, + incorrectDistibutionParameter)); + } + } + + /// /// Transforms the to . /// /// The model to transform. Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs =================================================================== diff -u -r602aa9de93c40ec9ca76e79530d13e7e32b45151 -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs (.../MacroStabilityInwardsSoilLayerTransformerTest.cs) (revision 602aa9de93c40ec9ca76e79530d13e7e32b45151) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs (.../MacroStabilityInwardsSoilLayerTransformerTest.cs) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.Drawing; using Core.Common.TestUtil; using NUnit.Framework; @@ -37,7 +38,7 @@ public void SoilLayer1DTransform_SoilLayer1DNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => MacroStabilityInwardsSoilLayerTransformer.Transform(null); + TestDelegate test = () => MacroStabilityInwardsSoilLayerTransformer.Transform((SoilLayer1D) null); // Assert var exception = Assert.Throws(test); @@ -63,19 +64,14 @@ double belowPhreaticLevelDeviation = random.NextDouble(); double cohesionMean = random.NextDouble(); double cohesionDeviation = random.NextDouble(); - double cohesionShift = random.NextDouble(); double frictionAngleMean = random.NextDouble(); double frictionAngleDeviation = random.NextDouble(); - double frictionAngleShift = random.NextDouble(); double shearStrengthRatioMean = random.NextDouble(); double shearStrengthRatioDeviation = random.NextDouble(); - double shearStrengthRatioShift = random.NextDouble(); double strengthIncreaseExponentMean = random.NextDouble(); double strengthIncreaseExponentDeviation = random.NextDouble(); - double strengthIncreaseExponentShift = random.NextDouble(); double popMean = random.NextDouble(); double popDeviation = random.NextDouble(); - double popShift = random.NextDouble(); var layer = new SoilLayer1D(top) { @@ -90,19 +86,14 @@ BelowPhreaticLevelDeviation = belowPhreaticLevelDeviation, CohesionMean = cohesionMean, CohesionDeviation = cohesionDeviation, - CohesionShift = cohesionShift, FrictionAngleMean = frictionAngleMean, FrictionAngleDeviation = frictionAngleDeviation, - FrictionAngleShift = frictionAngleShift, ShearStrengthRatioMean = shearStrengthRatioMean, ShearStrengthRatioDeviation = shearStrengthRatioDeviation, - ShearStrengthRatioShift = shearStrengthRatioShift, StrengthIncreaseExponentMean = strengthIncreaseExponentMean, StrengthIncreaseExponentDeviation = strengthIncreaseExponentDeviation, - StrengthIncreaseExponentShift = strengthIncreaseExponentShift, PopMean = popMean, - PopDeviation = popDeviation, - PopShift = popShift + PopDeviation = popDeviation }; // Call @@ -123,19 +114,14 @@ Assert.AreEqual(belowPhreaticLevelDeviation, properties.BelowPhreaticLevelDeviation); Assert.AreEqual(cohesionMean, properties.CohesionMean); Assert.AreEqual(cohesionDeviation, properties.CohesionDeviation); - Assert.AreEqual(cohesionShift, properties.CohesionShift); Assert.AreEqual(frictionAngleMean, properties.FrictionAngleMean); Assert.AreEqual(frictionAngleDeviation, properties.FrictionAngleDeviation); - Assert.AreEqual(frictionAngleShift, properties.FrictionAngleShift); Assert.AreEqual(shearStrengthRatioMean, properties.ShearStrengthRatioMean); Assert.AreEqual(shearStrengthRatioDeviation, properties.ShearStrengthRatioDeviation); - Assert.AreEqual(shearStrengthRatioShift, properties.ShearStrengthRatioShift); Assert.AreEqual(strengthIncreaseExponentMean, properties.StrengthIncreaseExponentMean); Assert.AreEqual(strengthIncreaseExponentDeviation, properties.StrengthIncreaseExponentDeviation); - Assert.AreEqual(strengthIncreaseExponentShift, properties.StrengthIncreaseExponentShift); Assert.AreEqual(popMean, properties.PopMean); Assert.AreEqual(popDeviation, properties.PopDeviation); - Assert.AreEqual(popShift, properties.PopShift); } [Test] @@ -156,6 +142,90 @@ Assert.IsInstanceOf(exception.InnerException); } + [Test] + [TestCaseSource(nameof(IncorrectLogNormalDistributionsSoilLayer1D))] + public void SoilLayer1DTransform_IncorrectLogNormalDistribution_ThrowImportedDataTransformException(SoilLayer1D layer, string parameter) + { + // Call + TestDelegate test = () => MacroStabilityInwardsSoilLayerTransformer.Transform(layer); + + // Assert + Exception exception = Assert.Throws(test); + Assert.AreEqual($"Parameter '{parameter}' is niet lognormaal verdeeld.", exception.Message); + } + + private static IEnumerable IncorrectLogNormalDistributionsSoilLayer1D() + { + return IncorrectLogNormalDistributions(() => new SoilLayer1D(0.0), nameof(SoilLayer1D)); + } + + private static IEnumerable IncorrectLogNormalDistributions(Func soilLayer, string typeName) + { + const string testNameFormat = "{0}Transform_Incorrect{1}{{1}}_ThrowsImportedDataTransformException"; + const long validDistribution = SoilLayerConstants.LogNormalDistributionValue; + const double validShift = 0.0; + + SoilLayerBase invalidCohesionShift = soilLayer(); + invalidCohesionShift.CohesionDistribution = validDistribution; + invalidCohesionShift.CohesionShift = -1; + yield return new TestCaseData(invalidCohesionShift, "Cohesie" + ).SetName(string.Format(testNameFormat, typeName, "Shift")); + + SoilLayerBase invalidCohesionDistribution = soilLayer(); + invalidCohesionDistribution.CohesionDistribution = -1; + invalidCohesionDistribution.CohesionShift = validShift; + yield return new TestCaseData(invalidCohesionDistribution, "Cohesie" + ).SetName(string.Format(testNameFormat, typeName, "Distribution")); + + SoilLayerBase invalidFrictionAngleShift = soilLayer(); + invalidFrictionAngleShift.FrictionAngleDistribution = validDistribution; + invalidFrictionAngleShift.FrictionAngleShift = -1; + yield return new TestCaseData(invalidFrictionAngleShift, "Wrijvingshoek" + ).SetName(string.Format(testNameFormat, typeName, "Shift")); + + SoilLayerBase invalidFrictionAngleDistribution = soilLayer(); + invalidFrictionAngleDistribution.FrictionAngleDistribution = -1; + invalidFrictionAngleDistribution.FrictionAngleShift = validShift; + yield return new TestCaseData(invalidFrictionAngleDistribution, "Wrijvingshoek" + ).SetName(string.Format(testNameFormat, typeName, "Distribution")); + + SoilLayerBase invalidShearStrengthRatioShift = soilLayer(); + invalidShearStrengthRatioShift.ShearStrengthRatioDistribution = validDistribution; + invalidShearStrengthRatioShift.ShearStrengthRatioShift = -1; + yield return new TestCaseData(invalidShearStrengthRatioShift, "Schuifsterkte ratio S" + ).SetName(string.Format(testNameFormat, typeName, "Shift")); + + SoilLayerBase invalidShearStrengthRatioDistribution = soilLayer(); + invalidShearStrengthRatioDistribution.ShearStrengthRatioDistribution = -1; + invalidShearStrengthRatioDistribution.ShearStrengthRatioShift = validShift; + yield return new TestCaseData(invalidShearStrengthRatioDistribution, "Schuifsterkte ratio S" + ).SetName(string.Format(testNameFormat, typeName, "Distribution")); + + SoilLayerBase invalidStrengthIncreaseExponentShift = soilLayer(); + invalidStrengthIncreaseExponentShift.StrengthIncreaseExponentDistribution = validDistribution; + invalidStrengthIncreaseExponentShift.StrengthIncreaseExponentShift = -1; + yield return new TestCaseData(invalidStrengthIncreaseExponentShift, "Sterkte toename exponent" + ).SetName(string.Format(testNameFormat, typeName, "Shift")); + + SoilLayerBase invalidStrengthIncreaseExponentDistribution = soilLayer(); + invalidStrengthIncreaseExponentDistribution.StrengthIncreaseExponentDistribution = -1; + invalidStrengthIncreaseExponentDistribution.StrengthIncreaseExponentShift = validShift; + yield return new TestCaseData(invalidStrengthIncreaseExponentDistribution, "Sterkte toename exponent" + ).SetName(string.Format(testNameFormat, typeName, "Distribution")); + + SoilLayerBase invalidPopShift = soilLayer(); + invalidPopShift.PopDistribution = validDistribution; + invalidPopShift.PopShift = -1; + yield return new TestCaseData(invalidPopShift, "POP" + ).SetName(string.Format(testNameFormat, typeName, "Shift")); + + SoilLayerBase invalidPopDistribution = soilLayer(); + invalidPopDistribution.PopDistribution = -1; + invalidPopDistribution.PopShift = validShift; + yield return new TestCaseData(invalidPopDistribution, "POP" + ).SetName(string.Format(testNameFormat, typeName, "Distribution")); + } + private MacroStabilityInwardsShearStrengthModel GetMacroStabilityInwardsShearStrengthModel(ShearStrengthModel shearStrengthModel) { switch (shearStrengthModel) Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rab481580593706295cd3af50672dc394ce5fe3ee -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ab481580593706295cd3af50672dc394ce5fe3ee) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -236,15 +236,6 @@ } /// - /// Looks up a localized string similar to Parameter '{0}' is niet lognormaal verdeeld.. - /// - public static string SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution { - get { - return ResourceManager.GetString("SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Parameter '{0}' is niet verschoven lognormaal verdeeld.. /// public static string SoilLayer_Stochastic_parameter_0_has_no_shifted_lognormal_distribution { Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx =================================================================== diff -u -rab481580593706295cd3af50672dc394ce5fe3ee -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision ab481580593706295cd3af50672dc394ce5fe3ee) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -135,9 +135,6 @@ Doorlatendheid - - Parameter '{0}' is niet lognormaal verdeeld. - Parameter '{0}' is niet verschoven lognormaal verdeeld. Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs =================================================================== diff -u -r7b692ef44a3029ae881190f04c20cfd075927783 -rbc09678ed3cac5622e2b12b440d3de2f1b57eef1 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs (.../PipingSoilLayerTransformer.cs) (revision 7b692ef44a3029ae881190f04c20cfd075927783) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs (.../PipingSoilLayerTransformer.cs) (revision bc09678ed3cac5622e2b12b440d3de2f1b57eef1) @@ -28,6 +28,7 @@ using Ringtoets.Common.IO.SoilProfile; using Ringtoets.Piping.IO.Properties; using Ringtoets.Piping.Primitives; +using RingtoetsCommonResources = Ringtoets.Common.IO.Properties.Resources; namespace Ringtoets.Piping.IO.SoilProfiles { @@ -51,7 +52,7 @@ throw new ArgumentNullException(nameof(soilLayer)); } - ValidateStochasticParametersForPiping(soilLayer); + ValidateStochasticParameters(soilLayer); var pipingSoilLayer = new PipingSoilLayer(soilLayer.Top) { @@ -72,7 +73,7 @@ throw new ArgumentNullException(nameof(soilLayer)); } - ValidateStochasticParametersForPiping(soilLayer); + ValidateStochasticParameters(soilLayer); bottom = double.MaxValue; @@ -121,27 +122,27 @@ /// /// Thrown when any of the distributions of the /// stochastic parameters is not defined as lognormal or is shifted when it should not be. - private static void ValidateStochasticParametersForPiping(SoilLayerBase soilLayer1D) + private static void ValidateStochasticParameters(SoilLayerBase soilLayer) { ValidateIsLogNormal( - soilLayer1D.BelowPhreaticLevelDistribution, + soilLayer.BelowPhreaticLevelDistribution, Resources.SoilLayer_BelowPhreaticLevelDistribution_Description); ValidateIsNonShiftedLogNormal( - soilLayer1D.DiameterD70Distribution, - soilLayer1D.DiameterD70Shift, + soilLayer.DiameterD70Distribution, + soilLayer.DiameterD70Shift, Resources.SoilLayer_DiameterD70Distribution_Description); ValidateIsNonShiftedLogNormal( - soilLayer1D.PermeabilityDistribution, - soilLayer1D.PermeabilityShift, + soilLayer.PermeabilityDistribution, + soilLayer.PermeabilityShift, Resources.SoilLayer_PermeabilityDistribution_Description); } /// - /// Sets the values of the optional stochastic parameters for the given . + /// Sets the values of the stochastic parameters for the given . /// /// The to set the property values for. /// The to get the properties from. - /// This method does not perform validation. Use to + /// This method does not perform validation. Use to /// verify whether the distributions for the stochastic parameters are correctly defined. private static void SetStochasticParameters(PipingSoilLayer pipingSoilLayer, SoilLayerBase soilLayer1D) { @@ -160,7 +161,7 @@ || Math.Abs(shift) > 1e-6)) { throw new ImportedDataTransformException(string.Format( - Resources.SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution, + RingtoetsCommonResources.SoilLayer_Stochastic_parameter_0_has_no_lognormal_distribution, incorrectDistibutionParameter)); } }