Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs
===================================================================
diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r0fb4d7721a6fd350aeee563c018c429cb0eb23ee
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision 0fb4d7721a6fd350aeee563c018c429cb0eb23ee)
@@ -155,8 +155,28 @@
}
///
- /// Gets or sets how the dike height should be calculated.
+ /// Gets or sets whether the Dike Height should be calculated.
///
+ public bool ShouldDikeHeightBeCalculated { get; set; }
+
+ ///
+ /// Gets or sets whether the Overtopping Rate should be calculated.
+ ///
+ public bool ShouldOvertoppingRateBeCalculated { get; set; }
+
+ ///
+ /// Gets or sets the reliability index for the Dike Height calculation.
+ ///
+ public double DikeHeightReliabilityIndex { get; set; }
+
+ ///
+ /// Gets or sets the reliability index for the Overtopping Rate calculation.
+ ///
+ public double OvertoppingRateReliabilityIndex { get; set; }
+
+ ///
+ /// Gets or sets how the Dike Height should be calculated.
+ ///
public DikeHeightCalculationType DikeHeightCalculationType { get; set; }
///
@@ -165,17 +185,17 @@
public OvertoppingRateCalculationType OvertoppingRateCalculationType { get; set; }
///
- /// Gets or sets if the illustration points should be calculated for Dike Height.
+ /// Gets or sets whether the illustration points should be calculated for Dike Height.
///
public bool ShouldDikeHeightIllustrationPointsBeCalculated { get; set; }
///
- /// Gets or sets if the illustration points should be calculated for Overtopping Flow.
+ /// Gets or sets whether the illustration points should be calculated for Overtopping Flow.
///
public bool ShouldOvertoppingRateIllustrationPointsBeCalculated { get; set; }
///
- /// Gets or sets if the illustration points should be calculated for Overtopping Output.
+ /// Gets or sets whether the illustration points should be calculated for Overtopping Output.
///
public bool ShouldOvertoppingOutputIllustrationPointsBeCalculated { get; set; }
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs
===================================================================
diff -u -r5d4ce1b80a2b42ef653f826603115b86230b39a0 -r0fb4d7721a6fd350aeee563c018c429cb0eb23ee
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision 5d4ce1b80a2b42ef653f826603115b86230b39a0)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision 0fb4d7721a6fd350aeee563c018c429cb0eb23ee)
@@ -54,71 +54,71 @@
string defaultId = defaultDikeProfile.Id;
yield return new TestCaseData(
- new DikeProfile(defaultLocation,
- defaultRoughnessPoints,
- defaultForeshoreGeometry,
- new BreakWater(BreakWaterType.Caisson, defaultBreakWaterHeight),
- new DikeProfile.ConstructionProperties
- {
- Id = defaultId,
- Orientation = defaultOrientation,
- DikeHeight = defaultDikeHeight
- }));
+ new DikeProfile(defaultLocation,
+ defaultRoughnessPoints,
+ defaultForeshoreGeometry,
+ new BreakWater(BreakWaterType.Caisson, defaultBreakWaterHeight),
+ new DikeProfile.ConstructionProperties
+ {
+ Id = defaultId,
+ Orientation = defaultOrientation,
+ DikeHeight = defaultDikeHeight
+ }));
yield return new TestCaseData(
- new DikeProfile(defaultLocation,
- defaultRoughnessPoints,
- defaultForeshoreGeometry,
- new BreakWater(defaultBreakWaterType, 4),
- new DikeProfile.ConstructionProperties
- {
- Id = defaultId,
- Orientation = defaultOrientation,
- DikeHeight = defaultDikeHeight
- }));
+ new DikeProfile(defaultLocation,
+ defaultRoughnessPoints,
+ defaultForeshoreGeometry,
+ new BreakWater(defaultBreakWaterType, 4),
+ new DikeProfile.ConstructionProperties
+ {
+ Id = defaultId,
+ Orientation = defaultOrientation,
+ DikeHeight = defaultDikeHeight
+ }));
yield return new TestCaseData(
- new DikeProfile(defaultLocation,
- defaultRoughnessPoints,
- defaultForeshoreGeometry,
- new BreakWater(defaultBreakWaterType, defaultBreakWaterHeight),
- new DikeProfile.ConstructionProperties
- {
- Id = defaultId,
- Orientation = defaultOrientation,
- DikeHeight = 2
- }));
+ new DikeProfile(defaultLocation,
+ defaultRoughnessPoints,
+ defaultForeshoreGeometry,
+ new BreakWater(defaultBreakWaterType, defaultBreakWaterHeight),
+ new DikeProfile.ConstructionProperties
+ {
+ Id = defaultId,
+ Orientation = defaultOrientation,
+ DikeHeight = 2
+ }));
yield return new TestCaseData(
- new DikeProfile(defaultLocation,
- defaultRoughnessPoints,
- new Point2D[0],
- new BreakWater(defaultBreakWaterType, defaultBreakWaterHeight),
- new DikeProfile.ConstructionProperties
- {
- Id = defaultId,
- Orientation = defaultOrientation,
- DikeHeight = defaultDikeHeight
- }));
+ new DikeProfile(defaultLocation,
+ defaultRoughnessPoints,
+ new Point2D[0],
+ new BreakWater(defaultBreakWaterType, defaultBreakWaterHeight),
+ new DikeProfile.ConstructionProperties
+ {
+ Id = defaultId,
+ Orientation = defaultOrientation,
+ DikeHeight = defaultDikeHeight
+ }));
yield return new TestCaseData(
- new DikeProfile(defaultLocation,
- defaultRoughnessPoints,
- defaultForeshoreGeometry,
- null,
- new DikeProfile.ConstructionProperties
- {
- Id = defaultId,
- Orientation = defaultOrientation,
- DikeHeight = defaultDikeHeight
- }));
+ new DikeProfile(defaultLocation,
+ defaultRoughnessPoints,
+ defaultForeshoreGeometry,
+ null,
+ new DikeProfile.ConstructionProperties
+ {
+ Id = defaultId,
+ Orientation = defaultOrientation,
+ DikeHeight = defaultDikeHeight
+ }));
yield return new TestCaseData(
- new DikeProfile(defaultLocation,
- defaultRoughnessPoints,
- defaultForeshoreGeometry,
- null,
- new DikeProfile.ConstructionProperties
- {
- Id = defaultId,
- Orientation = 12,
- DikeHeight = defaultDikeHeight
- }));
+ new DikeProfile(defaultLocation,
+ defaultRoughnessPoints,
+ defaultForeshoreGeometry,
+ null,
+ new DikeProfile.ConstructionProperties
+ {
+ Id = defaultId,
+ Orientation = 12,
+ DikeHeight = defaultDikeHeight
+ }));
}
}
@@ -146,6 +146,9 @@
AssertDikeProfileInput(null, input);
Assert.IsNull(input.HydraulicBoundaryLocation);
+
+ Assert.IsFalse(input.ShouldDikeHeightBeCalculated);
+ Assert.IsFalse(input.ShouldOvertoppingRateBeCalculated);
Assert.AreEqual(DikeHeightCalculationType.NoCalculation, input.DikeHeightCalculationType);
Assert.AreEqual(OvertoppingRateCalculationType.NoCalculation, input.OvertoppingRateCalculationType);