Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Gebruikershandleiding Ringtoets 17.2.1.pdf
===================================================================
diff -u -raea01d5fe27c28ae0a0b6e686d84ab99e0ce073a -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs
===================================================================
diff -u -rd25204b5728226909d03e56e21a954d4980c45c7 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs	(.../HydraulicBoundaryLocationOutput.cs)	(revision d25204b5728226909d03e56e21a954d4980c45c7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs	(.../HydraulicBoundaryLocationOutput.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -40,7 +40,7 @@
         /// <param name="calculatedProbability">the calculated probability.</param>
         /// <param name="calculatedReliability">The calculated reliability.</param>
         /// <param name="calculationConvergence">The convergence status of the calculation.</param>
-        /// <param name="generalResult">The general result of this output with submechanism illustration points.</param>
+        /// <param name="generalResult">The general result of this output with sub mechanism illustration points.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="targetProbability"/> 
         /// or <paramref name="calculatedProbability"/> falls outside the [0.0, 1.0] range and is not <see cref="double.NaN"/>.</exception>
         public HydraulicBoundaryLocationOutput(double result,
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs	(.../HydraRingSettingsDatabaseReader.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs	(.../HydraRingSettingsDatabaseReader.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -256,7 +256,7 @@
         }
 
         /// <summary>
-        /// Read a preprocessor setting for a given location.
+        /// Reads a preprocessor setting for a given location.
         /// </summary>
         /// <param name="locationId">The id of a hydraulic boundary location.</param>
         /// <returns>A new <see cref="ReadPreprocessorSetting"/> containing values read from the database.</returns>
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs	(.../NumericsSettingsProvider.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/NumericsSettingsProvider.cs	(.../NumericsSettingsProvider.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -97,12 +97,12 @@
         {
             FailureMechanismDefaults failureMechanismDefaults = new FailureMechanismDefaultsProvider().GetFailureMechanismDefaults(HydraRingFailureMechanismType.AssessmentLevel);
             int mechanismId = failureMechanismDefaults.MechanismId;
-            const int preprocessorSubmechanismId = 7;
-            const int defaultSubmechanismId = 1;
+            const int preprocessorSubMechanismId = 7;
+            const int defaultSubMechanismId = 1;
 
-            return numericsSettingsReader.ReadNumericsSetting(locationId, mechanismId, preprocessorSubmechanismId)
-                   ?? (numericsSettingsReader.ReadNumericsSetting(locationId, mechanismId, defaultSubmechanismId)
-                       ?? defaultNumericsSettings[HydraRingFailureMechanismType.AssessmentLevel][defaultSubmechanismId]);
+            return numericsSettingsReader.ReadNumericsSetting(locationId, mechanismId, preprocessorSubMechanismId)
+                   ?? numericsSettingsReader.ReadNumericsSetting(locationId, mechanismId, defaultSubMechanismId)
+                   ?? defaultNumericsSettings[HydraRingFailureMechanismType.AssessmentLevel][defaultSubMechanismId];
         }
 
         public void Dispose()
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/PreprocessorSettingsProvider.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/PreprocessorSettingsProvider.cs	(.../PreprocessorSettingsProvider.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/PreprocessorSettingsProvider.cs	(.../PreprocessorSettingsProvider.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -59,9 +59,11 @@
         }
 
         /// <summary>
-        /// Gets <see cref="PreprocessorSetting"/> based on the provided failure mechanism type and location id.
+        /// Gets <see cref="PreprocessorSetting"/> based on the provided location id.
         /// </summary>
-        /// <returns>The <see cref="PreprocessorSetting"/> .</returns>
+        /// <param name="locationId">The location id to obtain the <see cref="PreprocessorSetting"/> for.</param>
+        /// <param name="usePreprocessor">Indicator whether the preprocessor must be taken into account.</param>
+        /// <returns>The <see cref="PreprocessorSetting"/>.</returns>
         /// <exception cref="CriticalFileReadException">Thrown when a column that is being read doesn't
         /// contain expected type.</exception>
         public PreprocessorSetting GetPreprocessorSetting(long locationId, bool usePreprocessor)
@@ -73,22 +75,36 @@
 
             ReadPreprocessorSetting readSetting = preprocessorSettingsReader.ReadPreprocessorSetting(locationId) ?? defaultPreprocessorSetting;
 
-            return new PreprocessorSetting(readSetting.ValueMin, readSetting.ValueMax, GetNumericSetting(locationId));
+            return new PreprocessorSetting(readSetting.ValueMin, readSetting.ValueMax, GetNumericsSetting(locationId));
         }
 
         public void Dispose()
         {
             preprocessorSettingsReader.Dispose();
         }
 
+        /// <summary>
+        /// Checks whether the location corresponding to the provided id is an excluded location.
+        /// </summary>
+        /// <param name="locationId">The location id to check exclusion for.</param>
+        /// <returns><c>true</c> when <paramref name="locationId"/> is excluded; <c>false</c> otherwise.</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when a column that is being read doesn't
+        /// contain expected type.</exception>
         private bool LocationExcluded(long locationId)
         {
             IEnumerable<long> excludedIds = preprocessorSettingsReader.ReadExcludedPreprocessorLocations();
 
             return excludedIds.Contains(locationId);
         }
 
-        private NumericsSetting GetNumericSetting(long locationId)
+        /// <summary>
+        /// Returns <see cref="NumericsSetting"/> based on the provided location id.
+        /// </summary>
+        /// <param name="locationId">The location id to obtain the <see cref="NumericsSetting"/> for.</param>
+        /// <returns>A new <see cref="NumericsSetting"/> containing values corresponding to the provided location id.</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when a column that is being read doesn't
+        /// contain expected type.</exception>
+        private NumericsSetting GetNumericsSetting(long locationId)
         {
             using (var numericsSettingsProvider = new NumericsSettingsProvider(databaseFilePath))
             {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/ReadPreprocessorSetting.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/ReadPreprocessorSetting.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/HydraRing/ReadPreprocessorSetting.cs	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.Common.IO.HydraRing
+{
+    /// <summary>
+    /// Container for read preprocessor settings.
+    /// </summary>
+    public class ReadPreprocessorSetting
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="ReadPreprocessorSetting"/>.
+        /// </summary>
+        /// <param name="valueMin">The minimum value to use while running the preprocessor.</param>
+        /// <param name="valueMax">The maximum value to use while running the preprocessor.</param>
+        public ReadPreprocessorSetting(double valueMin, double valueMax)
+        {
+            ValueMin = valueMin;
+            ValueMax = valueMax;
+        }
+
+        /// <summary>
+        /// Gets the minimum value to use while running the preprocessor.
+        /// </summary>
+        public double ValueMin { get; }
+
+        /// <summary>
+        /// Gets the maximum value to use while running the preprocessor.
+        /// </summary>
+        public double ValueMax { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj	(.../Ringtoets.Common.IO.csproj)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -90,6 +90,7 @@
     <Compile Include="FileImporters\StructuresImporter.cs" />
     <Compile Include="HydraRing\HydraulicBoundaryDatabaseHelper.cs" />
     <Compile Include="HydraRing\PreprocessorSettingsProvider.cs" />
+    <Compile Include="HydraRing\ReadPreprocessorSetting.cs" />
     <Compile Include="HydraRing\TimeIntegrationSettingsProvider.cs" />
     <Compile Include="HydraRing\NumericsSettingsProvider.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryLocationsExporter.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs
===================================================================
diff -u -r268c1647f0094f6c43aeceaa5793437562cffe5a -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs	(.../TopLevelSubMechanismIllustrationPointTest.cs)	(revision 268c1647f0094f6c43aeceaa5793437562cffe5a)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs	(.../TopLevelSubMechanismIllustrationPointTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -35,11 +35,11 @@
         public void Constructor_WindDirectionNull_ThrowsArgumentNullException()
         {
             // Setup
-            var submechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
+            var subMechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
 
             // Call
             TestDelegate call = () =>
-                new TopLevelSubMechanismIllustrationPoint(null, "closing situation", submechanismIllustrationPoint);
+                new TopLevelSubMechanismIllustrationPoint(null, "closing situation", subMechanismIllustrationPoint);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -51,11 +51,11 @@
         {
             // Setup
             WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
-            var submechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
+            var subMechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
 
             // Call
             TestDelegate call = () =>
-                new TopLevelSubMechanismIllustrationPoint(windDirection, null, submechanismIllustrationPoint);
+                new TopLevelSubMechanismIllustrationPoint(windDirection, null, subMechanismIllustrationPoint);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -83,17 +83,17 @@
             // Setup
             const string closingScenario = "closing scenario";
             WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
-            var submechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
+            var subMechanismIllustrationPoint = new TestSubMechanismIllustrationPoint();
 
             // Call
             var windDirectionClosingScenarioIllustrationPoint =
-                new TopLevelSubMechanismIllustrationPoint(windDirection, closingScenario, submechanismIllustrationPoint);
+                new TopLevelSubMechanismIllustrationPoint(windDirection, closingScenario, subMechanismIllustrationPoint);
 
             // Assert
             Assert.IsInstanceOf<TopLevelIllustrationPointBase>(windDirectionClosingScenarioIllustrationPoint);
             Assert.AreEqual(closingScenario, windDirectionClosingScenarioIllustrationPoint.ClosingSituation);
             Assert.AreSame(windDirection, windDirectionClosingScenarioIllustrationPoint.WindDirection);
-            Assert.AreSame(submechanismIllustrationPoint, windDirectionClosingScenarioIllustrationPoint.SubMechanismIllustrationPoint);
+            Assert.AreSame(subMechanismIllustrationPoint, windDirectionClosingScenarioIllustrationPoint.SubMechanismIllustrationPoint);
         }
 
         [Test]
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs
===================================================================
diff -u -r44f75ace98dd75de607002abd122dfe8310d5456 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs	(.../SubMechanismIllustrationPointPropertiesTest.cs)	(revision 44f75ace98dd75de607002abd122dfe8310d5456)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointPropertiesTest.cs	(.../SubMechanismIllustrationPointPropertiesTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -49,7 +49,7 @@
             // Setup
             const string windDirection = "N";
             const string closingSituation = "closing situation";
-            var illustrationPoint = new SubMechanismIllustrationPoint("Submechanism A",
+            var illustrationPoint = new SubMechanismIllustrationPoint("Sub mechanism A",
                                                                       5.4,
                                                                       new[]
                                                                       {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs
===================================================================
diff -u -r44f75ace98dd75de607002abd122dfe8310d5456 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs	(.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs)	(revision 44f75ace98dd75de607002abd122dfe8310d5456)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/TopLevelSubMechanismIllustrationPointPropertiesTest.cs	(.../TopLevelSubMechanismIllustrationPointPropertiesTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -89,7 +89,7 @@
         {
             // Setup
             string illustrationPointName = string.Empty;
-            var submechanismIllustrationPoint =
+            var subMechanismIllustrationPoint =
                 new SubMechanismIllustrationPoint(illustrationPointName,
                                                   3,
                                                   Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
@@ -99,7 +99,7 @@
             WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             var context = new TopLevelSubMechanismIllustrationPoint(windDirection,
                                                                     closingSituation,
-                                                                    submechanismIllustrationPoint);
+                                                                    subMechanismIllustrationPoint);
 
             // Call
             var properties = new TopLevelSubMechanismIllustrationPointProperties(
@@ -121,7 +121,7 @@
         {
             // Setup
             string illustrationPointName = string.Empty;
-            var submechanismIllustrationPoint =
+            var subMechanismIllustrationPoint =
                 new SubMechanismIllustrationPoint(illustrationPointName,
                                                   3,
                                                   Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
@@ -131,7 +131,7 @@
             WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             var context = new TopLevelSubMechanismIllustrationPoint(windDirection,
                                                                     closingSituation,
-                                                                    submechanismIllustrationPoint);
+                                                                    subMechanismIllustrationPoint);
 
             // Call
             var properties = new TopLevelSubMechanismIllustrationPointProperties(
@@ -162,7 +162,7 @@
             };
 
             const string illustrationPointName = "name";
-            var submechanismIllustrationPoint = new SubMechanismIllustrationPoint(illustrationPointName,
+            var subMechanismIllustrationPoint = new SubMechanismIllustrationPoint(illustrationPointName,
                                                                                   beta,
                                                                                   stochasts,
                                                                                   illustrationPointResults);
@@ -171,7 +171,7 @@
             const string windDirectionName = "windDirection";
             var illustrationPoint = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(windDirectionName),
                                                                               closingSituation,
-                                                                              submechanismIllustrationPoint);
+                                                                              subMechanismIllustrationPoint);
 
             // Call
             var properties = new TopLevelSubMechanismIllustrationPointProperties(illustrationPoint, Enumerable.Empty<string>());
@@ -180,8 +180,8 @@
             Assert.AreEqual(illustrationPointName, properties.Name);
             Assert.AreEqual(windDirectionName, properties.WindDirection);
             Assert.AreEqual(closingSituation, properties.ClosingSituation);
-            CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.AlphaValues);
-            CollectionAssert.AreEqual(submechanismIllustrationPoint.Stochasts, properties.Durations);
+            CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, properties.AlphaValues);
+            CollectionAssert.AreEqual(subMechanismIllustrationPoint.Stochasts, properties.Durations);
 
             Assert.AreSame(illustrationPoint.SubMechanismIllustrationPoint,
                            properties.SubMechanismIllustrationPointValues.Data);
@@ -191,7 +191,7 @@
         public void GetProperties_DifferentClosingSituations_ReturnsExpectedAttributeValues()
         {
             // Setup
-            var submechanismIllustrationPoint =
+            var subMechanismIllustrationPoint =
                 new SubMechanismIllustrationPoint(string.Empty,
                                                   3,
                                                   Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
@@ -201,7 +201,7 @@
             WindDirection windDirection = WindDirectionTestFactory.CreateTestWindDirection();
             var data = new TopLevelSubMechanismIllustrationPoint(windDirection,
                                                                  closingSituation,
-                                                                 submechanismIllustrationPoint);
+                                                                 subMechanismIllustrationPoint);
 
             // Call
             var properties = new TopLevelSubMechanismIllustrationPointProperties(
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs	(.../HydraRingSettingsDatabaseReaderTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs	(.../HydraRingSettingsDatabaseReaderTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -384,7 +384,7 @@
         }
 
         [Test]
-        public void ReadExcludedLocations_EmptyTable_ReturnsEmptyList()
+        public void ReadExcludedLocations_EmptyTable_ReturnsEmptyEnumerable()
         {
             // Setup
             using (var reader = new HydraRingSettingsDatabaseReader(emptyDatabasePath))
@@ -478,7 +478,7 @@
         }
 
         [Test]
-        public void ReadExcludedPreprocessorLocations_EmptyTable_ReturnsEmptyList()
+        public void ReadExcludedPreprocessorLocations_EmptyTable_ReturnsEmptyEnumerable()
         {
             // Setup
             using (var reader = new HydraRingSettingsDatabaseReader(emptyDatabasePath))
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs	(.../NumericsSettingsProviderTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/NumericsSettingsProviderTest.cs	(.../NumericsSettingsProviderTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -64,32 +64,19 @@
         }
 
         [Test]
-        public void GetNumericsSetting_KnownLocationId_ReturnsExpectedNumericsSetting()
+        public void GetNumericsSettings_KnownLocationId_ReturnsExpectedNumericsSetting()
         {
             // Setup
             using (var numericsSettingsProvider = new NumericsSettingsProvider(completeDatabaseDataPath))
             {
-                NumericsSetting expectedValues = GetExpectedNumericsSetting();
-
                 // Call
                 Dictionary<int, NumericsSetting> numericsSettings = numericsSettingsProvider.GetNumericsSettings(700132, HydraRingFailureMechanismType.AssessmentLevel);
 
                 // Assert
-                NumericsSetting numericsSetting = numericsSettings[1];
-                Assert.AreEqual(expectedValues.CalculationTechniqueId, numericsSetting.CalculationTechniqueId);
-                Assert.AreEqual(expectedValues.FormStartMethod, numericsSetting.FormStartMethod);
-                Assert.AreEqual(expectedValues.FormNumberOfIterations, numericsSetting.FormNumberOfIterations);
-                Assert.AreEqual(expectedValues.FormRelaxationFactor, numericsSetting.FormRelaxationFactor);
-                Assert.AreEqual(expectedValues.FormEpsBeta, numericsSetting.FormEpsBeta);
-                Assert.AreEqual(expectedValues.FormEpsHoh, numericsSetting.FormEpsHoh);
-                Assert.AreEqual(expectedValues.FormEpsZFunc, numericsSetting.FormEpsZFunc);
-                Assert.AreEqual(expectedValues.DsStartMethod, numericsSetting.DsStartMethod);
-                Assert.AreEqual(expectedValues.DsMinNumberOfIterations, numericsSetting.DsMinNumberOfIterations);
-                Assert.AreEqual(expectedValues.DsMaxNumberOfIterations, numericsSetting.DsMaxNumberOfIterations);
-                Assert.AreEqual(expectedValues.DsVarCoefficient, numericsSetting.DsVarCoefficient);
-                Assert.AreEqual(expectedValues.NiNumberSteps, numericsSetting.NiNumberSteps);
-                Assert.AreEqual(expectedValues.NiUMin, numericsSetting.NiUMin);
-                Assert.AreEqual(expectedValues.NiUMax, numericsSetting.NiUMax);
+                Assert.IsTrue(numericsSettings.ContainsKey(1));
+
+                NumericsSetting expected = GetExpectedNumericsSetting();
+                AssertNumericsSetting(expected, numericsSettings[1]);
             }
         }
 
@@ -120,7 +107,7 @@
         [TestCase(HydraRingFailureMechanismType.DunesBoundaryConditions, 6, 1, 4, 10000, 40000)]
         [TestCase(HydraRingFailureMechanismType.OvertoppingRate, 102, 11, 4, 10000, 40000)]
         [TestCase(HydraRingFailureMechanismType.OvertoppingRate, 103, 11, 4, 10000, 40000)]
-        public void GetNumericsSetting_UnknownLocationId_ReturnsExpectedDefaultNumericsSetting(
+        public void GetNumericsSettings_UnknownLocationId_ReturnsExpectedDefaultNumericsSetting(
             HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId,
             int expectedFormStartMethod, int expectedDsMinNumberOfIterations, int expectedDsMaxNumberOfIterations)
         {
@@ -131,26 +118,20 @@
                 Dictionary<int, NumericsSetting> numericsSettings = numericsSettingsProvider.GetNumericsSettings(-1, failureMechanismType);
 
                 // Assert
-                NumericsSetting numericsSetting = numericsSettings[subMechanismId];
-                Assert.AreEqual(expectedCalculationTechniqueId, numericsSetting.CalculationTechniqueId);
-                Assert.AreEqual(expectedFormStartMethod, numericsSetting.FormStartMethod);
-                Assert.AreEqual(150, numericsSetting.FormNumberOfIterations);
-                Assert.AreEqual(0.15, numericsSetting.FormRelaxationFactor);
-                Assert.AreEqual(0.005, numericsSetting.FormEpsBeta);
-                Assert.AreEqual(0.005, numericsSetting.FormEpsHoh);
-                Assert.AreEqual(0.005, numericsSetting.FormEpsZFunc);
-                Assert.AreEqual(2, numericsSetting.DsStartMethod);
-                Assert.AreEqual(expectedDsMinNumberOfIterations, numericsSetting.DsMinNumberOfIterations);
-                Assert.AreEqual(expectedDsMaxNumberOfIterations, numericsSetting.DsMaxNumberOfIterations);
-                Assert.AreEqual(0.1, numericsSetting.DsVarCoefficient);
-                Assert.AreEqual(-6.0, numericsSetting.NiUMin);
-                Assert.AreEqual(6.0, numericsSetting.NiUMax);
-                Assert.AreEqual(25, numericsSetting.NiNumberSteps);
+                Assert.IsTrue(numericsSettings.ContainsKey(subMechanismId));
+
+                var expected = new NumericsSetting(expectedCalculationTechniqueId,
+                                                   expectedFormStartMethod,
+                                                   150, 0.15, 0.005, 0.005, 0.005, 2,
+                                                   expectedDsMinNumberOfIterations,
+                                                   expectedDsMaxNumberOfIterations,
+                                                   0.1, -6.0, 6.0, 25);
+                AssertNumericsSetting(expected, numericsSettings[subMechanismId]);
             }
         }
 
         [Test]
-        public void GetNumericsSettingForPreprocessor_PreprocessorSubmechanismIdKnown_ReturnExpectedNumericsSetting()
+        public void GetNumericsSettingForPreprocessor_PreprocessorSubMechanismIdKnown_ReturnExpectedNumericsSetting()
         {
             // Setup
             using (var numericsSettingsProvider = new NumericsSettingsProvider(completeDatabaseDataPath))
@@ -159,25 +140,13 @@
                 NumericsSetting numericsSetting = numericsSettingsProvider.GetNumericsSettingForPreprocessor(700131);
 
                 // Assert
-                Assert.AreEqual(2, numericsSetting.CalculationTechniqueId);
-                Assert.AreEqual(3, numericsSetting.FormStartMethod);
-                Assert.AreEqual(20, numericsSetting.FormNumberOfIterations);
-                Assert.AreEqual(0.2, numericsSetting.FormRelaxationFactor);
-                Assert.AreEqual(0.1, numericsSetting.FormEpsBeta);
-                Assert.AreEqual(0.1, numericsSetting.FormEpsHoh);
-                Assert.AreEqual(0.1, numericsSetting.FormEpsZFunc);
-                Assert.AreEqual(3, numericsSetting.DsStartMethod);
-                Assert.AreEqual(4, numericsSetting.DsMinNumberOfIterations);
-                Assert.AreEqual(15000, numericsSetting.DsMaxNumberOfIterations);
-                Assert.AreEqual(90000, numericsSetting.DsVarCoefficient);
-                Assert.AreEqual(0.2, numericsSetting.NiUMin);
-                Assert.AreEqual(-4, numericsSetting.NiUMax);
-                Assert.AreEqual(5, numericsSetting.NiNumberSteps);
+                var expected = new NumericsSetting(2, 3, 20, 0.2, 0.1, 0.1, 0.1, 3, 4, 15000, 90000, 0.2, -4, 5);
+                AssertNumericsSetting(expected, numericsSetting);
             }
         }
 
         [Test]
-        public void GetNumericsSettingForPreprocessor_PreprocessorSubmechanismIdUnknownDefaultSubmechanismIdKnown_ReturnExpectedNumericsSetting()
+        public void GetNumericsSettingForPreprocessor_PreprocessorSubMechanismIdUnknownDefaultSubMechanismIdKnown_ReturnExpectedNumericsSetting()
         {
             // Setup
             using (var numericsSettingsProvider = new NumericsSettingsProvider(completeDatabaseDataPath))
@@ -186,21 +155,8 @@
                 NumericsSetting numericsSetting = numericsSettingsProvider.GetNumericsSettingForPreprocessor(700138);
 
                 // Assert
-                NumericsSetting expectedValues = GetExpectedNumericsSetting();
-                Assert.AreEqual(expectedValues.CalculationTechniqueId, numericsSetting.CalculationTechniqueId);
-                Assert.AreEqual(expectedValues.FormStartMethod, numericsSetting.FormStartMethod);
-                Assert.AreEqual(expectedValues.FormNumberOfIterations, numericsSetting.FormNumberOfIterations);
-                Assert.AreEqual(expectedValues.FormRelaxationFactor, numericsSetting.FormRelaxationFactor);
-                Assert.AreEqual(expectedValues.FormEpsBeta, numericsSetting.FormEpsBeta);
-                Assert.AreEqual(expectedValues.FormEpsHoh, numericsSetting.FormEpsHoh);
-                Assert.AreEqual(expectedValues.FormEpsZFunc, numericsSetting.FormEpsZFunc);
-                Assert.AreEqual(expectedValues.DsStartMethod, numericsSetting.DsStartMethod);
-                Assert.AreEqual(expectedValues.DsMinNumberOfIterations, numericsSetting.DsMinNumberOfIterations);
-                Assert.AreEqual(expectedValues.DsMaxNumberOfIterations, numericsSetting.DsMaxNumberOfIterations);
-                Assert.AreEqual(expectedValues.DsVarCoefficient, numericsSetting.DsVarCoefficient);
-                Assert.AreEqual(expectedValues.NiNumberSteps, numericsSetting.NiNumberSteps);
-                Assert.AreEqual(expectedValues.NiUMin, numericsSetting.NiUMin);
-                Assert.AreEqual(expectedValues.NiUMax, numericsSetting.NiUMax);
+                NumericsSetting expected = GetExpectedNumericsSetting();
+                AssertNumericsSetting(expected, numericsSetting);
             }
         }
 
@@ -214,26 +170,32 @@
                 NumericsSetting numericsSetting = numericsSettingsProvider.GetNumericsSettingForPreprocessor(700139);
 
                 // Assert
-                Assert.AreEqual(11, numericsSetting.CalculationTechniqueId);
-                Assert.AreEqual(4, numericsSetting.FormStartMethod);
-                Assert.AreEqual(150, numericsSetting.FormNumberOfIterations);
-                Assert.AreEqual(0.15, numericsSetting.FormRelaxationFactor);
-                Assert.AreEqual(0.005, numericsSetting.FormEpsBeta);
-                Assert.AreEqual(0.005, numericsSetting.FormEpsHoh);
-                Assert.AreEqual(0.005, numericsSetting.FormEpsZFunc);
-                Assert.AreEqual(2, numericsSetting.DsStartMethod);
-                Assert.AreEqual(10000, numericsSetting.DsMinNumberOfIterations);
-                Assert.AreEqual(40000, numericsSetting.DsMaxNumberOfIterations);
-                Assert.AreEqual(0.1, numericsSetting.DsVarCoefficient);
-                Assert.AreEqual(-6.0, numericsSetting.NiUMin);
-                Assert.AreEqual(6.0, numericsSetting.NiUMax);
-                Assert.AreEqual(25, numericsSetting.NiNumberSteps);
+                var expected = new NumericsSetting(11, 4, 150, 0.15, 0.005, 0.005, 0.005, 2, 10000, 40000, 0.1, -6.0, 6.0, 25);
+                AssertNumericsSetting(expected, numericsSetting);
             }
         }
 
         private static NumericsSetting GetExpectedNumericsSetting()
         {
             return new NumericsSetting(1, 4, 50, 0.15, 0.05, 0.01, 0.01, 0, 2, 20000, 100000, 0.1, -6, 6);
         }
+
+        private static void AssertNumericsSetting(NumericsSetting expectedNumericsSetting, NumericsSetting actualNumericsSetting)
+        {
+            Assert.AreEqual(expectedNumericsSetting.CalculationTechniqueId, actualNumericsSetting.CalculationTechniqueId);
+            Assert.AreEqual(expectedNumericsSetting.FormStartMethod, actualNumericsSetting.FormStartMethod);
+            Assert.AreEqual(expectedNumericsSetting.FormNumberOfIterations, actualNumericsSetting.FormNumberOfIterations);
+            Assert.AreEqual(expectedNumericsSetting.FormRelaxationFactor, actualNumericsSetting.FormRelaxationFactor);
+            Assert.AreEqual(expectedNumericsSetting.FormEpsBeta, actualNumericsSetting.FormEpsBeta);
+            Assert.AreEqual(expectedNumericsSetting.FormEpsHoh, actualNumericsSetting.FormEpsHoh);
+            Assert.AreEqual(expectedNumericsSetting.FormEpsZFunc, actualNumericsSetting.FormEpsZFunc);
+            Assert.AreEqual(expectedNumericsSetting.DsStartMethod, actualNumericsSetting.DsStartMethod);
+            Assert.AreEqual(expectedNumericsSetting.DsMinNumberOfIterations, actualNumericsSetting.DsMinNumberOfIterations);
+            Assert.AreEqual(expectedNumericsSetting.DsMaxNumberOfIterations, actualNumericsSetting.DsMaxNumberOfIterations);
+            Assert.AreEqual(expectedNumericsSetting.DsVarCoefficient, actualNumericsSetting.DsVarCoefficient);
+            Assert.AreEqual(expectedNumericsSetting.NiNumberSteps, actualNumericsSetting.NiNumberSteps);
+            Assert.AreEqual(expectedNumericsSetting.NiUMin, actualNumericsSetting.NiUMin);
+            Assert.AreEqual(expectedNumericsSetting.NiUMax, actualNumericsSetting.NiUMax);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/PreprocessorSettingsProviderTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/PreprocessorSettingsProviderTest.cs	(.../PreprocessorSettingsProviderTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/PreprocessorSettingsProviderTest.cs	(.../PreprocessorSettingsProviderTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -56,8 +56,7 @@
                 PreprocessorSetting setting = provider.GetPreprocessorSetting(700131, false);
 
                 // Assert
-                Assert.IsNaN(setting.ValueMin);
-                Assert.IsNaN(setting.ValueMax);
+                Assert.IsFalse(setting.RunPreprocessor);
             }
         }
 
@@ -71,8 +70,7 @@
                 PreprocessorSetting setting = provider.GetPreprocessorSetting(700136, true);
 
                 // Assert
-                Assert.IsNaN(setting.ValueMin);
-                Assert.IsNaN(setting.ValueMax);
+                Assert.IsFalse(setting.RunPreprocessor);
             }
         }
 
@@ -86,6 +84,7 @@
                 PreprocessorSetting setting = provider.GetPreprocessorSetting(700131, true);
 
                 // Assert
+                Assert.IsTrue(setting.RunPreprocessor);
                 Assert.AreEqual(2, setting.ValueMin);
                 Assert.AreEqual(8, setting.ValueMax);
                 NumericsSetting numericsSetting = setting.NumericsSetting;
@@ -116,6 +115,7 @@
                 PreprocessorSetting setting = provider.GetPreprocessorSetting(700139, true);
 
                 // Assert
+                Assert.IsTrue(setting.RunPreprocessor);
                 Assert.AreEqual(1, setting.ValueMin);
                 Assert.AreEqual(6, setting.ValueMax);
                 NumericsSetting numericsSetting = setting.NumericsSetting;
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/ReadPreprocessorSettingTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/ReadPreprocessorSettingTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/ReadPreprocessorSettingTest.cs	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -0,0 +1,47 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+using Ringtoets.Common.IO.HydraRing;
+
+namespace Ringtoets.Common.IO.Test.HydraRing
+{
+    [TestFixture]
+    public class ReadPreprocessorSettingTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var random = new Random(11);
+            double valueMin = random.NextDouble();
+            double valueMax = random.NextDouble();
+
+            // Call
+            var readPreprocessorSetting = new ReadPreprocessorSetting(valueMin, valueMax);
+
+            // Assert
+            Assert.AreEqual(valueMin, readPreprocessorSetting.ValueMin);
+            Assert.AreEqual(valueMax, readPreprocessorSetting.ValueMax);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj	(.../Ringtoets.Common.IO.Test.csproj)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj	(.../Ringtoets.Common.IO.Test.csproj)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -92,6 +92,7 @@
     <Compile Include="HydraRing\HydraRingSettingsDatabaseReaderTest.cs" />
     <Compile Include="HydraRing\HydraulicBoundaryDatabaseHelperTest.cs" />
     <Compile Include="HydraRing\PreprocessorSettingsProviderTest.cs" />
+    <Compile Include="HydraRing\ReadPreprocessorSettingTest.cs" />
     <Compile Include="HydraRing\TimeIntegrationSettingsProviderTest.cs" />
     <Compile Include="HydraRing\NumericsSettingsProviderTest.cs" />
     <Compile Include="Hydraulics\HydraulicBoundaryLocationsExporterTest.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs	(.../HydraRingSettingsDatabaseHelperTest.cs)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingSettingsDatabaseHelperTest.cs	(.../HydraRingSettingsDatabaseHelperTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -55,25 +55,9 @@
         }
 
         [Test]
-        public void AssignSettingsFromDatabase_FileWithEmptySettingsDatabase_DefaultsSettingsAdded()
-        {
-            // Setup
-            var input = new TestHydraRingCalculationInput();
-
-            // Call
-            HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, Path.Combine(testDataPath, "hrd.sqlite"), false);
-
-            // Assert
-            Assert.NotNull(input.PreprocessorSetting);
-            Assert.NotNull(input.DesignTablesSetting);
-            Assert.NotNull(input.NumericsSettings);
-            Assert.NotNull(input.TimeIntegrationSetting);
-        }
-
-        [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void AssignSettingsFromDatabase_UsePreprocessor_SettingsAdded(bool usePreprocessor)
+        public void AssignSettingsFromDatabase_FileWithEmptySettingsDatabase_DefaultsSettingsAdded(bool usePreprocessor)
         {
             // Setup
             var input = new TestHydraRingCalculationInput();
@@ -82,6 +66,9 @@
             HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, Path.Combine(testDataPath, "hrd.sqlite"), usePreprocessor);
 
             // Assert
+            Assert.NotNull(input.DesignTablesSetting);
+            Assert.NotNull(input.NumericsSettings);
+            Assert.NotNull(input.TimeIntegrationSetting);
             Assert.NotNull(input.PreprocessorSetting);
             Assert.AreEqual(usePreprocessor, input.PreprocessorSetting.RunPreprocessor);
         }
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs
===================================================================
diff -u -r566d36e29347b40381bff26e321334b5af07c367 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs	(.../IllustrationPointsParser.cs)	(revision 566d36e29347b40381bff26e321334b5af07c367)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs	(.../IllustrationPointsParser.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -413,8 +413,8 @@
                 AddRange(illustrationPointResults, subMechanismResults[dataKey]);
             }
 
-            string submechanismIllustrationPointName = subMechanisms[subMechanismId];
-            var illustrationPoint = new SubMechanismIllustrationPoint(submechanismIllustrationPointName,
+            string subMechanismIllustrationPointName = subMechanisms[subMechanismId];
+            var illustrationPoint = new SubMechanismIllustrationPoint(subMechanismIllustrationPointName,
                                                                       illustrationPointStochasts,
                                                                       illustrationPointResults,
                                                                       subMechanismIllustrationPointBeta);
Fisheye: Tag 09c47b676fdd8a2a9f891f226e1c2a676a3dec08 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/ReadPreprocessorSetting.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -142,7 +142,6 @@
     <Compile Include="Providers\FailureMechanismDefaultsProvider.cs" />
     <Compile Include="Data\Settings\DesignTablesSetting.cs" />
     <Compile Include="Data\HydraRingFailureMechanismType.cs" />
-    <Compile Include="Readers\ReadPreprocessorSetting.cs" />
     <Compile Include="Services\HydraRingConfigurationService.cs" />
     <Compile Include="Data\Settings\NumericsSetting.cs" />
     <Compile Include="Data\Input\ReliabilityIndexCalculationInput.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs	(.../StructuresClosureFloodedCulvertCalculationInputTest.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs	(.../StructuresClosureFloodedCulvertCalculationInputTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -121,10 +121,10 @@
                                                                             66, 77, 88, 99, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);
 
             // Call
-            int? actualSubmechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
+            int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
 
             // Assert
-            Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId);
+            Assert.AreEqual(expectedSubMechanismModelId, actualSubMechanismModelId);
         }
 
         private static IEnumerable<HydraRingVariable> GetDefaultVariables()
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs	(.../StructuresClosureLowSillCalculationInputTest.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs	(.../StructuresClosureLowSillCalculationInputTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -128,10 +128,10 @@
                                                                      22, 23, 24, 25);
 
             // Call
-            int? actualSubmechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
+            int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
 
             // Assert
-            Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId);
+            Assert.AreEqual(expectedSubMechanismModelId, actualSubMechanismModelId);
         }
 
         private static IEnumerable<HydraRingVariable> GetDefaultVariables()
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs	(.../StructuresClosureVerticalWallCalculationInputTest.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs	(.../StructuresClosureVerticalWallCalculationInputTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -129,10 +129,10 @@
                                                                           22, 23, 24, 25);
 
             // Call
-            int? actualSubmechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
+            int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
 
             // Assert
-            Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId);
+            Assert.AreEqual(expectedSubMechanismModelId, actualSubMechanismModelId);
         }
 
         private static IEnumerable<HydraRingVariable> GetDefaultVariables()
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs	(.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs	(.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -180,10 +180,10 @@
                                                                                          53.53, 54.54, 55.55, 56.56, 57.57, 58.58, 59.59);
 
             // Call
-            int? actualSubmechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
+            int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
 
             // Assert
-            Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId);
+            Assert.AreEqual(expectedSubMechanismModelId, actualSubMechanismModelId);
         }
 
         private static IEnumerable<HydraRingVariable> GetDefaultVariables()
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs	(.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs	(.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -180,10 +180,10 @@
                                                                                             53.53, 54.54, 55.55, 56.56, 57.57, 58.58, 59.59);
 
             // Call
-            int? actualSubmechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
+            int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
 
             // Assert
-            Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId);
+            Assert.AreEqual(expectedSubMechanismModelId, actualSubMechanismModelId);
         }
 
         private static IEnumerable<HydraRingVariable> GetDefaultVariables()
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs	(.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs	(.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -180,10 +180,10 @@
                                                                                   53.53, 54.54, 55.55, 56.56, 57.57, 58.58, 59.59);
 
             // Call
-            int? actualSubmechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
+            int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
 
             // Assert
-            Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId);
+            Assert.AreEqual(expectedSubMechanismModelId, actualSubMechanismModelId);
         }
 
         private static IEnumerable<HydraRingVariable> GetDefaultVariables()
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs
===================================================================
diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs	(.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs)	(revision 64d60335b1deab4bafd37f78f3514660cc4afb27)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs	(.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -180,10 +180,10 @@
                                                                                      53.53, 54.54, 55.55, 56.56, 57.57, 58.58, 59.59);
 
             // Call
-            int? actualSubmechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
+            int? actualSubMechanismModelId = input.GetSubMechanismModelId(subMechanismModelId);
 
             // Assert
-            Assert.AreEqual(expectedSubMechanismModelId, actualSubmechanismModelId);
+            Assert.AreEqual(expectedSubMechanismModelId, actualSubMechanismModelId);
         }
 
         private static IEnumerable<HydraRingVariable> GetDefaultVariables()
Fisheye: Tag 09c47b676fdd8a2a9f891f226e1c2a676a3dec08 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Readers/ReadPreprocessorSettingTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r09c47b676fdd8a2a9f891f226e1c2a676a3dec08
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 09c47b676fdd8a2a9f891f226e1c2a676a3dec08)
@@ -127,7 +127,6 @@
     <Compile Include="Parsers\OvertoppingCalculationWaveHeightParserTest.cs" />
     <Compile Include="Parsers\ReliabilityIndexCalculationParserTest.cs" />
     <Compile Include="Parsers\WaveConditionsCalculationParserTest.cs" />
-    <Compile Include="Readers\ReadPreprocessorSettingTest.cs" />
     <Compile Include="Services\HydraRingConfigurationServiceTest.cs" />
     <Compile Include="Data\HydraRingSectionTest.cs" />
     <Compile Include="Data\HydraRingProfilePointTest.cs" />