Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs
===================================================================
diff -u -r78382ec129ddc7537096860680cef36f3796700d -rd619624819b7200ac55b357b0a0c54d198fc20e4
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 78382ec129ddc7537096860680cef36f3796700d)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision d619624819b7200ac55b357b0a0c54d198fc20e4)
@@ -47,16 +47,14 @@
/// Surface lines to generate the structure for and to use to configure
/// with.
/// The soil models from which profiles are taken to configure with.
- /// General input to assign to each generated macro stability inwards calculation.
/// A structure of matching combinations of and
/// profiles of intersecting .
/// Throw when either:
///
/// - is null
/// - is null
- /// - is null
///
- public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput)
+ public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels)
{
if (surfaceLines == null)
{
@@ -66,15 +64,11 @@
{
throw new ArgumentNullException(nameof(soilModels));
}
- if (generalInput == null)
- {
- throw new ArgumentNullException(nameof(generalInput));
- }
var groups = new List();
foreach (MacroStabilityInwardsSurfaceLine surfaceLine in surfaceLines)
{
- CalculationGroup group = CreateCalculationGroup(surfaceLine, soilModels, generalInput);
+ CalculationGroup group = CreateCalculationGroup(surfaceLine, soilModels);
if (group.GetCalculations().Any())
{
groups.Add(group);
@@ -109,27 +103,27 @@
.ToList();
}
- private static CalculationGroup CreateCalculationGroup(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput)
+ private static CalculationGroup CreateCalculationGroup(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable soilModels)
{
var calculationGroup = new CalculationGroup(surfaceLine.Name, true);
IEnumerable stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels);
foreach (MacroStabilityInwardsStochasticSoilModel stochasticSoilModel in stochasticSoilModels)
{
foreach (MacroStabilityInwardsStochasticSoilProfile soilProfile in stochasticSoilModel.StochasticSoilProfiles)
{
- calculationGroup.Children.Add(CreateMacroStabilityInwardsCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput));
+ calculationGroup.Children.Add(CreateMacroStabilityInwardsCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children));
}
}
return calculationGroup;
}
- private static ICalculationBase CreateMacroStabilityInwardsCalculation(MacroStabilityInwardsSurfaceLine surfaceLine, MacroStabilityInwardsStochasticSoilModel stochasticSoilModel, MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralMacroStabilityInwardsInput generalInput)
+ private static ICalculationBase CreateMacroStabilityInwardsCalculation(MacroStabilityInwardsSurfaceLine surfaceLine, MacroStabilityInwardsStochasticSoilModel stochasticSoilModel, MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile, IEnumerable calculations)
{
string nameBase = $"{surfaceLine.Name} {stochasticSoilProfile}";
string name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name);
- return new MacroStabilityInwardsCalculationScenario(generalInput)
+ return new MacroStabilityInwardsCalculationScenario
{
Name = name,
InputParameters =