Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs
===================================================================
diff -u -r801944e042197afab2cf3bb57359970479e286b3 -r78382ec129ddc7537096860680cef36f3796700d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 801944e042197afab2cf3bb57359970479e286b3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/MacroStabilityInwardsCalculationConfigurationHelper.cs (.../MacroStabilityInwardsCalculationConfigurationHelper.cs) (revision 78382ec129ddc7537096860680cef36f3796700d)
@@ -56,7 +56,7 @@
/// - is null
/// - is null
///
- public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput)
+ public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput)
{
if (surfaceLines == null)
{
@@ -92,30 +92,30 @@
///
/// Gets the stochastic soil models matching the input of a calculation.
///
- /// The surface line used to match a .
+ /// The surface line used to match a .
/// The available stochastic soil models.
/// The (sub)set of stochastic soil models from
- /// or empty if no matching instances can be found
+ /// or empty if no matching instances can be found
/// or when there is not enough information to associate soil profiles to the calculation.
- public static IEnumerable GetStochasticSoilModelsForSurfaceLine(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable availableSoilModels)
+ public static IEnumerable GetStochasticSoilModelsForSurfaceLine(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable availableSoilModels)
{
if (surfaceLine == null)
{
- return Enumerable.Empty();
+ return Enumerable.Empty();
}
return availableSoilModels.Where(stochasticSoilModel => stochasticSoilModel.StochasticSoilProfiles.Any() &&
stochasticSoilModel.IntersectsWithSurfaceLineGeometry(surfaceLine))
.ToList();
}
- private static CalculationGroup CreateCalculationGroup(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput)
+ private static CalculationGroup CreateCalculationGroup(MacroStabilityInwardsSurfaceLine surfaceLine, IEnumerable soilModels, GeneralMacroStabilityInwardsInput generalInput)
{
var calculationGroup = new CalculationGroup(surfaceLine.Name, true);
- IEnumerable stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels);
- foreach (StochasticSoilModel stochasticSoilModel in stochasticSoilModels)
+ IEnumerable stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels);
+ foreach (MacroStabilityInwardsStochasticSoilModel stochasticSoilModel in stochasticSoilModels)
{
- foreach (StochasticSoilProfile soilProfile in stochasticSoilModel.StochasticSoilProfiles)
+ foreach (MacroStabilityInwardsStochasticSoilProfile soilProfile in stochasticSoilModel.StochasticSoilProfiles)
{
calculationGroup.Children.Add(CreateMacroStabilityInwardsCalculation(surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children, generalInput));
}
@@ -124,7 +124,7 @@
return calculationGroup;
}
- private static ICalculationBase CreateMacroStabilityInwardsCalculation(MacroStabilityInwardsSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralMacroStabilityInwardsInput generalInput)
+ private static ICalculationBase CreateMacroStabilityInwardsCalculation(MacroStabilityInwardsSurfaceLine surfaceLine, MacroStabilityInwardsStochasticSoilModel stochasticSoilModel, MacroStabilityInwardsStochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralMacroStabilityInwardsInput generalInput)
{
string nameBase = $"{surfaceLine.Name} {stochasticSoilProfile}";
string name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name);