Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensions.cs
===================================================================
diff -u -rc68b62821df129218cd8d89b8b59db8c37ce3065 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensions.cs) (revision c68b62821df129218cd8d89b8b59db8c37ce3065)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputEntityReadExtensions.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -49,10 +49,8 @@
entity.TargetProbability.ToNullAsNaN(),
entity.TargetReliability.ToNullAsNaN(),
entity.CalculatedProbability.ToNullAsNaN(),
- entity.CalculatedReliability.ToNullAsNaN())
- {
- CalculationConvergence = (CalculationConvergence) entity.CalculationConvergence
- };
+ entity.CalculatedReliability.ToNullAsNaN(),
+ (CalculationConvergence) entity.CalculationConvergence);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsOutputEntityReadExtensions.cs
===================================================================
diff -u -rc68b62821df129218cd8d89b8b59db8c37ce3065 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsOutputEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsOutputEntityReadExtensions.cs) (revision c68b62821df129218cd8d89b8b59db8c37ce3065)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsOutputEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsOutputEntityReadExtensions.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -49,10 +49,8 @@
entity.TargetProbability.ToNullAsNaN(),
entity.TargetReliability.ToNullAsNaN(),
entity.CalculatedProbability.ToNullAsNaN(),
- entity.CalculatedReliability.ToNullAsNaN())
- {
- CalculationConvergence = (CalculationConvergence) entity.CalculationConvergence
- };
+ entity.CalculatedReliability.ToNullAsNaN(),
+ (CalculationConvergence) entity.CalculationConvergence);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs
===================================================================
diff -u -rc68b62821df129218cd8d89b8b59db8c37ce3065 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs) (revision c68b62821df129218cd8d89b8b59db8c37ce3065)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntityReadExtensions.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -49,10 +49,8 @@
entity.TargetProbability.ToNullAsNaN(),
entity.TargetReliability.ToNullAsNaN(),
entity.CalculatedProbability.ToNullAsNaN(),
- entity.CalculatedReliability.ToNullAsNaN())
- {
- CalculationConvergence = (CalculationConvergence) entity.CalculationConvergence
- };
+ entity.CalculatedReliability.ToNullAsNaN(),
+ (CalculationConvergence)entity.CalculationConvergence);
}
}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs
===================================================================
diff -u -recf136a787efcd5d3f171f8aee8930f84a89e80a -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs (.../ProbabilityAssessmentService.cs) (revision ecf136a787efcd5d3f171f8aee8930f84a89e80a)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs (.../ProbabilityAssessmentService.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -40,10 +40,10 @@
/// The calculated .
public static ProbabilityAssessmentOutput Calculate(double norm, double contribution, double lengthEffectN, double reliability)
{
- var requiredProbability = RequiredProbability(contribution/100.0, norm, lengthEffectN);
+ var requiredProbability = GetRequiredProbability(contribution/100.0, norm, lengthEffectN);
var probability = StatisticsConverter.ReliabilityToProbability(reliability);
var requiredReliability = StatisticsConverter.ProbabilityToReliability(requiredProbability);
- var factorOfSafety = FactorOfSafety(reliability, requiredReliability);
+ var factorOfSafety = GetFactorOfSafety(reliability, requiredReliability);
return new ProbabilityAssessmentOutput(requiredProbability,
requiredReliability,
@@ -52,12 +52,12 @@
factorOfSafety);
}
- private static double RequiredProbability(double contribution, double norm, double lengthEffectN)
+ private static double GetRequiredProbability(double contribution, double norm, double lengthEffectN)
{
return contribution*norm/lengthEffectN;
}
- private static double FactorOfSafety(double reliability, double requiredReliability)
+ private static double GetFactorOfSafety(double reliability, double requiredReliability)
{
return reliability/requiredReliability;
}
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs
===================================================================
diff -u -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -86,7 +86,6 @@
Assert.AreEqual(factorOfSafety, properties.FactorOfSafety, properties.FactorOfSafety.GetAccuracy());
Assert.AreEqual(ProbabilityFormattingHelper.Format(requiredProbability), properties.RequiredProbability);
- Assert.AreEqual(requiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy());
Assert.AreEqual(ProbabilityFormattingHelper.Format(probability), properties.Probability);
Assert.AreEqual(isOvertoppingDominant, properties.IsOvertoppingDominant);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -19,7 +19,6 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System.Collections.Generic;
using System.Linq;
using Core.Common.Utils;
using NUnit.Framework;
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs
===================================================================
diff -u -r365b392c739a678d44c4d0de3c8cb8c3e0684229 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 365b392c739a678d44c4d0de3c8cb8c3e0684229)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -19,7 +19,6 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System.Collections.Generic;
using System.Linq;
using Core.Common.Utils;
using NUnit.Framework;
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs
===================================================================
diff -u -rbc5e613a18bbcf1309b2b54ab2de35e5d03ca960 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs (.../WaveConditionsOutput.cs) (revision bc5e613a18bbcf1309b2b54ab2de35e5d03ca960)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsOutput.cs (.../WaveConditionsOutput.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -50,12 +50,15 @@
/// The target beta (reliability).
/// The calculated probability.
/// The calculated beta (reliability).
+ /// The convergence status of the calculation.
/// Thrown when or
- /// lies outside[0,1] and is not .
+ /// falls outside the [0.0, 1.0] range and is not
+ /// .
public WaveConditionsOutput(double waterLevel, double waveHeight, double wavePeakPeriod, double waveAngle,
double waveDirection,
double targetProbability, double targetReliability,
- double calculatedProbability, double calculatedReliability)
+ double calculatedProbability, double calculatedReliability,
+ CalculationConvergence calculationConvergence = CalculationConvergence.NotCalculated)
{
WaterLevel = new RoundedDouble(2, waterLevel);
WaveHeight = new RoundedDouble(2, waveHeight);
@@ -69,7 +72,7 @@
CalculatedProbability = calculatedProbability;
CalculatedReliability = new RoundedDouble(5, calculatedReliability);
- CalculationConvergence = CalculationConvergence.NotCalculated;
+ CalculationConvergence = calculationConvergence;
}
///
@@ -177,11 +180,11 @@
{
return calculationConvergence;
}
- set
+ private set
{
if (!Enum.IsDefined(typeof(CalculationConvergence), value))
{
- throw new InvalidEnumArgumentException("CalculationConvergence", (int) value, typeof(CalculationConvergence));
+ throw new InvalidEnumArgumentException("value", (int) value, typeof(CalculationConvergence));
}
calculationConvergence = value;
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj
===================================================================
diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj (.../Ringtoets.Revetment.Service.csproj) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/Ringtoets.Revetment.Service.csproj (.../Ringtoets.Revetment.Service.csproj) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -67,6 +67,7 @@
{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}
Core.Common.Utils
+ False
{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsService.cs
===================================================================
diff -u -rbc5e613a18bbcf1309b2b54ab2de35e5d03ca960 -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsService.cs (.../WaveConditionsService.cs) (revision bc5e613a18bbcf1309b2b54ab2de35e5d03ca960)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsService.cs (.../WaveConditionsService.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -22,6 +22,7 @@
using System;
using Core.Common.Utils;
using Ringtoets.Common.Service;
+using Ringtoets.HydraRing.Data;
using Ringtoets.Revetment.Data;
namespace Ringtoets.Revetment.Service
@@ -42,8 +43,6 @@
/// The target norm to calculate for.
/// The calculated reliability.
/// The calculated .
- /// Thrown when the target probability or
- /// calculated probability lies outside [0, 1] and is not .
public static WaveConditionsOutput Calculate(double waterLevel, double waveHeight, double wavePeakPeriod,
double waveAngle, double waveDirection,
double norm, double calculatedReliability)
@@ -53,11 +52,10 @@
double calculatedProbability = StatisticsConverter.ReliabilityToProbability(calculatedReliability);
+ CalculationConvergence convergence = RingtoetsCommonDataCalculationService.CalculationConverged(calculatedReliability, norm);
+
return new WaveConditionsOutput(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection, targetProbability,
- targetReliability, calculatedProbability, calculatedReliability)
- {
- CalculationConvergence = RingtoetsCommonDataCalculationService.CalculationConverged(calculatedReliability, norm)
- };
+ targetReliability, calculatedProbability, calculatedReliability, convergence);
}
}
}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs
===================================================================
diff -u -r860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs (.../WaveConditionsOutputTest.cs) (revision 860f5fdc0e43f0693f756b0b79ea2cb7a5b91a3b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsOutputTest.cs (.../WaveConditionsOutputTest.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -144,30 +144,30 @@
{
// Setup
var output = new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN,
- double.NaN, double.NaN, double.NaN);
+ double.NaN, double.NaN, double.NaN, convergence);
// Call
- output.CalculationConvergence = convergence;
+ CalculationConvergence setConvergence = output.CalculationConvergence;
// Assert
- Assert.AreEqual(convergence, output.CalculationConvergence);
+ Assert.AreEqual(convergence, setConvergence);
}
[Test]
public void CalculationConvergence_Invalidvalue_ThrowsInvalidEnumArgumentException()
{
// Setup
- var output = new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN,
- double.NaN, double.NaN, double.NaN);
+ var invalidEnumValue = (CalculationConvergence) 9001;
// Call
- TestDelegate call = () => output.CalculationConvergence = (CalculationConvergence) 9001;
+ TestDelegate call = () => new WaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN,
+ double.NaN, double.NaN, double.NaN, invalidEnumValue);
// Assert
- const string expectedMessage = "The value of argument 'CalculationConvergence' (9001) is invalid for Enum type 'CalculationConvergence'.";
+ const string expectedMessage = "The value of argument 'value' (9001) is invalid for Enum type 'CalculationConvergence'.";
string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call,
expectedMessage).ParamName;
- Assert.AreEqual("CalculationConvergence", paramName);
+ Assert.AreEqual("value", paramName);
}
}
}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs
===================================================================
diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs (.../TestWaveConditionsOutput.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs (.../TestWaveConditionsOutput.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -44,9 +44,6 @@
/// The calculated wave peak period
public TestWaveConditionsOutput(double waterLevel, double waveHeight, double wavePeakPeriod, double waveAngle,
CalculationConvergence convergence = CalculationConvergence.NotCalculated) :
- base(waterLevel, waveHeight, wavePeakPeriod, waveAngle, 5.5, 0.1, 1.282, 0.4, 0.253)
- {
- CalculationConvergence = convergence;
- }
+ base(waterLevel, waveHeight, wavePeakPeriod, waveAngle, 5.5, 0.1, 1.282, 0.4, 0.253, convergence) {}
}
}
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs
===================================================================
diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -r2b711a78eafd364bd30d015ee235115ddb1cb8ff
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff)
@@ -23,7 +23,6 @@
using System.ComponentModel;
using Core.Common.Gui.Converters;
using Core.Common.Gui.PropertyBag;
-using Core.Common.Utils;
using NUnit.Framework;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Forms.Helpers;