Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -r7d4a5ea0881e014dcdca60378286858959b88395 -r6ea49410690a01c9d6882053913633f0b0de4bb8
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 7d4a5ea0881e014dcdca60378286858959b88395)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 6ea49410690a01c9d6882053913633f0b0de4bb8)
@@ -47,6 +47,23 @@
public const string StochasticSoilProfileElement = "ondergrondschematisatie";
///
+ /// The tag of the element containing the value indicating the minimum depth of the slip plane.
+ ///
+ public const string SlipPlaneMinimumDepthElement = "minimaleglijvlakdiepte";
+
+ ///
+ /// The tag of the element containing the value indicating the minimum length of the slip plane.
+ ///
+ public const string SlipPlaneMinimumLengthElement = "minimaleglijvlaklengte";
+
+ ///
+ /// The tag of the element containing the value indicating the maximum slice width.
+ ///
+ public const string MaximumSliceWidthElement = "maximalelamelbreedte";
+
+ #region Tangent line determination type
+
+ ///
/// The identifier for the tangent line determination type elements.
///
public const string TangentLineDeterminationTypeElement = "bepalingtangentlijnen";
@@ -63,6 +80,10 @@
///
public const string TangentLineDeterminationTypeSpecified = "gespecificeerd";
+ #endregion
+
+ #region Dike soil scenario
+
///
/// The identifier for the dike soil scenario type elements.
///
@@ -92,6 +113,10 @@
///
public const string DikeSoilScenarioSandDikeOnSand = "2B";
+ #endregion
+
+ #region Grid determination type
+
///
/// The identifier for the grid determination type elements.
///
@@ -109,19 +134,50 @@
///
public const string GridDeterminationTypeManual = "handmatig";
+ #endregion
+
+ #region MacroStability Inwards Grid
+
///
- /// The tag of the element containing the value indicating the minimum depth of the slip plane.
+ /// The identifier for left grid elements.
///
- public const string SlipPlaneMinimumDepthElement = "minimaleglijvlakdiepte";
+ public const string LeftGridElement = "linkergrid";
///
- /// The tag of the element containing the value indicating the minimum length of the slip plane.
+ /// The identifier for right grid elements.
///
- public const string SlipPlaneMinimumLengthElement = "minimaleglijvlaklengte";
+ public const string RightGridElement = "rechtergrid";
///
- /// The tag of the element containing the value indicating the maximum slice width.
+ /// The tag of the element containing the value indicating the left x of the grid.
///
- public const string MaximumSliceWidthElement = "maximalelamelbreedte";
+ public const string GridXLeft = "links";
+
+ ///
+ /// The tag of the element containing the value indicating the right x of the grid.
+ ///
+ public const string GridXRight = "rechts";
+
+ ///
+ /// The tag of the element containing the value indicating the top z of the grid.
+ ///
+ public const string GridZTop = "boven";
+
+ ///
+ /// The tag of the element containing the value indicating the bottom z of the grid.
+ ///
+ public const string GridZBottom = "onder";
+
+ ///
+ /// The tag of the element containing the value indicating the number of horizontal points of the grid.
+ ///
+ public const string GridNumberOfHorizontalPoints = "aantalpuntenhorizontaal";
+
+ ///
+ /// The tag of the element containing the value indicating the number of vertical points of the grid.
+ ///
+ public const string GridNumberOfVerticalPoints = "aantalpuntenverticaal";
+
+ #endregion
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsGridConfiguration.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsGridConfiguration.cs (revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsGridConfiguration.cs (revision 6ea49410690a01c9d6882053913633f0b0de4bb8)
@@ -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 a grid.
+ ///
+ public class MacroStabilityInwardsGridConfiguration
+ {
+ ///
+ /// Gets or sets the x left of the grid.
+ ///
+ public double? XLeft { get; set; }
+
+ ///
+ /// Gets or sets the x right of the grid.
+ ///
+ public double? XRight { get; set; }
+
+ ///
+ /// Gets or sets the z top of the grid.
+ ///
+ public double? ZTop { get; set; }
+
+ ///
+ /// Gets or sets the z bottom of the grid.
+ ///
+ public double? ZBottom { get; set; }
+
+ ///
+ /// Gets or set the number of horizontal points.
+ ///
+ public int? NumberOfHorizontalPoints { get; set; }
+
+ ///
+ /// Gets or sets the number of vertical points.
+ ///
+ public int? NumberOfVerticalPoints { get; set; }
+ }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj
===================================================================
diff -u -ra13245503f96cce3c9040a1e85699e4f03b5fe3c -r6ea49410690a01c9d6882053913633f0b0de4bb8
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj (.../Ringtoets.MacroStabilityInwards.IO.csproj) (revision a13245503f96cce3c9040a1e85699e4f03b5fe3c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Ringtoets.MacroStabilityInwards.IO.csproj (.../Ringtoets.MacroStabilityInwards.IO.csproj) (revision 6ea49410690a01c9d6882053913633f0b0de4bb8)
@@ -44,6 +44,7 @@
+
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs
===================================================================
diff -u -ra13245503f96cce3c9040a1e85699e4f03b5fe3c -r6ea49410690a01c9d6882053913633f0b0de4bb8
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision a13245503f96cce3c9040a1e85699e4f03b5fe3c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../MacroStabilityInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 6ea49410690a01c9d6882053913633f0b0de4bb8)
@@ -48,6 +48,19 @@
Assert.AreEqual("bepaling", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeElement);
Assert.AreEqual("automatisch", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeAutomatic);
Assert.AreEqual("handmatig", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeManual);
+
+ Assert.AreEqual("minimaleglijvlakdiepte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumDepthElement);
+ Assert.AreEqual("minimaleglijvlaklengte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumLengthElement);
+ Assert.AreEqual("maximalelamelbreedte", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MaximumSliceWidthElement);
+
+ Assert.AreEqual("linkergrid", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LeftGridElement);
+ Assert.AreEqual("rechtergrid", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.RightGridElement);
+ Assert.AreEqual("links", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridXLeft);
+ Assert.AreEqual("rechts", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridXRight);
+ Assert.AreEqual("boven", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridZTop);
+ Assert.AreEqual("onder", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridZBottom);
+ Assert.AreEqual("aantalpuntenhorizontaal", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridNumberOfHorizontalPoints);
+ Assert.AreEqual("aantalpuntenverticaal", MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridNumberOfVerticalPoints);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsGridConfigurationTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsGridConfigurationTest.cs (revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsGridConfigurationTest.cs (revision 6ea49410690a01c9d6882053913633f0b0de4bb8)
@@ -0,0 +1,77 @@
+// 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;
+using Ringtoets.MacroStabilityInwards.IO.Configurations;
+
+namespace Ringtoets.MacroStabilityInwards.IO.Test.Configurations
+{
+ [TestFixture]
+ public class MacroStabilityInwardsGridConfigurationTest
+ {
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var configuration = new MacroStabilityInwardsGridConfiguration();
+
+ // Assert
+ Assert.IsNull(configuration.XLeft);
+ Assert.IsNull(configuration.XRight);
+ Assert.IsNull(configuration.ZTop);
+ Assert.IsNull(configuration.ZBottom);
+ Assert.IsNull(configuration.NumberOfHorizontalPoints);
+ Assert.IsNull(configuration.NumberOfVerticalPoints);
+ }
+
+ [Test]
+ public void SimpleProperties_SetNewValue_GetsNewlySetValue()
+ {
+ // Setup
+ var random = new Random(31);
+ var configuration = new MacroStabilityInwardsGridConfiguration();
+
+ double xLeft = random.NextDouble();
+ double xRight = random.NextDouble();
+ double zTop = random.NextDouble();
+ double zBottom = random.NextDouble();
+ int numberOfHorizontalPoints = random.Next();
+ int numberOfVerticalPoints = random.Next();
+
+ // Call
+ configuration.XLeft = xLeft;
+ configuration.XRight = xRight;
+ configuration.ZTop = zTop;
+ configuration.ZBottom = zBottom;
+ configuration.NumberOfHorizontalPoints = numberOfHorizontalPoints;
+ configuration.NumberOfVerticalPoints = numberOfVerticalPoints;
+
+ // Assert
+ Assert.AreEqual(xLeft, configuration.XLeft);
+ Assert.AreEqual(xRight, configuration.XRight);
+ Assert.AreEqual(zTop, configuration.ZTop);
+ Assert.AreEqual(zBottom, configuration.ZBottom);
+ Assert.AreEqual(numberOfHorizontalPoints, configuration.NumberOfHorizontalPoints);
+ Assert.AreEqual(numberOfVerticalPoints, configuration.NumberOfVerticalPoints);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj
===================================================================
diff -u -ra13245503f96cce3c9040a1e85699e4f03b5fe3c -r6ea49410690a01c9d6882053913633f0b0de4bb8
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision a13245503f96cce3c9040a1e85699e4f03b5fe3c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj (.../Ringtoets.MacroStabilityInwards.IO.Test.csproj) (revision 6ea49410690a01c9d6882053913633f0b0de4bb8)
@@ -70,6 +70,7 @@
+