Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs
===================================================================
diff -u -r63a5a07d2178d1a83e2439cb40bcfd8cae317455 -rf0d6c65c6d7251bdc0c2cde6128d5777cff9ed49
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 63a5a07d2178d1a83e2439cb40bcfd8cae317455)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision f0d6c65c6d7251bdc0c2cde6128d5777cff9ed49)
@@ -56,35 +56,27 @@
}
///
- /// Performs the calculation for all .
+ /// Performs the calculation for all .
///
- /// The objects to perform the calculation for.
- /// for obtaining a
- /// based on .
+ /// The collection of to perform
+ /// the calculation for.
/// The hydraulic boundary database file
/// that should be used for performing the calculation.
/// The preprocessor directory.
/// The norm to use during the calculation.
/// Preprocessing is disabled when
/// equals .
- /// Thrown when or
- /// is null.
- public void Calculate(IEnumerable locations,
- Func getCalculationFunc,
+ /// Thrown when is null.
+ public void Calculate(IEnumerable calculations,
string hydraulicBoundaryDatabaseFilePath,
string preprocessorDirectory,
double norm)
{
- if (locations == null)
+ if (calculations == null)
{
- throw new ArgumentNullException(nameof(locations));
+ throw new ArgumentNullException(nameof(calculations));
}
- if (getCalculationFunc == null)
- {
- throw new ArgumentNullException(nameof(getCalculationFunc));
- }
-
string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath,
preprocessorDirectory);
if (!string.IsNullOrEmpty(validationProblem))
@@ -96,11 +88,10 @@
ActivityProgressDialogRunner.Run(
viewParent,
- locations.Select(l => new DuneErosionBoundaryCalculationActivity(l,
- getCalculationFunc(l),
- hydraulicBoundaryDatabaseFilePath,
- preprocessorDirectory,
- norm)).ToArray());
+ calculations.Select(calculation => new DuneErosionBoundaryCalculationActivity(calculation,
+ hydraulicBoundaryDatabaseFilePath,
+ preprocessorDirectory,
+ norm)).ToArray());
}
}
}
\ No newline at end of file