Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensions.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensions.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensions.cs (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -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 Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.IO.Configurations.Helpers +{ + /// + /// Extension methods for converting to + /// . + /// + public static class MacroStabilityInwardsLocationInputConversionExtensions + { + /// + /// Configure a new with + /// values taken from . + /// + /// The input to take the values from. + /// A new . + /// Thrown when is null. + public static MacroStabilityInwardsLocationInputConfiguration ToMacroStabilityInwardsLocationInputConfiguration( + this IMacroStabilityInwardsLocationInputDaily inputDaily) + { + if (inputDaily == null) + { + throw new ArgumentNullException(nameof(inputDaily)); + } + + return new MacroStabilityInwardsLocationInputConfiguration + { + WaterLevelPolder = inputDaily.WaterLevelPolder, + UseDefaultOffsets = inputDaily.UseDefaultOffsets, + PhreaticLineOffsetBelowDikeTopAtRiver = inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver, + PhreaticLineOffsetBelowDikeTopAtPolder = inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder, + PhreaticLineOffsetBelowShoulderBaseInside = inputDaily.PhreaticLineOffsetBelowShoulderBaseInside, + PhreaticLineOffsetBelowDikeToeAtPolder = inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder + }; + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -172,6 +172,11 @@ /// public PhreaticLineConfiguration PhreaticLine4 { get; set; } + /// + /// Gets or sets the locations input values for daily conditions. + /// + public MacroStabilityInwardsLocationInputConfiguration LocationInputDaily { get; set; } + #endregion #region Grid Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -82,6 +82,7 @@ Inwards = input.LeakageLengthInwardsPhreaticLine4, Outwards = input.LeakageLengthOutwardsPhreaticLine4 }, + LocationInputDaily = input.LocationInputDaily.ToMacroStabilityInwardsLocationInputConfiguration(), Scenario = calculation.ToScenarioConfiguration(), SlipPlaneMinimumDepth = input.SlipPlaneMinimumDepth, SlipPlaneMinimumLength = input.SlipPlaneMinimumLength, Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -147,6 +147,55 @@ /// public const string AdjustPhreaticLine3And4ForUpliftElement = "corrigeervooropbarsten"; + #region Location input + + /// + /// The identifier for all location input elements for daily conditions. + /// + public const string LocationInputDailyElement = "dagelijks"; + + /// + /// The identifier for all location input elements for extreme conditions. + /// + public const string LocationInputExtremeElement = "extreem"; + + /// + /// The tag of the element containing the polder water level. + /// + public const string WaterLevelPolderElement = "polderpeil"; + + /// + /// The identifier for the offset of the location input elements. + /// + public const string LocationInputOffsetElement = "offsets"; + + /// + /// The tag of the element containing the value whether the default offsets should be used. + /// + public const string UseDefaultOffsetsElement = "gebruikdefaults"; + + /// + /// The tag of the element containing the offset of the phreatic line below dike top at river. + /// + public const string PhreaticLineOffsetBelowDikeTopAtRiverElement = "buitenkruin"; + + /// + /// The tag of the element containing the offset of the phreatic line below dike top at polder. + /// + public const string PhreaticLineOffsetBelowDikeTopAtPolderElement = "binnenkruin"; + + /// + /// The tag of the element containing the offset of the phreatic line below shoulder base inside. + /// + public const string PhreaticLineOffsetBelowShoulderBaseInsideElement = "insteekbinnenberm"; + + /// + /// The tag of the element containing the offset of the phreatic line below dike toe at polder. + /// + public const string PhreaticLineOffsetBelowDikeToeAtPolderElement = "teendijkbinnenwaarts"; + + #endregion + #region Drainage /// Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -166,7 +166,7 @@ WriteDrainageConstruction(writer, configuration); WriteMinimumLevelPhreaticLine(writer, configuration); - + WriteElementWhenContentAvailable(writer, MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement, configuration.AdjustPhreaticLine3And4ForUplift); @@ -175,6 +175,8 @@ WritePiezometricHead(writer, configuration); + WriteLocationLocationDailyInput(writer, configuration.LocationInputDaily); + writer.WriteEndElement(); } @@ -248,6 +250,66 @@ } /// + /// Writes a location input configuration. + /// + /// The writer to use for writing. + /// The configuration for the location input that can be null. + /// Thrown when the + /// is closed. + private static void WriteLocationLocationDailyInput(XmlWriter writer, MacroStabilityInwardsLocationInputConfiguration configuration) + { + if (configuration == null) + { + return; + } + + writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputDailyElement); + + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelPolderElement, + configuration.WaterLevelPolder); + + WriteLocationLocationInputOffset(writer, configuration); + + writer.WriteEndElement(); + } + + /// + /// Writes the offset of a location input configuration. + /// + /// The writer to use for writing. + /// The configuration for the location input that can be null. + /// Thrown when the + /// is closed. + private static void WriteLocationLocationInputOffset(XmlWriter writer, MacroStabilityInwardsLocationInputConfiguration configuration) + { + if (configuration == null) + { + return; + } + + writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputOffsetElement); + + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.UseDefaultOffsetsElement, + configuration.UseDefaultOffsets); + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowDikeTopAtRiverElement, + configuration.PhreaticLineOffsetBelowDikeTopAtRiver); + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowDikeTopAtPolderElement, + configuration.PhreaticLineOffsetBelowDikeTopAtPolder); + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowShoulderBaseInsideElement, + configuration.PhreaticLineOffsetBelowShoulderBaseInside); + WriteElementWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowDikeToeAtPolderElement, + configuration.PhreaticLineOffsetBelowDikeToeAtPolder); + + writer.WriteEndElement(); + } + + /// /// Writes the drainage construction related parameters. /// /// The writer to use for writing. Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputConfiguration.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputConfiguration.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputConfiguration.cs (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -0,0 +1,59 @@ +// 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.IO.Configurations +{ + /// + /// Configuration of locations input. + /// + public class MacroStabilityInwardsLocationInputConfiguration + { + /// + /// Gets or sets the polder water level. + /// + public double? WaterLevelPolder { get; set; } + + /// + /// Gets or sets whether the default offsets should be used. + /// + public bool? UseDefaultOffsets { get; set; } + + /// + /// Gets or sets the offset of the phreatic line below dike top at river. + /// + public double? PhreaticLineOffsetBelowDikeTopAtRiver { get; set; } + + /// + /// Gets or sets the offset of the phreatic line below dike top at polder. + /// + public double? PhreaticLineOffsetBelowDikeTopAtPolder { get; set; } + + /// + /// Gets or sets the offset of the phreatic line below shoulder base inside. + /// + public double? PhreaticLineOffsetBelowShoulderBaseInside { get; set; } + + /// + /// Gets or sets the offset of the phreatic line below dike toe at polder. + /// + public double? PhreaticLineOffsetBelowDikeToeAtPolder { get; set; } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj =================================================================== diff -u -raf341ae554425a1832b712c219f5eff86c5d2282 -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj (.../Ringtoets.MacroStabilityInwards.IO.csproj) (revision af341ae554425a1832b712c219f5eff86c5d2282) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj (.../Ringtoets.MacroStabilityInwards.IO.csproj) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -42,11 +42,13 @@ + + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -26,6 +26,7 @@ using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.Primitives; namespace Ringtoets.MacroStabilityInwards.Data.TestUtil.Test { @@ -185,6 +186,13 @@ Assert.IsNaN(input.RightGrid.XRight); Assert.IsNaN(input.RightGrid.ZTop); Assert.IsNaN(input.RightGrid.ZBottom); + + IMacroStabilityInwardsLocationInputDaily inputDaily = input.LocationInputDaily; + Assert.IsNaN(inputDaily.WaterLevelPolder); + Assert.IsNaN(inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver); + Assert.IsNaN(inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder); + Assert.IsNaN(inputDaily.PhreaticLineOffsetBelowShoulderBaseInside); + Assert.IsNaN(inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder); } [Test] @@ -229,6 +237,13 @@ Assert.AreEqual(double.PositiveInfinity, input.RightGrid.XRight); Assert.AreEqual(double.PositiveInfinity, input.RightGrid.ZTop); Assert.AreEqual(double.NegativeInfinity, input.RightGrid.ZBottom); + + IMacroStabilityInwardsLocationInputDaily inputDaily = input.LocationInputDaily; + Assert.AreEqual(double.PositiveInfinity, inputDaily.WaterLevelPolder); + Assert.AreEqual(double.PositiveInfinity, inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver); + Assert.AreEqual(double.PositiveInfinity, inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder); + Assert.AreEqual(double.NegativeInfinity, inputDaily.PhreaticLineOffsetBelowShoulderBaseInside); + Assert.AreEqual(double.NegativeInfinity, inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder); } private static void AssertCalculation(MacroStabilityInwardsCalculationScenario calculation, @@ -308,6 +323,14 @@ Assert.IsNull(input.StochasticSoilModel); Assert.IsNull(input.StochasticSoilProfile); } + + IMacroStabilityInwardsLocationInputDaily inputDaily = input.LocationInputDaily; + Assert.IsTrue(inputDaily.UseDefaultOffsets); + Assert.AreEqual(2.2, inputDaily.WaterLevelPolder, inputDaily.WaterLevelPolder.GetAccuracy()); + Assert.AreEqual(2.21, inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver, inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver.GetAccuracy()); + Assert.AreEqual(2.22, inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder, inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder.GetAccuracy()); + Assert.AreEqual(2.23, inputDaily.PhreaticLineOffsetBelowShoulderBaseInside, inputDaily.PhreaticLineOffsetBelowShoulderBaseInside.GetAccuracy()); + Assert.AreEqual(2.24, inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder, inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy()); } private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -153,6 +153,15 @@ { new MacroStabilityInwardsSoilLayer1D(0) })), + LocationInputDaily = + { + UseDefaultOffsets = true, + WaterLevelPolder = (RoundedDouble) 2.2, + PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) 2.21, + PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) 2.22, + PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) 2.23, + PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) 2.24 + }, WaterLevelRiverAverage = (RoundedDouble) 10.5, DrainageConstructionPresent = true, XCoordinateDrainageConstruction = (RoundedDouble) 10.6, @@ -220,6 +229,13 @@ input.RightGrid.ZTop = RoundedDouble.NaN; input.RightGrid.ZBottom = RoundedDouble.NaN; + IMacroStabilityInwardsLocationInputDaily inputDaily = input.LocationInputDaily; + inputDaily.WaterLevelPolder = RoundedDouble.NaN; + inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver = RoundedDouble.NaN; + inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder = RoundedDouble.NaN; + inputDaily.PhreaticLineOffsetBelowShoulderBaseInside = RoundedDouble.NaN; + inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder = RoundedDouble.NaN; + return calculation; } @@ -274,6 +290,13 @@ input.RightGrid.ZTop = (RoundedDouble) double.PositiveInfinity; input.RightGrid.ZBottom = (RoundedDouble) double.NegativeInfinity; + IMacroStabilityInwardsLocationInputDaily inputDaily = input.LocationInputDaily; + inputDaily.WaterLevelPolder = (RoundedDouble) double.PositiveInfinity; + inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) double.PositiveInfinity; + inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) double.PositiveInfinity; + inputDaily.PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) double.NegativeInfinity; + inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) double.NegativeInfinity; + return calculation; } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensionsTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensionsTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensionsTest.cs (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -0,0 +1,91 @@ +// 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 Core.Common.Base.Data; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.IO.Configurations; +using Ringtoets.MacroStabilityInwards.IO.Configurations.Helpers; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.IO.Test.Configurations.Helpers +{ + [TestFixture] + public class MacroStabilityInwardsLocationInputConversionExtensionsTest + { + [Test] + public void ToMacroStabilityInwardsLocationInputConfiguration_MacroStabilityInwardsLocationInputDailyNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => ((IMacroStabilityInwardsLocationInputDaily) null).ToMacroStabilityInwardsLocationInputConfiguration(); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("inputDaily", exception.ParamName); + } + + [Test] + public void ToMacroStabilityInwardsLocationInputConfiguration_ValidMacroStabilityInwardsLocationInputDaily_ReturnsNewMacroStabilityInwardsLocationInputConfigurationWithParametersSet() + { + // Setup + var random = new Random(31); + + bool useDefaultOffsets = random.NextBoolean(); + RoundedDouble waterLevelPolder = random.NextRoundedDouble(); + RoundedDouble phreaticLineOffsetBelowDikeTopAtRiver = random.NextRoundedDouble(); + RoundedDouble phreaticLineOffsetBelowDikeTopAtPolder = random.NextRoundedDouble(); + RoundedDouble phreaticLineOffsetBelowShoulderBaseInside = random.NextRoundedDouble(); + RoundedDouble phreaticLineOffsetBelowDikeToeAtPolder = random.NextRoundedDouble(); + + var mockRepository = new MockRepository(); + var inputDaily = mockRepository.Stub(); + inputDaily.UseDefaultOffsets = useDefaultOffsets; + inputDaily.WaterLevelPolder = waterLevelPolder; + inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver = phreaticLineOffsetBelowDikeTopAtRiver; + inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder = phreaticLineOffsetBelowDikeTopAtPolder; + inputDaily.PhreaticLineOffsetBelowShoulderBaseInside = phreaticLineOffsetBelowShoulderBaseInside; + inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder = phreaticLineOffsetBelowDikeToeAtPolder; + mockRepository.ReplayAll(); + + // Call + MacroStabilityInwardsLocationInputConfiguration configuration = inputDaily.ToMacroStabilityInwardsLocationInputConfiguration(); + + // Assert + Assert.AreEqual(useDefaultOffsets, configuration.UseDefaultOffsets); + Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtRiver, + configuration.PhreaticLineOffsetBelowDikeTopAtRiver, + phreaticLineOffsetBelowDikeTopAtRiver.GetAccuracy()); + Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtPolder, + configuration.PhreaticLineOffsetBelowDikeTopAtPolder, + phreaticLineOffsetBelowDikeTopAtPolder.GetAccuracy()); + Assert.AreEqual(phreaticLineOffsetBelowShoulderBaseInside, + configuration.PhreaticLineOffsetBelowShoulderBaseInside, + phreaticLineOffsetBelowShoulderBaseInside.GetAccuracy()); + Assert.AreEqual(phreaticLineOffsetBelowDikeToeAtPolder, + configuration.PhreaticLineOffsetBelowDikeToeAtPolder, + phreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy()); + mockRepository.VerifyAll(); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -56,6 +56,15 @@ Assert.AreEqual("buitenwaarts", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); Assert.AreEqual("corrigeervooropbarsten", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement); + Assert.AreEqual("dagelijks", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputDailyElement); + Assert.AreEqual("extreem", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputExtremeElement); + Assert.AreEqual("polderpeil", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelPolderElement); + Assert.AreEqual("offsets", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputOffsetElement); + Assert.AreEqual("gebruikdefaults", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.UseDefaultOffsetsElement); + Assert.AreEqual("buitenkruin", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowDikeTopAtRiverElement); + Assert.AreEqual("binnenkruin", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowDikeTopAtPolderElement); + Assert.AreEqual("insteekbinnenberm", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowShoulderBaseInsideElement); + Assert.AreEqual("teendijkbinnenwaarts", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowDikeToeAtPolderElement); Assert.AreEqual("drainage", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionElement); Assert.AreEqual("aanwezig", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionPresentElement); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -68,6 +68,7 @@ Assert.IsNull(configuration.PhreaticLine2); Assert.IsNull(configuration.PhreaticLine3); Assert.IsNull(configuration.PhreaticLine4); + Assert.IsNull(configuration.LocationInputDaily); Assert.IsNull(configuration.SlipPlaneMinimumDepth); Assert.IsNull(configuration.SlipPlaneMinimumLength); Assert.IsNull(configuration.MaximumSliceWidth); @@ -106,6 +107,7 @@ var phreaticLine2 = new PhreaticLineConfiguration(); var phreaticLine3 = new PhreaticLineConfiguration(); var phreaticLine4 = new PhreaticLineConfiguration(); + var locationInputDaily = new MacroStabilityInwardsLocationInputConfiguration(); const double slipPlaneMinimumDepth = 2.2; const double slipPlaneMinimumLength = 3.3; @@ -142,6 +144,7 @@ PhreaticLine2 = phreaticLine2, PhreaticLine3 = phreaticLine3, PhreaticLine4 = phreaticLine4, + LocationInputDaily = locationInputDaily, SlipPlaneMinimumDepth = slipPlaneMinimumDepth, SlipPlaneMinimumLength = slipPlaneMinimumLength, MaximumSliceWidth = maximumSliceWidth, @@ -175,6 +178,7 @@ Assert.AreSame(phreaticLine2, configuration.PhreaticLine2); Assert.AreSame(phreaticLine3, configuration.PhreaticLine3); Assert.AreSame(phreaticLine4, configuration.PhreaticLine4); + Assert.AreSame(locationInputDaily, configuration.LocationInputDaily); Assert.AreEqual(slipPlaneMinimumDepth, configuration.SlipPlaneMinimumDepth); Assert.AreEqual(slipPlaneMinimumLength, configuration.SlipPlaneMinimumLength); Assert.AreEqual(maximumSliceWidth, configuration.MaximumSliceWidth); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -110,6 +110,15 @@ Inwards = 80.1, Outwards = 80.2 }, + LocationInputDaily = new MacroStabilityInwardsLocationInputConfiguration + { + WaterLevelPolder = 99.9, + PhreaticLineOffsetBelowDikeToeAtPolder = 99.8, + PhreaticLineOffsetBelowDikeTopAtPolder = 99.7, + PhreaticLineOffsetBelowDikeTopAtRiver = 99.6, + PhreaticLineOffsetBelowShoulderBaseInside = 99.5, + UseDefaultOffsets = false + }, AdjustPhreaticLine3And4ForUplift = true, CreateZones = true, MoveGrid = true, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsLocationInputConfigurationTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsLocationInputConfigurationTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsLocationInputConfigurationTest.cs (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -0,0 +1,76 @@ +// 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 NUnit.Framework; +using Ringtoets.MacroStabilityInwards.IO.Configurations; + +namespace Ringtoets.MacroStabilityInwards.IO.Test.Configurations +{ + [TestFixture] + public class MacroStabilityInwardsLocationInputConfigurationTest + { + [Test] + public void Constructor_Always_ExpectedValues() + { + // Call + var configuration = new MacroStabilityInwardsLocationInputConfiguration(); + + // Assert + Assert.IsNull(configuration.WaterLevelPolder); + Assert.IsNull(configuration.UseDefaultOffsets); + Assert.IsNull(configuration.PhreaticLineOffsetBelowDikeTopAtRiver); + Assert.IsNull(configuration.PhreaticLineOffsetBelowDikeTopAtPolder); + Assert.IsNull(configuration.PhreaticLineOffsetBelowShoulderBaseInside); + Assert.IsNull(configuration.PhreaticLineOffsetBelowDikeToeAtPolder); + } + + [Test] + public void SimpleProperties_SetNewValues_NewValuesSet() + { + // Setup + const double waterLevelPolder = 2.2; + const bool useDefaultOffsets = false; + const double phreaticLineOffsetBelowDikeTopAtRiver = 4.4; + const double phreaticLineOffsetBelowDikeTopAtPolder = 5.5; + const double phreaticLineOffsetBelowShoulderBaseInside = 6.6; + const double phreaticLineOffsetBelowDikeToeAtPolder = 7.7; + + // Call + var configuration = new MacroStabilityInwardsLocationInputConfiguration + { + WaterLevelPolder = waterLevelPolder, + UseDefaultOffsets = useDefaultOffsets, + PhreaticLineOffsetBelowDikeTopAtRiver = phreaticLineOffsetBelowDikeTopAtRiver, + PhreaticLineOffsetBelowDikeTopAtPolder = phreaticLineOffsetBelowDikeTopAtPolder, + PhreaticLineOffsetBelowShoulderBaseInside = phreaticLineOffsetBelowShoulderBaseInside, + PhreaticLineOffsetBelowDikeToeAtPolder = phreaticLineOffsetBelowDikeToeAtPolder + }; + + // Assert + Assert.AreEqual(waterLevelPolder, configuration.WaterLevelPolder); + Assert.AreEqual(useDefaultOffsets, configuration.UseDefaultOffsets); + Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtRiver, configuration.PhreaticLineOffsetBelowDikeTopAtRiver); + Assert.AreEqual(phreaticLineOffsetBelowDikeTopAtPolder, configuration.PhreaticLineOffsetBelowDikeTopAtPolder); + Assert.AreEqual(phreaticLineOffsetBelowShoulderBaseInside, configuration.PhreaticLineOffsetBelowShoulderBaseInside); + Assert.AreEqual(phreaticLineOffsetBelowDikeToeAtPolder, configuration.PhreaticLineOffsetBelowDikeToeAtPolder); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj =================================================================== diff -u -raf341ae554425a1832b712c219f5eff86c5d2282 -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision af341ae554425a1832b712c219f5eff86c5d2282) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -65,13 +65,15 @@ + + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -36,6 +36,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -36,6 +36,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -36,6 +36,16 @@ -INF + + INF + + true + INF + INF + -INF + -INF + + -INF INF Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -36,6 +36,16 @@ NaN + + NaN + + true + NaN + NaN + NaN + NaN + + NaN NaN Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -35,6 +35,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -35,6 +35,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -34,6 +34,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -35,6 +35,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -37,6 +37,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 @@ -112,6 +122,16 @@ 20.2 + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 0.4 0.5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rcbfda96c30eb17a999ebf82ec545dcbae8935dcc -r8b38b01d4375511d520c9dcea90d891c0fa4372a --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision cbfda96c30eb17a999ebf82ec545dcbae8935dcc) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a) @@ -38,6 +38,16 @@ 60.2 + + 99.9 + + false + 99.6 + 99.7 + 99.5 + 99.8 + + 0.4 0.5