Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -rae63828db6c6e20bc476fe8adfef362e3966a5ad --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationScenarioCreateExtensions.cs) (revision ae63828db6c6e20bc476fe8adfef362e3966a5ad) @@ -83,18 +83,20 @@ entity.HydraulicLocationEntity = registry.Get(input.HydraulicBoundaryLocation); } - entity.BreakWaterHeight = input.BreakWater.Height.ToNaNAsNull(); - entity.BreakWaterType = Convert.ToByte(input.BreakWater.Type); - entity.UseBreakWater = Convert.ToByte(input.UseBreakWater); - entity.CriticalFlowRateMean = input.CriticalFlowRate.Mean.ToNaNAsNull(); - entity.CriticalFlowRateStandardDeviation = input.CriticalFlowRate.StandardDeviation.ToNaNAsNull(); entity.Orientation = input.Orientation.ToNaNAsNull(); - entity.DikeHeightCalculationType = Convert.ToByte(input.DikeHeightCalculationType); - entity.OvertoppingRateCalculationType = Convert.ToByte(input.OvertoppingRateCalculationType); entity.DikeHeight = input.DikeHeight.ToNaNAsNull(); entity.UseForeshore = Convert.ToByte(input.UseForeshore); + entity.UseBreakWater = Convert.ToByte(input.UseBreakWater); + entity.BreakWaterType = Convert.ToByte(input.BreakWater.Type); + entity.BreakWaterHeight = input.BreakWater.Height.ToNaNAsNull(); + entity.CriticalFlowRateMean = input.CriticalFlowRate.Mean.ToNaNAsNull(); + entity.CriticalFlowRateStandardDeviation = input.CriticalFlowRate.StandardDeviation.ToNaNAsNull(); entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated = Convert.ToByte(input.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + entity.ShouldDikeHeightBeCalculated = Convert.ToByte(input.ShouldDikeHeightBeCalculated); + entity.DikeHeightTargetProbability = input.DikeHeightTargetProbability; entity.ShouldDikeHeightIllustrationPointsBeCalculated = Convert.ToByte(input.ShouldDikeHeightIllustrationPointsBeCalculated); + entity.ShouldOvertoppingRateBeCalculated = Convert.ToByte(input.ShouldOvertoppingRateBeCalculated); + entity.OvertoppingRateTargetProbability = input.OvertoppingRateTargetProbability; entity.ShouldOvertoppingRateIllustrationPointsBeCalculated = Convert.ToByte(input.ShouldOvertoppingRateIllustrationPointsBeCalculated); } } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs =================================================================== diff -u -r9af8b802af77b91ca5a44601170b092eabde5e01 -rae63828db6c6e20bc476fe8adfef362e3966a5ad --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision 9af8b802af77b91ca5a44601170b092eabde5e01) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision ae63828db6c6e20bc476fe8adfef362e3966a5ad) @@ -79,10 +79,12 @@ inputParameters.UseBreakWater = Convert.ToBoolean(entity.UseBreakWater); inputParameters.BreakWater.Height = (RoundedDouble) entity.BreakWaterHeight.ToNullAsNaN(); inputParameters.BreakWater.Type = (BreakWaterType) entity.BreakWaterType; - inputParameters.DikeHeightCalculationType = (DikeHeightCalculationType) entity.DikeHeightCalculationType; - inputParameters.OvertoppingRateCalculationType = (OvertoppingRateCalculationType) entity.OvertoppingRateCalculationType; inputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + inputParameters.ShouldDikeHeightBeCalculated = Convert.ToBoolean(entity.ShouldDikeHeightBeCalculated); + inputParameters.DikeHeightTargetProbability = entity.DikeHeightTargetProbability; inputParameters.ShouldDikeHeightIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldDikeHeightIllustrationPointsBeCalculated); + inputParameters.ShouldOvertoppingRateBeCalculated = Convert.ToBoolean(entity.ShouldOvertoppingRateBeCalculated); + inputParameters.OvertoppingRateTargetProbability = entity.OvertoppingRateTargetProbability; inputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldOvertoppingRateIllustrationPointsBeCalculated); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -r9af8b802af77b91ca5a44601170b092eabde5e01 -rae63828db6c6e20bc476fe8adfef362e3966a5ad --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs) (revision 9af8b802af77b91ca5a44601170b092eabde5e01) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationScenarioCreateExtensionsTest.cs) (revision ae63828db6c6e20bc476fe8adfef362e3966a5ad) @@ -80,17 +80,19 @@ Height = (RoundedDouble) 3.3, Type = BreakWaterType.Dam }, - DikeHeightCalculationType = random.NextEnumValue(), - OvertoppingRateCalculationType = random.NextEnumValue(), CriticalFlowRate = { Mean = (RoundedDouble) 4.4, StandardDeviation = (RoundedDouble) 5.5 }, UseBreakWater = true, UseForeshore = false, - ShouldDikeHeightIllustrationPointsBeCalculated = random.NextBoolean(), ShouldOvertoppingOutputIllustrationPointsBeCalculated = random.NextBoolean(), + ShouldDikeHeightBeCalculated = random.NextBoolean(), + DikeHeightTargetProbability = random.NextDouble(1e-15, 0.1), + ShouldDikeHeightIllustrationPointsBeCalculated = random.NextBoolean(), + ShouldOvertoppingRateBeCalculated = random.NextBoolean(), + OvertoppingRateTargetProbability = random.NextDouble(1e-15, 0.1), ShouldOvertoppingRateIllustrationPointsBeCalculated = random.NextBoolean() }, Output = null @@ -119,15 +121,19 @@ Assert.AreEqual(input.CriticalFlowRate.Mean.Value, entity.CriticalFlowRateMean); Assert.AreEqual(input.CriticalFlowRate.StandardDeviation.Value, entity.CriticalFlowRateStandardDeviation); Assert.AreEqual(input.Orientation.Value, entity.Orientation); - Assert.AreEqual(Convert.ToByte(input.DikeHeightCalculationType), entity.DikeHeightCalculationType); - Assert.AreEqual(Convert.ToByte(input.OvertoppingRateCalculationType), entity.OvertoppingRateCalculationType); Assert.AreEqual(input.DikeHeight.Value, entity.DikeHeight); Assert.AreEqual(Convert.ToByte(input.UseForeshore), entity.UseForeshore); - Assert.AreEqual(Convert.ToByte(input.ShouldDikeHeightIllustrationPointsBeCalculated), - entity.ShouldDikeHeightIllustrationPointsBeCalculated); Assert.AreEqual(Convert.ToByte(input.ShouldOvertoppingOutputIllustrationPointsBeCalculated), entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + + Assert.AreEqual(Convert.ToByte(input.ShouldDikeHeightBeCalculated), entity.ShouldDikeHeightBeCalculated); + Assert.AreEqual(input.DikeHeightTargetProbability, entity.DikeHeightTargetProbability); + Assert.AreEqual(Convert.ToByte(input.ShouldDikeHeightIllustrationPointsBeCalculated), + entity.ShouldDikeHeightIllustrationPointsBeCalculated); + + Assert.AreEqual(Convert.ToByte(input.ShouldOvertoppingRateBeCalculated), entity.ShouldOvertoppingRateBeCalculated); + Assert.AreEqual(input.OvertoppingRateTargetProbability, entity.OvertoppingRateTargetProbability); Assert.AreEqual(Convert.ToByte(input.ShouldOvertoppingRateIllustrationPointsBeCalculated), entity.ShouldOvertoppingRateIllustrationPointsBeCalculated); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r805f1c45d686b1334f741f909441ee2dac73ee0e -rae63828db6c6e20bc476fe8adfef362e3966a5ad --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 805f1c45d686b1334f741f909441ee2dac73ee0e) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision ae63828db6c6e20bc476fe8adfef362e3966a5ad) @@ -1787,8 +1787,13 @@ Assert.AreEqual(expectedInput.DikeHeight, actualInput.DikeHeight); Assert.AreEqual(expectedInput.CriticalFlowRate.Mean, actualInput.CriticalFlowRate.Mean); Assert.AreEqual(expectedInput.CriticalFlowRate.StandardDeviation, actualInput.CriticalFlowRate.StandardDeviation); - Assert.AreEqual(expectedInput.DikeHeightCalculationType, actualInput.DikeHeightCalculationType); - Assert.AreEqual(expectedInput.OvertoppingRateCalculationType, actualInput.OvertoppingRateCalculationType); + Assert.AreEqual(expectedInput.ShouldOvertoppingOutputIllustrationPointsBeCalculated, actualInput.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + Assert.AreEqual(expectedInput.ShouldDikeHeightBeCalculated, actualInput.ShouldDikeHeightBeCalculated); + Assert.AreEqual(expectedInput.DikeHeightTargetProbability, actualInput.DikeHeightTargetProbability); + Assert.AreEqual(expectedInput.ShouldDikeHeightIllustrationPointsBeCalculated, actualInput.ShouldDikeHeightIllustrationPointsBeCalculated); + Assert.AreEqual(expectedInput.ShouldOvertoppingRateBeCalculated, actualInput.ShouldOvertoppingRateBeCalculated); + Assert.AreEqual(expectedInput.OvertoppingRateTargetProbability, actualInput.OvertoppingRateTargetProbability); + Assert.AreEqual(expectedInput.ShouldOvertoppingRateIllustrationPointsBeCalculated, actualInput.ShouldOvertoppingRateIllustrationPointsBeCalculated); } private static void AssertGrassCoverErosionInwardsOutput(GrassCoverErosionInwardsOutput expectedOutput, Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -rae63828db6c6e20bc476fe8adfef362e3966a5ad --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs (.../CalculationGroupEntityReadExtensionsTest.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs (.../CalculationGroupEntityReadExtensionsTest.cs) (revision ae63828db6c6e20bc476fe8adfef362e3966a5ad) @@ -626,13 +626,17 @@ { Order = 0, Name = "1", - ScenarioContribution = 0.1 + ScenarioContribution = 0.1, + DikeHeightTargetProbability = 0.02, + OvertoppingRateTargetProbability = 0.03 }, new GrassCoverErosionInwardsCalculationEntity { Order = 1, Name = "2", - ScenarioContribution = 0.1 + ScenarioContribution = 0.1, + DikeHeightTargetProbability = 0.02, + OvertoppingRateTargetProbability = 0.03 } } }; @@ -666,13 +670,17 @@ { Order = 2, Name = "calculation2", - ScenarioContribution = 0.1 + ScenarioContribution = 0.1, + DikeHeightTargetProbability = 0.02, + OvertoppingRateTargetProbability = 0.03 }, new GrassCoverErosionInwardsCalculationEntity { Order = 0, Name = "calculation1", - ScenarioContribution = 0.1 + ScenarioContribution = 0.1, + DikeHeightTargetProbability = 0.02, + OvertoppingRateTargetProbability = 0.03 } }, CalculationGroupEntity1 = Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -rae63828db6c6e20bc476fe8adfef362e3966a5ad --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision ae63828db6c6e20bc476fe8adfef362e3966a5ad) @@ -58,8 +58,6 @@ // Setup var random = new Random(14); var breakWaterType = random.NextEnumValue(); - var dikeHeightCalculationType = random.NextEnumValue(); - var overtoppingRateCalculationType = random.NextEnumValue(); var entity = new GrassCoverErosionInwardsCalculationEntity { Name = "sodhfksn", @@ -74,10 +72,12 @@ UseBreakWater = Convert.ToByte(random.NextBoolean()), BreakWaterType = Convert.ToByte(breakWaterType), BreakWaterHeight = 5.7, - DikeHeightCalculationType = Convert.ToByte(dikeHeightCalculationType), - OvertoppingRateCalculationType = Convert.ToByte(overtoppingRateCalculationType), ShouldOvertoppingOutputIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean()), + ShouldDikeHeightBeCalculated = Convert.ToByte(random.NextBoolean()), + DikeHeightTargetProbability = 0.01, ShouldDikeHeightIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean()), + ShouldOvertoppingRateBeCalculated = Convert.ToByte(random.NextBoolean()), + OvertoppingRateTargetProbability = 0.02, ShouldOvertoppingRateIllustrationPointsBeCalculated = Convert.ToByte(random.NextBoolean()), RelevantForScenario = Convert.ToByte(random.NextBoolean()), ScenarioContribution = 0.45 @@ -103,12 +103,15 @@ AssertBoolean(entity.UseBreakWater, input.UseBreakWater); Assert.AreEqual(breakWaterType, input.BreakWater.Type); Assert.AreEqual(entity.BreakWaterHeight, input.BreakWater.Height.Value); - Assert.AreEqual(dikeHeightCalculationType, input.DikeHeightCalculationType); - Assert.AreEqual(overtoppingRateCalculationType, input.OvertoppingRateCalculationType); AssertBoolean(entity.ShouldOvertoppingOutputIllustrationPointsBeCalculated, input.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + + AssertBoolean(entity.ShouldDikeHeightBeCalculated, input.ShouldDikeHeightBeCalculated); + Assert.AreEqual(entity.DikeHeightTargetProbability, input.DikeHeightTargetProbability); AssertBoolean(entity.ShouldDikeHeightIllustrationPointsBeCalculated, input.ShouldDikeHeightIllustrationPointsBeCalculated); + AssertBoolean(entity.ShouldOvertoppingRateBeCalculated, input.ShouldOvertoppingRateBeCalculated); + Assert.AreEqual(entity.OvertoppingRateTargetProbability, input.OvertoppingRateTargetProbability); AssertBoolean(entity.ShouldOvertoppingRateIllustrationPointsBeCalculated, input.ShouldOvertoppingRateIllustrationPointsBeCalculated); @@ -130,7 +133,9 @@ CriticalFlowRateMean = null, CriticalFlowRateStandardDeviation = null, DikeHeight = null, - BreakWaterHeight = null + BreakWaterHeight = null, + DikeHeightTargetProbability = 0.01, + OvertoppingRateTargetProbability = 0.02 }; var collector = new ReadConversionCollector(); @@ -163,7 +168,9 @@ var entity = new GrassCoverErosionInwardsCalculationEntity { DikeProfileEntity = dikeProfileEntity, - ScenarioContribution = 0 + ScenarioContribution = 0, + DikeHeightTargetProbability = 0.01, + OvertoppingRateTargetProbability = 0.02 }; var collector = new ReadConversionCollector(); @@ -189,7 +196,9 @@ var entity = new GrassCoverErosionInwardsCalculationEntity { DikeProfileEntity = dikeProfileEntity, - ScenarioContribution = 0 + ScenarioContribution = 0, + DikeHeightTargetProbability = 0.01, + OvertoppingRateTargetProbability = 0.02 }; var collector = new ReadConversionCollector(); @@ -211,7 +220,9 @@ var entity = new GrassCoverErosionInwardsCalculationEntity { HydraulicLocationEntity = hydraulicLocationEntity, - ScenarioContribution = 0 + ScenarioContribution = 0, + DikeHeightTargetProbability = 0.01, + OvertoppingRateTargetProbability = 0.02 }; var collector = new ReadConversionCollector(); @@ -232,7 +243,9 @@ var entity = new GrassCoverErosionInwardsCalculationEntity { HydraulicLocationEntity = hydraulicLocationEntity, - ScenarioContribution = 0 + ScenarioContribution = 0, + DikeHeightTargetProbability = 0.01, + OvertoppingRateTargetProbability = 0.02 }; var collector = new ReadConversionCollector(); @@ -255,7 +268,9 @@ { new GrassCoverErosionInwardsOutputEntity() }, - ScenarioContribution = 0 + ScenarioContribution = 0, + DikeHeightTargetProbability = 0.01, + OvertoppingRateTargetProbability = 0.02 }; var collector = new ReadConversionCollector();