Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs =================================================================== diff -u -r8b5a6f938fe2b04cd78623649df37580e145055f -ra1d0c950e24eeef7e35cf3b79e7fcd9fd7af041c --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs (.../HydraRingCalculationService.cs) (revision 8b5a6f938fe2b04cd78623649df37580e145055f) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs (.../HydraRingCalculationService.cs) (revision a1d0c950e24eeef7e35cf3b79e7fcd9fd7af041c) @@ -47,10 +47,33 @@ /// A or null when something went wrong. public virtual TargetProbabilityCalculationOutput PerformCalculation(string hlcdDirectory, string ringId, HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType, HydraRingUncertaintiesType uncertaintiesType, TargetProbabilityCalculationInput targetProbabilityCalculationInput) { - return PerformCalculation(hlcdDirectory, ringId, timeIntegrationSchemeType, uncertaintiesType, targetProbabilityCalculationInput, (outputFilePath, outputDatabasePath) => TargetProbabilityCalculationParser.Parse(outputFilePath, targetProbabilityCalculationInput.Section.SectionId)); + return PerformCalculation(hlcdDirectory, ringId, timeIntegrationSchemeType, uncertaintiesType, + targetProbabilityCalculationInput, (outputFilePath, outputDatabasePath) => + TargetProbabilityCalculationParser.Parse( + outputFilePath, targetProbabilityCalculationInput.Section.SectionId)); } /// + /// This method performs a type I calculation via Hydra-Ring: + /// Given a set of random variables, compute the probability of failure. + /// + /// The directory of the HLCD file that should be used for performing the calculation. + /// The id of the ring to perform the calculation for. + /// The to use while executing the calculation. + /// The to use while executing the calculation. + /// The input of the calculation to perform. + /// A on a succesfull calculation, null otherwise. + public virtual ExceedanceProbabilityCalculationOutput PerformCalculation(string hlcdDirectory, string ringId, HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType, + HydraRingUncertaintiesType uncertaintiesType, + ExceedanceProbabilityCalculationInput exceedanceProbabilityCalculationInput) + { + return PerformCalculation(hlcdDirectory, ringId, timeIntegrationSchemeType, uncertaintiesType, + exceedanceProbabilityCalculationInput, (outputFilePath, outputDatabasePath) => + ExceedanceProbabilityCalculationParser.Parse( + outputDatabasePath, exceedanceProbabilityCalculationInput.Section.SectionId)); + } + + /// /// Cancels any currently running Hydra-Ring calculation. /// public virtual void CancelRunningCalculation()