Index: Ringtoets/Common/src/Ringtoets.Common.IO/PreconsolidationStress.cs =================================================================== diff -u -r6c59d09636a0a170b03797b7bb1f778dd70ac9a7 -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/Common/src/Ringtoets.Common.IO/PreconsolidationStress.cs (.../PreconsolidationStress.cs) (revision 6c59d09636a0a170b03797b7bb1f778dd70ac9a7) +++ Ringtoets/Common/src/Ringtoets.Common.IO/PreconsolidationStress.cs (.../PreconsolidationStress.cs) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -39,9 +39,9 @@ public double ZCoordinate { get; set; } = double.NaN; /// - /// Gets or sets the value of the preconsolidation stress. + /// Gets or sets the calculation value of the preconsolidation stress. /// - public double PreconsolidationStressValue { get; set; } = double.NaN; + public double PreconsolidationStressCalculationValue { get; set; } = double.NaN; /// /// Gets or sets distribution type of the preconsolidation stress. Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/PreconsolidationStressProperties.cs =================================================================== diff -u -r6c59d09636a0a170b03797b7bb1f778dd70ac9a7 -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/PreconsolidationStressProperties.cs (.../PreconsolidationStressProperties.cs) (revision 6c59d09636a0a170b03797b7bb1f778dd70ac9a7) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/PreconsolidationStressProperties.cs (.../PreconsolidationStressProperties.cs) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -66,8 +66,8 @@ readColumn = PreconsolidationStressTableDefinitions.PreconsolidationStressZCoordinate; ZCoordinate = reader.ReadOrDefault(readColumn); - readColumn = PreconsolidationStressTableDefinitions.PreconsolidationStressValue; - PreconsolidationStressValue = reader.ReadOrDefault(readColumn); + readColumn = PreconsolidationStressTableDefinitions.PreconsolidationStressCalculationValue; + PreconsolidationStressCalculationValue = reader.ReadOrDefault(readColumn); readColumn = PreconsolidationStressTableDefinitions.PreconsolidationStressDistribution; PreconsolidationStressDistributionType = reader.ReadOrDefault(readColumn); @@ -100,10 +100,10 @@ public double? ZCoordinate { get; } /// - /// Gets the value representing the stress of the preconsolidation stress location. + /// Gets the value representing the calculation value of the preconsolidation stress. /// [kN/m�] /// - public double? PreconsolidationStressValue { get; } + public double? PreconsolidationStressCalculationValue { get; } /// /// Gets the distribution type of the preconsolidation stress. Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/PreconsolidationStressTableDefinitions.cs =================================================================== diff -u -r35bc4534bcde8be5385cda72e5dd7a1d854e4bfa -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/PreconsolidationStressTableDefinitions.cs (.../PreconsolidationStressTableDefinitions.cs) (revision 35bc4534bcde8be5385cda72e5dd7a1d854e4bfa) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/PreconsolidationStressTableDefinitions.cs (.../PreconsolidationStressTableDefinitions.cs) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -48,9 +48,9 @@ public const string PreconsolidationStressZCoordinate = "PreconsolidationStressZCoordinate"; /// - /// The name of the stress value column. + /// The name of the stress calculation value column. /// - public const string PreconsolidationStressValue = "PreconsolidationStressValue"; + public const string PreconsolidationStressCalculationValue = "PreconsolidationStressCalculationValue"; /// /// The name of the preconsolidation stress distribution column. Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseQueryBuilder.cs =================================================================== diff -u -r35bc4534bcde8be5385cda72e5dd7a1d854e4bfa -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 35bc4534bcde8be5385cda72e5dd7a1d854e4bfa) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -349,7 +349,7 @@ $"preconsolidationStressesCount.{PreconsolidationStressTableDefinitions.PreconsolidationstressesCount}, " + $"{PreconsolidationStressTableDefinitions.PreconsolidationStressXCoordinate}, " + $"{PreconsolidationStressTableDefinitions.PreconsolidationStressZCoordinate}, " + - $"{PreconsolidationStressTableDefinitions.PreconsolidationStressValue}, " + + $"{PreconsolidationStressTableDefinitions.PreconsolidationStressCalculationValue}, " + $"{PreconsolidationStressTableDefinitions.PreconsolidationStressDistribution}, " + $"{PreconsolidationStressTableDefinitions.PreconsolidationStressMean}, " + $"{PreconsolidationStressTableDefinitions.PreconsolidationStressCoefficientOfVariation}, " + @@ -366,7 +366,7 @@ "SP2D_ID, " + $"X as {PreconsolidationStressTableDefinitions.PreconsolidationStressXCoordinate}, " + $"Z as {PreconsolidationStressTableDefinitions.PreconsolidationStressZCoordinate}, " + - $"Stress as {PreconsolidationStressTableDefinitions.PreconsolidationStressValue}, " + + $"Stress as {PreconsolidationStressTableDefinitions.PreconsolidationStressCalculationValue}, " + $"s.ST_Dist_Type AS {PreconsolidationStressTableDefinitions.PreconsolidationStressDistribution}, " + $"s.ST_Shift AS {PreconsolidationStressTableDefinitions.PreconsolidationStressShift}, " + $"s.ST_Mean AS {PreconsolidationStressTableDefinitions.PreconsolidationStressMean}, " + Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressPropertiesTest.cs =================================================================== diff -u -r6c59d09636a0a170b03797b7bb1f778dd70ac9a7 -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressPropertiesTest.cs (.../PreconsolidationStressPropertiesTest.cs) (revision 6c59d09636a0a170b03797b7bb1f778dd70ac9a7) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressPropertiesTest.cs (.../PreconsolidationStressPropertiesTest.cs) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -79,7 +79,7 @@ var reader = mockRepository.StrictMock(); reader.Expect(r => r.ReadOrDefault(PreconsolidationStressTableDefinitions.PreconsolidationStressXCoordinate)).Return(xCoordinate); reader.Expect(r => r.ReadOrDefault(PreconsolidationStressTableDefinitions.PreconsolidationStressZCoordinate)).Return(zCoordinate); - reader.Expect(r => r.ReadOrDefault(PreconsolidationStressTableDefinitions.PreconsolidationStressValue)).Return(preconsolidationStressValue); + reader.Expect(r => r.ReadOrDefault(PreconsolidationStressTableDefinitions.PreconsolidationStressCalculationValue)).Return(preconsolidationStressValue); reader.Expect(r => r.ReadOrDefault(PreconsolidationStressTableDefinitions.PreconsolidationStressDistribution)).Return(preconsolidationStressDistributionType); reader.Expect(r => r.ReadOrDefault(PreconsolidationStressTableDefinitions.PreconsolidationStressMean)).Return(preconsolidationStressMean); reader.Expect(r => r.ReadOrDefault(PreconsolidationStressTableDefinitions.PreconsolidationStressCoefficientOfVariation)).Return(preconsolidationStressCoefficientOfVariation); @@ -92,7 +92,7 @@ // Assert Assert.AreEqual(xCoordinate, properties.XCoordinate); Assert.AreEqual(zCoordinate, properties.ZCoordinate); - Assert.AreEqual(preconsolidationStressValue, properties.PreconsolidationStressValue); + Assert.AreEqual(preconsolidationStressValue, properties.PreconsolidationStressCalculationValue); Assert.AreEqual(preconsolidationStressDistributionType, properties.PreconsolidationStressDistributionType); Assert.AreEqual(preconsolidationStressMean, properties.PreconsolidationStressMean); Assert.AreEqual(preconsolidationStressCoefficientOfVariation, properties.PreconsolidationStressCoefficientOfVariation); @@ -143,7 +143,7 @@ { yield return PreconsolidationStressTableDefinitions.PreconsolidationStressXCoordinate; yield return PreconsolidationStressTableDefinitions.PreconsolidationStressZCoordinate; - yield return PreconsolidationStressTableDefinitions.PreconsolidationStressValue; + yield return PreconsolidationStressTableDefinitions.PreconsolidationStressCalculationValue; yield return PreconsolidationStressTableDefinitions.PreconsolidationStressDistribution; yield return PreconsolidationStressTableDefinitions.PreconsolidationStressMean; yield return PreconsolidationStressTableDefinitions.PreconsolidationStressCoefficientOfVariation; Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressTest.cs =================================================================== diff -u -r6c59d09636a0a170b03797b7bb1f778dd70ac9a7 -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressTest.cs (.../PreconsolidationStressTest.cs) (revision 6c59d09636a0a170b03797b7bb1f778dd70ac9a7) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressTest.cs (.../PreconsolidationStressTest.cs) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -35,7 +35,7 @@ // Assert Assert.IsNaN(stress.XCoordinate); Assert.IsNaN(stress.ZCoordinate); - Assert.IsNaN(stress.PreconsolidationStressValue); + Assert.IsNaN(stress.PreconsolidationStressCalculationValue); Assert.IsNull(stress.PreconsolidationStressDistributionType); Assert.IsNaN(stress.PreconsolidationStressMean); Assert.IsNaN(stress.PreconsolidationStressCoefficientOfVariation); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseQueryBuilderTest.cs =================================================================== diff -u -r35bc4534bcde8be5385cda72e5dd7a1d854e4bfa -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 35bc4534bcde8be5385cda72e5dd7a1d854e4bfa) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -398,7 +398,7 @@ "preconsolidationStressesCount.PreconsolidationStressesCount, " + "PreconsolidationStressXCoordinate, " + "PreconsolidationStressZCoordinate, " + - "PreconsolidationStressValue, " + + "PreconsolidationStressCalculationValue, " + "PreconsolidationStressDistribution, " + "PreconsolidationStressMean, " + "PreconsolidationStressCoefficientOfVariation, " + @@ -427,7 +427,7 @@ "SP2D_ID, " + "X as PreconsolidationStressXCoordinate, " + "Z as PreconsolidationStressZCoordinate, " + - "Stress as PreconsolidationStressValue, " + + "Stress as PreconsolidationStressCalculationValue, " + "s.ST_Dist_Type AS PreconsolidationStressDistribution, " + "s.ST_Shift AS PreconsolidationStressShift, " + "s.ST_Mean AS PreconsolidationStressMean, " + Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPreconsolidationStress.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPreconsolidationStress.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPreconsolidationStress.cs (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -0,0 +1,94 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Ringtoets.MacroStabilityInwards.Primitives +{ + /// + /// This class represents a preconsolidation stress definition that was imported + /// from D-Soil model. + /// + public class MacroStabilityInwardsPreconsolidationStress + { + /// + /// Creates a new instance of . + /// + /// The x coordinate of the preconsolidation stress location. + /// The z coordinate of the preconsolidation stress location. + /// The stress calculation value + /// of the preconsolidation stress. + /// The mean of the stochastic distribution + /// for the preconsolidation stress. + /// The coefficient of + /// variation of the stochastic distribution for the preconsolidation stress. + /// The shift of the stochastic distribution + /// for the preconsolidation stress + public MacroStabilityInwardsPreconsolidationStress(double xCoordinate, + double zCoordinate, + double preconsolidationStressCalculationValue, + double preconsolidationStressMean, + double preconsolidationStressCoefficientOfVariation, + double preconsolidationStressShift) + { + XCoordinate = xCoordinate; + ZCoordinate = zCoordinate; + PreconsolidationStressCalculationValue = preconsolidationStressCalculationValue; + PreconsolidationStressMean = preconsolidationStressMean; + PreconsolidationStressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation; + PreconsolidationStressShift = preconsolidationStressShift; + } + + /// + /// Gets the value representing the X coordinate of the preconsolidation stress location. + /// [m] + /// + public double XCoordinate { get; } + + /// + /// Gets the value representing the Z coordinate of the preconsolidation stress location. + /// [m] + /// + public double ZCoordinate { get; } + + /// + /// Gets the value representing the calculation value of the preconsolidation stress. + /// [kN/m�] + /// + public double PreconsolidationStressCalculationValue { get; } + + /// + /// Gets the value representing the mean of the distribution for the preconsolidation stress. + /// [kN/m�] + /// + public double PreconsolidationStressMean { get; } + + /// + /// Gets the value representing the coefficient of variation of the distribution for the preconsolidation stress. + /// [kN/m�] + /// + public double PreconsolidationStressCoefficientOfVariation { get; } + + /// + /// Gets the value representing the shift of the distribution for the preconsolidation stress. + /// [kN/m�] + /// + public double PreconsolidationStressShift { get; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj =================================================================== diff -u -r708bcebfe9e5db209c818a12d630cb418231f863 -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision 708bcebfe9e5db209c818a12d630cb418231f863) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -43,6 +43,7 @@ Properties\GlobalAssembly.cs + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPreconsolidationStressTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPreconsolidationStressTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPreconsolidationStressTest.cs (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -0,0 +1,60 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using NUnit.Framework; + +namespace Ringtoets.MacroStabilityInwards.Primitives.Test +{ + [TestFixture] + public class MacroStabilityInwardsPreconsolidationStressTest + { + [Test] + public void Constructor_ReturnsExpectedValues() + { + // Setup + var random = new Random(21); + + double xCoordinate = random.NextDouble(); + double zCoordinate = random.NextDouble(); + double stressCalculationValue = random.NextDouble(); + double stressShift = random.NextDouble(); + double stressMean = random.NextDouble(); + double stressCoefficientOfVariation = random.NextDouble(); + + // Call + var stress = new MacroStabilityInwardsPreconsolidationStress(xCoordinate, + zCoordinate, + stressCalculationValue, + stressMean, + stressCoefficientOfVariation, + stressShift); + // Assert + Assert.AreEqual(xCoordinate, stress.XCoordinate); + Assert.AreEqual(zCoordinate, stress.ZCoordinate); + + Assert.AreEqual(stressCalculationValue, stress.PreconsolidationStressCalculationValue); + Assert.AreEqual(stressMean, stress.PreconsolidationStressMean); + Assert.AreEqual(stressCoefficientOfVariation, stress.PreconsolidationStressCoefficientOfVariation); + Assert.AreEqual(stressShift, stress.PreconsolidationStressShift); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj =================================================================== diff -u -r708bcebfe9e5db209c818a12d630cb418231f863 -r241892f4db7cdaceeb42524d7b30e362adedae54 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj) (revision 708bcebfe9e5db209c818a12d630cb418231f863) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj) (revision 241892f4db7cdaceeb42524d7b30e362adedae54) @@ -53,6 +53,7 @@ Properties\GlobalAssembly.cs +