Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rab1121dee05c5484181bb1b0470d49eb48d325fe -rc4a957f939912203096b6ba3e09f43950414389a --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision ab1121dee05c5484181bb1b0470d49eb48d325fe) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision c4a957f939912203096b6ba3e09f43950414389a) @@ -76,7 +76,7 @@ yield return new PropertyInfo { CreateInstance = context => new PipingInputContextProperties(context, - () => GetCalculatedAssessmentLevel(context.PipingCalculation), + () => GetNormativeAssessmentLevel(context.PipingCalculation), new ObservablePropertyChangeHandler(context.PipingCalculation, context.WrappedData)) }; yield return new PropertyInfo @@ -553,7 +553,7 @@ { foreach (PipingCalculation calculation in pipingCalculations) { - PipingCalculationService.Validate(calculation, GetCalculatedAssessmentLevel(calculation)); + PipingCalculationService.Validate(calculation, GetNormativeAssessmentLevel(calculation)); } } @@ -566,7 +566,7 @@ Gui.MainWindow, calculations .Select(pc => new PipingCalculationActivity(pc, - GetCalculatedAssessmentLevel(pc), + GetNormativeAssessmentLevel(pc), assessmentInput, norm, contribution)) @@ -617,7 +617,7 @@ #endregion - private static RoundedDouble GetCalculatedAssessmentLevel(PipingCalculation calculation) + private static RoundedDouble GetNormativeAssessmentLevel(PipingCalculation calculation) { return calculation.InputParameters.HydraulicBoundaryLocation?.DesignWaterLevelCalculation1.Output?.Result ?? RoundedDouble.NaN; } @@ -809,7 +809,7 @@ private static void Validate(PipingCalculationScenarioContext context) { - PipingCalculationService.Validate(context.WrappedData, GetCalculatedAssessmentLevel(context.WrappedData)); + PipingCalculationService.Validate(context.WrappedData, GetNormativeAssessmentLevel(context.WrappedData)); } private static string ValidateAllDataAvailableAndGetErrorMessage(PipingCalculationScenarioContext context) @@ -821,7 +821,7 @@ { ActivityProgressDialogRunner.Run(Gui.MainWindow, new PipingCalculationActivity(calculation, - GetCalculatedAssessmentLevel(calculation), + GetNormativeAssessmentLevel(calculation), context.FailureMechanism.PipingProbabilityAssessmentInput, context.AssessmentSection.FailureMechanismContribution.Norm, context.FailureMechanism.Contribution)); Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs =================================================================== diff -u -rab1121dee05c5484181bb1b0470d49eb48d325fe -rc4a957f939912203096b6ba3e09f43950414389a --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision ab1121dee05c5484181bb1b0470d49eb48d325fe) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision c4a957f939912203096b6ba3e09f43950414389a) @@ -35,14 +35,14 @@ private readonly double norm; private readonly double contribution; private readonly PipingCalculation calculation; - private readonly RoundedDouble calculatedAssessmentLevel; + private readonly RoundedDouble normativeAssessmentLevel; 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. + /// The normative 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. @@ -51,7 +51,7 @@ /// Thrown when any /// or is null. public PipingCalculationActivity(PipingCalculation calculation, - RoundedDouble calculatedAssessmentLevel, + RoundedDouble normativeAssessmentLevel, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput, double norm, double contribution) @@ -67,7 +67,7 @@ } this.calculation = calculation; - this.calculatedAssessmentLevel = calculatedAssessmentLevel; + this.normativeAssessmentLevel = normativeAssessmentLevel; this.pipingProbabilityAssessmentInput = pipingProbabilityAssessmentInput; this.norm = norm; this.contribution = contribution; @@ -77,15 +77,15 @@ protected override void OnRun() { - if (!PipingCalculationService.Validate(calculation, calculatedAssessmentLevel)) + if (!PipingCalculationService.Validate(calculation, normativeAssessmentLevel)) { State = ActivityState.Failed; return; } PipingDataSynchronizationService.ClearCalculationOutput(calculation); - PipingCalculationService.Calculate(calculation, calculatedAssessmentLevel); + PipingCalculationService.Calculate(calculation, normativeAssessmentLevel); } protected override void OnCancel()