Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs =================================================================== diff -u -rd26a556cd48a6494079d88774977215ee2177274 -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision d26a556cd48a6494079d88774977215ee2177274) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision a79ad28aed9a5de0a80df09d9b7e65d45070b940) @@ -51,7 +51,7 @@ private readonly VariationCoefficientLogNormalDistribution criticalOvertoppingDischarge; private RoundedDouble structureNormalOrientation; private RoundedDouble factorStormDurationOpenStructure; - private double failureProbablityOpenStructure; + private double failureProbabilityOpenStructure; private double failureProbabilityReparation; private double failureProbabilityStructureWithErosion; private double probabilityOpenStructureBeforeFlooding; @@ -67,7 +67,7 @@ factorStormDurationOpenStructure = new RoundedDouble(2, double.NaN); deviationWaveDirection = new RoundedDouble(2, double.NaN); - failureProbablityOpenStructure = double.NaN; + failureProbabilityOpenStructure = double.NaN; failureProbabilityReparation = double.NaN; failureProbabilityStructureWithErosion = double.NaN; probabilityOpenStructureBeforeFlooding = 1.0; @@ -418,15 +418,15 @@ { get { - return failureProbablityOpenStructure; + return failureProbabilityOpenStructure; } set { if (!ValidProbabilityValue(value)) { throw new ArgumentOutOfRangeException("value", RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_between_0_and_1); } - failureProbablityOpenStructure = value; + failureProbabilityOpenStructure = value; } } @@ -436,7 +436,7 @@ /// /// Thrown when the value of the probability /// is not between [0, 1]. - public double FailureProbablityReparation + public double FailureProbabilityReparation { get { Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -ra2c7b86519fdc614e1156b67ace16b5c9f265520 -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a2c7b86519fdc614e1156b67ace16b5c9f265520) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a79ad28aed9a5de0a80df09d9b7e65d45070b940) @@ -109,38 +109,38 @@ } /// - /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie.. + /// Looks up a localized string similar to Kans op mislukken sluiting van geopend kunstwerk.. /// - public static string FailureProbabilityReparation_Description { + public static string FailureProbabilityOpenStructure_Description { get { - return ResourceManager.GetString("FailureProbabilityReparation_Description", resourceCulture); + return ResourceManager.GetString("FailureProbabilityOpenStructure_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie [1/jaar]. + /// Looks up a localized string similar to Kans mislukken sluiting [1/jaar]. /// - public static string FailureProbabilityReparation_DisplayName { + public static string FailureProbabilityOpenStructure_DisplayName { get { - return ResourceManager.GetString("FailureProbabilityReparation_DisplayName", resourceCulture); + return ResourceManager.GetString("FailureProbabilityOpenStructure_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Kans op mislukken sluiting van geopend kunstwerk.. + /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie.. /// - public static string FailureProbablityOpenStructure_Description { + public static string FailureProbabilityReparation_Description { get { - return ResourceManager.GetString("FailureProbablityOpenStructure_Description", resourceCulture); + return ResourceManager.GetString("FailureProbabilityReparation_Description", resourceCulture); } } /// - /// Looks up a localized string similar to Kans mislukken sluiting [1/jaar]. + /// Looks up a localized string similar to Faalkans herstel van gefaalde situatie [1/jaar]. /// - public static string FailureProbablityOpenStructure_DisplayName { + public static string FailureProbabilityReparation_DisplayName { get { - return ResourceManager.GetString("FailureProbablityOpenStructure_DisplayName", resourceCulture); + return ResourceManager.GetString("FailureProbabilityReparation_DisplayName", resourceCulture); } } @@ -217,7 +217,7 @@ } /// - /// Looks up a localized string similar to Drempelhoogte niet gesloten kering of hoogte van de onderkant van de wand/drempel.. + /// Looks up a localized string similar to Drempelhoogte niet gesloten kering.. /// public static string ThresholdHeightOpenWeir_Description { get { Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx =================================================================== diff -u -ra2c7b86519fdc614e1156b67ace16b5c9f265520 -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision a2c7b86519fdc614e1156b67ace16b5c9f265520) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision a79ad28aed9a5de0a80df09d9b7e65d45070b940) @@ -156,10 +156,10 @@ Kans op open staan bij naderend hoogwater [-] - + Kans op mislukken sluiting van geopend kunstwerk. - + Kans mislukken sluiting [1/jaar] Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs =================================================================== diff -u -rb70abd70f1cd326d1a753c5879a065149ac2ae84 -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision b70abd70f1cd326d1a753c5879a065149ac2ae84) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision a79ad28aed9a5de0a80df09d9b7e65d45070b940) @@ -54,7 +54,7 @@ private const int insideWaterLevelPropertyIndex = 13; private const int criticalOvertoppingDischargePropertyIndex = 14; private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 15; - private const int failureProbablityOpenStructurePropertyIndex = 16; + private const int failureProbabilityOpenStructurePropertyIndex = 16; private const int failureProbabilityReparationPropertyIndex = 17; [PropertyOrder(namePropertyIndex)] @@ -275,10 +275,10 @@ } } - [PropertyOrder(failureProbablityOpenStructurePropertyIndex)] + [PropertyOrder(failureProbabilityOpenStructurePropertyIndex)] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] - [ResourcesDisplayName(typeof(Resources), "FailureProbablityOpenStructure_DisplayName")] - [ResourcesDescription(typeof(Resources), "FailureProbablityOpenStructure_Description")] + [ResourcesDisplayName(typeof(Resources), "FailureProbabilityOpenStructure_DisplayName")] + [ResourcesDescription(typeof(Resources), "FailureProbabilityOpenStructure_Description")] public string FailureProbabilityOpenStructure { get Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -r655bf07f2f48502ad49bb0980514db70dbe71704 -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 655bf07f2f48502ad49bb0980514db70dbe71704) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision a79ad28aed9a5de0a80df09d9b7e65d45070b940) @@ -63,7 +63,7 @@ Assert.IsNaN(input.FailureProbabilityOpenStructure); Assert.IsNaN(input.FailureProbabilityStructureWithErosion); - Assert.IsNaN(input.FailureProbablityReparation); + Assert.IsNaN(input.FailureProbabilityReparation); Assert.IsNaN(input.FactorStormDurationOpenStructure); Assert.IsNaN(input.DeviationWaveDirection); @@ -348,7 +348,7 @@ [TestCase(-1.1)] [TestCase(2)] [TestCase(double.NaN)] - public void Properties_FailureProbablityOpenStructure_ThrowArgumentException(double probability) + public void Properties_FailureProbabilityOpenStructure_ThrowArgumentException(double probability) { // Setup var input = new ClosingStructuresInput(); @@ -380,13 +380,13 @@ [TestCase(-1.1)] [TestCase(2)] [TestCase(double.NaN)] - public void Properties_FailureProbablityReparation_ThrowArgumentOutOfRangeException(double probability) + public void Properties_FailureProbabilityReparation_ThrowArgumentOutOfRangeException(double probability) { // Setup var input = new ClosingStructuresInput(); // Call - TestDelegate call = () => input.FailureProbablityReparation = probability; + TestDelegate call = () => input.FailureProbabilityReparation = probability; // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de faalkans moet in het bereik tussen [0, 1] liggen."); @@ -402,10 +402,10 @@ var input = new ClosingStructuresInput(); // Call - input.FailureProbablityReparation = probability; + input.FailureProbabilityReparation = probability; // Assert - Assert.AreEqual(probability, input.FailureProbablityReparation); + Assert.AreEqual(probability, input.FailureProbabilityReparation); } [Test] Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs =================================================================== diff -u -r280b0f571146361ce8d158cb7db49668c441214e -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision 280b0f571146361ce8d158cb7db49668c441214e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision a79ad28aed9a5de0a80df09d9b7e65d45070b940) @@ -26,6 +26,7 @@ using NUnit.Framework; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.Forms.PropertyClasses; +using Ringtoets.Common.Forms.Helpers; namespace Ringtoets.ClosingStructures.Forms.Test.PropertyClasses { @@ -47,7 +48,7 @@ private const int insideWaterLevelPropertyIndex = 12; private const int criticalOvertoppingDischargePropertyIndex = 13; private const int probabilityOpenStructureBeforeFloodingPropertyIndex = 14; - private const int failureProbablityOpenStructurePropertyIndex = 15; + private const int failureProbabilityOpenStructurePropertyIndex = 15; private const int failureProbabilityReparationPropertyIndex = 16; [Test] @@ -127,6 +128,10 @@ Assert.AreEqual(structure.CriticalOvertoppingDischarge, properties.CriticalOvertoppingDischarge.Data); Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("Mean")); Assert.IsTrue(properties.CriticalOvertoppingDischarge.DynamicReadOnlyValidationMethod("CoefficientOfVariation")); + + Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.ProbabilityOpenStructureBeforeFlooding), properties.ProbabilityOpenStructureBeforeFlooding); + Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityOpenStructure), properties.FailureProbabilityOpenStructure); + Assert.AreEqual(ProbabilityFormattingHelper.Format(structure.FailureProbabilityReparation), properties.FailureProbabilityReparation); } [Test]