Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r563140e7cff80481be10f7bc3303f1313140b2dc -ref4b3fac5923a625dc7d6d74238039d6c628c198 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 563140e7cff80481be10f7bc3303f1313140b2dc) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision ef4b3fac5923a625dc7d6d74238039d6c628c198) @@ -534,7 +534,8 @@ assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation, calculation.InputParameters.CategoryType), assessmentSection.HydraulicBoundaryDatabase.FilePath, - assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); + assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), + assessmentSection.GetNorm(calculation.InputParameters.CategoryType)); } } @@ -636,11 +637,15 @@ private static void Validate(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) { - WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(context.WrappedData, - context.AssessmentSection.GetAssessmentLevel(context.WrappedData.InputParameters.HydraulicBoundaryLocation, - context.WrappedData.InputParameters.CategoryType), - context.AssessmentSection.HydraulicBoundaryDatabase.FilePath, - context.AssessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); + IAssessmentSection assessmentSection = context.AssessmentSection; + WaveImpactAsphaltCoverWaveConditionsCalculation calculation = context.WrappedData; + + WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, + assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation, + calculation.InputParameters.CategoryType), + assessmentSection.HydraulicBoundaryDatabase.FilePath, + assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), + assessmentSection.GetNorm(calculation.InputParameters.CategoryType)); } private void PerformCalculation(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs =================================================================== diff -u -r58c9f9cdcb8a79a6e42f37e56859d5720cc722cb -ref4b3fac5923a625dc7d6d74238039d6c628c198 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision 58c9f9cdcb8a79a6e42f37e56859d5720cc722cb) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs) (revision ef4b3fac5923a625dc7d6d74238039d6c628c198) @@ -89,7 +89,8 @@ assessmentSection.GetAssessmentLevel(calculation.InputParameters.HydraulicBoundaryLocation, calculation.InputParameters.CategoryType), hlcdFilePath, - assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); + assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), + assessmentSection.GetNorm(calculation.InputParameters.CategoryType)); } protected override void PerformCalculation() Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r4fe0f0d5253898a20cf0175c4b913aa74e8ad32f -ref4b3fac5923a625dc7d6d74238039d6c628c198 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 4fe0f0d5253898a20cf0175c4b913aa74e8ad32f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision ef4b3fac5923a625dc7d6d74238039d6c628c198) @@ -48,6 +48,7 @@ [TestFixture] public class WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest { + 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 dutch coast south.sqlite"); private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath(); @@ -69,7 +70,8 @@ TestDelegate test = () => WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(null, GetValidAssessmentLevel(), validFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert var exception = Assert.Throws(test); @@ -95,7 +97,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, GetValidAssessmentLevel(), testFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages => @@ -131,7 +134,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, GetValidAssessmentLevel(), invalidFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages => @@ -167,7 +171,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, GetValidAssessmentLevel(), validFilePath, - invalidPreprocessorDirectory); + invalidPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages => @@ -203,7 +208,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, GetValidAssessmentLevel(), testFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages => @@ -238,7 +244,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, GetValidAssessmentLevel(), validFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages => @@ -273,7 +280,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, RoundedDouble.NaN, validFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages => @@ -312,7 +320,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, GetValidAssessmentLevel(), validFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages => @@ -353,7 +362,8 @@ Action call = () => isValid = WaveImpactAsphaltCoverWaveConditionsCalculationService.Validate(calculation, GetValidAssessmentLevel(), validFilePath, - validPreprocessorDirectory); + validPreprocessorDirectory, + validTargetProbability); // Assert TestHelper.AssertLogMessages(call, messages =>