Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -830,6 +830,7 @@
: string.Empty;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var failureMechanism = new ClosingStructuresFailureMechanism();
@@ -1142,6 +1143,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettings.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettings.cs (.../HydraulicBoundaryCalculationSettings.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettings.cs (.../HydraulicBoundaryCalculationSettings.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -33,11 +33,13 @@
///
/// The file path of the hydraulic boundary database.
/// The file path of the HLCD.
+ /// Indicator whether to use the preprocessor closure.
/// The preprocessor directory.
/// Thrown when
/// or is null, is empty or consists of whitespace.
public HydraulicBoundaryCalculationSettings(string hydraulicBoundaryDatabaseFilePath,
string hlcdFilePath,
+ bool usePreprocessorClosure,
string preprocessorDirectory)
{
if (string.IsNullOrWhiteSpace(hydraulicBoundaryDatabaseFilePath))
@@ -52,6 +54,7 @@
HydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath;
HlcdFilePath = hlcdFilePath;
+ UsePreprocessorClosure = usePreprocessorClosure;
PreprocessorDirectory = preprocessorDirectory;
}
@@ -69,5 +72,10 @@
/// Gets the preprocessor directory.
///
public string PreprocessorDirectory { get; }
+
+ ///
+ /// Gets the indicator whether to use the preprocessor closure.
+ ///
+ public bool UsePreprocessorClosure { get; }
}
}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs
===================================================================
diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs (.../HydraulicBoundaryCalculationSettingsFactory.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc)
+++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryCalculationSettingsFactory.cs (.../HydraulicBoundaryCalculationSettingsFactory.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -46,6 +46,7 @@
return new HydraulicBoundaryCalculationSettings(hydraulicBoundaryDatabase.FilePath,
hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath,
+ hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessorClosure,
hydraulicBoundaryDatabase.EffectivePreprocessorDirectory());
}
}
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsTest.cs (.../HydraulicBoundaryCalculationSettingsTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsTest.cs (.../HydraulicBoundaryCalculationSettingsTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -38,6 +38,7 @@
// Call
TestDelegate call = () => new HydraulicBoundaryCalculationSettings(invalidHydraulicBoundaryDatabaseFilePath,
"D:\\hlcdFilePath",
+ false,
null);
// Assert
@@ -54,6 +55,7 @@
// Call
TestDelegate call = () => new HydraulicBoundaryCalculationSettings("D:\\HydraulicBoundaryDatabseFilePath",
invalidHlcdFilePath,
+ false,
null);
// Assert
@@ -71,15 +73,18 @@
// Setup
const string hydraulicBoundaryDatabaseFilePath = "D:\\HydraulicBoundaryDatabaseFilePath";
const string hlcdFilePath = "D:\\hlcdFilePath";
+ bool usePreprocessorClosure = new Random(21).NextBoolean();
// Call
var settings = new HydraulicBoundaryCalculationSettings(hydraulicBoundaryDatabaseFilePath,
hlcdFilePath,
+ usePreprocessorClosure,
preprocessorDirectory);
// Assert
Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, settings.HydraulicBoundaryDatabaseFilePath);
Assert.AreEqual(hlcdFilePath, settings.HlcdFilePath);
+ Assert.AreEqual(usePreprocessorClosure, settings.UsePreprocessorClosure);
Assert.AreEqual(preprocessorDirectory, settings.PreprocessorDirectory);
}
}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -115,6 +115,7 @@
var settings = new HydraulicBoundaryCalculationSettings(invalidFilePath,
validHlcdFilePath,
+ false,
string.Empty);
var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)),
settings,
@@ -147,6 +148,7 @@
var settings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
invalidPreprocessorDirectory);
var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)),
settings,
@@ -215,6 +217,7 @@
string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var mockRepository = new MockRepository();
@@ -511,6 +514,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -131,6 +131,7 @@
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var mockRepository = new MockRepository();
@@ -664,6 +665,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs (.../HydraRingCalculationSettingsFactoryTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraRingCalculationSettingsFactoryTest.cs (.../HydraRingCalculationSettingsFactoryTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -46,6 +46,7 @@
// Setup
var hydraulicBoundaryCalculationSettings = new HydraulicBoundaryCalculationSettings("HydraulicBoundaryDataBaseFilePath",
"hlcdFilePath",
+ false,
"preprocessorDirectory");
// Call
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs (.../StructuresCalculationServiceBaseTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/Structures/StructuresCalculationServiceBaseTest.cs (.../StructuresCalculationServiceBaseTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -527,6 +527,7 @@
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var mocks = new MockRepository();
@@ -991,6 +992,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs (.../TargetProbabilityCalculationServiceTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/TargetProbabilityCalculationServiceTest.cs (.../TargetProbabilityCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -77,6 +77,7 @@
string invalidHydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "notexisting.sqlite");
var calculationSettings = new HydraulicBoundaryCalculationSettings(invalidHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
var valid = true;
@@ -103,6 +104,7 @@
var valid = false;
var calculationSettings = new HydraulicBoundaryCalculationSettings(invalidHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
// Call
@@ -128,6 +130,7 @@
var valid = true;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
invalidPreprocessorDirectory);
// Call
@@ -212,6 +215,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
validPreprocessorDirectory);
}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -115,6 +115,7 @@
var settings = new HydraulicBoundaryCalculationSettings(invalidFilePath,
validHlcdFilePath,
+ false,
string.Empty);
var activity = new WaveHeightCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)),
settings,
@@ -147,6 +148,7 @@
var settings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
invalidPreprocessorDirectory);
var activity = new WaveHeightCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)),
settings,
@@ -214,6 +216,7 @@
string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var mockRepository = new MockRepository();
@@ -509,6 +512,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -132,6 +132,7 @@
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var mockRepository = new MockRepository();
@@ -666,6 +667,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs
===================================================================
diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -107,6 +107,7 @@
var settings = new HydraulicBoundaryCalculationSettings(invalidFilePath,
validHlcdFilePath,
+ false,
string.Empty);
var activity = new DuneLocationCalculationActivity(new DuneLocationCalculation(new TestDuneLocation(locationName)),
settings,
@@ -138,6 +139,7 @@
var settings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
"NonExistingPreprocessorDirectory");
var activity = new DuneLocationCalculationActivity(new DuneLocationCalculation(new TestDuneLocation(locationName)),
settings,
@@ -206,6 +208,7 @@
string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var calculatorFactory = mockRepository.StrictMock();
@@ -495,6 +498,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs
===================================================================
diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs (.../DuneLocationCalculationServiceTest.cs) (revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs (.../DuneLocationCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -128,6 +128,7 @@
: string.Empty;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var calculator = new TestDunesBoundaryConditionsCalculator
@@ -533,6 +534,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -836,6 +836,7 @@
: string.Empty;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var failureMechanism = new HeightStructuresFailureMechanism();
@@ -885,6 +886,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r12c732c4549e943a1700d17c3d00b6ddacfcb8c5
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 12c732c4549e943a1700d17c3d00b6ddacfcb8c5)
@@ -1540,6 +1540,7 @@
: string.Empty;
var calculationSettings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
preprocessorDirectory);
var failureMechanism = new StabilityPointStructuresFailureMechanism();
@@ -1854,6 +1855,7 @@
{
return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath,
validHlcdFilePath,
+ false,
string.Empty);
}