Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs
===================================================================
diff -u -r76948e8765899b35776102ecd211d3d7575a9e4d -rfac7e62a7ddf09152476581c294e5e30722849eb
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision 76948e8765899b35776102ecd211d3d7575a9e4d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision fac7e62a7ddf09152476581c294e5e30722849eb)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using Core.Common.Base.Data;
using Core.Common.Base.Service;
using Ringtoets.Piping.Data;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
@@ -34,21 +35,26 @@
private readonly double norm;
private readonly double contribution;
private readonly PipingCalculation calculation;
+ private readonly RoundedDouble calculatedAssessmentLevel;
private readonly PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput;
///
/// Initializes a new instance of the class.
///
/// The piping data used for the calculation.
+ /// The calculated assessment level to use in case no manual assessment level is provided.
/// General input that influences the probability estimate for a piping
/// assessment.
/// The norm to assess for.
/// The contribution of piping as a percentage (0-100) to the total of the failure probability
/// of the assessment section.
/// Thrown when any
/// or is null.
- public PipingCalculationActivity(PipingCalculation calculation, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput,
- double norm, double contribution)
+ public PipingCalculationActivity(PipingCalculation calculation,
+ RoundedDouble calculatedAssessmentLevel,
+ PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput,
+ double norm,
+ double contribution)
{
if (calculation == null)
{
@@ -60,6 +66,7 @@
}
this.calculation = calculation;
+ this.calculatedAssessmentLevel = calculatedAssessmentLevel;
this.pipingProbabilityAssessmentInput = pipingProbabilityAssessmentInput;
this.norm = norm;
this.contribution = contribution;
@@ -69,15 +76,15 @@
protected override void OnRun()
{
- if (!PipingCalculationService.Validate(calculation))
+ if (!PipingCalculationService.Validate(calculation, calculatedAssessmentLevel))
{
State = ActivityState.Failed;
return;
}
PipingDataSynchronizationService.ClearCalculationOutput(calculation);
- PipingCalculationService.Calculate(calculation);
+ PipingCalculationService.Calculate(calculation, calculatedAssessmentLevel);
PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution);
}