Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -19,37 +19,20 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using System.Linq; -using Core.Common.Base; using Core.Common.Base.Data; -using Core.Common.Base.Geometry; -using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Probabilistics; -using Ringtoets.HydraRing.Data; +using Ringtoets.Common.Data.Structures; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; namespace Ringtoets.HeightStructures.Data { /// /// Class that holds all height structures calculation specific input parameters. /// - public class HeightStructuresInput : Observable, ICalculationInput, IUseBreakWater, IUseForeshore + public class HeightStructuresInput : StructuresInputBase { private readonly NormalDistribution levelCrestStructure; - private readonly NormalDistribution modelFactorSuperCriticalFlow; - private readonly LogNormalDistribution allowedLevelIncreaseStorage; - private readonly VariationCoefficientLogNormalDistribution storageStructureArea; - private readonly LogNormalDistribution flowWidthAtBottomProtection; - private readonly VariationCoefficientLogNormalDistribution criticalOvertoppingDischarge; - private readonly VariationCoefficientNormalDistribution widthFlowApertures; - private readonly VariationCoefficientLogNormalDistribution stormDuration; - private RoundedDouble structureNormalOrientation; private RoundedDouble deviationWaveDirection; - private double failureProbabilityStructureWithErosion; - private ForeshoreProfile foreshoreProfile; - private HeightStructure heightStructure; /// /// Creates a new instance of the class. @@ -62,91 +45,19 @@ StandardDeviation = (RoundedDouble) 0.05 }; - structureNormalOrientation = new RoundedDouble(2, double.NaN); - - modelFactorSuperCriticalFlow = new NormalDistribution(2) - { - Mean = (RoundedDouble) 1.1, - StandardDeviation = (RoundedDouble) 0.03 - }; - - allowedLevelIncreaseStorage = new LogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - StandardDeviation = (RoundedDouble) 0.1 - }; - - storageStructureArea = new VariationCoefficientLogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 - }; - - flowWidthAtBottomProtection = new LogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - StandardDeviation = (RoundedDouble) 0.05 - }; - - criticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - CoefficientOfVariation = (RoundedDouble) 0.15 - }; - - failureProbabilityStructureWithErosion = double.NaN; - - widthFlowApertures = new VariationCoefficientNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - CoefficientOfVariation = (RoundedDouble) 0.05 - }; - deviationWaveDirection = new RoundedDouble(2, double.NaN); - stormDuration = new VariationCoefficientLogNormalDistribution(2) - { - Mean = (RoundedDouble) 6.0, - CoefficientOfVariation = (RoundedDouble) 0.25 - }; - - UpdateHeightStructureProperties(); - UpdateForeshoreProperties(); + UpdateStructureProperties(); } private static bool ValidProbabilityValue(double probability) { return !double.IsNaN(probability) && probability <= 1 && probability >= 0; } - #region Model factors - - /// - /// Gets or sets the model factor for super critical flow. - /// - /// Only sets the mean. - public NormalDistribution ModelFactorSuperCriticalFlow - { - get - { - return modelFactorSuperCriticalFlow; - } - set - { - modelFactorSuperCriticalFlow.Mean = value.Mean; - } - } - - #endregion - #region Hydraulic data /// - /// Gets or sets the hydraulic boundary location from which to use the assessment level. - /// - public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; } - - /// /// Gets or sets the deviation of the wave direction. /// [degrees] /// @@ -162,23 +73,6 @@ } } - /// - /// Gets or sets the storm duration. - /// [hrs] - /// - /// Only sets the mean. - public VariationCoefficientLogNormalDistribution StormDuration - { - get - { - return stormDuration; - } - set - { - stormDuration.Mean = value.Mean; - } - } - #endregion #region Schematization @@ -200,227 +94,21 @@ } } - /// - /// Gets or sets the orientation of the normal of the structure. - /// [degrees] - /// - /// Thrown when the value for the orientation is not between [0, 360] degrees. - public RoundedDouble StructureNormalOrientation + protected override void UpdateStructureProperties() { - get + if (Structure != null) { - return structureNormalOrientation; + StructureNormalOrientation = Structure.StructureNormalOrientation; + LevelCrestStructure = Structure.LevelCrestStructure; + FlowWidthAtBottomProtection = Structure.FlowWidthAtBottomProtection; + CriticalOvertoppingDischarge = Structure.CriticalOvertoppingDischarge; + WidthFlowApertures = Structure.WidthFlowApertures; + FailureProbabilityStructureWithErosion = Structure.FailureProbabilityStructureWithErosion; + StorageStructureArea = Structure.StorageStructureArea; + AllowedLevelIncreaseStorage = Structure.AllowedLevelIncreaseStorage; } - set - { - if (double.IsNaN(value)) - { - structureNormalOrientation = value.ToPrecision(structureNormalOrientation.NumberOfDecimalPlaces); - return; - } - - RoundedDouble newOrientationValue = value.ToPrecision(structureNormalOrientation.NumberOfDecimalPlaces); - if (newOrientationValue < 0 || newOrientationValue > 360) - { - throw new ArgumentOutOfRangeException("value", RingtoetsCommonDataResources.Orientation_Value_needs_to_be_between_0_and_360); - } - structureNormalOrientation = newOrientationValue; - } } - /// - /// Gets or sets the allowed increase of level for the storage. - /// [m] - /// - public LogNormalDistribution AllowedLevelIncreaseStorage - { - get - { - return allowedLevelIncreaseStorage; - } - set - { - allowedLevelIncreaseStorage.Mean = value.Mean; - allowedLevelIncreaseStorage.StandardDeviation = value.StandardDeviation; - } - } - - /// - /// Gets or sets the storage structure area. - /// [m^2] - /// - public VariationCoefficientLogNormalDistribution StorageStructureArea - { - get - { - return storageStructureArea; - } - set - { - storageStructureArea.Mean = value.Mean; - storageStructureArea.CoefficientOfVariation = value.CoefficientOfVariation; - } - } - - /// - /// Gets or sets the flow width at the bottom protection. - /// [m] - /// - public LogNormalDistribution FlowWidthAtBottomProtection - { - get - { - return flowWidthAtBottomProtection; - } - set - { - flowWidthAtBottomProtection.Mean = value.Mean; - flowWidthAtBottomProtection.StandardDeviation = value.StandardDeviation; - } - } - - /// - /// Gets or sets the critical overtopping discharge. - /// [m^3/s/m] - /// - public VariationCoefficientLogNormalDistribution CriticalOvertoppingDischarge - { - get - { - return criticalOvertoppingDischarge; - } - set - { - criticalOvertoppingDischarge.Mean = value.Mean; - criticalOvertoppingDischarge.CoefficientOfVariation = value.CoefficientOfVariation; - } - } - - /// - /// Gets or sets the failure probability of structure given erosion. - /// [1/year] - /// - /// Thrown when the value of the probability - /// is not between [0, 1]. - public double FailureProbabilityStructureWithErosion - { - get - { - return failureProbabilityStructureWithErosion; - } - set - { - if (!ValidProbabilityValue(value)) - { - throw new ArgumentOutOfRangeException("value", RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_between_0_and_1); - } - failureProbabilityStructureWithErosion = value; - } - } - - /// - /// Gets or sets the width of flow apertures. - /// [m] - /// - public VariationCoefficientNormalDistribution WidthFlowApertures - { - get - { - return widthFlowApertures; - } - set - { - widthFlowApertures.Mean = value.Mean; - widthFlowApertures.CoefficientOfVariation = value.CoefficientOfVariation; - } - } - - /// - /// Gets or sets the height structure. - /// - public HeightStructure HeightStructure - { - get - { - return heightStructure; - } - set - { - heightStructure = value; - UpdateHeightStructureProperties(); - } - } - - /// - /// Gets or sets the foreshore profile. - /// - public ForeshoreProfile ForeshoreProfile - { - get - { - return foreshoreProfile; - } - set - { - foreshoreProfile = value; - UpdateForeshoreProperties(); - } - } - - public bool UseBreakWater { get; set; } - - public bool UseForeshore { get; set; } - - public RoundedPoint2DCollection ForeshoreGeometry - { - get - { - return foreshoreProfile != null - ? foreshoreProfile.Geometry - : new RoundedPoint2DCollection(2, Enumerable.Empty()); - } - } - - public BreakWater BreakWater { get; private set; } - - private void UpdateHeightStructureProperties() - { - if (heightStructure != null) - { - StructureNormalOrientation = heightStructure.StructureNormalOrientation; - LevelCrestStructure = heightStructure.LevelCrestStructure; - FlowWidthAtBottomProtection = heightStructure.FlowWidthAtBottomProtection; - CriticalOvertoppingDischarge = heightStructure.CriticalOvertoppingDischarge; - WidthFlowApertures = heightStructure.WidthFlowApertures; - FailureProbabilityStructureWithErosion = heightStructure.FailureProbabilityStructureWithErosion; - StorageStructureArea = heightStructure.StorageStructureArea; - AllowedLevelIncreaseStorage = heightStructure.AllowedLevelIncreaseStorage; - } - } - - private void UpdateForeshoreProperties() - { - if (foreshoreProfile == null) - { - UseForeshore = false; - UseBreakWater = false; - BreakWater = GetDefaultBreakWater(); - } - else - { - UseForeshore = foreshoreProfile.Geometry.Count() > 1; - UseBreakWater = foreshoreProfile.HasBreakWater; - BreakWater = foreshoreProfile.HasBreakWater ? - new BreakWater(foreshoreProfile.BreakWater.Type, foreshoreProfile.BreakWater.Height) : - GetDefaultBreakWater(); - } - } - - private static BreakWater GetDefaultBreakWater() - { - return new BreakWater(BreakWaterType.Dam, 0.0); - } - #endregion } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -126,11 +126,11 @@ { get { - return data.WrappedData.HeightStructure; + return data.WrappedData.Structure; } set { - data.WrappedData.HeightStructure = value; + data.WrappedData.Structure = value; HeightStructuresHelper.Update(data.FailureMechanism.SectionResults, data.Calculation); data.WrappedData.NotifyObservers(); } @@ -144,10 +144,10 @@ { get { - return data.WrappedData.HeightStructure == null ? null : + return data.WrappedData.Structure == null ? null : new Point2D( - new RoundedDouble(0, data.WrappedData.HeightStructure.Location.X), - new RoundedDouble(0, data.WrappedData.HeightStructure.Location.Y)); + new RoundedDouble(0, data.WrappedData.Structure.Location.X), + new RoundedDouble(0, data.WrappedData.Structure.Location.Y)); } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -485,7 +485,7 @@ Name = NamingHelper.GetUniqueName(calculations, structure.Name, c => c.Name), InputParameters = { - HeightStructure = structure + Structure = structure } }; calculations.Add(calculation); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Utils/HeightStructuresHelper.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Utils/HeightStructuresHelper.cs (.../HeightStructuresHelper.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Utils/HeightStructuresHelper.cs (.../HeightStructuresHelper.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -153,11 +153,11 @@ { throw new ArgumentNullException("calculation"); } - if (calculation.InputParameters.HeightStructure == null) + if (calculation.InputParameters.Structure == null) { return null; } - return new CalculationWithLocation(calculation, calculation.InputParameters.HeightStructure.Location); + return new CalculationWithLocation(calculation, calculation.InputParameters.Structure.Location); } private static SectionResultWithCalculationAssignment AsCalculationAssignment(HeightStructuresFailureMechanismSectionResult failureMechanismSectionResult) Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -29,6 +29,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; using Ringtoets.HeightStructures.Data.TestUtil; using Ringtoets.HydraRing.Data; @@ -48,120 +49,19 @@ StandardDeviation = (RoundedDouble) 0.05 }; - var modelFactorSuperCriticalFlow = new NormalDistribution(2) - { - Mean = (RoundedDouble) 1.1, - StandardDeviation = (RoundedDouble) 0.03 - }; - - var allowedLevelIncreaseStorage = new LogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - StandardDeviation = (RoundedDouble) 0.1 - }; - - var storageStructureArea = new VariationCoefficientLogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 - }; - - var flowWidthAtBottomProtection = new LogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - StandardDeviation = (RoundedDouble) 0.05 - }; - - var criticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - CoefficientOfVariation = (RoundedDouble) 0.15 - }; - - var widthFlowApertures = new VariationCoefficientNormalDistribution(2) - { - Mean = (RoundedDouble) double.NaN, - CoefficientOfVariation = (RoundedDouble) 0.05 - }; - - var stormDuration = new VariationCoefficientLogNormalDistribution(2) - { - Mean = (RoundedDouble) 6.0, - CoefficientOfVariation = (RoundedDouble) 0.25 - }; - // Call var input = new HeightStructuresInput(); // Assert - Assert.IsInstanceOf(input); - Assert.IsInstanceOf(input); - Assert.IsInstanceOf(input); - Assert.IsInstanceOf(input); + Assert.IsInstanceOf>(input); - Assert.IsNull(input.HeightStructure); - AssertForeshoreProfile(null, input); - - Assert.IsNull(input.HydraulicBoundaryLocation); - CollectionAssert.IsEmpty(input.ForeshoreGeometry); - - AssertAreEqual(double.NaN, input.StructureNormalOrientation); - Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - DistributionAssert.AreEqual(levelCrestStructure, input.LevelCrestStructure); - DistributionAssert.AreEqual(modelFactorSuperCriticalFlow, input.ModelFactorSuperCriticalFlow); - DistributionAssert.AreEqual(allowedLevelIncreaseStorage, input.AllowedLevelIncreaseStorage); - DistributionAssert.AreEqual(storageStructureArea, input.StorageStructureArea); - DistributionAssert.AreEqual(flowWidthAtBottomProtection, input.FlowWidthAtBottomProtection); - DistributionAssert.AreEqual(criticalOvertoppingDischarge, input.CriticalOvertoppingDischarge); - DistributionAssert.AreEqual(widthFlowApertures, input.WidthFlowApertures); - DistributionAssert.AreEqual(stormDuration, input.StormDuration); - Assert.IsNaN(input.FailureProbabilityStructureWithErosion); Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces); Assert.IsNaN(input.DeviationWaveDirection); } [Test] - public void Properties_ModelFactorSuperCriticalFlow_ExpectedValues() - { - // Setup - var random = new Random(22); - var input = new HeightStructuresInput(); - var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation - }; - var distributionToSet = new NormalDistribution(5) - { - Mean = mean, - StandardDeviation = (RoundedDouble) random.NextDouble() - }; - - // Call - input.ModelFactorSuperCriticalFlow = distributionToSet; - - // Assert - AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution); - } - - [Test] - public void Properties_HydraulicBoundaryLocation_ExpectedValues() - { - // Setup - var input = new HeightStructuresInput(); - var location = new HydraulicBoundaryLocation(0, "test", 0, 0); - - // Call - input.HydraulicBoundaryLocation = location; - - // Assert - Assert.AreSame(location, input.HydraulicBoundaryLocation); - } - - [Test] public void Properties_DeviationWaveDirection_ExpectedValues() { // Setup @@ -179,31 +79,6 @@ } [Test] - public void Properties_StormDuration_ExpectedValues() - { - // Setup - var random = new Random(22); - var input = new HeightStructuresInput(); - var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = input.StormDuration.CoefficientOfVariation - }; - var distributionToSet = new VariationCoefficientLogNormalDistribution(5) - { - Mean = mean, - CoefficientOfVariation = (RoundedDouble) random.NextDouble() - }; - - // Call - input.StormDuration = distributionToSet; - - // Assert - AssertDistributionCorrectlySet(input.StormDuration, distributionToSet, expectedDistribution); - } - - [Test] public void Properties_LevelCrestStructure_ExpectedValues() { // Setup @@ -228,280 +103,29 @@ // Assert AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); } - + [Test] - [TestCase(360.004)] - [TestCase(300)] - [TestCase(0)] - [TestCase(-0.004)] - [TestCase(double.NaN)] - public void Properties_StructureNormalOrientationValidValues_NewValueSet(double orientation) + public void Properties_StructureNull_DoesNotChangeValues() { // Setup var input = new HeightStructuresInput(); // Call - input.StructureNormalOrientation = (RoundedDouble) orientation; + input.Structure = null; // Assert - Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - AssertAreEqual(orientation, input.StructureNormalOrientation); - } - - [Test] - [TestCase(400)] - [TestCase(360.05)] - [TestCase(-0.005)] - [TestCase(-23)] - [TestCase(double.PositiveInfinity)] - [TestCase(double.NegativeInfinity)] - public void Properties_StructureNormalOrientationInValidValues_ThrowsArgumentOutOfRangeException(double invalidValue) - { - // Setup - var input = new HeightStructuresInput(); - - // Call - TestDelegate call = () => input.StructureNormalOrientation = (RoundedDouble) invalidValue; - - // Assert - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de oriëntatie moet in het bereik tussen [0, 360] graden liggen."); - } - - [Test] - public void Properties_AllowedLevelIncreaseStorage_ExpectedValues() - { - // Setup - var random = new Random(22); - var input = new HeightStructuresInput(); - var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new LogNormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; - var distributionToSet = new LogNormalDistribution(5) - { - Mean = mean, - StandardDeviation = standardDeviation - }; - - // Call - input.AllowedLevelIncreaseStorage = distributionToSet; - - // Assert - AssertDistributionCorrectlySet(input.AllowedLevelIncreaseStorage, distributionToSet, expectedDistribution); - } - - [Test] - public void Properties_StorageStructureArea_ExpectedValues() - { - // Setup - var random = new Random(22); - var input = new HeightStructuresInput(); - var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; - var distributionToSet = new VariationCoefficientLogNormalDistribution(5) - { - Mean = mean, - CoefficientOfVariation = variation - }; - - // Call - input.StorageStructureArea = distributionToSet; - - // Assert - AssertDistributionCorrectlySet(input.StorageStructureArea, distributionToSet, expectedDistribution); - } - - [Test] - public void Properties_FlowWidthAtBottomProtection_ExpectedValues() - { - // Setup - var random = new Random(22); - var input = new HeightStructuresInput(); - var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new LogNormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; - var distributionToSet = new LogNormalDistribution(5) - { - Mean = mean, - StandardDeviation = standardDeviation - }; - - // Call - input.FlowWidthAtBottomProtection = distributionToSet; - - // Assert - AssertDistributionCorrectlySet(input.FlowWidthAtBottomProtection, distributionToSet, expectedDistribution); - } - - [Test] - public void Properties_CriticalOvertoppingDischarge_ExpectedValues() - { - // Setup - var random = new Random(22); - var input = new HeightStructuresInput(); - var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; - var distributionToSet = new VariationCoefficientLogNormalDistribution(5) - { - Mean = mean, - CoefficientOfVariation = variation - }; - - // Call - input.CriticalOvertoppingDischarge = distributionToSet; - - // Assert - AssertDistributionCorrectlySet(input.CriticalOvertoppingDischarge, distributionToSet, expectedDistribution); - } - - [Test] - [TestCase(0)] - [TestCase(0.5)] - [TestCase(1)] - public void Properties_ValidFailureProbabilityStructureWithErosion_ExpectedValues(double failureProbabilityStructureWithErosion) - { - // Setup - var input = new HeightStructuresInput(); - - // Call - input.FailureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; - - // Assert - Assert.AreEqual(failureProbabilityStructureWithErosion, input.FailureProbabilityStructureWithErosion); - } - - [Test] - [TestCase(-0.1)] - [TestCase(1.1)] - [TestCase(double.NaN)] - public void Properties_InvalidFailureProbabilityStructureWithErosion_ThrowArgumentOutOfRangeException(double failureProbabilityStructureWithErosion) - { - // Setup - var input = new HeightStructuresInput(); - - // Call - TestDelegate call = () => input.FailureProbabilityStructureWithErosion = (RoundedDouble) failureProbabilityStructureWithErosion; - - // Assert - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de faalkans moet in het bereik tussen [0, 1] liggen."); - } - - [Test] - public void Properties_WidthFlowApertures_ExpectedValues() - { - // Setup - var random = new Random(22); - var input = new HeightStructuresInput(); - var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; - var distributionToSet = new VariationCoefficientNormalDistribution(5) - { - Mean = mean, - CoefficientOfVariation = variation - }; - - // Call - input.WidthFlowApertures = distributionToSet; - - // Assert - AssertDistributionCorrectlySet(input.WidthFlowApertures, distributionToSet, expectedDistribution); - } - - [Test] - public void Properties_ForeshoreProfileIsNull_ExpectedValues() - { - // Setup - var input = new HeightStructuresInput - { - UseForeshore = true, - UseBreakWater = true - }; - - // Call - input.ForeshoreProfile = null; - - // Assert - AssertForeshoreProfile(null, input); - } - - [Test] - public void Properties_ForeshoreProfileWithoutBreakwater_ExpectedValues() - { - // Setup - var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new[] - { - new Point2D(1, 1) - }, null, new ForeshoreProfile.ConstructionProperties()); - var input = new HeightStructuresInput(); - - // Call - input.ForeshoreProfile = foreshoreProfile; - - // Assert - AssertForeshoreProfile(foreshoreProfile, input); - } - - [Test] - public void Properties_ForeshoreProfileWithBreakwater_ExpectedValues() - { - // Setup - var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0), new[] - { - new Point2D(1, 1) - }, new BreakWater(BreakWaterType.Wall, 2), new ForeshoreProfile.ConstructionProperties()); - var input = new HeightStructuresInput(); - - // Call - input.ForeshoreProfile = foreshoreProfile; - - // Assert - AssertForeshoreProfile(foreshoreProfile, input); - } - - [Test] - public void Properties_HeightStructureNull_DoesNotChangeValues() - { - // Setup - var input = new HeightStructuresInput(); - - // Call - input.HeightStructure = null; - - // Assert AssertHeightStructure(null, input); } [Test] - public void Properties_HeightStructure_UpdateValuesAccordingly() + public void Properties_Structure_UpdateValuesAccordingly() { // Setup var input = new HeightStructuresInput(); TestHeightStructure structure = new TestHeightStructure(); // Call - input.HeightStructure = structure; + input.Structure = structure; // Assert AssertHeightStructure(structure, input); @@ -511,7 +135,7 @@ { if (expectedHeightStructure == null) { - Assert.IsNull(input.HeightStructure); + Assert.IsNull(input.Structure); var defaultInput = new HeightStructuresInput(); AssertAreEqual(defaultInput.StructureNormalOrientation, input.StructureNormalOrientation); @@ -572,38 +196,7 @@ input.AllowedLevelIncreaseStorage.StandardDeviation); } } - - private static void AssertForeshoreProfile(ForeshoreProfile expectedForeshoreProfile, HeightStructuresInput input) - { - if (expectedForeshoreProfile == null) - { - Assert.IsNull(input.ForeshoreProfile); - Assert.IsFalse(input.UseForeshore); - - Assert.IsFalse(input.UseBreakWater); - BreakWater breakWater = GetDefaultBreakWater(); - Assert.AreEqual(breakWater.Type, input.BreakWater.Type); - AssertAreEqual(breakWater.Height, input.BreakWater.Height); - } - else - { - Assert.AreEqual(expectedForeshoreProfile, input.ForeshoreProfile); - Assert.AreEqual(expectedForeshoreProfile.Geometry.Count() > 1, input.UseForeshore); - - Assert.AreEqual(expectedForeshoreProfile.HasBreakWater, input.UseBreakWater); - BreakWater breakWater = expectedForeshoreProfile.HasBreakWater ? - new BreakWater(expectedForeshoreProfile.BreakWater.Type, expectedForeshoreProfile.BreakWater.Height) : - GetDefaultBreakWater(); - Assert.AreEqual(breakWater.Type, input.BreakWater.Type); - AssertAreEqual(breakWater.Height, input.BreakWater.Height); - } - } - - private static BreakWater GetDefaultBreakWater() - { - return new BreakWater(BreakWaterType.Dam, 0.0); - } - + private static void AssertAreEqual(double expectedValue, RoundedDouble actualValue) { Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); @@ -614,11 +207,5 @@ Assert.AreNotSame(setDistribution, distributionToAssert); DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); } - - private static void AssertDistributionCorrectlySet(IVariationCoefficientDistribution distributionToAssert, IVariationCoefficientDistribution setDistribution, IVariationCoefficientDistribution expectedDistribution) - { - Assert.AreNotSame(setDistribution, distributionToAssert); - DistributionAssert.AreEqual(expectedDistribution, distributionToAssert); - } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs (.../HeightStructuresInputContextPropertiesTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -182,7 +182,7 @@ { InputParameters = { - HeightStructure = new TestHeightStructure(), + Structure = new TestHeightStructure(), HydraulicBoundaryLocation = CreateValidHydraulicBoundaryLocation(), ForeshoreProfile = CreateValidForeshoreProfile() } @@ -197,12 +197,12 @@ // Assert var input = calculation.InputParameters; - Assert.AreSame(input.HeightStructure, properties.HeightStructure); + Assert.AreSame(input.Structure, properties.HeightStructure); - var expectedHeightStructureLocation = new Point2D(new RoundedDouble(0, input.HeightStructure.Location.X), new RoundedDouble(0, input.HeightStructure.Location.Y)); + var expectedHeightStructureLocation = new Point2D(new RoundedDouble(0, input.Structure.Location.X), new RoundedDouble(0, input.Structure.Location.Y)); Assert.AreEqual(expectedHeightStructureLocation, properties.HeightStructureLocation); - Assert.AreEqual(input.HeightStructure.StructureNormalOrientation, properties.StructureNormalOrientation); + Assert.AreEqual(input.Structure.StructureNormalOrientation, properties.StructureNormalOrientation); var levelCrestStructureProperties = new NormalDistributionProperties { Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rfda32224be20ced8ee871a3ab495f11e55d48835 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision fda32224be20ced8ee871a3ab495f11e55d48835) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -608,7 +608,7 @@ InputParameters = { HydraulicBoundaryLocation = hydraulicBoundaryLocation, - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rfda32224be20ced8ee871a3ab495f11e55d48835 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision fda32224be20ced8ee871a3ab495f11e55d48835) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -811,7 +811,7 @@ InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }); @@ -821,7 +821,7 @@ InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -734,7 +734,7 @@ InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }); failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation @@ -743,7 +743,7 @@ InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextStructureEditorTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextStructureEditorTest.cs (.../HeightStructuresInputContextStructureEditorTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextStructureEditorTest.cs (.../HeightStructuresInputContextStructureEditorTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -99,7 +99,7 @@ { InputParameters = { - HeightStructure = heightStructure + Structure = heightStructure } }, new HeightStructuresFailureMechanism Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs (.../HeightStructuresScenariosViewTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs (.../HeightStructuresScenariosViewTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -224,7 +224,7 @@ var calculationA = (HeightStructuresCalculation) failureMechanism.CalculationsGroup.Children[0]; var calculationB = (HeightStructuresCalculation) failureMechanism.CalculationsGroup.Children[1]; - calculationA.InputParameters.HeightStructure = calculationB.InputParameters.HeightStructure; + calculationA.InputParameters.Structure = calculationB.InputParameters.Structure; // Call calculationA.NotifyObservers(); @@ -254,12 +254,12 @@ Name = "CalculationC", InputParameters = { - HeightStructure = calculationB.InputParameters.HeightStructure + Structure = calculationB.InputParameters.Structure } }; failureMechanism.CalculationsGroup.Children.Add(calculationC); - calculationC.InputParameters.HeightStructure = calculationC.InputParameters.HeightStructure; + calculationC.InputParameters.Structure = calculationC.InputParameters.Structure; // Call failureMechanism.CalculationsGroup.NotifyObservers(); @@ -311,15 +311,15 @@ Name = "CalculationA", InputParameters = { - HeightStructure = new TestHeightStructure(matchingPointA) + Structure = new TestHeightStructure(matchingPointA) } }; var calculationB = new HeightStructuresCalculation { Name = "CalculationB", InputParameters = { - HeightStructure = new TestHeightStructure(matchingPointB) + Structure = new TestHeightStructure(matchingPointB) } }; Point2D connectionPoint = new Point2D(10, 10); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -147,7 +147,7 @@ InputParameters = { HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }; @@ -197,7 +197,7 @@ InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }; @@ -251,7 +251,7 @@ InputParameters = { HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }; @@ -299,7 +299,7 @@ InputParameters = { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1), - HeightStructure = new TestHeightStructure() + Structure = new TestHeightStructure() } }; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -110,7 +110,7 @@ Name = NamingHelper.GetUniqueName(((CalculationGroup) view.Data).Children, profile.Name, c => c.Name), InputParameters = { - HeightStructure = profile + Structure = profile } }); } @@ -157,7 +157,7 @@ Name = NamingHelper.GetUniqueName(calculationsGroup.Children, profile.Name, c => c.Name), InputParameters = { - HeightStructure = profile + Structure = profile } }); } @@ -209,15 +209,15 @@ Name = NamingHelper.GetUniqueName(assessmentSection.HeightStructures.CalculationsGroup.Children, profile.Name + "Calculation", c => c.Name), InputParameters = { - HeightStructure = profile + Structure = profile } }); } // Call var calculationsGroup = assessmentSection.HeightStructures.CalculationsGroup; - ((HeightStructuresCalculation) calculationsGroup.Children[1]).InputParameters.HeightStructure = - ((HeightStructuresCalculation) calculationsGroup.Children[0]).InputParameters.HeightStructure; + ((HeightStructuresCalculation) calculationsGroup.Children[1]).InputParameters.Structure = + ((HeightStructuresCalculation) calculationsGroup.Children[0]).InputParameters.Structure; calculationsGroup.NotifyObservers(); // Assert Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs =================================================================== diff -u -rf989a06ad41e4081dd1d155fafa263e94b070816 -r3dc04fc5fb21350c7b4da44fdba336aead86560e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs (.../HeightStructuresHelperTest.cs) (revision f989a06ad41e4081dd1d155fafa263e94b070816) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs (.../HeightStructuresHelperTest.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) @@ -68,15 +68,15 @@ { InputParameters = { - HeightStructure = new TestHeightStructure(new Point2D(1.1, 2.2)) + Structure = new TestHeightStructure(new Point2D(1.1, 2.2)) } }; private readonly HeightStructuresCalculation calculationInSectionB = new HeightStructuresCalculation { InputParameters = { - HeightStructure = new TestHeightStructure(new Point2D(50.0, 66.0)) + Structure = new TestHeightStructure(new Point2D(50.0, 66.0)) } };