Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r3a8f6ba90c3d906662b38b9420858e48665ce799 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs) (revision 06e3624f72482462ebb7e4ee29d1a8173005e59d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) @@ -118,6 +118,8 @@ SetGridParametersToEntity(entity, inputParameters.LeftGrid, inputParameters.RightGrid); entity.CreateZones = Convert.ToByte(inputParameters.CreateZones); + entity.ZoneBoundaryLeft = inputParameters.ZoneBoundaryLeft.ToNaNAsNull(); + entity.ZoneBoundaryRight = inputParameters.ZoneBoundaryRight.ToNaNAsNull(); } private static void SetGridParametersToEntity(MacroStabilityInwardsCalculationEntity entity, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r3a8f6ba90c3d906662b38b9420858e48665ce799 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs (.../MacroStabilityInwardsCalculationEntityReadExtensions.cs) (revision 06e3624f72482462ebb7e4ee29d1a8173005e59d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs (.../MacroStabilityInwardsCalculationEntityReadExtensions.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) @@ -129,6 +129,8 @@ SetGridparametersToInput(inputParameters.LeftGrid, inputParameters.RightGrid, entity); inputParameters.CreateZones = Convert.ToBoolean(entity.CreateZones); + inputParameters.ZoneBoundaryLeft = (RoundedDouble) entity.ZoneBoundaryLeft.ToNullAsNaN(); + inputParameters.ZoneBoundaryRight = (RoundedDouble) entity.ZoneBoundaryRight.ToNullAsNaN(); } private static void SetSurfaceLineToInput(MacroStabilityInwardsInput inputParameters, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -r10e060be0b77c159b3e99a7200e43c4326b17642 -r3a8f6ba90c3d906662b38b9420858e48665ce799 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision 10e060be0b77c159b3e99a7200e43c4326b17642) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) @@ -109,7 +109,10 @@ XRight = RoundedDouble.NaN, ZTop = RoundedDouble.NaN, ZBottom = RoundedDouble.NaN - } + }, + CreateZones = true, + ZoneBoundaryLeft = RoundedDouble.NaN, + ZoneBoundaryRight = RoundedDouble.NaN } }; var registry = new PersistenceRegistry(); @@ -164,6 +167,9 @@ Assert.IsNull(entity.RightGridXRight); Assert.IsNull(entity.RightGridZTop); Assert.IsNull(entity.RightGridZBottom); + + Assert.IsNull(entity.ZoneBoundaryLeft); + Assert.IsNull(entity.ZoneBoundaryRight); } [Test] @@ -239,7 +245,9 @@ ZBottom = random.NextRoundedDouble(0.0, 1.0), NumberOfVerticalPoints = random.Next(1, 100) }, - CreateZones = random.NextBoolean() + CreateZones = random.NextBoolean(), + ZoneBoundaryLeft = random.NextRoundedDouble(2, 5), + ZoneBoundaryRight = random.NextRoundedDouble(6, 10) } }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r7b2237f0bdfa03edcf158d24294c4433266ca91f -r3a8f6ba90c3d906662b38b9420858e48665ce799 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs (.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs) (revision 7b2237f0bdfa03edcf158d24294c4433266ca91f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs (.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) @@ -115,7 +115,9 @@ RightGridZTop = random.GetFromRange(2.0, 3.0), RightGridZBottom = random.GetFromRange(0.0, 1.0), RightGridNrOfVerticalPoints = random.Next(1, 100), - CreateZones = Convert.ToByte(random.NextBoolean()) + CreateZones = Convert.ToByte(random.NextBoolean()), + ZoneBoundaryLeft = random.Next(2, 5), + ZoneBoundaryRight = random.Next(6, 10) }; var collector = new ReadConversionCollector(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs =================================================================== diff -u -r06e3624f72482462ebb7e4ee29d1a8173005e59d -r3a8f6ba90c3d906662b38b9420858e48665ce799 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs (.../MacroStabilityInwardsCalculationEntityTestHelper.cs) (revision 06e3624f72482462ebb7e4ee29d1a8173005e59d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs (.../MacroStabilityInwardsCalculationEntityTestHelper.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) @@ -106,6 +106,8 @@ AssertGridInputs(input.LeftGrid, input.RightGrid, entity); Assert.AreEqual(Convert.ToByte(input.CreateZones), entity.CreateZones); + AssertAreEqual(input.ZoneBoundaryLeft, entity.ZoneBoundaryLeft); + AssertAreEqual(input.ZoneBoundaryRight, entity.ZoneBoundaryRight); } private static void AssertGridInputs(MacroStabilityInwardsGrid leftGrid, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -rae47ec1ec171e74d0eedf64cf0bcda742bc5f289 -r3a8f6ba90c3d906662b38b9420858e48665ce799 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision ae47ec1ec171e74d0eedf64cf0bcda742bc5f289) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 3a8f6ba90c3d906662b38b9420858e48665ce799) @@ -1416,7 +1416,9 @@ ZBottom = (RoundedDouble) 3.4, NumberOfVerticalPoints = 6 }, - CreateZones = false + CreateZones = false, + ZoneBoundaryLeft = (RoundedDouble) 10, + ZoneBoundaryRight = (RoundedDouble) 12 }, Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(), SemiProbabilisticOutput = new MacroStabilityInwardsSemiProbabilisticOutput(1, 0.7, 8.8, 0.9, @@ -1497,7 +1499,9 @@ ZBottom = (RoundedDouble) 3.4, NumberOfVerticalPoints = 6 }, - CreateZones = false + CreateZones = false, + ZoneBoundaryLeft = (RoundedDouble) 5.4, + ZoneBoundaryRight = (RoundedDouble) 6.5 }, Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(), SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()