Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs
===================================================================
diff -u -rdec46d5efaad5332ffb2a96e67ec11209ddc5515 -re568165b751acf8d72cdf0d128f76d7792dadb56
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs (.../HydraRingCalculationService.cs) (revision dec46d5efaad5332ffb2a96e67ec11209ddc5515)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs (.../HydraRingCalculationService.cs) (revision e568165b751acf8d72cdf0d128f76d7792dadb56)
@@ -46,7 +46,7 @@
/// The to use while executing the calculation.
/// The input of the calculation to perform.
/// A on a successful calculation, null otherwise.
- public virtual TargetProbabilityCalculationOutput PerformCalculation(string hlcdDirectory, string ringId,
+ public static TargetProbabilityCalculationOutput PerformCalculation(string hlcdDirectory, string ringId,
HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType,
HydraRingUncertaintiesType uncertaintiesType,
TargetProbabilityCalculationInput targetProbabilityCalculationInput)
@@ -67,7 +67,7 @@
/// The to use while executing the calculation.
/// The input of the calculation to perform.
/// A on a successful calculation, null otherwise.
- public virtual ExceedanceProbabilityCalculationOutput PerformCalculation(string hlcdDirectory, string ringId,
+ public static ExceedanceProbabilityCalculationOutput PerformCalculation(string hlcdDirectory, string ringId,
HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType,
HydraRingUncertaintiesType uncertaintiesType,
ExceedanceProbabilityCalculationInput exceedanceProbabilityCalculationInput)
@@ -81,7 +81,7 @@
///
/// Cancels any currently running Hydra-Ring calculation.
///
- public virtual void CancelRunningCalculation()
+ public static void CancelRunningCalculation()
{
if (hydraRingProcess != null && !hydraRingProcess.HasExited)
{
@@ -96,7 +96,7 @@
var sectionId = hydraRingCalculationInput.Section.SectionId;
// Create a working directory
- var workingDirectory = CreateWorkingDirectory(sectionId.ToString());
+ var workingDirectory = CreateWorkingDirectory();
// Write the initialization script
var hydraRingInitializationService = new HydraRingInitializationService(hydraRingCalculationInput.FailureMechanismType, sectionId, hlcdDirectory, workingDirectory);
@@ -116,9 +116,9 @@
return parseFunction(hydraRingInitializationService.OutputFilePath, hydraRingInitializationService.OutputDataBasePath);
}
- private static string CreateWorkingDirectory(string folderName)
+ private static string CreateWorkingDirectory()
{
- var workingDirectory = Path.Combine(Path.GetTempPath(), folderName);
+ var workingDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
if (Directory.Exists(workingDirectory))
{