Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs =================================================================== diff -u -r89a636adaa25d5bb86bc8f4618126e5364664ab1 -r3f74bb4c7f48c55dd67639ebef7a803567bc3aad --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 89a636adaa25d5bb86bc8f4618126e5364664ab1) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 3f74bb4c7f48c55dd67639ebef7a803567bc3aad) @@ -222,7 +222,7 @@ #endregion - #region settings + #region Settings /// /// Gets or sets the minimum depth of the slip plane. @@ -278,12 +278,12 @@ public bool MoveGrid { get; set; } /// - /// Gets the grid determination type. + /// Gets or sets the grid determination type. /// public MacroStabilityInwardsGridDetermination GridDetermination { get; set; } /// - /// Gets the tangent line determination type. + /// Gets or sets the tangent line determination type. /// public MacroStabilityInwardsTangentLineDetermination TangentLineDetermination { get; set; } @@ -440,7 +440,7 @@ } /// - /// Gets or sets whether the default offset should be used. + /// Gets or sets whether the default offsets should be used. /// public bool UseDefaultOffsets { get; set; } @@ -626,12 +626,12 @@ } /// - /// Gets or sets create zones. + /// Gets or sets whether zones should be created. /// public bool CreateZones { get; set; } /// - /// Gets the automatic forbidden zones. + /// Gets the zoning boundaries determination type. /// public MacroStabilityInwardsZoningBoundariesDetermination AutomaticForbiddenZones { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs =================================================================== diff -u -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 -r3f74bb4c7f48c55dd67639ebef7a803567bc3aad --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision 3f74bb4c7f48c55dd67639ebef7a803567bc3aad) @@ -39,7 +39,7 @@ /// Creates a new . /// /// The soil profile containing layers under the . - /// The surface line for which determines the top of the . + /// The surface line which determines the top of the . /// A new containing geometries from the /// under the . /// Thrown when any parameter is null. @@ -93,7 +93,7 @@ layer => new MacroStabilityInwardsSoilLayerUnderSurfaceLine( RingToPoints(layer.OuterRing), layer.Holes.Select(RingToPoints), - ToUnderSurfaceLineProperties(layer.Properties))); + ToUnderSurfaceLineProperties(layer.Properties))).ToArray(); IEnumerable preconsolidationStressesUnderSurfaceLine = soilProfile.PreconsolidationStresses.Select(ToPreconsolidationStressUnderSurfaceLine).ToArray(); @@ -208,12 +208,11 @@ { OuterLoop = outerLoop; Properties = properties; - InnerLoops = Enumerable.Empty(); } public Point2D[] OuterLoop { get; } + public MacroStabilityInwardsSoilLayerProperties Properties { get; } - public IEnumerable InnerLoops { get; } } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs =================================================================== diff -u -r82e52ce72856fab42af51e186cb8c48f0a45cc30 -r3f74bb4c7f48c55dd67639ebef7a803567bc3aad --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs (.../MacroStabilityInwardsOffsetPropertiesTest.cs) (revision 82e52ce72856fab42af51e186cb8c48f0a45cc30) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOffsetPropertiesTest.cs (.../MacroStabilityInwardsOffsetPropertiesTest.cs) (revision 3f74bb4c7f48c55dd67639ebef7a803567bc3aad) @@ -39,7 +39,7 @@ [TestFixture] public class MacroStabilityInwardsOffsetPropertiesTest { - private const int expectedUseDefaultOffsetPropertyIndex = 0; + private const int expectedUseDefaultOffsetsPropertyIndex = 0; private const int expectedPhreaticLineOffsetBelowDikeTopAtRiverPropertyIndex = 1; private const int expectedPhreaticLineOffsetBelowDikeTopAtPolderPropertyIndex = 2; private const int expectedPhreaticLineOffsetBelowShoulderBaseInsidePropertyIndex = 3; @@ -118,9 +118,9 @@ const string offsetCategory = "Offsets PL 1"; - PropertyDescriptor useDefaultOffsetProperty = dynamicProperties[expectedUseDefaultOffsetPropertyIndex]; + PropertyDescriptor useDefaultOffsetsProperty = dynamicProperties[expectedUseDefaultOffsetsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties( - useDefaultOffsetProperty, + useDefaultOffsetsProperty, offsetCategory, "Gebruik default waarden voor offsets van PL 1", "Gebruik standaard waterstandsverschillen voor het bepalen van de freatische lijn?"); @@ -219,7 +219,7 @@ } [Test] - public void UseDefaultOffset_SetValidValue_SetsValueAndUpdatesObservers() + public void UseDefaultOffsets_SetValidValue_SetsValueAndUpdatesObservers() { // Setup var calculation = new MacroStabilityInwardsCalculationScenario();