Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rd56804cd3f9825093f28d7e03b7ab8ccc3f24655 -rbab612eeaa5a8f962d0e53325464c8e8d1e35f16 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d56804cd3f9825093f28d7e03b7ab8ccc3f24655) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bab612eeaa5a8f962d0e53325464c8e8d1e35f16) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -82,22 +82,22 @@ } /// - /// Looks up a localized string similar to De bovengrens van de rekenreeks moet boven de ondergrens liggen.. + /// Looks up a localized string similar to De bovengrens van de bekleding moet boven de ondergrens liggen.. /// - internal static string WaveConditionsInput_ValidateCalculatorSeriesBoundaries_Calculator_series_upperboundary_must_be_above_lowerboundary { + internal static string WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment { get { - return ResourceManager.GetString("WaveConditionsInput_ValidateCalculatorSeriesBoundaries_Calculator_series_upperbou" + - "ndary_must_be_above_lowerboundary", resourceCulture); + return ResourceManager.GetString("WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_" + + "above_lower_boundary_revetment", resourceCulture); } } /// - /// Looks up a localized string similar to De bovengrens van de bekleding moet boven de ondergrens liggen.. + /// Looks up a localized string similar to De bovengrens van de rekenreeks moet boven de ondergrens liggen.. /// - internal static string WaveConditionsInput_ValidateRevetmentLevels_Upper_revetment_level_must_be_above_lower_revetment_level { + internal static string WaveConditionsInput_ValidateWaterLevelBoundaries_Upper_boundary_water_levels_must_be_above_lower_boundary_water_levels { get { - return ResourceManager.GetString("WaveConditionsInput_ValidateRevetmentLevels_Upper_revetment_level_must_be_above_l" + - "ower_revetment_level", resourceCulture); + return ResourceManager.GetString("WaveConditionsInput_ValidateWaterLevelBoundaries_Upper_boundary_water_levels_must" + + "_be_above_lower_boundary_water_levels", resourceCulture); } } } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx =================================================================== diff -u -rd56804cd3f9825093f28d7e03b7ab8ccc3f24655 -rbab612eeaa5a8f962d0e53325464c8e8d1e35f16 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision d56804cd3f9825093f28d7e03b7ab8ccc3f24655) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision bab612eeaa5a8f962d0e53325464c8e8d1e35f16) @@ -98,10 +98,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + De bovengrens van de rekenreeks moet boven de ondergrens liggen. - + De bovengrens van de bekleding moet boven de ondergrens liggen. \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs =================================================================== diff -u -rb762914ea1a584bb69a286d389a8a6a83d171769 -rbab612eeaa5a8f962d0e53325464c8e8d1e35f16 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision b762914ea1a584bb69a286d389a8a6a83d171769) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision bab612eeaa5a8f962d0e53325464c8e8d1e35f16) @@ -40,22 +40,22 @@ private const double designWaterLevelSubstraction = 0.01; private DikeProfile dikeProfile; - private RoundedDouble upperRevetmentLevel; - private RoundedDouble lowerRevetmentLevel; + private RoundedDouble upperBoundaryRevetment; + private RoundedDouble lowerBoundaryRevetment; private RoundedDouble stepSize; - private RoundedDouble upperBoundaryCalculatorSeries; - private RoundedDouble lowerBoundaryCalculatorSeries; + private RoundedDouble upperBoundaryWaterLevels; + private RoundedDouble lowerBoundaryWaterLevels; /// /// Creates a new instance of . /// public WaveConditionsInput() { - upperRevetmentLevel = new RoundedDouble(2, double.NaN); - lowerRevetmentLevel = new RoundedDouble(2, double.NaN); + upperBoundaryRevetment = new RoundedDouble(2, double.NaN); + lowerBoundaryRevetment = new RoundedDouble(2, double.NaN); stepSize = new RoundedDouble(1, double.NaN); - upperBoundaryCalculatorSeries = new RoundedDouble(2, double.NaN); - lowerBoundaryCalculatorSeries = new RoundedDouble(2, double.NaN); + upperBoundaryWaterLevels = new RoundedDouble(2, double.NaN); + lowerBoundaryWaterLevels = new RoundedDouble(2, double.NaN); UpdateDikeProfileParameters(); } @@ -110,42 +110,42 @@ } /// - /// Gets or sets the upper level of the revetment. + /// Gets or sets the lower boundary of the revetment. /// - /// Thrown when value is smaller than or equal to . - public RoundedDouble UpperRevetmentLevel + /// Thrown when value is larger than or equal to . + public RoundedDouble LowerBoundaryRevetment { get { - return upperRevetmentLevel; + return lowerBoundaryRevetment; } set { - var newUpperRevetmentLevel = value.ToPrecision(upperRevetmentLevel.NumberOfDecimalPlaces); + var newLowerBoundaryRevetment = value.ToPrecision(lowerBoundaryRevetment.NumberOfDecimalPlaces); - ValidateRevetmentLevels(LowerRevetmentLevel, newUpperRevetmentLevel); + ValidateRevetmentBoundaries(newLowerBoundaryRevetment, UpperBoundaryRevetment); - upperRevetmentLevel = newUpperRevetmentLevel; + lowerBoundaryRevetment = newLowerBoundaryRevetment; } } /// - /// Gets or sets the lower level of the revetment. + /// Gets or sets the upper boundary of the revetment. /// - /// Thrown when value is larger than or equal to . - public RoundedDouble LowerRevetmentLevel + /// Thrown when value is smaller than or equal to . + public RoundedDouble UpperBoundaryRevetment { get { - return lowerRevetmentLevel; + return upperBoundaryRevetment; } set { - var newLowerRevetmentLevel = value.ToPrecision(lowerRevetmentLevel.NumberOfDecimalPlaces); + var newUpperBoundaryRevetment = value.ToPrecision(upperBoundaryRevetment.NumberOfDecimalPlaces); - ValidateRevetmentLevels(newLowerRevetmentLevel, UpperRevetmentLevel); + ValidateRevetmentBoundaries(LowerBoundaryRevetment, newUpperBoundaryRevetment); - lowerRevetmentLevel = newLowerRevetmentLevel; + upperBoundaryRevetment = newUpperBoundaryRevetment; } } @@ -165,47 +165,55 @@ } /// - /// Gets or sets the upper boundary for the calculator series. + /// Gets or sets the lower boundary of the range. /// - /// Thrown when value is smaller than or equal to . - public RoundedDouble UpperBoundaryCalculatorSeries + /// Thrown when value is larger than or equal to . + /// + /// Setting this property is optional when it comes to determining ; if the value + /// equals , only will be taken into account. + /// + public RoundedDouble LowerBoundaryWaterLevels { get { - return upperBoundaryCalculatorSeries; + return lowerBoundaryWaterLevels; } set { - var newUpperBoundaryCalculatorSeries = value.ToPrecision(upperBoundaryCalculatorSeries.NumberOfDecimalPlaces); + var newLowerBoundaryWaterLevels = value.ToPrecision(lowerBoundaryWaterLevels.NumberOfDecimalPlaces); - ValidateCalculatorSeriesBoundaries(LowerBoundaryCalculatorSeries, newUpperBoundaryCalculatorSeries); + ValidateWaterLevelBoundaries(newLowerBoundaryWaterLevels, UpperBoundaryWaterLevels); - upperBoundaryCalculatorSeries = newUpperBoundaryCalculatorSeries; + lowerBoundaryWaterLevels = newLowerBoundaryWaterLevels; } } /// - /// Gets or sets the lower boundary for the calculator series. + /// Gets or sets the upper boundary of the range. /// - /// Thrown when value is larger than or equal to . - public RoundedDouble LowerBoundaryCalculatorSeries + /// Thrown when value is smaller than or equal to . + /// + /// Setting this property is optional when it comes to determining ; if the value + /// equals , only will be taken into account. + /// + public RoundedDouble UpperBoundaryWaterLevels { get { - return lowerBoundaryCalculatorSeries; + return upperBoundaryWaterLevels; } set { - var newLowerBoundaryCalculatorSeries = value.ToPrecision(lowerBoundaryCalculatorSeries.NumberOfDecimalPlaces); + var newUpperBoundaryWaterLevels = value.ToPrecision(upperBoundaryWaterLevels.NumberOfDecimalPlaces); - ValidateCalculatorSeriesBoundaries(newLowerBoundaryCalculatorSeries, UpperBoundaryCalculatorSeries); + ValidateWaterLevelBoundaries(LowerBoundaryWaterLevels, newUpperBoundaryWaterLevels); - lowerBoundaryCalculatorSeries = newLowerBoundaryCalculatorSeries; + upperBoundaryWaterLevels = newUpperBoundaryWaterLevels; } } /// - /// Gets the water levels to calculate for. + /// Gets the water levels to perform a wave conditions calculation for. /// public IEnumerable WaterLevels { @@ -215,23 +223,23 @@ } } - private static void ValidateRevetmentLevels(RoundedDouble lowerRevetmentLevelValue, RoundedDouble upperRevetmentLevelValue) + private static void ValidateRevetmentBoundaries(RoundedDouble lowerBoundary, RoundedDouble upperBoundary) { - if (!double.IsNaN(lowerRevetmentLevelValue) - && !double.IsNaN(upperRevetmentLevelValue) - && lowerRevetmentLevelValue >= upperRevetmentLevelValue) - { - throw new ArgumentOutOfRangeException(null, Resources.WaveConditionsInput_ValidateRevetmentLevels_Upper_revetment_level_must_be_above_lower_revetment_level); - } + ValidateBoundaries(lowerBoundary, upperBoundary, Resources.WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment); } - private static void ValidateCalculatorSeriesBoundaries(RoundedDouble lowerBoundary, RoundedDouble upperBoundary) + private static void ValidateWaterLevelBoundaries(RoundedDouble lowerBoundary, RoundedDouble upperBoundary) { + ValidateBoundaries(lowerBoundary, upperBoundary, Resources.WaveConditionsInput_ValidateWaterLevelBoundaries_Upper_boundary_water_levels_must_be_above_lower_boundary_water_levels); + } + + private static void ValidateBoundaries(RoundedDouble lowerBoundary, RoundedDouble upperBoundary, string exceptionMessage) + { if (!double.IsNaN(lowerBoundary) && !double.IsNaN(upperBoundary) && lowerBoundary >= upperBoundary) { - throw new ArgumentOutOfRangeException(null, Resources.WaveConditionsInput_ValidateCalculatorSeriesBoundaries_Calculator_series_upperboundary_must_be_above_lowerboundary); + throw new ArgumentOutOfRangeException(null, exceptionMessage); } } @@ -245,8 +253,8 @@ private IEnumerable DetermineWaterLevels() { var waterLevels = new List(); - var upperBoundary = new RoundedDouble(2, Math.Min(DetermineUpperWaterLevel(), Math.Min(UpperRevetmentLevel, UpperBoundaryCalculatorSeries))); - var lowerBoundary = new RoundedDouble(2, Math.Max(LowerRevetmentLevel, LowerBoundaryCalculatorSeries)); + var upperBoundary = new RoundedDouble(2, Math.Min(DetermineUpperWaterLevel(), Math.Min(UpperBoundaryRevetment, UpperBoundaryWaterLevels))); + var lowerBoundary = new RoundedDouble(2, Math.Max(LowerBoundaryRevetment, LowerBoundaryWaterLevels)); if (double.IsNaN(upperBoundary) || double.IsNaN(lowerBoundary) || Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs =================================================================== diff -u -rb762914ea1a584bb69a286d389a8a6a83d171769 -rbab612eeaa5a8f962d0e53325464c8e8d1e35f16 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision b762914ea1a584bb69a286d389a8a6a83d171769) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision bab612eeaa5a8f962d0e53325464c8e8d1e35f16) @@ -94,11 +94,11 @@ Assert.AreEqual(new RoundedDouble(2), input.BreakWater.Height); Assert.IsFalse(input.UseForeshore); CollectionAssert.IsEmpty(input.ForeshoreGeometry); - Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperRevetmentLevel); - Assert.AreEqual(new RoundedDouble(2, double.NaN), input.LowerRevetmentLevel); + Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryRevetment); + Assert.AreEqual(new RoundedDouble(2, double.NaN), input.LowerBoundaryRevetment); Assert.AreEqual(new RoundedDouble(1, double.NaN), input.StepSize); - Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryCalculatorSeries); - Assert.AreEqual(new RoundedDouble(2, double.NaN), input.LowerBoundaryCalculatorSeries); + Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryWaterLevels); + Assert.AreEqual(new RoundedDouble(2, double.NaN), input.LowerBoundaryWaterLevels); CollectionAssert.IsEmpty(input.WaterLevels); } @@ -210,68 +210,68 @@ } [Test] - public void UpperRevetmentLevel_SetNewValue_ValueIsRounded() + public void LowerBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup var input = new WaveConditionsInput(); - int originalNumberOfDecimalPlaces = input.UpperRevetmentLevel.NumberOfDecimalPlaces; + int originalNumberOfDecimalPlaces = input.LowerBoundaryRevetment.NumberOfDecimalPlaces; // Call - input.UpperRevetmentLevel = new RoundedDouble(5, 1.23456); + input.LowerBoundaryRevetment = new RoundedDouble(5, 1.23456); // Assert - Assert.AreEqual(originalNumberOfDecimalPlaces, input.UpperRevetmentLevel.NumberOfDecimalPlaces); - Assert.AreEqual(1.23, input.UpperRevetmentLevel.Value); + Assert.AreEqual(originalNumberOfDecimalPlaces, input.LowerBoundaryRevetment.NumberOfDecimalPlaces); + Assert.AreEqual(1.23, input.LowerBoundaryRevetment.Value); } [Test] - public void UpperRevetmentLevel_BelowLowerRevetmentLevel_ThrowsArgumentOutOfRangeException() + public void LowerBoundaryRevetment_AboveUpperBoundaryRevetment_ThrowsArgumentOutOfRangeException() { // Setup var input = new WaveConditionsInput { - LowerRevetmentLevel = (RoundedDouble) 0.0 + UpperBoundaryRevetment = (RoundedDouble) 0.0 }; // Call - TestDelegate test = () => input.UpperRevetmentLevel = (RoundedDouble) (-3); + TestDelegate test = () => input.LowerBoundaryRevetment = (RoundedDouble) 3.0; // Assert - string expectedMessage = Resources.WaveConditionsInput_ValidateRevetmentLevels_Upper_revetment_level_must_be_above_lower_revetment_level; + string expectedMessage = Resources.WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } [Test] - public void LowerRevetmentLevel_SetNewValue_ValueIsRounded() + public void UpperBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup var input = new WaveConditionsInput(); - int originalNumberOfDecimalPlaces = input.LowerRevetmentLevel.NumberOfDecimalPlaces; + int originalNumberOfDecimalPlaces = input.UpperBoundaryRevetment.NumberOfDecimalPlaces; // Call - input.LowerRevetmentLevel = new RoundedDouble(5, 1.23456); + input.UpperBoundaryRevetment = new RoundedDouble(5, 1.23456); // Assert - Assert.AreEqual(originalNumberOfDecimalPlaces, input.LowerRevetmentLevel.NumberOfDecimalPlaces); - Assert.AreEqual(1.23, input.LowerRevetmentLevel.Value); + Assert.AreEqual(originalNumberOfDecimalPlaces, input.UpperBoundaryRevetment.NumberOfDecimalPlaces); + Assert.AreEqual(1.23, input.UpperBoundaryRevetment.Value); } [Test] - public void LowerRevetmentLevel_AboveUpperRevetmentLevel_ThrowsArgumentOutOfRangeException() + public void UpperBoundaryRevetment_BelowLowerBoundaryRevetment_ThrowsArgumentOutOfRangeException() { // Setup var input = new WaveConditionsInput { - UpperRevetmentLevel = (RoundedDouble) 0.0 + LowerBoundaryRevetment = (RoundedDouble) 0.0 }; // Call - TestDelegate test = () => input.LowerRevetmentLevel = (RoundedDouble) 3.0; + TestDelegate test = () => input.UpperBoundaryRevetment = (RoundedDouble) (-3); // Assert - string expectedMessage = Resources.WaveConditionsInput_ValidateRevetmentLevels_Upper_revetment_level_must_be_above_lower_revetment_level; + string expectedMessage = Resources.WaveConditionsInput_ValidateRevetmentBoundaries_Upper_boundary_revetment_must_be_above_lower_boundary_revetment; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } @@ -292,75 +292,75 @@ } [Test] - public void LowerBoundaryCalculatorSeries_SetNewValue_ValueIsRounded() + public void LowerBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup var input = new WaveConditionsInput(); - int originalNumberOfDecimalPlaces = input.LowerBoundaryCalculatorSeries.NumberOfDecimalPlaces; + int originalNumberOfDecimalPlaces = input.LowerBoundaryWaterLevels.NumberOfDecimalPlaces; // Call - input.LowerBoundaryCalculatorSeries = new RoundedDouble(5, 1.23456); + input.LowerBoundaryWaterLevels = new RoundedDouble(5, 1.23456); // Assert - Assert.AreEqual(originalNumberOfDecimalPlaces, input.LowerBoundaryCalculatorSeries.NumberOfDecimalPlaces); - Assert.AreEqual(1.23, input.LowerBoundaryCalculatorSeries.Value); + Assert.AreEqual(originalNumberOfDecimalPlaces, input.LowerBoundaryWaterLevels.NumberOfDecimalPlaces); + Assert.AreEqual(1.23, input.LowerBoundaryWaterLevels.Value); } [Test] [TestCase(5)] [TestCase(3.004)] [TestCase(3.009)] - public void LowerBoundaryCalculatorSeries_BoundaryAboveUpperBoundary_ThrowsArgumentOutOfRangeException(double newValue) + public void LowerBoundaryWaterLevels_BoundaryAboveUpperBoundaryWaterLevels_ThrowsArgumentOutOfRangeException(double newValue) { // Setup var input = new WaveConditionsInput { - UpperBoundaryCalculatorSeries = (RoundedDouble) 3.0 + UpperBoundaryWaterLevels = (RoundedDouble) 3.0 }; // Call - TestDelegate test = () => input.LowerBoundaryCalculatorSeries = (RoundedDouble) newValue; + TestDelegate test = () => input.LowerBoundaryWaterLevels = (RoundedDouble) newValue; // Assert - string expectedMessage = Resources.WaveConditionsInput_ValidateCalculatorSeriesBoundaries_Calculator_series_upperboundary_must_be_above_lowerboundary; + string expectedMessage = Resources.WaveConditionsInput_ValidateWaterLevelBoundaries_Upper_boundary_water_levels_must_be_above_lower_boundary_water_levels; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } [Test] - [TestCase(1)] - [TestCase(3.004)] - [TestCase(2.999)] - public void UpperBoundaryCalculatorSeries_BoundaryBelowLowerBoundary_ThrowsArgumentOutOfRangeException(double newValue) + public void UpperBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup - var input = new WaveConditionsInput - { - LowerBoundaryCalculatorSeries = (RoundedDouble) 3.0 - }; + var input = new WaveConditionsInput(); + int originalNumberOfDecimalPlaces = input.UpperBoundaryWaterLevels.NumberOfDecimalPlaces; + // Call - TestDelegate test = () => input.UpperBoundaryCalculatorSeries = (RoundedDouble)newValue; + input.UpperBoundaryWaterLevels = new RoundedDouble(5, 1.23456); // Assert - string expectedMessage = Resources.WaveConditionsInput_ValidateCalculatorSeriesBoundaries_Calculator_series_upperboundary_must_be_above_lowerboundary; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + Assert.AreEqual(originalNumberOfDecimalPlaces, input.UpperBoundaryWaterLevels.NumberOfDecimalPlaces); + Assert.AreEqual(1.23, input.UpperBoundaryWaterLevels.Value); } [Test] - public void UpperBoundaryCalculatorSeries_SetNewValue_ValueIsRounded() + [TestCase(1)] + [TestCase(3.004)] + [TestCase(2.999)] + public void UpperBoundaryWaterLevels_BoundaryBelowLowerBoundaryWaterLevels_ThrowsArgumentOutOfRangeException(double newValue) { // Setup - var input = new WaveConditionsInput(); + var input = new WaveConditionsInput + { + LowerBoundaryWaterLevels = (RoundedDouble) 3.0 + }; - int originalNumberOfDecimalPlaces = input.UpperBoundaryCalculatorSeries.NumberOfDecimalPlaces; - // Call - input.UpperBoundaryCalculatorSeries = new RoundedDouble(5, 1.23456); + TestDelegate test = () => input.UpperBoundaryWaterLevels = (RoundedDouble) newValue; // Assert - Assert.AreEqual(originalNumberOfDecimalPlaces, input.UpperBoundaryCalculatorSeries.NumberOfDecimalPlaces); - Assert.AreEqual(1.23, input.UpperBoundaryCalculatorSeries.Value); + string expectedMessage = Resources.WaveConditionsInput_ValidateWaterLevelBoundaries_Upper_boundary_water_levels_must_be_above_lower_boundary_water_levels; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } [Test] @@ -374,14 +374,14 @@ var input = new WaveConditionsInput { StepSize = (RoundedDouble) stepSize, - UpperRevetmentLevel = (RoundedDouble) (upperBoundaryLevel - 0.01), - UpperBoundaryCalculatorSeries = (RoundedDouble) (upperBoundaryLevel - 0.01), + UpperBoundaryRevetment = (RoundedDouble) (upperBoundaryLevel - 0.01), + UpperBoundaryWaterLevels = (RoundedDouble) (upperBoundaryLevel - 0.01), HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { DesignWaterLevel = (RoundedDouble) upperBoundaryLevel }, - LowerRevetmentLevel = (RoundedDouble) lowerBoundaryLevel, - LowerBoundaryCalculatorSeries = (RoundedDouble) lowerBoundaryLevel + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryLevel, + LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryLevel }; // Call @@ -393,22 +393,22 @@ [Test] [TestCaseSource("WaterLevels")] - public void WaterLevels_ValidData_ReturnsWaterLevels(double stepSize, double upperRevetmentLevel, - double lowerRevetmentLevel, double upperBoundaryCalculatorSeries, double lowerBoundaryCalculatorSeries, + public void WaterLevels_ValidData_ReturnsWaterLevels(double stepSize, double upperBoundaryRevetment, + double lowerBoundaryRevetment, double upperBoundaryWaterLevels, double lowerBoundaryWaterLevels, double designWaterLevel, IEnumerable expectedWaterLevels) { // Setup var input = new WaveConditionsInput { StepSize = (RoundedDouble) stepSize, - UpperRevetmentLevel = (RoundedDouble) upperRevetmentLevel, - UpperBoundaryCalculatorSeries = (RoundedDouble) upperBoundaryCalculatorSeries, + UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, + UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels, HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { DesignWaterLevel = (RoundedDouble) designWaterLevel }, - LowerRevetmentLevel = (RoundedDouble) lowerRevetmentLevel, - LowerBoundaryCalculatorSeries = (RoundedDouble) lowerBoundaryCalculatorSeries + LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, + LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels }; // Call