Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs =================================================================== diff -u -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -85,7 +85,7 @@ StandardDeviation = (RoundedDouble) 0.1 }; } - + #region Structure /// Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -r15ead312ec6f70a6f5b3fd75a01b2735cca3e616 -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 15ead312ec6f70a6f5b3fd75a01b2735cca3e616) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -36,7 +36,7 @@ [Test] public void Constructor_ExpectedValues() { - // Setup + // Setup var insideWaterLevel = new NormalDistribution(2) { Mean = (RoundedDouble) double.NaN, @@ -109,9 +109,8 @@ public void Properties_FactorStormDurationOpenStructure_ExpectedValues() { // Setup - var input = new ClosingStructuresInput(); var random = new Random(22); - + var input = new ClosingStructuresInput(); var factorStormDuration = new RoundedDouble(5, random.NextDouble()); // Call @@ -203,7 +202,7 @@ [TestCase(-1.1)] [TestCase(2)] [TestCase(double.NaN)] - public void Properties_FailureProbabilityOpenStructure_ThrowArgumentException(double probability) + public void Properties_FailureProbabilityOpenStructure_ThrowArgumentOutOfRangeException(double probability) { // Setup var input = new ClosingStructuresInput(); @@ -267,9 +266,8 @@ public void Properties_IdenticalApertures_ExpectedValues() { // Setup - var input = new ClosingStructuresInput(); var random = new Random(22); - + var input = new ClosingStructuresInput(); int identicalAperture = random.Next(); // Call @@ -335,9 +333,8 @@ public void Properties_DeviationWaveDirection_ExpectedValues() { // Setup - var input = new ClosingStructuresInput(); var random = new Random(22); - + var input = new ClosingStructuresInput(); var deviationWaveDirection = new RoundedDouble(5, random.NextDouble()); // Call @@ -352,7 +349,7 @@ [TestCase(-1.1)] [TestCase(2)] [TestCase(double.NaN)] - public void Properties_ProbabilityOpenStructureBeforeFlooding_ThrowArgumentException(double probability) + public void Properties_ProbabilityOpenStructureBeforeFlooding_ThrowArgumentOutOfRangeException(double probability) { // Setup var input = new ClosingStructuresInput(); @@ -449,7 +446,7 @@ DistributionAssert.AreEqual(expectedClosingStructure.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); } } - + private static void AssertAreEqual(double expectedValue, RoundedDouble actualValue) { Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs =================================================================== diff -u -r64fea503e6e9cacfb0ff8f22cfdd864b60c95bab -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision 64fea503e6e9cacfb0ff8f22cfdd864b60c95bab) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -87,6 +87,8 @@ } } + #endregion + protected override void UpdateStructureProperties() { if (Structure != null) @@ -101,7 +103,5 @@ AllowedLevelIncreaseStorage = Structure.AllowedLevelIncreaseStorage; } } - - #endregion } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -114,7 +114,7 @@ return data.FailureMechanism.ForeshoreProfiles; } - #region Schematisation + #region Schematization [PropertyOrder(heightStructurePropertyIndex)] [Editor(typeof(HeightStructuresInputContextStructureEditor), typeof(UITypeEditor))] Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -rf211e80f654ef76473f816c8846521a28232d591 -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision f211e80f654ef76473f816c8846521a28232d591) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -49,7 +49,6 @@ using Ringtoets.HydraRing.IO; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; -using HeightStructuresFormsResources = Ringtoets.HeightStructures.Forms.Properties.Resources; using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources; using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs =================================================================== diff -u -r64fea503e6e9cacfb0ff8f22cfdd864b60c95bab -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision 64fea503e6e9cacfb0ff8f22cfdd864b60c95bab) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -58,8 +58,8 @@ public void Properties_DeviationWaveDirection_ExpectedValues() { // Setup - var input = new HeightStructuresInput(); var random = new Random(22); + var input = new HeightStructuresInput(); RoundedDouble deviationWaveDirection = new RoundedDouble(5, random.NextDouble()); @@ -96,7 +96,7 @@ // Assert AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); } - + [Test] public void Properties_StructureNull_DoesNotChangeValues() { @@ -155,7 +155,7 @@ DistributionAssert.AreEqual(expectedHeightStructure.AllowedLevelIncreaseStorage, input.AllowedLevelIncreaseStorage); } } - + private static void AssertAreEqual(double expectedValue, RoundedDouble actualValue) { Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs =================================================================== diff -u -rc899b9042ee83f3ac6d6213515d7edacfbe8c414 -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision c899b9042ee83f3ac6d6213515d7edacfbe8c414) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs (.../HeightStructuresScenariosViewIntegrationTest.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -103,14 +103,14 @@ // Call - foreach (var profile in assessmentSection.HeightStructures.HeightStructures) + foreach (var structure in assessmentSection.HeightStructures.HeightStructures) { calculationsGroup.Children.Add(new HeightStructuresCalculation { - Name = NamingHelper.GetUniqueName(((CalculationGroup) view.Data).Children, profile.Name, c => c.Name), + Name = NamingHelper.GetUniqueName(((CalculationGroup) view.Data).Children, structure.Name, c => c.Name), InputParameters = { - Structure = profile + Structure = structure } }); } @@ -139,7 +139,7 @@ .Import(); CalculationGroup calculationsGroup = assessmentSection.HeightStructures.CalculationsGroup; - var view = new HeightStructuresScenariosView() + var view = new HeightStructuresScenariosView { Data = calculationsGroup, FailureMechanism = assessmentSection.HeightStructures @@ -150,14 +150,14 @@ var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - foreach (var profile in assessmentSection.HeightStructures.HeightStructures) + foreach (var structure in assessmentSection.HeightStructures.HeightStructures) { calculationsGroup.Children.Add(new HeightStructuresCalculation { - Name = NamingHelper.GetUniqueName(calculationsGroup.Children, profile.Name, c => c.Name), + Name = NamingHelper.GetUniqueName(calculationsGroup.Children, structure.Name, c => c.Name), InputParameters = { - Structure = profile + Structure = structure } }); } @@ -192,7 +192,7 @@ filePath) .Import(); - var view = new HeightStructuresScenariosView() + var view = new HeightStructuresScenariosView { Data = assessmentSection.HeightStructures.CalculationsGroup, FailureMechanism = assessmentSection.HeightStructures @@ -202,14 +202,14 @@ var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; - foreach (var profile in assessmentSection.HeightStructures.HeightStructures) + foreach (var structure in assessmentSection.HeightStructures.HeightStructures) { assessmentSection.HeightStructures.CalculationsGroup.Children.Add(new HeightStructuresCalculation { - Name = NamingHelper.GetUniqueName(assessmentSection.HeightStructures.CalculationsGroup.Children, profile.Name + "Calculation", c => c.Name), + Name = NamingHelper.GetUniqueName(assessmentSection.HeightStructures.CalculationsGroup.Children, structure.Name + "Calculation", c => c.Name), InputParameters = { - Structure = profile + Structure = structure } }); } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs =================================================================== diff -u -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 -rba2eefab3569d05ed59629b5d02dc8420bc1163a --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a) @@ -63,7 +63,7 @@ factorStormDurationOpenStructure = new RoundedDouble(2, double.NaN); failureProbabilityRepairClosure = double.NaN; probabilityCollisionSecondaryStructure = double.NaN; - evaluationLevel = new RoundedDouble(2, 0); + evaluationLevel = new RoundedDouble(2); verticalDistance = new RoundedDouble(2, double.NaN); insideWaterLevelFailureConstruction = new NormalDistribution(2) @@ -158,7 +158,7 @@ } #region Structure / calculation - + /// /// Gets or sets the type of stability point structure inflow model. /// @@ -225,7 +225,7 @@ #endregion - #region Model Inputs and critical values + #region Model inputs and critical values /// /// Gets or sets the factor for the storm duration for an open structure.