Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs =================================================================== diff -u -rbb8e7ef450e816a647e105ad1123f43b6d22ff36 -rff1b7c6a13dfcb3583d654055b422ec99ae7dc43 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision bb8e7ef450e816a647e105ad1123f43b6d22ff36) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision ff1b7c6a13dfcb3583d654055b422ec99ae7dc43) @@ -103,18 +103,41 @@ var props = new MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine( new MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine.ConstructionProperties { - AbovePhreaticLevelMean = properties.AbovePhreaticLevelMean, - AbovePhreaticLevelCoefficientOfVariation = properties.AbovePhreaticLevelCoefficientOfVariation, UsePop = properties.UsePop, IsAquifer = properties.IsAquifer, ShearStrengthModel = properties.ShearStrengthModel, - MaterialName = properties.MaterialName + MaterialName = properties.MaterialName, + AbovePhreaticLevelMean = properties.AbovePhreaticLevelMean, + AbovePhreaticLevelCoefficientOfVariation = properties.AbovePhreaticLevelCoefficientOfVariation, + BelowPhreaticLevelMean = properties.BelowPhreaticLevelMean, + BelowPhreaticLevelCoefficientOfVariation = properties.BelowPhreaticLevelCoefficientOfVariation, + CohesionMean = properties.CohesionMean, + CohesionCoefficientOfVariation = properties.CohesionCoefficientOfVariation, + FrictionAngleMean = properties.FrictionAngleMean, + FrictionAngleCoefficientOfVariation = properties.FrictionAngleCoefficientOfVariation, + StrengthIncreaseExponentMean = properties.StrengthIncreaseExponentMean, + StrengthIncreaseExponentCoefficientOfVariation = properties.StrengthIncreaseExponentCoefficientOfVariation, + ShearStrengthRatioMean = properties.ShearStrengthRatioMean, + ShearStrengthRatioCoefficientOfVariation = properties.ShearStrengthRatioCoefficientOfVariation, + PopMean = properties.PopMean, + PopCoefficientOfVariation = properties.PopCoefficientOfVariation }); - props.AbovePhreaticLevelDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetAbovePhreaticLevel(props).GetDesignValue(); + SetDesignVariables(props); return props; } + private static void SetDesignVariables(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine props) + { + props.AbovePhreaticLevelDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetAbovePhreaticLevel(props).GetDesignValue(); + props.BelowPhreaticLevelDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetBelowPhreaticLevel(props).GetDesignValue(); + props.CohesionDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetCohesion(props).GetDesignValue(); + props.FrictionAngleDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetFrictionAngle(props).GetDesignValue(); + props.StrengthIncreaseExponentDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetStrengthIncreaseExponent(props).GetDesignValue(); + props.ShearStrengthRatioDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetShearStrengthRatio(props).GetDesignValue(); + props.PopDesignVariable = MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetPop(props).GetDesignValue(); + } + private static Point2D[] RingToPoints(Ring ring) { return ring.Points.ToArray(); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs =================================================================== diff -u -rea4edac77eb5c9870c9585e0ddc2428423f8265e -rff1b7c6a13dfcb3583d654055b422ec99ae7dc43 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs (.../MacroStabilityInwardsSoilLayerTransformer.cs) (revision ea4edac77eb5c9870c9585e0ddc2428423f8265e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs (.../MacroStabilityInwardsSoilLayerTransformer.cs) (revision ff1b7c6a13dfcb3583d654055b422ec99ae7dc43) @@ -115,7 +115,7 @@ properties.AbovePhreaticLevelCoefficientOfVariation = soilLayer.AbovePhreaticLevelCoefficientOfVariation; properties.AbovePhreaticLevelShift = soilLayer.AbovePhreaticLevelShift; properties.BelowPhreaticLevelMean = soilLayer.BelowPhreaticLevelMean; - properties.BelowPhreaticLevelDeviation = soilLayer.BelowPhreaticLevelDeviation; + properties.BelowPhreaticLevelCoefficientOfVariation = soilLayer.BelowPhreaticLevelDeviation; properties.BelowPhreaticLevelShift = soilLayer.BelowPhreaticLevelShift; properties.CohesionMean = soilLayer.CohesionMean; properties.CohesionCoefficientOfVariation = soilLayer.CohesionCoefficientOfVariation; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayerProperties.cs =================================================================== diff -u -r0ff0d940b426329a221aa40c6dee1fc20a285de6 -rff1b7c6a13dfcb3583d654055b422ec99ae7dc43 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayerProperties.cs (.../MacroStabilityInwardsSoilLayerProperties.cs) (revision 0ff0d940b426329a221aa40c6dee1fc20a285de6) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayerProperties.cs (.../MacroStabilityInwardsSoilLayerProperties.cs) (revision ff1b7c6a13dfcb3583d654055b422ec99ae7dc43) @@ -104,10 +104,10 @@ public double BelowPhreaticLevelMean { get; set; } = double.NaN; /// - /// Gets or sets the deviation of the distribution for the volumic weight of the layer below the phreatic level. + /// Gets or sets the coefficient of variation of the distribution for the volumic weight of the layer below the phreatic level. /// [kN/m³] /// - public double BelowPhreaticLevelDeviation { get; set; } = double.NaN; + public double BelowPhreaticLevelCoefficientOfVariation { get; set; } = double.NaN; /// /// Gets or sets the shift of the distribution for the volumic weight of the layer below the phreatic level. @@ -196,7 +196,7 @@ hashCode = (hashCode * 397) ^ AbovePhreaticLevelCoefficientOfVariation.GetHashCode(); hashCode = (hashCode * 397) ^ AbovePhreaticLevelShift.GetHashCode(); hashCode = (hashCode * 397) ^ BelowPhreaticLevelMean.GetHashCode(); - hashCode = (hashCode * 397) ^ BelowPhreaticLevelDeviation.GetHashCode(); + hashCode = (hashCode * 397) ^ BelowPhreaticLevelCoefficientOfVariation.GetHashCode(); hashCode = (hashCode * 397) ^ BelowPhreaticLevelShift.GetHashCode(); hashCode = (hashCode * 397) ^ CohesionMean.GetHashCode(); hashCode = (hashCode * 397) ^ CohesionCoefficientOfVariation.GetHashCode(); @@ -223,7 +223,7 @@ && AbovePhreaticLevelCoefficientOfVariation.Equals(other.AbovePhreaticLevelCoefficientOfVariation) && AbovePhreaticLevelShift.Equals(other.AbovePhreaticLevelShift) && BelowPhreaticLevelMean.Equals(other.BelowPhreaticLevelMean) - && BelowPhreaticLevelDeviation.Equals(other.BelowPhreaticLevelDeviation) + && BelowPhreaticLevelCoefficientOfVariation.Equals(other.BelowPhreaticLevelCoefficientOfVariation) && BelowPhreaticLevelShift.Equals(other.BelowPhreaticLevelShift) && CohesionMean.Equals(other.CohesionMean) && CohesionCoefficientOfVariation.Equals(other.CohesionCoefficientOfVariation) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs =================================================================== diff -u -rbb8e7ef450e816a647e105ad1123f43b6d22ff36 -rff1b7c6a13dfcb3583d654055b422ec99ae7dc43 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision bb8e7ef450e816a647e105ad1123f43b6d22ff36) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision ff1b7c6a13dfcb3583d654055b422ec99ae7dc43) @@ -22,12 +22,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; @@ -342,6 +340,18 @@ var shearStrengthModel = random.NextEnumValue(); double abovePhreaticLevelMean = random.NextDouble(); double abovePhreaticLevelCoefficientOfVariation = random.NextDouble(); + double belowPhreaticLevelMean = random.NextDouble(); + double belowPhreaticLevelCoefficientOfVariation = random.NextDouble(); + double cohesionMean = random.NextDouble(); + double cohesionCoefficientOfVariation = random.NextDouble(); + double frictionAngleMean = random.NextDouble(); + double frictionAngleCoefficientOfVariation = random.NextDouble(); + double shearStrengthRatioMean = random.NextDouble(); + double shearStrengthRatioCoefficientOfVariation = random.NextDouble(); + double strengthIncreaseExponentMean = random.NextDouble(); + double strengthIncreaseExponentCoefficientOfVariation = random.NextDouble(); + double popMean = random.NextDouble(); + double popCoefficientOfVariation = random.NextDouble(); const string material = "Clay"; var layer = new MacroStabilityInwardsSoilLayer1D(1) @@ -351,9 +361,21 @@ UsePop = usePop, IsAquifer = isAquifer, ShearStrengthModel = shearStrengthModel, + MaterialName = material, AbovePhreaticLevelMean = abovePhreaticLevelMean, AbovePhreaticLevelCoefficientOfVariation = abovePhreaticLevelCoefficientOfVariation, - MaterialName = material + BelowPhreaticLevelMean = belowPhreaticLevelMean, + BelowPhreaticLevelCoefficientOfVariation = belowPhreaticLevelCoefficientOfVariation, + CohesionMean = cohesionMean, + CohesionCoefficientOfVariation = cohesionCoefficientOfVariation, + FrictionAngleMean = frictionAngleMean, + FrictionAngleCoefficientOfVariation = frictionAngleCoefficientOfVariation, + ShearStrengthRatioMean = shearStrengthRatioMean, + ShearStrengthRatioCoefficientOfVariation = shearStrengthRatioCoefficientOfVariation, + StrengthIncreaseExponentMean = strengthIncreaseExponentMean, + StrengthIncreaseExponentCoefficientOfVariation = strengthIncreaseExponentCoefficientOfVariation, + PopMean = popMean, + PopCoefficientOfVariation = popCoefficientOfVariation } }; @@ -371,13 +393,16 @@ Assert.AreEqual(usePop, layerUnderSurfaceLineProperties.UsePop); Assert.AreEqual(isAquifer, layerUnderSurfaceLineProperties.IsAquifer); Assert.AreEqual(shearStrengthModel, layerUnderSurfaceLineProperties.ShearStrengthModel); - Assert.AreEqual(abovePhreaticLevelMean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean, - layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean.GetAccuracy()); - Assert.AreEqual(abovePhreaticLevelCoefficientOfVariation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation, - layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation.GetAccuracy()); Assert.AreEqual(material, layerUnderSurfaceLineProperties.MaterialName); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetAbovePhreaticLevel(layerUnderSurfaceLineProperties).GetDesignValue(), - layerUnderSurfaceLineProperties.AbovePhreaticLevelDesignVariable); + + AssertDistributionsAndDesignVariables(layerUnderSurfaceLineProperties, + abovePhreaticLevelMean, abovePhreaticLevelCoefficientOfVariation, + belowPhreaticLevelMean, belowPhreaticLevelCoefficientOfVariation, + cohesionMean, cohesionCoefficientOfVariation, + frictionAngleMean, frictionAngleCoefficientOfVariation, + shearStrengthRatioMean, shearStrengthRatioCoefficientOfVariation, + strengthIncreaseExponentMean, strengthIncreaseExponentCoefficientOfVariation, + popMean, popCoefficientOfVariation); } [Test] @@ -425,21 +450,48 @@ public void SoilProfile2DCreate_WithProperties_ReturnsProperties() { // Setup + const string material = "Clay"; + var random = new Random(); bool usePop = random.NextBoolean(); bool isAquifer = random.NextBoolean(); var shearStrengthModel = random.NextEnumValue(); + double abovePhreaticLevelMean = random.NextDouble(); double abovePhreaticLevelCoefficientOfVariation = random.NextDouble(); - const string material = "Clay"; + double belowPhreaticLevelMean = random.NextDouble(); + double belowPhreaticLevelCoefficientOfVariation = random.NextDouble(); + double cohesionMean = random.NextDouble(); + double cohesionCoefficientOfVariation = random.NextDouble(); + double frictionAngleMean = random.NextDouble(); + double frictionAngleCoefficientOfVariation = random.NextDouble(); + double shearStrengthRatioMean = random.NextDouble(); + double shearStrengthRatioCoefficientOfVariation = random.NextDouble(); + double strengthIncreaseExponentMean = random.NextDouble(); + double strengthIncreaseExponentCoefficientOfVariation = random.NextDouble(); + double popMean = random.NextDouble(); + double popCoefficientOfVariation = random.NextDouble(); MacroStabilityInwardsSoilLayer2D layer = GetSoilLayer(); layer.Properties.UsePop = usePop; layer.Properties.IsAquifer = isAquifer; layer.Properties.ShearStrengthModel = shearStrengthModel; + layer.Properties.MaterialName = material; + layer.Properties.AbovePhreaticLevelMean = abovePhreaticLevelMean; layer.Properties.AbovePhreaticLevelCoefficientOfVariation = abovePhreaticLevelCoefficientOfVariation; - layer.Properties.MaterialName = material; + layer.Properties.BelowPhreaticLevelMean = belowPhreaticLevelMean; + layer.Properties.BelowPhreaticLevelCoefficientOfVariation = belowPhreaticLevelCoefficientOfVariation; + layer.Properties.CohesionMean = cohesionMean; + layer.Properties.CohesionCoefficientOfVariation = cohesionCoefficientOfVariation; + layer.Properties.FrictionAngleMean = frictionAngleMean; + layer.Properties.FrictionAngleCoefficientOfVariation = frictionAngleCoefficientOfVariation; + layer.Properties.ShearStrengthRatioMean = shearStrengthRatioMean; + layer.Properties.ShearStrengthRatioCoefficientOfVariation = shearStrengthRatioCoefficientOfVariation; + layer.Properties.StrengthIncreaseExponentMean = strengthIncreaseExponentMean; + layer.Properties.StrengthIncreaseExponentCoefficientOfVariation = strengthIncreaseExponentCoefficientOfVariation; + layer.Properties.PopMean = popMean; + layer.Properties.PopCoefficientOfVariation = popCoefficientOfVariation; var profile = new MacroStabilityInwardsSoilProfile2D("name", new[] { @@ -455,15 +507,77 @@ Assert.AreEqual(usePop, layerUnderSurfaceLineProperties.UsePop); Assert.AreEqual(isAquifer, layerUnderSurfaceLineProperties.IsAquifer); Assert.AreEqual(shearStrengthModel, layerUnderSurfaceLineProperties.ShearStrengthModel); - Assert.AreEqual(abovePhreaticLevelMean, layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean, - layerUnderSurfaceLineProperties.AbovePhreaticLevel.Mean.GetAccuracy()); - Assert.AreEqual(abovePhreaticLevelCoefficientOfVariation, layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation, - layerUnderSurfaceLineProperties.AbovePhreaticLevel.CoefficientOfVariation.GetAccuracy()); Assert.AreEqual(material, layerUnderSurfaceLineProperties.MaterialName); - Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetAbovePhreaticLevel(layerUnderSurfaceLineProperties).GetDesignValue(), - layerUnderSurfaceLineProperties.AbovePhreaticLevelDesignVariable); + + AssertDistributionsAndDesignVariables(layerUnderSurfaceLineProperties, + abovePhreaticLevelMean, abovePhreaticLevelCoefficientOfVariation, + belowPhreaticLevelMean, belowPhreaticLevelCoefficientOfVariation, + cohesionMean, cohesionCoefficientOfVariation, + frictionAngleMean, frictionAngleCoefficientOfVariation, + shearStrengthRatioMean, shearStrengthRatioCoefficientOfVariation, + strengthIncreaseExponentMean, strengthIncreaseExponentCoefficientOfVariation, + popMean, popCoefficientOfVariation); } + private static void AssertDistributionsAndDesignVariables(MacroStabilityInwardsSoilLayerPropertiesUnderSurfaceLine properties, + double abovePhreaticLevelMean, double abovePhreaticLevelCoefficientOfVariation, + double belowPhreaticLevelMean, double belowPhreaticLevelCoefficientOfVariation, + double cohesionMean, double cohesionCoefficientOfVariation, + double frictionAngleMean, double frictionAngleCoefficientOfVariation, + double shearStrengthRatioMean, double shearStrengthRatioCoefficientOfVariation, + double strengthIncreaseExponentMean, double strengthIncreaseExponentCoefficientOfVariation, + double popMean, double popCoefficientOfVariation) + { + Assert.AreEqual(abovePhreaticLevelMean, properties.AbovePhreaticLevel.Mean, + properties.AbovePhreaticLevel.Mean.GetAccuracy()); + Assert.AreEqual(abovePhreaticLevelCoefficientOfVariation, properties.AbovePhreaticLevel.CoefficientOfVariation, + properties.AbovePhreaticLevel.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetAbovePhreaticLevel(properties).GetDesignValue(), + properties.AbovePhreaticLevelDesignVariable); + + Assert.AreEqual(belowPhreaticLevelMean, properties.BelowPhreaticLevel.Mean, + properties.BelowPhreaticLevel.Mean.GetAccuracy()); + Assert.AreEqual(belowPhreaticLevelCoefficientOfVariation, properties.BelowPhreaticLevel.CoefficientOfVariation, + properties.BelowPhreaticLevel.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetBelowPhreaticLevel(properties).GetDesignValue(), + properties.BelowPhreaticLevelDesignVariable); + + Assert.AreEqual(cohesionMean, properties.Cohesion.Mean, + properties.Cohesion.Mean.GetAccuracy()); + Assert.AreEqual(cohesionCoefficientOfVariation, properties.Cohesion.CoefficientOfVariation, + properties.Cohesion.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetCohesion(properties).GetDesignValue(), + properties.CohesionDesignVariable); + + Assert.AreEqual(frictionAngleMean, properties.FrictionAngle.Mean, + properties.FrictionAngle.Mean.GetAccuracy()); + Assert.AreEqual(frictionAngleCoefficientOfVariation, properties.FrictionAngle.CoefficientOfVariation, + properties.FrictionAngle.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetFrictionAngle(properties).GetDesignValue(), + properties.FrictionAngleDesignVariable); + + Assert.AreEqual(shearStrengthRatioMean, properties.ShearStrengthRatio.Mean, + properties.ShearStrengthRatio.Mean.GetAccuracy()); + Assert.AreEqual(shearStrengthRatioCoefficientOfVariation, properties.ShearStrengthRatio.CoefficientOfVariation, + properties.ShearStrengthRatio.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetShearStrengthRatio(properties).GetDesignValue(), + properties.ShearStrengthRatioDesignVariable); + + Assert.AreEqual(strengthIncreaseExponentMean, properties.StrengthIncreaseExponent.Mean, + properties.StrengthIncreaseExponent.Mean.GetAccuracy()); + Assert.AreEqual(strengthIncreaseExponentCoefficientOfVariation, properties.StrengthIncreaseExponent.CoefficientOfVariation, + properties.StrengthIncreaseExponent.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetStrengthIncreaseExponent(properties).GetDesignValue(), + properties.StrengthIncreaseExponentDesignVariable); + + Assert.AreEqual(popMean, properties.Pop.Mean, + properties.Pop.Mean.GetAccuracy()); + Assert.AreEqual(popCoefficientOfVariation, properties.Pop.CoefficientOfVariation, + properties.Pop.CoefficientOfVariation.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsSemiProbabilisticDesignValueFactory.GetPop(properties).GetDesignValue(), + properties.PopDesignVariable); + } + private static MacroStabilityInwardsSoilLayer2D GetSoilLayer() { return new MacroStabilityInwardsSoilLayer2D(CreateRing(21), Enumerable.Empty()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs =================================================================== diff -u -rea4edac77eb5c9870c9585e0ddc2428423f8265e -rff1b7c6a13dfcb3583d654055b422ec99ae7dc43 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs (.../MacroStabilityInwardsSoilLayerTransformerTest.cs) (revision ea4edac77eb5c9870c9585e0ddc2428423f8265e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs (.../MacroStabilityInwardsSoilLayerTransformerTest.cs) (revision ff1b7c6a13dfcb3583d654055b422ec99ae7dc43) @@ -113,7 +113,7 @@ Assert.AreEqual(abovePhreaticLevelCoefficientOfVariation, properties.AbovePhreaticLevelCoefficientOfVariation); Assert.AreEqual(abovePhreaticLevelShift, properties.AbovePhreaticLevelShift); Assert.AreEqual(belowPhreaticLevelMean, properties.BelowPhreaticLevelMean); - Assert.AreEqual(belowPhreaticLevelDeviation, properties.BelowPhreaticLevelDeviation); + Assert.AreEqual(belowPhreaticLevelDeviation, properties.BelowPhreaticLevelCoefficientOfVariation); Assert.AreEqual(belowPhreaticLevelShift, properties.BelowPhreaticLevelShift); Assert.AreEqual(cohesionMean, properties.CohesionMean); Assert.AreEqual(cohesionCoefficientOfVariation, properties.CohesionCoefficientOfVariation); @@ -295,7 +295,7 @@ Assert.AreEqual(abovePhreaticLevelDeviation, properties.AbovePhreaticLevelCoefficientOfVariation); Assert.AreEqual(abovePhreaticLevelShift, properties.AbovePhreaticLevelShift); Assert.AreEqual(belowPhreaticLevelMean, properties.BelowPhreaticLevelMean); - Assert.AreEqual(belowPhreaticLevelDeviation, properties.BelowPhreaticLevelDeviation); + Assert.AreEqual(belowPhreaticLevelDeviation, properties.BelowPhreaticLevelCoefficientOfVariation); Assert.AreEqual(belowPhreaticLevelShift, properties.BelowPhreaticLevelShift); Assert.AreEqual(cohesionMean, properties.CohesionMean); Assert.AreEqual(cohesionDeviation, properties.CohesionCoefficientOfVariation); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerPropertiesTest.cs =================================================================== diff -u -rea4edac77eb5c9870c9585e0ddc2428423f8265e -rff1b7c6a13dfcb3583d654055b422ec99ae7dc43 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerPropertiesTest.cs (.../MacroStabilityInwardsSoilLayerPropertiesTest.cs) (revision ea4edac77eb5c9870c9585e0ddc2428423f8265e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayerPropertiesTest.cs (.../MacroStabilityInwardsSoilLayerPropertiesTest.cs) (revision ff1b7c6a13dfcb3583d654055b422ec99ae7dc43) @@ -50,7 +50,7 @@ Assert.IsNaN(properties.AbovePhreaticLevelShift); Assert.IsNaN(properties.BelowPhreaticLevelMean); - Assert.IsNaN(properties.BelowPhreaticLevelDeviation); + Assert.IsNaN(properties.BelowPhreaticLevelCoefficientOfVariation); Assert.IsNaN(properties.BelowPhreaticLevelShift); Assert.IsNaN(properties.CohesionMean); @@ -183,7 +183,7 @@ yield return new TestCaseData(new Action(lp => lp.AbovePhreaticLevelCoefficientOfVariation = 1.0 - lp.AbovePhreaticLevelCoefficientOfVariation)); yield return new TestCaseData(new Action(lp => lp.AbovePhreaticLevelShift = 1.0 - lp.AbovePhreaticLevelShift)); yield return new TestCaseData(new Action(lp => lp.BelowPhreaticLevelMean = 1.0 - lp.BelowPhreaticLevelMean)); - yield return new TestCaseData(new Action(lp => lp.BelowPhreaticLevelDeviation = 1.0 - lp.BelowPhreaticLevelDeviation)); + yield return new TestCaseData(new Action(lp => lp.BelowPhreaticLevelCoefficientOfVariation = 1.0 - lp.BelowPhreaticLevelCoefficientOfVariation)); yield return new TestCaseData(new Action(lp => lp.BelowPhreaticLevelShift = 1.0 - lp.BelowPhreaticLevelShift)); yield return new TestCaseData(new Action(lp => lp.CohesionMean = 1.0 - lp.CohesionMean)); yield return new TestCaseData(new Action(lp => lp.CohesionCoefficientOfVariation = 1.0 - lp.CohesionCoefficientOfVariation)); @@ -247,7 +247,7 @@ AbovePhreaticLevelCoefficientOfVariation = random.NextDouble(), AbovePhreaticLevelShift = random.NextDouble(), BelowPhreaticLevelMean = random.NextDouble(), - BelowPhreaticLevelDeviation = random.NextDouble(), + BelowPhreaticLevelCoefficientOfVariation = random.NextDouble(), BelowPhreaticLevelShift = random.NextDouble(), CohesionMean = random.NextDouble(), CohesionCoefficientOfVariation = random.NextDouble(),