Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -r77d25c75ebe120c39ed7956a0aace093ed96e135 -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision de8e5c0dd97c9e53a07e905a0f59617e570b2259) @@ -48,17 +48,17 @@ /// with. /// The soil models from which profiles are taken to configure with. /// General input to assign to each generated piping calculation. - /// Semi probabilistic input to assign to each generated piping calculation. + /// Probabilistic assessment input to assign to each generated piping calculation. /// A structure of matching combinations of and /// profiles of intersecting . /// Throw when either: /// /// is null /// is null /// is null - /// is null + /// is null /// - public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput normProbabilityInput) + public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) { if (surfaceLines == null) { @@ -72,15 +72,15 @@ { throw new ArgumentNullException("generalInput"); } - if (normProbabilityInput == null) + if (pipingProbabilityAssessmentInput == null) { - throw new ArgumentNullException("normProbabilityInput"); + throw new ArgumentNullException("pipingProbabilityAssessmentInput"); } List groups = new List(); foreach (var surfaceLine in surfaceLines) { - var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput, normProbabilityInput); + var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput, pipingProbabilityAssessmentInput); if (group.GetCalculations().Any()) { groups.Add(group); @@ -123,27 +123,27 @@ return soilModelObjectsForCalculation; } - private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput normProbabilityInput) + private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) { var calculationGroup = new CalculationGroup(surfaceLine.Name, true); var stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels); foreach (var stochasticSoilModel in stochasticSoilModels) { foreach (var soilProfile in stochasticSoilModel.StochasticSoilProfiles) { - calculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput, normProbabilityInput)); + calculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput, pipingProbabilityAssessmentInput)); } } return calculationGroup; } - private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput normProbabilityInput) + private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) { var nameBase = string.Format("{0} {1}", surfaceLine.Name, stochasticSoilProfile); var name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name); - return new PipingCalculationScenario(generalInput, normProbabilityInput) + return new PipingCalculationScenario(generalInput, pipingProbabilityAssessmentInput) { Name = name, InputParameters =