Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensions.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensions.cs (.../MacroStabilityInwardsLocationInputConversionExtensions.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensions.cs (.../MacroStabilityInwardsLocationInputConversionExtensions.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -46,15 +46,47 @@
throw new ArgumentNullException(nameof(inputDaily));
}
- return new MacroStabilityInwardsLocationInputConfiguration
+ var configuration = new MacroStabilityInwardsLocationInputConfiguration();
+
+ SetMacroStabilityInwardsLocationInputParameters(configuration, inputDaily);
+
+ return configuration;
+ }
+
+ ///
+ /// Configure a new with
+ /// values taken from .
+ ///
+ /// The input to take the values from.
+ /// A new .
+ /// Thrown when is null.
+ public static MacroStabilityInwardsLocationInputExtremeConfiguration ToMacroStabilityInwardsLocationInputExtremeConfiguration(
+ this IMacroStabilityInwardsLocationInputExtreme inputExtreme)
+ {
+ if (inputExtreme == null)
{
- WaterLevelPolder = inputDaily.WaterLevelPolder,
- UseDefaultOffsets = inputDaily.UseDefaultOffsets,
- PhreaticLineOffsetBelowDikeTopAtRiver = inputDaily.PhreaticLineOffsetBelowDikeTopAtRiver,
- PhreaticLineOffsetBelowDikeTopAtPolder = inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder,
- PhreaticLineOffsetBelowShoulderBaseInside = inputDaily.PhreaticLineOffsetBelowShoulderBaseInside,
- PhreaticLineOffsetBelowDikeToeAtPolder = inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder
+ throw new ArgumentNullException(nameof(inputExtreme));
+ }
+
+ var configuration = new MacroStabilityInwardsLocationInputExtremeConfiguration
+ {
+ PenetrationLength = inputExtreme.PenetrationLength
};
+
+ SetMacroStabilityInwardsLocationInputParameters(configuration, inputExtreme);
+
+ return configuration;
}
+
+ private static void SetMacroStabilityInwardsLocationInputParameters(MacroStabilityInwardsLocationInputConfiguration configuration,
+ IMacroStabilityInwardsLocationInput input)
+ {
+ configuration.WaterLevelPolder = input.WaterLevelPolder;
+ configuration.UseDefaultOffsets = input.UseDefaultOffsets;
+ configuration.PhreaticLineOffsetBelowDikeTopAtRiver = input.PhreaticLineOffsetBelowDikeTopAtRiver;
+ configuration.PhreaticLineOffsetBelowDikeTopAtPolder = input.PhreaticLineOffsetBelowDikeTopAtPolder;
+ configuration.PhreaticLineOffsetBelowShoulderBaseInside = input.PhreaticLineOffsetBelowShoulderBaseInside;
+ configuration.PhreaticLineOffsetBelowDikeToeAtPolder = input.PhreaticLineOffsetBelowDikeToeAtPolder;
+ }
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfiguration.cs (.../MacroStabilityInwardsCalculationConfiguration.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -177,6 +177,11 @@
///
public MacroStabilityInwardsLocationInputConfiguration LocationInputDaily { get; set; }
+ ///
+ /// Gets or sets the locations input values for extreme conditions.
+ ///
+ public MacroStabilityInwardsLocationInputExtremeConfiguration LocationInputExtreme { get; set; }
+
#endregion
#region Grid
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationExporter.cs (.../MacroStabilityInwardsCalculationConfigurationExporter.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -83,6 +83,7 @@
Outwards = input.LeakageLengthOutwardsPhreaticLine4
},
LocationInputDaily = input.LocationInputDaily.ToMacroStabilityInwardsLocationInputConfiguration(),
+ LocationInputExtreme = input.LocationInputExtreme.ToMacroStabilityInwardsLocationInputExtremeConfiguration(),
Scenario = calculation.ToScenarioConfiguration(),
SlipPlaneMinimumDepth = input.SlipPlaneMinimumDepth,
SlipPlaneMinimumLength = input.SlipPlaneMinimumLength,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -165,6 +165,11 @@
public const string WaterLevelPolderElement = "polderpeil";
///
+ /// The tag of the element containing the penetration length.
+ ///
+ public const string PenetrationLengthElement = "indringingslengte";
+
+ ///
/// The identifier for the offset of the location input elements.
///
public const string LocationInputOffsetElement = "offsets";
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -177,6 +177,8 @@
WriteLocationLocationDailyInput(writer, configuration.LocationInputDaily);
+ WriteLocationLocationExtremeInput(writer, configuration.LocationInputExtreme);
+
writer.WriteEndElement();
}
@@ -275,6 +277,35 @@
}
///
+ /// 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 WriteLocationLocationExtremeInput(XmlWriter writer, MacroStabilityInwardsLocationInputExtremeConfiguration configuration)
+ {
+ if (configuration == null)
+ {
+ return;
+ }
+
+ writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputExtremeElement);
+
+ WriteElementWhenContentAvailable(writer,
+ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelPolderElement,
+ configuration.WaterLevelPolder);
+
+ WriteElementWhenContentAvailable(writer,
+ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PenetrationLengthElement,
+ configuration.PenetrationLength);
+
+ WriteLocationLocationInputOffset(writer, configuration);
+
+ writer.WriteEndElement();
+ }
+
+ ///
/// Writes the offset of a location input configuration.
///
/// The writer to use for writing.
@@ -349,6 +380,13 @@
writer.WriteEndElement();
}
+ ///
+ /// Writes the phreatic 1 related parameters.
+ ///
+ /// The writer to use for writing.
+ /// The configuration to write.
+ /// Thrown when the
+ /// is closed.
private static void WritePhreaticLine1(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration)
{
writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine1Element);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputExtremeConfiguration.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputExtremeConfiguration.cs (revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputExtremeConfiguration.cs (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -0,0 +1,34 @@
+// 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 for extreme conditions.
+ ///
+ public class MacroStabilityInwardsLocationInputExtremeConfiguration : MacroStabilityInwardsLocationInputConfiguration
+ {
+ ///
+ /// Gets or sets the penetration length.
+ ///
+ public double? PenetrationLength { get; set; }
+ }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj (.../Ringtoets.MacroStabilityInwards.IO.csproj) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj (.../Ringtoets.MacroStabilityInwards.IO.csproj) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -47,6 +47,7 @@
+
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs (.../MacroStabilityInwardsTestDataGeneratorTest.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -193,6 +193,14 @@
Assert.IsNaN(inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder);
Assert.IsNaN(inputDaily.PhreaticLineOffsetBelowShoulderBaseInside);
Assert.IsNaN(inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder);
+
+ IMacroStabilityInwardsLocationInputExtreme inputExtreme = input.LocationInputExtreme;
+ Assert.IsNaN(inputExtreme.PenetrationLength);
+ Assert.IsNaN(inputExtreme.WaterLevelPolder);
+ Assert.IsNaN(inputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver);
+ Assert.IsNaN(inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder);
+ Assert.IsNaN(inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside);
+ Assert.IsNaN(inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder);
}
[Test]
@@ -244,6 +252,14 @@
Assert.AreEqual(double.PositiveInfinity, inputDaily.PhreaticLineOffsetBelowDikeTopAtPolder);
Assert.AreEqual(double.NegativeInfinity, inputDaily.PhreaticLineOffsetBelowShoulderBaseInside);
Assert.AreEqual(double.NegativeInfinity, inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder);
+
+ IMacroStabilityInwardsLocationInputExtreme inputExtreme = input.LocationInputExtreme;
+ Assert.AreEqual(double.PositiveInfinity, inputExtreme.PenetrationLength);
+ Assert.AreEqual(double.NegativeInfinity, inputExtreme.WaterLevelPolder);
+ Assert.AreEqual(double.NegativeInfinity, inputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver);
+ Assert.AreEqual(double.NegativeInfinity, inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder);
+ Assert.AreEqual(double.PositiveInfinity, inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside);
+ Assert.AreEqual(double.PositiveInfinity, inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder);
}
private static void AssertCalculation(MacroStabilityInwardsCalculationScenario calculation,
@@ -331,6 +347,15 @@
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());
+
+ IMacroStabilityInwardsLocationInputExtreme inputExtreme = input.LocationInputExtreme;
+ Assert.IsFalse(inputExtreme.UseDefaultOffsets);
+ Assert.AreEqual(16.2, inputExtreme.PenetrationLength, inputExtreme.PenetrationLength.GetAccuracy());
+ Assert.AreEqual(15.2, inputExtreme.WaterLevelPolder, inputExtreme.WaterLevelPolder.GetAccuracy());
+ Assert.AreEqual(15.21, inputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver, inputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver.GetAccuracy());
+ Assert.AreEqual(15.22, inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder, inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder.GetAccuracy());
+ Assert.AreEqual(15.23, inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside, inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside.GetAccuracy());
+ Assert.AreEqual(15.24, inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder, inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy());
}
private static void AssertCalculationsHasSameHydraulicBoundaryLocation(CalculationGroup calculationGroup,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -162,6 +162,16 @@
PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) 2.23,
PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) 2.24
},
+ LocationInputExtreme =
+ {
+ UseDefaultOffsets = false,
+ PenetrationLength = (RoundedDouble) 16.2,
+ WaterLevelPolder = (RoundedDouble) 15.2,
+ PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) 15.21,
+ PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) 15.22,
+ PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) 15.23,
+ PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) 15.24
+ },
WaterLevelRiverAverage = (RoundedDouble) 10.5,
DrainageConstructionPresent = true,
XCoordinateDrainageConstruction = (RoundedDouble) 10.6,
@@ -236,6 +246,14 @@
inputDaily.PhreaticLineOffsetBelowShoulderBaseInside = RoundedDouble.NaN;
inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder = RoundedDouble.NaN;
+ IMacroStabilityInwardsLocationInputExtreme inputExtreme = input.LocationInputExtreme;
+ inputExtreme.PenetrationLength = RoundedDouble.NaN;
+ inputExtreme.WaterLevelPolder = RoundedDouble.NaN;
+ inputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver = RoundedDouble.NaN;
+ inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder = RoundedDouble.NaN;
+ inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside = RoundedDouble.NaN;
+ inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder = RoundedDouble.NaN;
+
return calculation;
}
@@ -297,6 +315,14 @@
inputDaily.PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) double.NegativeInfinity;
inputDaily.PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) double.NegativeInfinity;
+ IMacroStabilityInwardsLocationInputExtreme inputExtreme = input.LocationInputExtreme;
+ inputExtreme.PenetrationLength = (RoundedDouble) double.PositiveInfinity;
+ inputExtreme.WaterLevelPolder = (RoundedDouble) double.NegativeInfinity;
+ inputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) double.NegativeInfinity;
+ inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) double.NegativeInfinity;
+ inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) double.PositiveInfinity;
+ inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) double.PositiveInfinity;
+
return calculation;
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensionsTest.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensionsTest.cs (.../MacroStabilityInwardsLocationInputConversionExtensionsTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/Helpers/MacroStabilityInwardsLocationInputConversionExtensionsTest.cs (.../MacroStabilityInwardsLocationInputConversionExtensionsTest.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -87,5 +87,64 @@
phreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy());
mockRepository.VerifyAll();
}
+
+ [Test]
+ public void ToMacroStabilityInwardsLocationInputExtremeConfiguration_MacroStabilityInwardsLocationInputExtremeNull_ThrowsArgumentNullException()
+ {
+ // Call
+ TestDelegate test = () => ((IMacroStabilityInwardsLocationInputExtreme) null).ToMacroStabilityInwardsLocationInputExtremeConfiguration();
+
+ // Assert
+ var exception = Assert.Throws(test);
+ Assert.AreEqual("inputExtreme", exception.ParamName);
+ }
+
+ [Test]
+ public void ToMacroStabilityInwardsLocationInputExtremeConfiguration_ValidMacroStabilityInwardsLocationInputExtreme_ReturnsNewMacroStabilityInwardsLocationInputExtremeConfigurationWithParametersSet()
+ {
+ // Setup
+ var random = new Random(31);
+
+ RoundedDouble penetrationLength = random.NextRoundedDouble();
+ 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 inputExtreme = mockRepository.Stub();
+ inputExtreme.PenetrationLength = penetrationLength;
+ inputExtreme.UseDefaultOffsets = useDefaultOffsets;
+ inputExtreme.WaterLevelPolder = waterLevelPolder;
+ inputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver = phreaticLineOffsetBelowDikeTopAtRiver;
+ inputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder = phreaticLineOffsetBelowDikeTopAtPolder;
+ inputExtreme.PhreaticLineOffsetBelowShoulderBaseInside = phreaticLineOffsetBelowShoulderBaseInside;
+ inputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder = phreaticLineOffsetBelowDikeToeAtPolder;
+ mockRepository.ReplayAll();
+
+ // Call
+ MacroStabilityInwardsLocationInputExtremeConfiguration configuration = inputExtreme.ToMacroStabilityInwardsLocationInputExtremeConfiguration();
+
+ // Assert
+ Assert.AreEqual(penetrationLength,
+ configuration.PenetrationLength,
+ penetrationLength.GetAccuracy());
+ 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 -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -59,6 +59,7 @@
Assert.AreEqual("dagelijks", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputDailyElement);
Assert.AreEqual("extreem", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputExtremeElement);
Assert.AreEqual("polderpeil", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelPolderElement);
+ Assert.AreEqual("indringingslengte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PenetrationLengthElement);
Assert.AreEqual("offsets", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputOffsetElement);
Assert.AreEqual("gebruikdefaults", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.UseDefaultOffsetsElement);
Assert.AreEqual("buitenkruin", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOffsetBelowDikeTopAtRiverElement);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationTest.cs (.../MacroStabilityInwardsCalculationConfigurationTest.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -69,6 +69,7 @@
Assert.IsNull(configuration.PhreaticLine3);
Assert.IsNull(configuration.PhreaticLine4);
Assert.IsNull(configuration.LocationInputDaily);
+ Assert.IsNull(configuration.LocationInputExtreme);
Assert.IsNull(configuration.SlipPlaneMinimumDepth);
Assert.IsNull(configuration.SlipPlaneMinimumLength);
Assert.IsNull(configuration.MaximumSliceWidth);
@@ -108,6 +109,7 @@
var phreaticLine3 = new PhreaticLineConfiguration();
var phreaticLine4 = new PhreaticLineConfiguration();
var locationInputDaily = new MacroStabilityInwardsLocationInputConfiguration();
+ var locationInputExtreme = new MacroStabilityInwardsLocationInputExtremeConfiguration();
const double slipPlaneMinimumDepth = 2.2;
const double slipPlaneMinimumLength = 3.3;
@@ -145,6 +147,7 @@
PhreaticLine3 = phreaticLine3,
PhreaticLine4 = phreaticLine4,
LocationInputDaily = locationInputDaily,
+ LocationInputExtreme = locationInputExtreme,
SlipPlaneMinimumDepth = slipPlaneMinimumDepth,
SlipPlaneMinimumLength = slipPlaneMinimumLength,
MaximumSliceWidth = maximumSliceWidth,
@@ -179,6 +182,7 @@
Assert.AreSame(phreaticLine3, configuration.PhreaticLine3);
Assert.AreSame(phreaticLine4, configuration.PhreaticLine4);
Assert.AreSame(locationInputDaily, configuration.LocationInputDaily);
+ Assert.AreSame(locationInputExtreme, configuration.LocationInputExtreme);
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 -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationWriterTest.cs (.../MacroStabilityInwardsCalculationConfigurationWriterTest.cs) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -119,6 +119,16 @@
PhreaticLineOffsetBelowShoulderBaseInside = 99.5,
UseDefaultOffsets = false
},
+ LocationInputExtreme = new MacroStabilityInwardsLocationInputExtremeConfiguration
+ {
+ PenetrationLength = 42,
+ WaterLevelPolder = 199.9,
+ PhreaticLineOffsetBelowDikeToeAtPolder = 199.8,
+ PhreaticLineOffsetBelowDikeTopAtPolder = 199.7,
+ PhreaticLineOffsetBelowDikeTopAtRiver = 199.6,
+ PhreaticLineOffsetBelowShoulderBaseInside = 199.5,
+ UseDefaultOffsets = true
+ },
AdjustPhreaticLine3And4ForUplift = true,
CreateZones = true,
MoveGrid = true,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsLocationInputExtremeConfigurationTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsLocationInputExtremeConfigurationTest.cs (revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsLocationInputExtremeConfigurationTest.cs (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -0,0 +1,80 @@
+// 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
+{
+ public class MacroStabilityInwardsLocationInputExtremeConfigurationTest
+ {
+ [Test]
+ public void Constructor_Always_ExpectedValues()
+ {
+ // Call
+ var configuration = new MacroStabilityInwardsLocationInputExtremeConfiguration();
+
+ // Assert
+ Assert.IsInstanceOf(configuration);
+ Assert.IsNull(configuration.PenetrationLength);
+ 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 penetrationLength = 1.1;
+ 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 MacroStabilityInwardsLocationInputExtremeConfiguration
+ {
+ PenetrationLength = penetrationLength,
+ WaterLevelPolder = waterLevelPolder,
+ UseDefaultOffsets = useDefaultOffsets,
+ PhreaticLineOffsetBelowDikeTopAtRiver = phreaticLineOffsetBelowDikeTopAtRiver,
+ PhreaticLineOffsetBelowDikeTopAtPolder = phreaticLineOffsetBelowDikeTopAtPolder,
+ PhreaticLineOffsetBelowShoulderBaseInside = phreaticLineOffsetBelowShoulderBaseInside,
+ PhreaticLineOffsetBelowDikeToeAtPolder = phreaticLineOffsetBelowDikeToeAtPolder
+ };
+
+ // Assert
+ Assert.AreEqual(penetrationLength, configuration.PenetrationLength);
+ 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 -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -74,6 +74,7 @@
+
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -46,6 +46,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -46,6 +46,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -46,6 +46,17 @@
-INF
+
+ -INF
+ INF
+
+ false
+ -INF
+ -INF
+ INF
+ INF
+
+
-INF
INF
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -46,6 +46,17 @@
NaN
+
+ NaN
+ NaN
+
+ false
+ NaN
+ NaN
+ NaN
+ NaN
+
+
NaN
NaN
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -45,6 +45,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -45,6 +45,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -44,6 +44,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -45,6 +45,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -47,6 +47,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
@@ -132,6 +143,17 @@
2.24
+
+ 15.2
+ 16.2
+
+ false
+ 15.21
+ 15.22
+ 15.23
+ 15.24
+
+
0.4
0.5
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -r8b38b01d4375511d520c9dcea90d891c0fa4372a -rc4136f9deafeaf014ebb35c316f10bea91ee4d2e
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 8b38b01d4375511d520c9dcea90d891c0fa4372a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision c4136f9deafeaf014ebb35c316f10bea91ee4d2e)
@@ -48,6 +48,17 @@
99.8
+
+ 199.9
+ 42
+
+ true
+ 199.6
+ 199.7
+ 199.5
+ 199.8
+
+
0.4
0.5