Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs
===================================================================
diff -u -r3ad0828133cb882ea12cce0a0392c772a523fbc9 -r69634527eef3ea9da999f4236d31a318e24b60f4
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 3ad0828133cb882ea12cce0a0392c772a523fbc9)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 69634527eef3ea9da999f4236d31a318e24b60f4)
@@ -75,6 +75,7 @@
/// The file path of the hydraulic boundary
/// database file which to validate.
/// The preprocessor directory to validate.
+ /// The target probability to validate.
/// The name of the design water level property.
/// true if there were no validation errors; false otherwise.
/// Thrown when
@@ -83,6 +84,7 @@
RoundedDouble assessmentLevel,
string hydraulicBoundaryDatabaseFilePath,
string preprocessorDirectory,
+ double targetProbability,
string designWaterLevelName)
{
if (waveConditionsInput == null)
@@ -101,6 +103,7 @@
preprocessorDirectory,
waveConditionsInput,
assessmentLevel,
+ targetProbability,
designWaterLevelName);
CalculationServiceHelper.LogMessagesAsError(messages);
@@ -211,6 +214,7 @@
string preprocessorDirectory,
WaveConditionsInput input,
RoundedDouble assessmentLevel,
+ double targetProbability,
string designWaterLevelName)
{
var validationResults = new List();
@@ -228,6 +232,8 @@
validationResults.Add(preprocessorDirectoryValidationProblem);
}
+ TargetProbabilityCalculationServiceHelper.ValidateTargetProbability(targetProbability, message => validationResults.Add(message));
+
if (validationResults.Any())
{
return validationResults.ToArray();
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -r8ce51e30daf6665658c57d67ba01a8a97f3489ad -r69634527eef3ea9da999f4236d31a318e24b60f4
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 8ce51e30daf6665658c57d67ba01a8a97f3489ad)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 69634527eef3ea9da999f4236d31a318e24b60f4)
@@ -45,6 +45,7 @@
[TestFixture]
public class WaveConditionsCalculationServiceBaseTest
{
+ private const double validTargetProbability = 0.005;
private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
private static readonly string validFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite");
private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath();
@@ -57,6 +58,7 @@
GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
string.Empty);
// Assert
@@ -78,6 +80,7 @@
GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
null);
// Assert
@@ -96,6 +99,7 @@
GetValidAssessmentLevel(),
string.Empty,
validPreprocessorDirectory,
+ validTargetProbability,
string.Empty);
// Assert
@@ -123,6 +127,7 @@
GetValidAssessmentLevel(),
invalidFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
string.Empty);
// Assert
@@ -150,6 +155,7 @@
GetValidAssessmentLevel(),
validFilePath,
invalidPreprocessorDirectory,
+ validTargetProbability,
string.Empty);
// Assert
@@ -177,6 +183,7 @@
GetValidAssessmentLevel(),
dbFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
string.Empty);
// Assert
@@ -205,6 +212,7 @@
GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
string.Empty);
// Assert
@@ -238,6 +246,7 @@
RoundedDouble.NaN,
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
designWaterLevelName);
// Assert
@@ -281,6 +290,7 @@
(RoundedDouble) assessmentLevel,
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
"DesignWaterLevelName");
// Assert
@@ -314,6 +324,7 @@
GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
"DesignWaterLevelName");
// Assert
@@ -347,6 +358,7 @@
GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
"DesignWaterLevelName");
// Assert
@@ -393,6 +405,7 @@
GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
"DesignWaterLevelName");
// Assert
@@ -421,6 +434,7 @@
GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory,
+ validTargetProbability,
"DesignWaterLevelName");
// Assert
@@ -927,12 +941,14 @@
RoundedDouble assessmentLevel,
string dbFilePath,
string preprocessorDirectory,
+ double targetProbability,
string valueName)
{
return ValidateWaveConditionsInput(waveConditionsInput,
assessmentLevel,
dbFilePath,
preprocessorDirectory,
+ targetProbability,
valueName);
}