Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/GeneralStabilityStoneCoverWaveConditionsInput.cs =================================================================== diff -u -rf940fb0318486114473985b8a28a9d62546bffb5 -rf8d9c7c9dc47cb28259582e0d68449f1d6d9b3eb --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/GeneralStabilityStoneCoverWaveConditionsInput.cs (.../GeneralStabilityStoneCoverWaveConditionsInput.cs) (revision f940fb0318486114473985b8a28a9d62546bffb5) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Data/GeneralStabilityStoneCoverWaveConditionsInput.cs (.../GeneralStabilityStoneCoverWaveConditionsInput.cs) (revision f8d9c7c9dc47cb28259582e0d68449f1d6d9b3eb) @@ -19,9 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.Base.Data; -using Riskeer.Common.Data.Properties; using Riskeer.Revetment.Data; namespace Riskeer.StabilityStoneCover.Data @@ -31,21 +28,13 @@ /// public class GeneralStabilityStoneCoverWaveConditionsInput { - private const int numberOfDecimalPlacesN = 2; - - private static readonly Range validityRangeN = new Range(new RoundedDouble(numberOfDecimalPlacesN, 1), - new RoundedDouble(numberOfDecimalPlacesN, 20)); - - private RoundedDouble n; - /// /// Creates a new instance of . /// public GeneralStabilityStoneCoverWaveConditionsInput() { GeneralBlocksWaveConditionsInput = new GeneralWaveConditionsInput(1.0, 1.0, 1.0); GeneralColumnsWaveConditionsInput = new GeneralWaveConditionsInput(1.0, 0.4, 0.8); - n = new RoundedDouble(numberOfDecimalPlacesN, 4.0); } /// @@ -57,34 +46,5 @@ /// Gets the general input parameter used in wave conditions calculations for columns. /// public GeneralWaveConditionsInput GeneralColumnsWaveConditionsInput { get; } - - /// - /// Gets the 'N' parameter used to factor in the 'length effect'. - /// - /// Thrown when the value of - /// is not in the range [1, 20]. - public RoundedDouble N - { - get - { - return n; - } - set - { - RoundedDouble newValue = value.ToPrecision(n.NumberOfDecimalPlaces); - if (!validityRangeN.InRange(newValue)) - { - throw new ArgumentOutOfRangeException(nameof(value), string.Format(Resources.N_Value_should_be_in_Range_0_, - validityRangeN)); - } - - n = newValue; - } - } - - /// - /// Gets or sets whether the length effect should be applied in the section. - /// - public bool ApplyLengthEffectInSection { get; set; } } } \ No newline at end of file Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/GeneralStabilityStoneCoverWaveConditionsInputTest.cs =================================================================== diff -u -rf940fb0318486114473985b8a28a9d62546bffb5 -rf8d9c7c9dc47cb28259582e0d68449f1d6d9b3eb --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/GeneralStabilityStoneCoverWaveConditionsInputTest.cs (.../GeneralStabilityStoneCoverWaveConditionsInputTest.cs) (revision f940fb0318486114473985b8a28a9d62546bffb5) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Data.Test/GeneralStabilityStoneCoverWaveConditionsInputTest.cs (.../GeneralStabilityStoneCoverWaveConditionsInputTest.cs) (revision f8d9c7c9dc47cb28259582e0d68449f1d6d9b3eb) @@ -19,9 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.Base.Data; -using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.TestUtil; @@ -54,48 +51,6 @@ Assert.AreEqual(2, generalInput.GeneralColumnsWaveConditionsInput.C.NumberOfDecimalPlaces); Assert.AreEqual(0.8, generalInput.GeneralColumnsWaveConditionsInput.C, generalInput.GeneralColumnsWaveConditionsInput.C.GetAccuracy()); - - Assert.AreEqual(2, generalInput.N.NumberOfDecimalPlaces); - Assert.AreEqual(4.0, generalInput.N, generalInput.N.GetAccuracy()); - - Assert.IsFalse(generalInput.ApplyLengthEffectInSection); } - - [Test] - [TestCase(1.0)] - [TestCase(10.0)] - [TestCase(20.0)] - [TestCase(0.999)] - [TestCase(20.001)] - public void N_SetValidValue_UpdatesValue(double value) - { - // Setup - var generalInput = new GeneralStabilityStoneCoverWaveConditionsInput(); - - // Call - generalInput.N = (RoundedDouble) value; - - // Assert - Assert.AreEqual(value, generalInput.N, generalInput.N.GetAccuracy()); - } - - [Test] - [SetCulture("nl-NL")] - [TestCase(-10.0)] - [TestCase(0.99)] - [TestCase(20.01)] - [TestCase(50.0)] - public void N_SetValueOutsideValidRange_ThrowArgumentOutOfRangeException(double value) - { - // Setup - var generalInput = new GeneralStabilityStoneCoverWaveConditionsInput(); - - // Call - TestDelegate call = () => generalInput.N = (RoundedDouble) value; - - // Assert - var expectedMessage = "De waarde voor 'N' moet in het bereik [1,00, 20,00] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); - } } } \ No newline at end of file