Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs
===================================================================
diff -u -re473fe41d29060803b0d8f560a48ec8b9618bea4 -r0a3678eabc5460352ffbfff25a9dca65edfef546
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision e473fe41d29060803b0d8f560a48ec8b9618bea4)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 0a3678eabc5460352ffbfff25a9dca65edfef546)
@@ -17,16 +17,18 @@
/// and the .
///
/// Surface lines to generate the structure for and to use to configure
- /// with.
+ /// with.
/// The soil models from which profiles are taken to configure with.
+ ///
+ ///
///
- public static IEnumerable GenerateCalculationsStructure(IEnumerable surfaceLines, IEnumerable soilModels)
+ public static IEnumerable GenerateCalculationsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
{
if (surfaceLines == null)
{
return Enumerable.Empty();
}
- var pipingCalculationGroups = surfaceLines.Select(sl => CreateCalculationGroup(sl, soilModels));
+ var pipingCalculationGroups = surfaceLines.Select(sl => CreateCalculationGroup(sl, soilModels, generalInput, semiProbabilisticInput));
return pipingCalculationGroups;
}
@@ -58,26 +60,26 @@
return soilProfileObjectsForCalculation;
}
- private static IPipingCalculationItem CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels)
+ private static IPipingCalculationItem CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
{
var pipingCalculationGroup = new PipingCalculationGroup(surfaceLine.Name, true);
if (soilModels != null)
{
foreach (var profile in GetPipingSoilProfilesForSurfaceLine(surfaceLine, soilModels))
{
- pipingCalculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, profile, pipingCalculationGroup.Children));
+ pipingCalculationGroup.Children.Add(CreatePipingCalculation(surfaceLine, profile, pipingCalculationGroup.Children, generalInput, semiProbabilisticInput));
}
}
return pipingCalculationGroup;
}
- private static IPipingCalculationItem CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, PipingSoilProfile profile, IEnumerable calculations)
+ private static IPipingCalculationItem CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, PipingSoilProfile profile, IEnumerable calculations, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
{
var nameBase = string.Format("{0} {1}", surfaceLine.Name, profile.Name);
var name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name);
- return new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput())
+ return new PipingCalculation(generalInput, semiProbabilisticInput)
{
Name = name,
InputParameters =