Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs
===================================================================
diff -u -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d -rf3608ba821878cd5f6b9ddb99cfe6e23277f31f3
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs (.../MacroStabilityInwardsCalculationActivity.cs) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationActivity.cs (.../MacroStabilityInwardsCalculationActivity.cs) (revision f3608ba821878cd5f6b9ddb99cfe6e23277f31f3)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using Core.Common.Base.Data;
using Core.Common.Base.Service;
using Ringtoets.MacroStabilityInwards.Data;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
@@ -31,36 +32,40 @@
///
public class MacroStabilityInwardsCalculationActivity : Activity
{
+ private readonly RoundedDouble normativeAssessmentLevel;
private readonly MacroStabilityInwardsCalculation calculation;
///
/// Initializes a new instance of the class.
///
/// The macro stability inwards data used for the calculation.
+ /// The normative assessment level to use in case no manual assessment level is provided.
/// Thrown when is null.
- public MacroStabilityInwardsCalculationActivity(MacroStabilityInwardsCalculation calculation)
+ public MacroStabilityInwardsCalculationActivity(MacroStabilityInwardsCalculation calculation,
+ RoundedDouble normativeAssessmentLevel)
{
if (calculation == null)
{
throw new ArgumentNullException(nameof(calculation));
}
this.calculation = calculation;
+ this.normativeAssessmentLevel = normativeAssessmentLevel;
Description = string.Format(RingtoetsCommonServiceResources.Perform_calculation_with_name_0_, calculation.Name);
}
protected override void OnRun()
{
- if (!MacroStabilityInwardsCalculationService.Validate(calculation))
+ if (!MacroStabilityInwardsCalculationService.Validate(calculation, normativeAssessmentLevel))
{
State = ActivityState.Failed;
return;
}
MacroStabilityInwardsDataSynchronizationService.ClearCalculationOutput(calculation);
- MacroStabilityInwardsCalculationService.Calculate(calculation);
+ MacroStabilityInwardsCalculationService.Calculate(calculation, normativeAssessmentLevel);
}
protected override void OnCancel()