Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs =================================================================== diff -u -r065af7e201b59ec19a17c42e9d772f5e86b31338 -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs (.../ProbabilityAssessmentOutput.cs) (revision 065af7e201b59ec19a17c42e9d772f5e86b31338) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentOutput.cs (.../ProbabilityAssessmentOutput.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -48,9 +48,9 @@ public ProbabilityAssessmentOutput(double requiredProbability, double requiredReliability, double probability, double reliability, double factorOfSafety) { RequiredProbability = requiredProbability; - RequiredReliability = new RoundedDouble(3, requiredReliability); + RequiredReliability = new RoundedDouble(5, requiredReliability); Probability = probability; - Reliability = new RoundedDouble(3, reliability); + Reliability = new RoundedDouble(5, reliability); FactorOfSafety = new RoundedDouble(3, factorOfSafety); } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs =================================================================== diff -u -raf62e374c37713df98c2866ec4bfa64206b5b2b3 -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision af62e374c37713df98c2866ec4bfa64206b5b2b3) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentOutputTest.cs (.../ProbabilityAssessmentOutputTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -52,9 +52,12 @@ Assert.IsNotNull(output); Assert.AreEqual(requiredProbability, output.RequiredProbability); + Assert.AreEqual(5, output.RequiredReliability.NumberOfDecimalPlaces); Assert.AreEqual(requiredReliability, output.RequiredReliability); Assert.AreEqual(probability, output.Probability); + Assert.AreEqual(5, output.Reliability.NumberOfDecimalPlaces); Assert.AreEqual(reliability, output.Reliability); + Assert.AreEqual(3, output.FactorOfSafety.NumberOfDecimalPlaces); Assert.AreEqual(factorOfSafety, output.FactorOfSafety); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ProbabilityAssessmentOutputPropertiesTest.cs =================================================================== diff -u -r5c5df51bc14a7e25692abf1db5a7476e5036b13f -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ProbabilityAssessmentOutputPropertiesTest.cs (.../ProbabilityAssessmentOutputPropertiesTest.cs) (revision 5c5df51bc14a7e25692abf1db5a7476e5036b13f) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ProbabilityAssessmentOutputPropertiesTest.cs (.../ProbabilityAssessmentOutputPropertiesTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -25,6 +25,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Probability; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PropertyClasses; @@ -71,10 +72,10 @@ // Assert Assert.AreEqual(ProbabilityFormattingHelper.Format(requiredProbability), properties.RequiredProbability); - Assert.AreEqual(requiredReliability, properties.RequiredReliability, 1e-3); + Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); Assert.AreEqual(ProbabilityFormattingHelper.Format(probability), properties.Probability); - Assert.AreEqual(reliability, properties.Reliability, 1e-3); - Assert.AreEqual(factorOfSafety, properties.FactorOfSafety, 1e-3); + Assert.AreEqual(reliability, properties.Reliability, properties.Reliability.GetAccuracy()); + Assert.AreEqual(factorOfSafety, properties.FactorOfSafety, properties.FactorOfSafety.GetAccuracy()); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs =================================================================== diff -u -r7d6e4c28a40fb056c182d0691dda2b2e88aeebfd -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 7d6e4c28a40fb056c182d0691dda2b2e88aeebfd) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -80,15 +80,13 @@ // Assert Assert.AreEqual(2, properties.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(waveHeight, properties.WaveHeight, properties.WaveHeight.GetAccuracy()); - Assert.AreEqual(3, properties.Reliability.NumberOfDecimalPlaces); Assert.AreEqual(reliability, properties.Reliability, properties.Reliability.GetAccuracy()); - Assert.AreEqual(3, properties.RequiredReliability.NumberOfDecimalPlaces); Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); Assert.AreEqual(3, properties.FactorOfSafety.NumberOfDecimalPlaces); Assert.AreEqual(factorOfSafety, properties.FactorOfSafety, properties.FactorOfSafety.GetAccuracy()); Assert.AreEqual(ProbabilityFormattingHelper.Format(requiredProbability), properties.RequiredProbability); - Assert.AreEqual(requiredReliability, properties.RequiredReliability, 1e-3); + Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy()); Assert.AreEqual(ProbabilityFormattingHelper.Format(probability), properties.Probability); Assert.AreEqual(isOvertoppingDominant, properties.IsOvertoppingDominant); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticOutput.cs =================================================================== diff -u -r065af7e201b59ec19a17c42e9d772f5e86b31338 -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticOutput.cs (.../PipingSemiProbabilisticOutput.cs) (revision 065af7e201b59ec19a17c42e9d772f5e86b31338) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticOutput.cs (.../PipingSemiProbabilisticOutput.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -73,9 +73,9 @@ SellmeijerProbability = sellmeijerProbability; RequiredProbability = requiredProbability; - RequiredReliability = new RoundedDouble(3, requiredReliability); + RequiredReliability = new RoundedDouble(5, requiredReliability); PipingProbability = pipingProbability; - PipingReliability = new RoundedDouble(3, pipingReliability); + PipingReliability = new RoundedDouble(5, pipingReliability); PipingFactorOfSafety = new RoundedDouble(3, pipingFactorOfSafety); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs =================================================================== diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs (.../PipingSemiProbabilisticOutputTest.cs) (revision b190a14336e0d8fe9aec34e81a68194081c76155) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs (.../PipingSemiProbabilisticOutputTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -77,9 +77,12 @@ Assert.AreEqual(sellmeijerReliability, output.SellmeijerReliability, output.SellmeijerReliability.GetAccuracy()); Assert.AreEqual(sellmeijerProbability, output.SellmeijerProbability); Assert.AreEqual(requiredProbability, output.RequiredProbability); + Assert.AreEqual(5, output.RequiredReliability.NumberOfDecimalPlaces); Assert.AreEqual(requiredReliability, output.RequiredReliability, output.RequiredReliability.GetAccuracy()); Assert.AreEqual(pipingProbability, output.PipingProbability); + Assert.AreEqual(5, output.PipingReliability.NumberOfDecimalPlaces); Assert.AreEqual(pipingReliability, output.PipingReliability, output.PipingReliability.GetAccuracy()); + Assert.AreEqual(3, output.PipingFactorOfSafety.NumberOfDecimalPlaces); Assert.AreEqual(pipingFactorOfSafety, output.PipingFactorOfSafety, output.PipingFactorOfSafety.GetAccuracy()); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -118,9 +118,9 @@ } [Test] - [TestCase(30000, 6000, 24, 4.777)] - [TestCase(20000, 6000, 12, 4.835)] - [TestCase(20000, 8000, 24, 4.748)] + [TestCase(30000, 6000, 24, 4.777171914)] + [TestCase(20000, 6000, 12, 4.834719763)] + [TestCase(20000, 8000, 24, 4.747728143)] public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double assessmentSectionLength, double contribution, double expectedResult) { // Setup Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs (.../WaveConditionsOutput.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs (.../WaveConditionsOutput.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -62,10 +62,10 @@ WaveDirection = new RoundedDouble(2, waveDirection); TargetProbability = targetProbability; - TargetReliability = new RoundedDouble(6, targetReliability); + TargetReliability = new RoundedDouble(5, targetReliability); CalculatedProbability = calculatedProbability; - CalculatedReliability = new RoundedDouble(6, calculatedReliability); + CalculatedReliability = new RoundedDouble(5, calculatedReliability); } /// Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs (.../WaveConditionsOutputTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs (.../WaveConditionsOutputTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -61,10 +61,10 @@ Assert.AreEqual(waveDirection, output.WaveDirection, output.WaveDirection.GetAccuracy()); Assert.AreEqual(targetProbability, output.TargetProbability); - Assert.AreEqual(6, output.TargetReliability.NumberOfDecimalPlaces); + Assert.AreEqual(5, output.TargetReliability.NumberOfDecimalPlaces); Assert.AreEqual(targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy()); Assert.AreEqual(calculatedProbability, output.CalculatedProbability); - Assert.AreEqual(6, output.CalculatedReliability.NumberOfDecimalPlaces); + Assert.AreEqual(5, output.CalculatedReliability.NumberOfDecimalPlaces); Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual(CalculationConvergence.NotCalculated, output.CalculationConvergence); } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsOutputPropertiesTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsOutputPropertiesTest.cs (.../WaveConditionsOutputPropertiesTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsOutputPropertiesTest.cs (.../WaveConditionsOutputPropertiesTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b) @@ -74,11 +74,9 @@ Assert.AreEqual(waveDirection, properties.WaveDirection, properties.WaveDirection.GetAccuracy()); Assert.AreEqual(ProbabilityFormattingHelper.Format(targetProbability), properties.TargetProbability); - Assert.AreEqual(6, properties.TargetReliability.NumberOfDecimalPlaces); Assert.AreEqual(targetReliability, properties.TargetReliability, properties.TargetReliability.GetAccuracy()); Assert.AreEqual(ProbabilityFormattingHelper.Format(calculatedProbability), properties.CalculatedProbability); - Assert.AreEqual(6, properties.CalculatedReliability.NumberOfDecimalPlaces); Assert.AreEqual(calculatedReliability, properties.CalculatedReliability, properties.CalculatedReliability.GetAccuracy()); Assert.AreEqual(string.Empty, properties.Convergence);