Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs =================================================================== diff -u -r3a8f6ba90c3d906662b38b9420858e48665ce799 -r00bfd042be81116693f829317b1ac6fef2edc7b7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs) (revision 00bfd042be81116693f829317b1ac6fef2edc7b7) @@ -118,6 +118,7 @@ SetGridParametersToEntity(entity, inputParameters.LeftGrid, inputParameters.RightGrid); entity.CreateZones = Convert.ToByte(inputParameters.CreateZones); + entity.ZoningBoundariesDeterminationType = Convert.ToByte(inputParameters.ZoningBoundariesDeterminationType); entity.ZoneBoundaryLeft = inputParameters.ZoneBoundaryLeft.ToNaNAsNull(); entity.ZoneBoundaryRight = inputParameters.ZoneBoundaryRight.ToNaNAsNull(); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs =================================================================== diff -u -r3a8f6ba90c3d906662b38b9420858e48665ce799 -r00bfd042be81116693f829317b1ac6fef2edc7b7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs (.../MacroStabilityInwardsCalculationEntityReadExtensions.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs (.../MacroStabilityInwardsCalculationEntityReadExtensions.cs) (revision 00bfd042be81116693f829317b1ac6fef2edc7b7) @@ -129,6 +129,7 @@ SetGridparametersToInput(inputParameters.LeftGrid, inputParameters.RightGrid, entity); inputParameters.CreateZones = Convert.ToBoolean(entity.CreateZones); + inputParameters.ZoningBoundariesDeterminationType = (MacroStabilityInwardsZoningBoundariesDeterminationType) entity.ZoningBoundariesDeterminationType; inputParameters.ZoneBoundaryLeft = (RoundedDouble) entity.ZoneBoundaryLeft.ToNullAsNaN(); inputParameters.ZoneBoundaryRight = (RoundedDouble) entity.ZoneBoundaryRight.ToNullAsNaN(); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -r3a8f6ba90c3d906662b38b9420858e48665ce799 -r00bfd042be81116693f829317b1ac6fef2edc7b7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision 00bfd042be81116693f829317b1ac6fef2edc7b7) @@ -246,6 +246,7 @@ NumberOfVerticalPoints = random.Next(1, 100) }, CreateZones = random.NextBoolean(), + ZoningBoundariesDeterminationType = random.NextEnumValue(), ZoneBoundaryLeft = random.NextRoundedDouble(2, 5), ZoneBoundaryRight = random.NextRoundedDouble(6, 10) } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs =================================================================== diff -u -r3a8f6ba90c3d906662b38b9420858e48665ce799 -r00bfd042be81116693f829317b1ac6fef2edc7b7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs (.../MacroStabilityInwardsCalculationEntityTestHelper.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs (.../MacroStabilityInwardsCalculationEntityTestHelper.cs) (revision 00bfd042be81116693f829317b1ac6fef2edc7b7) @@ -106,6 +106,7 @@ AssertGridInputs(input.LeftGrid, input.RightGrid, entity); Assert.AreEqual(Convert.ToByte(input.CreateZones), entity.CreateZones); + Assert.AreEqual(Convert.ToByte(input.ZoningBoundariesDeterminationType), entity.ZoningBoundariesDeterminationType); AssertAreEqual(input.ZoneBoundaryLeft, entity.ZoneBoundaryLeft); AssertAreEqual(input.ZoneBoundaryRight, entity.ZoneBoundaryRight); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r3a8f6ba90c3d906662b38b9420858e48665ce799 -r00bfd042be81116693f829317b1ac6fef2edc7b7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 00bfd042be81116693f829317b1ac6fef2edc7b7) @@ -1417,6 +1417,7 @@ NumberOfVerticalPoints = 6 }, CreateZones = false, + ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, ZoneBoundaryLeft = (RoundedDouble) 10, ZoneBoundaryRight = (RoundedDouble) 12 }, @@ -1500,6 +1501,7 @@ NumberOfVerticalPoints = 6 }, CreateZones = false, + ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, ZoneBoundaryLeft = (RoundedDouble) 5.4, ZoneBoundaryRight = (RoundedDouble) 6.5 }, @@ -1577,7 +1579,10 @@ ZTop = (RoundedDouble) 30.5, ZBottom = (RoundedDouble) 30.4, NumberOfVerticalPoints = 6 - } + }, + ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, + ZoneBoundaryLeft = (RoundedDouble) 1, + ZoneBoundaryRight = (RoundedDouble) 2 }, Output = null, SemiProbabilisticOutput = null