Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs
===================================================================
diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -rbb0aeecc47206f5089ab04ca6c3575a1de8c206f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision de8e5c0dd97c9e53a07e905a0f59617e570b2259)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision bb0aeecc47206f5089ab04ca6c3575a1de8c206f)
@@ -48,17 +48,15 @@
/// with.
/// The soil models from which profiles are taken to configure with.
/// General 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
///
- public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput)
+ public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput)
{
if (surfaceLines == null)
{
@@ -72,15 +70,11 @@
{
throw new ArgumentNullException("generalInput");
}
- if (pipingProbabilityAssessmentInput == null)
- {
- throw new ArgumentNullException("pipingProbabilityAssessmentInput");
- }
List groups = new List();
foreach (var surfaceLine in surfaceLines)
{
- var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput, pipingProbabilityAssessmentInput);
+ var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput);
if (group.GetCalculations().Any())
{
groups.Add(group);
@@ -123,27 +117,27 @@
return soilModelObjectsForCalculation;
}
- private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput)
+ private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput)
{
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, pipingProbabilityAssessmentInput));
+ calculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput));
}
}
return calculationGroup;
}
- private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput)
+ private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput)
{
var nameBase = string.Format("{0} {1}", surfaceLine.Name, stochasticSoilProfile);
var name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name);
- return new PipingCalculationScenario(generalInput, pipingProbabilityAssessmentInput)
+ return new PipingCalculationScenario(generalInput)
{
Name = name,
InputParameters =