Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rb7a286a62693f3a071c55ced2a7cdc4d6a577cfe -r18ff00ec64534e2a0f3ad728363660b4fd93b149
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision b7a286a62693f3a071c55ced2a7cdc4d6a577cfe)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 18ff00ec64534e2a0f3ad728363660b4fd93b149)
@@ -799,8 +799,9 @@
foreach (GrassCoverErosionOutwardsWaveConditionsCalculation calculation in calculations)
{
GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- failureMechanism.GetNormativeAssessmentLevel(assessmentSection,
- calculation.InputParameters.HydraulicBoundaryLocation),
+ failureMechanism.GetAssessmentLevel(assessmentSection,
+ calculation.InputParameters.HydraulicBoundaryLocation,
+ calculation.InputParameters.CategoryType),
assessmentSection.HydraulicBoundaryDatabase.FilePath,
assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory());
}
@@ -940,8 +941,9 @@
private static void Validate(GrassCoverErosionOutwardsWaveConditionsCalculationContext context)
{
GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(context.WrappedData,
- context.FailureMechanism.GetNormativeAssessmentLevel(context.AssessmentSection,
- context.WrappedData.InputParameters.HydraulicBoundaryLocation),
+ context.FailureMechanism.GetAssessmentLevel(context.AssessmentSection,
+ context.WrappedData.InputParameters.HydraulicBoundaryLocation,
+ context.WrappedData.InputParameters.CategoryType),
context.AssessmentSection.HydraulicBoundaryDatabase.FilePath,
context.AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory());
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs
===================================================================
diff -u -ra7c351a2f6cb6ab18a30d248a60cbf34abe47ad7 -r18ff00ec64534e2a0f3ad728363660b4fd93b149
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision a7c351a2f6cb6ab18a30d248a60cbf34abe47ad7)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs) (revision 18ff00ec64534e2a0f3ad728363660b4fd93b149)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using Core.Common.Base.Data;
using Core.Common.Base.Service;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Hydraulics;
@@ -58,14 +57,17 @@
{
throw new ArgumentNullException(nameof(calculation));
}
+
if (hlcdFilePath == null)
{
throw new ArgumentNullException(nameof(hlcdFilePath));
}
+
if (failureMechanism == null)
{
throw new ArgumentNullException(nameof(failureMechanism));
}
+
if (assessmentSection == null)
{
throw new ArgumentNullException(nameof(assessmentSection));
@@ -84,7 +86,9 @@
protected override bool Validate()
{
return GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- failureMechanism.GetNormativeAssessmentLevel(assessmentSection, calculation.InputParameters.HydraulicBoundaryLocation),
+ failureMechanism.GetAssessmentLevel(assessmentSection,
+ calculation.InputParameters.HydraulicBoundaryLocation,
+ calculation.InputParameters.CategoryType),
hlcdFilePath,
assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory());
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs
===================================================================
diff -u -r376859993eadc6d75eea3e97d624b83a24e922b6 -r18ff00ec64534e2a0f3ad728363660b4fd93b149
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 376859993eadc6d75eea3e97d624b83a24e922b6)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 18ff00ec64534e2a0f3ad728363660b4fd93b149)
@@ -44,13 +44,13 @@
/// Performs validation over the input parameters. Error and status information is logged during the execution of the operation.
///
/// The for which to validate the values.
- /// The normative assessment level to use for determining water levels.
+ /// The assessment level to use for determining water levels.
/// The file path of the hydraulic boundary database file which to validate.
/// The preprocessor directory to validate.
/// true if there were no validation errors; false otherwise.
/// Thrown when is null.
public static bool Validate(GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
- RoundedDouble normativeAssessmentLevel,
+ RoundedDouble assessmentLevel,
string hydraulicBoundaryDatabaseFilePath,
string preprocessorDirectory)
{
@@ -60,7 +60,7 @@
}
return ValidateWaveConditionsInput(calculation.InputParameters,
- normativeAssessmentLevel,
+ assessmentLevel,
hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory,
Resources.GrassCoverErosionOutwardsWaveConditionsCalculationService_LogMessage_DesignWaterLevel_name);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r376859993eadc6d75eea3e97d624b83a24e922b6 -r18ff00ec64534e2a0f3ad728363660b4fd93b149
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 376859993eadc6d75eea3e97d624b83a24e922b6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 18ff00ec64534e2a0f3ad728363660b4fd93b149)
@@ -1062,6 +1062,7 @@
if (validCalculation)
{
calculation.InputParameters.HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First();
+ calculation.InputParameters.CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm;
calculation.InputParameters.LowerBoundaryRevetment = (RoundedDouble) 1.0;
calculation.InputParameters.UpperBoundaryRevetment = (RoundedDouble) 10.0;
calculation.InputParameters.StepSize = WaveConditionsInputStepSize.One;
@@ -1143,6 +1144,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
@@ -1222,6 +1224,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
@@ -1301,6 +1304,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r376859993eadc6d75eea3e97d624b83a24e922b6 -r18ff00ec64534e2a0f3ad728363660b4fd93b149
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 376859993eadc6d75eea3e97d624b83a24e922b6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 18ff00ec64534e2a0f3ad728363660b4fd93b149)
@@ -914,6 +914,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
@@ -928,6 +929,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
@@ -999,6 +1001,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
@@ -1067,6 +1070,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
@@ -1139,6 +1143,7 @@
InputParameters =
{
HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(),
+ CategoryType = FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm,
LowerBoundaryRevetment = (RoundedDouble) 1.0,
UpperBoundaryRevetment = (RoundedDouble) 10.0,
StepSize = WaveConditionsInputStepSize.One,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r376859993eadc6d75eea3e97d624b83a24e922b6 -r18ff00ec64534e2a0f3ad728363660b4fd93b149
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 376859993eadc6d75eea3e97d624b83a24e922b6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 18ff00ec64534e2a0f3ad728363660b4fd93b149)
@@ -70,7 +70,7 @@
{
// Call
TestDelegate test = () => GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(null,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory);
@@ -96,7 +96,7 @@
{
// Call
Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
testFilePath,
validPreprocessorDirectory);
@@ -132,7 +132,7 @@
{
// Call
Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
invalidFilePath,
validPreprocessorDirectory);
@@ -168,7 +168,7 @@
{
// Call
Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
validFilePath,
invalidPreprocessorDirectory);
@@ -204,7 +204,7 @@
{
// Call
Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
testFilePath,
validPreprocessorDirectory);
@@ -240,7 +240,7 @@
{
// Call
Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory);
@@ -260,7 +260,7 @@
}
[Test]
- public void Validate_NormativeAssessmentLevelNaN_LogsValidationMessageAndReturnFalse()
+ public void Validate_AssessmentLevelNaN_LogsValidationMessageAndReturnFalse()
{
// Setup
var mockRepository = new MockRepository();
@@ -314,7 +314,7 @@
{
// Call
Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory);
@@ -355,7 +355,7 @@
{
// Call
Action call = () => isValid = GrassCoverErosionOutwardsWaveConditionsCalculationService.Validate(calculation,
- GetValidNormativeAssessmentLevel(),
+ GetValidAssessmentLevel(),
validFilePath,
validPreprocessorDirectory);
@@ -1099,7 +1099,7 @@
return calculation;
}
- private static RoundedDouble GetValidNormativeAssessmentLevel()
+ private static RoundedDouble GetValidAssessmentLevel()
{
return (RoundedDouble) 9.3;
}