Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -rfb3c4216478c0f072cf2f1a94053e81756ced5c7 -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision fb3c4216478c0f072cf2f1a94053e81756ced5c7) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d) @@ -536,21 +536,14 @@ private void CalculateAll(MacroStabilityInwardsFailureMechanismContext failureMechanismContext) { IEnumerable calculations = GetAllMacroStabilityInwardsCalculations(failureMechanismContext.WrappedData); - MacroStabilityInwardsProbabilityAssessmentInput assessmentInput = failureMechanismContext.WrappedData.MacroStabilityInwardsProbabilityAssessmentInput; - double norm = failureMechanismContext.Parent.FailureMechanismContribution.Norm; - double contribution = failureMechanismContext.WrappedData.Contribution; - CalculateAll(calculations, assessmentInput, norm, contribution); + CalculateAll(calculations); } private void CalculateAll(CalculationGroup group, MacroStabilityInwardsCalculationGroupContext context) { MacroStabilityInwardsCalculation[] calculations = group.GetCalculations().OfType().ToArray(); - MacroStabilityInwardsProbabilityAssessmentInput assessmentInput = context.FailureMechanism.MacroStabilityInwardsProbabilityAssessmentInput; - double norm = context.AssessmentSection.FailureMechanismContribution.Norm; - double contribution = context.FailureMechanism.Contribution; - - CalculateAll(calculations, assessmentInput, norm, contribution); + CalculateAll(calculations); } private static void ValidateAll(IEnumerable calculations) @@ -561,16 +554,12 @@ } } - private void CalculateAll(IEnumerable calculations, MacroStabilityInwardsProbabilityAssessmentInput assessmentInput, - double norm, double contribution) + private void CalculateAll(IEnumerable calculations) { ActivityProgressDialogRunner.Run( Gui.MainWindow, calculations - .Select(pc => new MacroStabilityInwardsCalculationActivity(pc, - assessmentInput, - norm, - contribution)) + .Select(pc => new MacroStabilityInwardsCalculationActivity(pc)) .ToList()); } @@ -802,10 +791,7 @@ private void PerformCalculation(MacroStabilityInwardsCalculation calculation, MacroStabilityInwardsCalculationScenarioContext context) { ActivityProgressDialogRunner.Run(Gui.MainWindow, - new MacroStabilityInwardsCalculationActivity(calculation, - context.FailureMechanism.MacroStabilityInwardsProbabilityAssessmentInput, - context.AssessmentSection.FailureMechanismContribution.Norm, - context.FailureMechanism.Contribution)); + new MacroStabilityInwardsCalculationActivity(calculation)); } #endregion