Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensions.cs =================================================================== diff -u -r8d37f4040238a84405d8f08363ec706232a35326 -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensions.cs (.../HeightStructuresSectionResultEntityReadExtensions.cs) (revision 8d37f4040238a84405d8f08363ec706232a35326) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresSectionResultEntityReadExtensions.cs (.../HeightStructuresSectionResultEntityReadExtensions.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -58,7 +58,7 @@ } sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne; - sectionResult.TailorMadeAssessmentProbability = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); + sectionResult.TailorMadeAssessmentProbability = entity.LayerThree.ToNullAsNaN(); if (entity.HeightStructuresCalculationEntity != null) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r8d37f4040238a84405d8f08363ec706232a35326 -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 8d37f4040238a84405d8f08363ec706232a35326) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -56,7 +56,7 @@ // Setup var random = new Random(21); var assessmentLayerOneResult = random.NextEnumValue(); - RoundedDouble tailorMadeAssessmentProbability = random.NextRoundedDouble(); + double tailorMadeAssessmentProbability = random.NextDouble(); var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection()) { @@ -79,7 +79,7 @@ // Setup var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection()) { - TailorMadeAssessmentProbability = RoundedDouble.NaN + TailorMadeAssessmentProbability = double.NaN }; // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r4f8f3ccccf4857781fe92b05d64e54320e6bfdfe -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 4f8f3ccccf4857781fe92b05d64e54320e6bfdfe) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -886,7 +886,7 @@ foreach (HeightStructuresFailureMechanismSectionResult sectionResult in sectionResults) { sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState(); - sectionResult.TailorMadeAssessmentProbability = (RoundedDouble) random.NextDouble(); + sectionResult.TailorMadeAssessmentProbability = random.NextDouble(); if (!firstSectionResultHasCalculation) { sectionResult.Calculation = calculation; Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -r83f5499bf4aeeddd62dcd1ebecbdfe97ed61b406 -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision 83f5499bf4aeeddd62dcd1ebecbdfe97ed61b406) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -67,6 +67,8 @@ /// The property values required to create an instance of /// . /// Thrown when any parameter is null. + /// Thrown when + /// is a valid value, but unsupported. public ClosingStructuresFailureMechanismSectionResultRow(ClosingStructuresFailureMechanismSectionResult sectionResult, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection, @@ -111,6 +113,8 @@ /// /// Gets or sets the value representing the simple assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public SimpleAssessmentResultType SimpleAssessmentResult { get @@ -127,6 +131,8 @@ /// /// Gets or sets the value representing the detailed assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public DetailedAssessmentResultType DetailedAssessmentResult { get @@ -143,6 +149,8 @@ /// /// Gets the value representing the detailed assessment probability. /// + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double DetailedAssessmentProbability { @@ -155,6 +163,8 @@ /// /// Gets or sets the value representing the tailor made assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public TailorMadeAssessmentProbabilityCalculationResultType TailorMadeAssessmentResult { get @@ -171,8 +181,10 @@ /// /// Gets or sets the value of the tailored assessment of safety. /// - /// Thrown when - /// is outside of the valid ranges. + /// Thrown when is + /// not in the range [0,1]. + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double TailorMadeAssessmentProbability { @@ -191,6 +203,8 @@ /// Gets or sets the indicator whether the combined assembly probability /// should be overwritten by . /// + /// Thrown when + /// is a valid value, but unsupported. public bool UseManualAssemblyProbability { get @@ -209,6 +223,8 @@ /// /// Thrown when is /// not in the range [0,1]. + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double ManualAssemblyProbability { @@ -273,6 +289,9 @@ [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double CombinedAssemblyProbability { get; private set; } + /// + /// Thrown when + /// is a valid value, but unsupported. public override void Update() { UpdateDerivedData(); @@ -411,6 +430,11 @@ } } + /// + /// Updates the column state definitions. + /// + /// Thrown when + /// is a valid value, but unsupported. private void UpdateColumnStateDefinitions() { bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -r920968c5c2c32585a5493e8a84f600d4a5c5524e -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision 920968c5c2c32585a5493e8a84f600d4a5c5524e) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -68,6 +68,8 @@ /// The property values required to create an instance of /// . /// Thrown when any parameter is null. + /// Thrown when + /// is a valid value, but unsupported. internal GrassCoverErosionInwardsFailureMechanismSectionResultRow(GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult, GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection, @@ -112,6 +114,8 @@ /// /// Gets or sets the value representing the simple assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public SimpleAssessmentResultValidityOnlyType SimpleAssessmentResult { get @@ -128,6 +132,8 @@ /// /// Gets or sets the value representing the detailed assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public DetailedAssessmentResultType DetailedAssessmentResult { get @@ -144,6 +150,8 @@ /// /// Gets the value representing the result of the detailed assessment. /// + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double DetailedAssessmentProbability { @@ -156,6 +164,8 @@ /// /// Gets or sets the value representing the tailor made assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public TailorMadeAssessmentProbabilityCalculationResultType TailorMadeAssessmentResult { get @@ -174,6 +184,8 @@ /// /// Thrown when is /// not in the range [0,1]. + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double TailorMadeAssessmentProbability { @@ -242,6 +254,8 @@ /// Gets or sets the indicator whether the combined assembly probability /// should be overwritten by . /// + /// Thrown when + /// is a valid value, but unsupported. public bool UseManualAssemblyProbability { get @@ -260,6 +274,8 @@ /// /// Thrown when is /// not in the range [0,1]. + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double ManualAssemblyProbability { @@ -290,6 +306,9 @@ } } + /// + /// Thrown when + /// is a valid value, but unsupported. public override void Update() { UpdateDerivedData(); @@ -411,7 +430,12 @@ ColumnStateDefinitions[combinedAssemblyProbabilityIndex].ErrorText = e.Message; } } - + + /// + /// Updates the column state definitions. + /// + /// Thrown when + /// is a valid value, but unsupported. private void UpdateColumnDefinitionStates() { bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -r8717c2a330a44d6abf7a5a329c7c98dfae8fba76 -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 8717c2a330a44d6abf7a5a329c7c98dfae8fba76) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs (.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -28,7 +28,6 @@ using Ringtoets.Common.Data.AssemblyTool; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Exceptions; -using Ringtoets.Common.Primitives; namespace Ringtoets.HeightStructures.Data { @@ -114,7 +113,7 @@ failureMechanism.GeneralInput.N); return calculator.AssembleDetailedAssessment( - DetailedAssessmentResultType.Probability, + failureMechanismSectionResult.DetailedAssessmentResult, failureMechanismSectionResult.GetDetailedAssessmentProbability(failureMechanism, assessmentSection), categories); } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -r920968c5c2c32585a5493e8a84f600d4a5c5524e -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision 920968c5c2c32585a5493e8a84f600d4a5c5524e) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -66,6 +66,8 @@ /// The property values required to create an instance of /// . /// Thrown when any parameter is null. + /// Thrown when + /// is a valid value, but unsupported. internal HeightStructuresFailureMechanismSectionResultRow(HeightStructuresFailureMechanismSectionResult sectionResult, HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection, @@ -110,6 +112,8 @@ /// /// Gets or sets the value representing the simple assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public SimpleAssessmentResultType SimpleAssessmentResult { get @@ -126,6 +130,8 @@ /// /// Gets or sets the value representing the detailed assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public DetailedAssessmentResultType DetailedAssessmentResult { get @@ -142,6 +148,8 @@ /// /// Gets the value representing the result of the detailed assessment. /// + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double DetailedAssessmentProbability { @@ -154,6 +162,8 @@ /// /// Gets or sets the value representing the tailor made assessment result. /// + /// Thrown when + /// is a valid value, but unsupported. public TailorMadeAssessmentProbabilityCalculationResultType TailorMadeAssessmentResult { get @@ -172,6 +182,8 @@ /// /// Thrown when is /// not in the range [0,1]. + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double TailorMadeAssessmentProbability { @@ -240,6 +252,8 @@ /// Gets or sets the indicator whether the combined assembly probability /// should be overwritten by . /// + /// Thrown when + /// is a valid value, but unsupported. public bool UseManualAssemblyProbability { get @@ -258,6 +272,8 @@ /// /// Thrown when is /// not in the range [0,1]. + /// Thrown when + /// is a valid value, but unsupported. [TypeConverter(typeof(NoProbabilityValueDoubleConverter))] public double ManualAssemblyProbability { @@ -272,6 +288,9 @@ } } + /// + /// Thrown when + /// is a valid value, but unsupported. public override void Update() { UpdateDerivedData(); @@ -410,6 +429,11 @@ } } + /// + /// Updates the column state definitions. + /// + /// Thrown when + /// is a valid value, but unsupported. private void UpdateColumnDefinitionStates() { bool simpleAssessmentSufficient = FailureMechanismSectionResultRowHelper.SimpleAssessmentIsSufficient(SimpleAssessmentResult); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs =================================================================== diff -u -rebad9aba8cf976073338b40279fb12bcecdcac46 -r4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision ebad9aba8cf976073338b40279fb12bcecdcac46) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision 4cdd6c4ecd15eba7d16363e42b7a6dcae4169bd0) @@ -197,6 +197,7 @@ Assert.AreEqual("VIv", cells[combinedAssemblyCategoryGroupIndex].Value); Assert.AreEqual(false, cells[useManualAssemblyCategoryGroupIndex].Value); Assert.AreEqual(SelectableFailureMechanismSectionAssemblyCategoryGroup.None, cells[manualAssemblyCategoryGroupIndex].Value); + mocks.VerifyAll(); } } }