Index: Ringtoets.sln
===================================================================
diff -u -rad75a347a7586757599297f2b2e776100d827264 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision ad75a347a7586757599297f2b2e776100d827264)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -930,16 +930,6 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.Service.TestUtil", "Ringtoets\Common\test\Ringtoets.Common.Service.TestUtil\Ringtoets.Common.Service.TestUtil.csproj", "{73E7E100-C015-4874-A548-AD6E33E7955E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.Service.TestUtil.Test", "Ringtoets\Common\test\Ringtoets.Common.Service.TestUtil.Test\Ringtoets.Common.Service.TestUtil.Test.csproj", "{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.WaveImpactAsphaltCover.Service", "Ringtoets\WaveImpactAsphaltCover\src\Ringtoets.WaveImpactAsphaltCover.Service\Ringtoets.WaveImpactAsphaltCover.Service.csproj", "{9E4A7C0B-F8B5-4101-B9D5-90F3F3C0FF7C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
@@ -2475,22 +2465,6 @@
 		{58463630-E5FD-431F-9C2E-52E88641C63E}.Release|x86.Build.0 = Release|x86
 		{58463630-E5FD-431F-9C2E-52E88641C63E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{58463630-E5FD-431F-9C2E-52E88641C63E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.CreateInstaller|x86.ActiveCfg = Release|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.Debug|x86.ActiveCfg = Debug|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.Debug|x86.Build.0 = Debug|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.Release|x86.ActiveCfg = Release|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.Release|x86.Build.0 = Release|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{73E7E100-C015-4874-A548-AD6E33E7955E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.CreateInstaller|x86.ActiveCfg = Release|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.Debug|x86.ActiveCfg = Debug|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.Debug|x86.Build.0 = Debug|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.Release|x86.ActiveCfg = Release|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.Release|x86.Build.0 = Release|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 		{9E4A7C0B-F8B5-4101-B9D5-90F3F3C0FF7C}.CreateInstaller|x86.ActiveCfg = Release|x86
 		{9E4A7C0B-F8B5-4101-B9D5-90F3F3C0FF7C}.CreateInstaller|x86.Build.0 = Release|x86
 		{9E4A7C0B-F8B5-4101-B9D5-90F3F3C0FF7C}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
@@ -2826,8 +2800,6 @@
 		{4843D6E5-066F-4795-94F5-1D53932DD03C} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
 		{7C78463D-09B1-455C-B58E-B8EDC9FBCB60} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
 		{915A3B93-38F6-4D8B-8204-BE7F4FB0043F} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
-		{73E7E100-C015-4874-A548-AD6E33E7955E} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
-		{DF6BC3F7-1751-4F3F-9092-ABD9095A2A6C} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
 		{3ED34ACD-41C9-4251-81EC-7493E0BFF57D} = {F8FFD6DD-19DA-47CE-A0BD-53F4E7D8BB86}
 		{1F0D20C2-7F04-431D-AF22-95A31FD53733} = {F8FFD6DD-19DA-47CE-A0BD-53F4E7D8BB86}
 		{D64E4F0E-E341-496F-82B2-941AD202B4E3} = {3ED34ACD-41C9-4251-81EC-7493E0BFF57D}
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -30,7 +30,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a design water level calculation.
     /// </summary>
-    public class DesignWaterLevelCalculationActivity : NewHydraRingActivity
+    public class DesignWaterLevelCalculationActivity : HydraRingActivityBase
     {
         private readonly HydraulicBoundaryLocation hydraulicBoundaryLocation;
         private readonly double norm;
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -30,7 +30,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a water height calculation.
     /// </summary>
-    public class WaveHeightCalculationActivity : NewHydraRingActivity
+    public class WaveHeightCalculationActivity : HydraRingActivityBase
     {
         private readonly HydraulicBoundaryLocation hydraulicBoundaryLocation;
         private readonly double norm;
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -119,10 +119,6 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Ringtoets.Common.Service.TestUtil\Ringtoets.Common.Service.TestUtil.csproj">
-      <Project>{73E7E100-C015-4874-A548-AD6E33E7955E}</Project>
-      <Name>Ringtoets.Common.Service.TestUtil</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\build\net40\System.Data.SQLite.Core.targets')" />
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj	(.../Ringtoets.Common.Service.TestUtil.Test.csproj)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj	(.../Ringtoets.Common.Service.TestUtil.Test.csproj)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -83,10 +83,6 @@
       <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
       <Name>Ringtoets.Common.Service</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Ringtoets.Common.Service.TestUtil\Ringtoets.Common.Service.TestUtil.csproj">
-      <Project>{73E7E100-C015-4874-A548-AD6E33E7955E}</Project>
-      <Name>Ringtoets.Common.Service.TestUtil</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs	(.../GrassCoverErosionInwardsCalculationActivity.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationActivity.cs	(.../GrassCoverErosionInwardsCalculationActivity.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -33,7 +33,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a grass cover erosion inwards calculation.
     /// </summary>
-    public class GrassCoverErosionInwardsCalculationActivity : NewHydraRingActivity
+    public class GrassCoverErosionInwardsCalculationActivity : HydraRingActivityBase
     {
         private readonly GrassCoverErosionInwardsCalculation calculation;
         private readonly string hlcdDirectory;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityTest.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityTest.cs	(.../GrassCoverErosionInwardsCalculationActivityTest.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationActivityTest.cs	(.../GrassCoverErosionInwardsCalculationActivityTest.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -47,7 +47,7 @@
             var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, "", failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<NewHydraRingActivity>(activity);
+            Assert.IsInstanceOf<HydraRingActivityBase>(activity);
             Assert.AreEqual(calculation.Name, activity.Name);
             Assert.IsNull(activity.ProgressText);
             Assert.AreEqual(ActivityState.None, activity.State);
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivity.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -31,7 +31,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a grass cover erosion outwards wave conditions calculation.
     /// </summary>
-    public class GrassCoverErosionOutwardsWaveConditionsCalculationActivity : NewHydraRingActivity
+    public class GrassCoverErosionOutwardsWaveConditionsCalculationActivity : HydraRingActivityBase
     {
         private readonly GrassCoverErosionOutwardsWaveConditionsCalculation calculation;
         private readonly string hlcdFilePath;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.Test.csproj)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -158,10 +158,6 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Service.TestUtil\Ringtoets.Common.Service.TestUtil.csproj">
-      <Project>{73E7E100-C015-4874-A548-AD6E33E7955E}</Project>
-      <Name>Ringtoets.Common.Service.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -71,7 +71,7 @@
                                                                          string ringId, GeneralHeightStructuresInput generalInput)
         {
             StructuresOvertoppingCalculationInput input = CreateInput(calculation, failureMechanismSection, generalInput);
-            var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationExceptionParser();
+            var exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser();
 
             CalculationServiceHelper.PerformCalculation(
                 calculation.Name,
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/HydraRingActivityBase.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/HydraRingActivityBase.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/HydraRingActivityBase.cs	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -0,0 +1,76 @@
+// Copyright (C) Stichting Deltares 2016. 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 Core.Common.Base.Service;
+using Ringtoets.HydraRing.Calculation.Services;
+
+namespace Ringtoets.HydraRing.Calculation.Activities
+{
+    /// <summary>
+    /// Base implementation of an <see cref="Activity"/> for running calculations via Hydra-Ring.
+    /// </summary>
+    public abstract class HydraRingActivityBase : Activity
+    {
+        protected override void OnCancel()
+        {
+            HydraRingCalculationService.CancelRunningCalculation();
+        }
+
+        protected override void OnRun()
+        {
+            if (!Validate())
+            {
+                State = ActivityState.Failed;
+            }
+            else
+            {
+                PerformCalculation();
+            }
+        }
+
+        /// <summary>
+        /// Updates the progress text using the parameters in a predefined format.
+        /// </summary>
+        /// <param name="currentStepName">A short description of the current step.</param>
+        /// <param name="currentStep">The number of the current step.</param>
+        /// <param name="totalSteps">The total numbers of steps.</param>
+        protected void UpdateProgressText(string currentStepName, int currentStep, int totalSteps)
+        {
+            ProgressText = string.Format("Stap {0} van {1} | {2}", currentStep, totalSteps, currentStepName);
+        }
+
+        /// <summary>
+        /// Performs the calculation. May throw exceptions, which will result in a <see cref="ActivityState.Failed"/>
+        /// state for the <see cref="HydraRingActivityBase"/>.
+        /// </summary>
+        protected abstract void PerformCalculation();
+
+        /// <summary>
+        /// Performs validation over the input of the <see cref="HydraRingActivityBase"/>. If the input is not valid
+        /// then <c>false</c> is returned and the problems are logged.
+        /// </summary>
+        /// <returns><c>true</c> if no validation problems were found, <c>false</c> otherwise.</returns>
+        protected virtual bool Validate()
+        {
+            return true;
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 1b0460d5f81926d0366ab10e4b0e9f6d75809c71 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/NewHydraRingActivity.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs	(.../DesignWaterLevelCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs	(.../DesignWaterLevelCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -26,17 +26,26 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
-    public class DesignWaterLevelCalculator : HydraRingCalculator, IDesignWaterLevelCalculator
+    /// <summary>
+    /// Calculator which calculates the water level associated to the result of iterating towards a
+    /// probability of failure given a norm.
+    /// </summary>
+    public class DesignWaterLevelCalculator : HydraRingCalculatorBase, IDesignWaterLevelCalculator
     {
         private readonly string hlcdDirectory;
         private readonly string ringId;
-        private readonly ReliabilityIndexCalculationExceptionParser targetProbabilityParser;
+        private readonly ReliabilityIndexCalculationParser targetProbabilityParser;
 
+        /// <summary>
+        /// Create a new instance of <see cref="DesignWaterLevelCalculator"/>.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory in which the Hydraulic Boundary Database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
         internal DesignWaterLevelCalculator(string hlcdDirectory, string ringId)
         {
             this.hlcdDirectory = hlcdDirectory;
             this.ringId = ringId;
-            targetProbabilityParser = new ReliabilityIndexCalculationExceptionParser();
+            targetProbabilityParser = new ReliabilityIndexCalculationParser();
 
             DesignWaterLevel = double.NaN;
             ReliabilityIndex = double.NaN;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs	(.../DikeHeightCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs	(.../DikeHeightCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -26,17 +26,26 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
-    public class DikeHeightCalculator : HydraRingCalculator, IDikeHeightCalculator
+    /// <summary>
+    /// Calculator which calculates the dike height associated to the result of iterating towards a
+    /// probability of failure given a norm.
+    /// </summary>
+    public class DikeHeightCalculator : HydraRingCalculatorBase, IDikeHeightCalculator
     {
         private readonly string hlcdDirectory;
         private readonly string ringId;
-        private readonly ReliabilityIndexCalculationExceptionParser targetProbabilityParser;
+        private readonly ReliabilityIndexCalculationParser targetProbabilityParser;
 
+        /// <summary>
+        /// Create a new instance of <see cref="DikeHeightCalculator"/>.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory in which the Hydraulic Boundary Database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
         internal DikeHeightCalculator(string hlcdDirectory, string ringId)
         {
             this.hlcdDirectory = hlcdDirectory;
             this.ringId = ringId;
-            targetProbabilityParser = new ReliabilityIndexCalculationExceptionParser();
+            targetProbabilityParser = new ReliabilityIndexCalculationParser();
 
             DikeHeight = double.NaN;
         }
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -21,10 +21,17 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator.Factory
 {
+    /// <summary>
+    /// The factory for creating <see cref="HydraRingCalculatorBase"/> instances.
+    /// </summary>
     public class HydraRingCalculatorFactory : IHydraRingCalculatorFactory
     {
         private static IHydraRingCalculatorFactory instance;
 
+        /// <summary>
+        /// Sets the current <see cref="IHydraRingCalculatorFactory"/>, which is used to create 
+        /// <see cref="HydraRingCalculatorBase"/> instances.
+        /// </summary>
         public static IHydraRingCalculatorFactory Instance
         {
             get
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -21,12 +21,50 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator.Factory
 {
+    /// <summary>
+    /// Interface for a factory which creates calculators that are used to perform a calculation using
+    /// Hydra-Ring.
+    /// </summary>
     public interface IHydraRingCalculatorFactory
     {
+        /// <summary>
+        /// Creates a calculator for calculating a design water level.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
+        /// <returns>A new <see cref="IDesignWaterLevelCalculator"/>.</returns>
         IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory, string ringId);
+
+        /// <summary>
+        /// Creates a calculator for calculating a dike height.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
+        /// <returns>A new <see cref="IDikeHeightCalculator"/>.</returns>
         IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory, string ringId);
+
+        /// <summary>
+        /// Creates a calculator for performing an overtopping calculation.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
+        /// <returns>A new <see cref="IOvertoppingCalculator"/>.</returns>
         IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory, string ringId);
+
+        /// <summary>
+        /// Creates a calculator for calculating wave conditions.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
+        /// <returns>A new <see cref="IWaveConditionsCosineCalculator"/>.</returns>
         IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory, string ringId);
+
+        /// <summary>
+        /// Creates a calculator for calculating a wave height.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
+        /// <returns>A new <see cref="IWaveHeightCalculator"/>.</returns>
         IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory, string ringId);
     }
 }
\ No newline at end of file
Fisheye: Tag 1b0460d5f81926d0366ab10e4b0e9f6d75809c71 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -0,0 +1,154 @@
+// Copyright (C) Stichting Deltares 2016. 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.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Data.Input;
+using Ringtoets.HydraRing.Calculation.Parsers;
+using Ringtoets.HydraRing.Calculation.Services;
+
+namespace Ringtoets.HydraRing.Calculation.Calculator
+{
+    /// <summary>
+    /// Base implementation for a calculator which uses Hydra-Ring to perform different calculations.
+    /// </summary>
+    public abstract class HydraRingCalculatorBase
+    {
+        private readonly HydraRingOutputFileParser outputFileParser;
+        private Process hydraRingProcess;
+
+        /// <summary>
+        /// Constructs a new <see cref="HydraRingCalculatorBase"/> which a default Hydra-Ring file parser
+        /// initialized.
+        /// </summary>
+        protected HydraRingCalculatorBase()
+        {
+            outputFileParser = new HydraRingOutputFileParser();
+        }
+
+        /// <summary>
+        /// The content of the output file produced during calculation.
+        /// </summary>
+        public string OutputFileContent { get; private set; }
+
+        /// <summary>
+        /// Cancels any currently running Hydra-Ring calculation.
+        /// </summary>
+        public void Cancel()
+        {
+            if (hydraRingProcess != null && !hydraRingProcess.HasExited)
+            {
+                hydraRingProcess.StandardInput.WriteLine("b");
+            }
+        }
+
+        /// <summary>
+        /// Gets the parsers that are executed on the output file(s) of Hydra-Ring.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual IEnumerable<IHydraRingFileParser> GetParsers()
+        {
+            yield break;
+        }
+
+        /// <summary>
+        /// Sets the values on the output parameters of the calculation.
+        /// </summary>
+        protected abstract void SetOutputs();
+
+        /// <summary>
+        /// Performs the actual calculation by running the Hydra-Ring executable.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory in which the Hydraulic Boundary Database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
+        /// <param name="uncertaintiesType">The uncertainty type used in the calculation.</param>
+        /// <param name="hydraRingCalculationInput">The object containing input data.</param>
+        protected void Calculate(
+            string hlcdDirectory,
+            string ringId,
+            HydraRingUncertaintiesType uncertaintiesType,
+            HydraRingCalculationInput hydraRingCalculationInput)
+        {
+            var sectionId = hydraRingCalculationInput.Section.SectionId;
+            var workingDirectory = CreateWorkingDirectory();
+
+            var hydraRingConfigurationService = new HydraRingConfigurationService(ringId, uncertaintiesType);
+            hydraRingConfigurationService.AddHydraRingCalculationInput(hydraRingCalculationInput);
+
+            var hydraRingInitializationService = new HydraRingInitializationService(hydraRingCalculationInput.FailureMechanismType, sectionId, hlcdDirectory, workingDirectory);
+            hydraRingInitializationService.WriteInitializationScript();
+            hydraRingConfigurationService.WriteDataBaseCreationScript(hydraRingInitializationService.DatabaseCreationScriptFilePath);
+
+            PerformCalculation(workingDirectory, hydraRingInitializationService);
+            ExecuteParsers(hydraRingInitializationService.TemporaryWorkingDirectory, sectionId);
+            SetAllOutputs();
+        }
+
+        private void SetAllOutputs()
+        {
+            OutputFileContent = outputFileParser.OutputFileContent;
+            SetOutputs();
+        }
+
+        private IEnumerable<IHydraRingFileParser> GetAllParsers()
+        {
+            yield return outputFileParser;
+            foreach (var parser in GetParsers())
+            {
+                yield return parser;
+            }
+        }
+
+        private void ExecuteParsers(string temporaryWorkingDirectory, int sectionId)
+        {
+            foreach (var parser in GetAllParsers())
+            {
+                parser.Parse(temporaryWorkingDirectory, sectionId);
+            }
+        }
+
+        private void PerformCalculation(string workingDirectory, HydraRingInitializationService hydraRingInitializationService)
+        {
+            hydraRingProcess = HydraRingProcessFactory.Create(
+                hydraRingInitializationService.MechanismComputationExeFilePath,
+                hydraRingInitializationService.IniFilePath,
+                workingDirectory);
+            hydraRingProcess.Start();
+            hydraRingProcess.WaitForExit();
+        }
+
+        private static string CreateWorkingDirectory()
+        {
+            var workingDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+
+            if (Directory.Exists(workingDirectory))
+            {
+                Directory.Delete(workingDirectory, true);
+            }
+
+            Directory.CreateDirectory(workingDirectory);
+
+            return workingDirectory;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs	(.../IDesignWaterLevelCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs	(.../IDesignWaterLevelCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -23,10 +23,32 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
+    /// <summary>
+    /// Interface for a calculator which calculates the water level associated to the result of iterating towards a
+    /// probability of failure given a norm.
+    /// </summary>
     public interface IDesignWaterLevelCalculator {
+
+        /// <summary>
+        /// Gets the water level at a location.
+        /// </summary>
         double DesignWaterLevel { get; }
+
+        /// <summary>
+        /// Gets the reliability index
+        /// </summary>
         double ReliabilityIndex { get; }
+
+        /// <summary>
+        /// Gets the content of the output file generated during the Hydra-Ring calculation.
+        /// </summary>
         string OutputFileContent { get; }
+
+        /// <summary>
+        /// Performs the actual calculation by running the Hydra-Ring executable.
+        /// </summary>
+        /// <param name="input">The <see cref="AssessmentLevelCalculationInput"/> which contains all the necessary input
+        /// for the calculation.</param>
         void Calculate(AssessmentLevelCalculationInput input);
 
         /// <summary>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs	(.../IDikeHeightCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs	(.../IDikeHeightCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -23,9 +23,27 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
+    /// <summary>
+    /// Interface for a calcultor which calculates a dike height associated to the result of iterating towards a
+    /// probability of failure given a norm.
+    /// </summary>
     public interface IDikeHeightCalculator {
+
+        /// <summary>
+        /// Gets the calculated dike height.
+        /// </summary>
         double DikeHeight { get; }
+
+        /// <summary>
+        /// Gets the content of the output file generated during the Hydra-Ring calculation.
+        /// </summary>
         string OutputFileContent { get; }
+
+        /// <summary>
+        /// Performs the actual calculation by running the Hydra-Ring executable.
+        /// </summary>
+        /// <param name="input">The <see cref="DikeHeightCalculationInput"/> which contains all the necessary input
+        /// for the calculation.</param>
         void Calculate(DikeHeightCalculationInput input);
 
         /// <summary>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs	(.../IOvertoppingCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingCalculator.cs	(.../IOvertoppingCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -23,11 +23,37 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
+    /// <summary>
+    /// Interface for a calculator which calculates probability of failure by overtopping or overflow
+    /// and the associated wave height.
+    /// </summary>
     public interface IOvertoppingCalculator {
+
+        /// <summary>
+        /// Gets the probability of failure.
+        /// </summary>
         double ExceedanceProbabilityBeta { get; }
+
+        /// <summary>
+        /// Gets an indication of the height of the wave.
+        /// </summary>
         double WaveHeight { get; }
+
+        /// <summary>
+        /// Gets a value representing whether overtopping is dominant over overflow.
+        /// </summary>
         bool IsOvertoppingDominant { get; }
+
+        /// <summary>
+        /// Gets the content of the output file generated during the Hydra-Ring calculation.
+        /// </summary>
         string OutputFileContent { get; }
+
+        /// <summary>
+        /// Performs the actual calculation by running the Hydra-Ring executable.
+        /// </summary>
+        /// <param name="input">The <see cref="OvertoppingCalculationInput"/> which contains all the necessary input
+        /// for the calculation.</param>
         void Calculate(OvertoppingCalculationInput input);
 
         /// <summary>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs	(.../IWaveConditionsCosineCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveConditionsCosineCalculator.cs	(.../IWaveConditionsCosineCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -23,11 +23,37 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
+    /// <summary>
+    /// Interface for a calculator which calculates values for a wave at a water level.
+    /// These are used in different failure mechanisms as input.
+    /// </summary>
     public interface IWaveConditionsCosineCalculator {
+
+        /// <summary>
+        /// Gets the height of the wave.
+        /// </summary>
         double WaveHeight { get; }
+
+        /// <summary>
+        /// Gets the angle of the wave.
+        /// </summary>
         double WaveAngle { get; }
+
+        /// <summary>
+        /// Gets the peak period of the wave.
+        /// </summary>
         double WavePeakPeriod { get; }
+
+        /// <summary>
+        /// Gets the content of the output file generated during the Hydra-Ring calculation.
+        /// </summary>
         string OutputFileContent { get; }
+
+        /// <summary>
+        /// Performs the actual calculation by running the Hydra-Ring executable.
+        /// </summary>
+        /// <param name="input">The <see cref="WaveConditionsCosineCalculationInput"/> which contains all the necessary input
+        /// for the calculation.</param>
         void Calculate(WaveConditionsCosineCalculationInput input);
 
         /// <summary>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs	(.../IWaveHeightCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs	(.../IWaveHeightCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -23,10 +23,32 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
+    /// <summary>
+    /// Interface for a calculator which calculates a wave height associated with a
+    /// reliability index.
+    /// </summary>
     public interface IWaveHeightCalculator {
+
+        /// <summary>
+        /// Gets the wave height resulting from iterating towards the reliability index.
+        /// </summary>
         double WaveHeight { get; }
+
+        /// <summary>
+        /// The reliability index towards which was iterated.
+        /// </summary>
         double ReliabilityIndex { get; }
+
+        /// <summary>
+        /// Gets the content of the output file generated during the Hydra-Ring calculation.
+        /// </summary>
         string OutputFileContent { get; }
+
+        /// <summary>
+        /// Performs the actual calculation by running the Hydra-Ring executable.
+        /// </summary>
+        /// <param name="input">The <see cref="WaveHeightCalculationInput"/> which contains all the necessary input
+        /// for the calculation.</param>
         void Calculate(WaveHeightCalculationInput input);
 
         /// <summary>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs	(.../OvertoppingCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs	(.../OvertoppingCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -26,19 +26,28 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
-    public class OvertoppingCalculator : HydraRingCalculator, IOvertoppingCalculator
+    /// <summary>
+    /// Calculator for calculating probability of failure by overtopping or overflow and the
+    /// associated wave height. This is used in a Grass Cover Erosion Inwards assessment.
+    /// </summary>
+    public class OvertoppingCalculator : HydraRingCalculatorBase, IOvertoppingCalculator
     {
         private readonly string hlcdDirectory;
         private readonly string ringId;
-        private readonly ExceedanceProbabilityCalculationExceptionParser exceedanceProbabilityCalculationParser;
-        private readonly OvertoppingCalculationWaveHeightExceptionParser waveHeightParser;
+        private readonly ExceedanceProbabilityCalculationParser exceedanceProbabilityCalculationParser;
+        private readonly OvertoppingCalculationWaveHeightParser waveHeightParser;
 
+        /// <summary>
+        /// Create a new instance of <see cref="OvertoppingCalculator"/>.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory in which the Hydraulic Boundary Database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
         internal OvertoppingCalculator(string hlcdDirectory, string ringId)
         {
             this.hlcdDirectory = hlcdDirectory;
             this.ringId = ringId;
-            exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationExceptionParser();
-            waveHeightParser = new OvertoppingCalculationWaveHeightExceptionParser();
+            exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser();
+            waveHeightParser = new OvertoppingCalculationWaveHeightParser();
 
             ExceedanceProbabilityBeta = double.NaN;
             WaveHeight = double.NaN;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs	(.../WaveConditionsCosineCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs	(.../WaveConditionsCosineCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -26,17 +26,26 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
-    public class WaveConditionsCosineCalculator : HydraRingCalculator, IWaveConditionsCosineCalculator
+    /// <summary>
+    /// Interface for a calculator which calculates values for a wave at a water level.
+    /// These are used in different failure mechanisms as input.
+    /// </summary>
+    public class WaveConditionsCosineCalculator : HydraRingCalculatorBase, IWaveConditionsCosineCalculator
     {
         private readonly string hlcdDirectory;
         private readonly string ringId;
-        private readonly WaveConditionsCalculationExceptionParser waveConditionsCalculationParser;
+        private readonly WaveConditionsCalculationParser waveConditionsCalculationParser;
 
+        /// <summary>
+        /// Create a new instance of <see cref="WaveConditionsCosineCalculator"/>.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory in which the Hydraulic Boundary Database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
         internal WaveConditionsCosineCalculator(string hlcdDirectory, string ringId)
         {
             this.hlcdDirectory = hlcdDirectory;
             this.ringId = ringId;
-            waveConditionsCalculationParser = new WaveConditionsCalculationExceptionParser();
+            waveConditionsCalculationParser = new WaveConditionsCalculationParser();
 
             WaveHeight = double.NaN;
             WaveAngle = double.NaN;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs	(.../WaveHeightCalculator.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs	(.../WaveHeightCalculator.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -26,17 +26,26 @@
 
 namespace Ringtoets.HydraRing.Calculation.Calculator
 {
-    public class WaveHeightCalculator : HydraRingCalculator, IWaveHeightCalculator
+    /// <summary>
+    /// Calculator which calculates the wave height associated to the result of iterating towards a
+    /// probability of failure given a norm.
+    /// </summary>
+    public class WaveHeightCalculator : HydraRingCalculatorBase, IWaveHeightCalculator
     {
         private readonly string hlcdDirectory;
         private readonly string ringId;
-        private readonly ReliabilityIndexCalculationExceptionParser targetProbabilityParser;
+        private readonly ReliabilityIndexCalculationParser targetProbabilityParser;
 
+        /// <summary>
+        /// Create a new instance of <see cref="WaveHeightCalculator"/>.
+        /// </summary>
+        /// <param name="hlcdDirectory">The directory in which the Hydraulic Boundary Database can be found.</param>
+        /// <param name="ringId">The id of the traject which is used in the calculation.</param>
         internal WaveHeightCalculator(string hlcdDirectory, string ringId)
         {
             this.hlcdDirectory = hlcdDirectory;
             this.ringId = ringId;
-            targetProbabilityParser = new ReliabilityIndexCalculationExceptionParser();
+            targetProbabilityParser = new ReliabilityIndexCalculationParser();
 
             WaveHeight = double.NaN;
             ReliabilityIndex = double.NaN;
Fisheye: Tag 1b0460d5f81926d0366ab10e4b0e9f6d75809c71 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationExceptionParser.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 02670d8c9fceeaea5f829937a2eb269f3488c6b1 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1b0460d5f81926d0366ab10e4b0e9f6d75809c71 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightExceptionParser.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 02670d8c9fceeaea5f829937a2eb269f3488c6b1 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/OvertoppingCalculationWaveHeightParser.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1b0460d5f81926d0366ab10e4b0e9f6d75809c71 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationExceptionParser.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs	(.../ReliabilityIndexCalculationParser.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs	(.../ReliabilityIndexCalculationParser.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -35,10 +35,9 @@
     public class ReliabilityIndexCalculationParser : IHydraRingFileParser
     {
         /// <summary>
-        /// Gets the output of a successful parse of the output file.
+        /// Gets a <see cref="ReliabilityIndexCalculationOutput"/> 
+        /// corresponding to the section id if <see cref="Parse"/> executed successfully; or <c>null</c> otherwise.
         /// </summary>
-        /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> corresponding to the section id if <see cref="Parse"/> executed
-        /// successfully; or <c>null</c> otherwise.</returns>
         public ReliabilityIndexCalculationOutput Output { get; private set; }
 
         public void Parse(string workingDirectory, int sectionId)
@@ -56,16 +55,14 @@
 
                         if (results.Any() && results.ElementAt(0) == sectionId.ToString())
                         {
-                            Output = new ReliabilityIndexCalculationOutput(
-                                GetDoubleValueFromElement(results.ElementAt(results.Length - 2)), 
-                                GetDoubleValueFromElement(results.ElementAt(results.Length - 1)));
+                            Output = new ReliabilityIndexCalculationOutput(GetDoubleValueFromElement(results.ElementAt(results.Length - 2)), GetDoubleValueFromElement(results.ElementAt(results.Length - 1)));
                         }
                     }
                 }
             }
             catch
             {
-                // ignored
+                throw new HydraRingFileParserException();
             }
         }
 
Fisheye: Tag 1b0460d5f81926d0366ab10e4b0e9f6d75809c71 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationExceptionParser.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs	(.../WaveConditionsCalculationParser.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/WaveConditionsCalculationParser.cs	(.../WaveConditionsCalculationParser.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -35,7 +35,7 @@
         private const string waveHeightText = "Wave height";
         private const string wavePeakPeriodText = "Wave period";
         private const string reductionFactorText = "reduction factor";
-
+        
         private const char equalsCharacter = '=';
 
         private double? waveAngle;
@@ -58,7 +58,7 @@
             }
             catch
             {
-                // ignored
+                throw new HydraRingFileParserException();
             }
         }
 
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -48,7 +48,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Activities\NewHydraRingActivity.cs" />
+    <Compile Include="Activities\HydraRingActivityBase.cs" />
     <Compile Include="Activities\HydraRingActivity.cs" />
     <Compile Include="Calculator\Factory\HydraRingCalculatorFactory.cs" />
     <Compile Include="Calculator\Factory\IHydraRingCalculatorFactory.cs" />
@@ -61,7 +61,7 @@
     <Compile Include="Calculator\WaveHeightCalculator.cs" />
     <Compile Include="Calculator\DesignWaterLevelCalculator.cs" />
     <Compile Include="Calculator\DikeHeightCalculator.cs" />
-    <Compile Include="Calculator\HydraRingCalculator.cs" />
+    <Compile Include="Calculator\HydraRingCalculatorBase.cs" />
     <Compile Include="Calculator\OvertoppingCalculator.cs" />
     <Compile Include="Data\HydraRingBreakWater.cs" />
     <Compile Include="Data\HydraRingSection.cs" />
@@ -99,14 +99,13 @@
     <Compile Include="IO\HydraulicModelsSettingsColumns.cs" />
     <Compile Include="IO\HydraulicModelsSettingsCsvReader.cs" />
     <Compile Include="IO\NumericsSettingsColumns.cs" />
-    <Compile Include="Parsers\OvertoppingCalculationWaveHeightExceptionParser.cs" />
-    <Compile Include="Parsers\WaveConditionsCalculationExceptionParser.cs" />
-    <Compile Include="Parsers\ExceedanceProbabilityCalculationExceptionParser.cs" />
+    <Compile Include="Parsers\OvertoppingCalculationWaveHeightParser.cs" />
+    <Compile Include="Parsers\WaveConditionsCalculationParser.cs" />
+    <Compile Include="Parsers\ExceedanceProbabilityCalculationParser.cs" />
     <Compile Include="Parsers\HydraRingFileParserException.cs" />
     <Compile Include="Parsers\IHydraRingFileParser.cs" />
     <Compile Include="Parsers\HydraRingOutputFileParser.cs" />
-    <Compile Include="Parsers\ReliabilityIndexCalculationExceptionParser.cs" />
-    <Compile Include="Parsers\WaveConditionsCalculationParser.cs" />
+    <Compile Include="Parsers\ReliabilityIndexCalculationParser.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -134,7 +133,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Data\HydraRingTimeIntegrationSchemeType.cs" />
     <Compile Include="Data\HydraRingUncertaintiesType.cs" />
-    <Compile Include="Parsers\ReliabilityIndexCalculationParser.cs" />
     <Compile Include="Services\HydraRingFileName.cs" />
     <Compile Include="Services\HydraRingInitializationService.cs" />
     <Compile Include="Services\HydraRingProcessFactory.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationExceptionParserTest.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationExceptionParserTest.cs	(.../ExceedanceProbabilityCalculationExceptionParserTest.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ExceedanceProbabilityCalculationExceptionParserTest.cs	(.../ExceedanceProbabilityCalculationExceptionParserTest.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -38,7 +38,7 @@
         public void DefaultConstructor_SetDefaultValues()
         {
             // Call
-            var parser = new ExceedanceProbabilityCalculationExceptionParser();
+            var parser = new ExceedanceProbabilityCalculationParser();
 
             // Assert
             Assert.IsInstanceOf<IHydraRingFileParser>(parser);
@@ -49,7 +49,7 @@
         public void Parse_NotExistingOutputFile_ThrowsHydraRingFileParserException()
         {
             // Setup
-            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationExceptionParser();
+            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationParser();
 
             // Call
             TestDelegate test = () => exceedanceProbabilityCalculationExceptionParser.Parse(testDataPath, 1);
@@ -63,7 +63,7 @@
         public void Parse_EmptyOutputFile_ThrowsHydraRingFileParserException()
         {
             // Setup
-            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationExceptionParser();
+            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "empty");
 
             // Call
@@ -79,7 +79,7 @@
         public void Parse_FileWithoutTableAlphaResults_ThrowsHydraRingFileParserException()
         {
             // Setup
-            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationExceptionParser();
+            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "withoutAlphaResults");
 
             // Call
@@ -96,7 +96,7 @@
         {
             // Setup
             var sectionId = 1;
-            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationExceptionParser();
+            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "complete");
 
             // Call
@@ -132,7 +132,7 @@
                 new ExceedanceProbabilityCalculationAlphaOutput(0, 1, 101, 0, 101, 35, 1, 1, 17, 0, 0.0470275786268176)
             };
 
-            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationExceptionParser();
+            var exceedanceProbabilityCalculationExceptionParser = new ExceedanceProbabilityCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "complete");
 
             // Call
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightExceptionParserTest.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightExceptionParserTest.cs	(.../OvertoppingCalculationWaveHeightExceptionParserTest.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/OvertoppingCalculationWaveHeightExceptionParserTest.cs	(.../OvertoppingCalculationWaveHeightExceptionParserTest.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -37,7 +37,7 @@
         public void DefaultConstructor_SetDefaultValues()
         {
             // Call
-            var parser = new OvertoppingCalculationWaveHeightExceptionParser();
+            var parser = new OvertoppingCalculationWaveHeightParser();
 
             // Assert
             Assert.IsInstanceOf<IHydraRingFileParser>(parser);
@@ -48,7 +48,7 @@
         public void Parse_NotExistingOutputFile_ThrowsHydraRingFileParserException()
         {
             // Setup
-            var parser = new OvertoppingCalculationWaveHeightExceptionParser();
+            var parser = new OvertoppingCalculationWaveHeightParser();
 
             // Call
             TestDelegate test = () => parser.Parse(testDataPath, 1);
@@ -66,7 +66,7 @@
         public void Parse_PartiallyOrCompletelyEmptyOutputFile_RetunsWithNullOutput(string testDir)
         {
             // Setup
-            var parser = new OvertoppingCalculationWaveHeightExceptionParser();
+            var parser = new OvertoppingCalculationWaveHeightParser();
             var workingDirectory = Path.Combine(testDataPath, testDir);
 
             // Call
@@ -90,7 +90,7 @@
         public void Parse_ExampleHydraRingOutputFileContainingSectionIds_OutputSetWithExpectedCalculationResult(string testDir, double expected, bool isOvertoppingDominant)
         {
             // Setup
-            var parser = new OvertoppingCalculationWaveHeightExceptionParser();
+            var parser = new OvertoppingCalculationWaveHeightParser();
             var workingDirectory = Path.Combine(testDataPath, testDir);
 
             // Call
@@ -111,7 +111,7 @@
         public void Parse_InvalidHydraRingOutputFile_ThrowsHydraRingFileParserException(string testDir)
         {
             // Setup
-            var parser = new OvertoppingCalculationWaveHeightExceptionParser();
+            var parser = new OvertoppingCalculationWaveHeightParser();
             var workingDirectory = Path.Combine(testDataPath, testDir);
 
             // Call
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ReliabilityIndexCalculationExceptionParserTest.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ReliabilityIndexCalculationExceptionParserTest.cs	(.../ReliabilityIndexCalculationExceptionParserTest.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ReliabilityIndexCalculationExceptionParserTest.cs	(.../ReliabilityIndexCalculationExceptionParserTest.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -36,7 +36,7 @@
         public void DefaultConstructor_SetDefaultValues()
         {
             // Call
-            var parser = new ReliabilityIndexCalculationExceptionParser();
+            var parser = new ReliabilityIndexCalculationParser();
 
             // Assert
             Assert.IsInstanceOf<IHydraRingFileParser>(parser);
@@ -47,7 +47,7 @@
         public void Parse_NotExistingOutputFile_OutputNull()
         {
             // Setup
-            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationExceptionParser();
+            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationParser();
 
             // Call
             TestDelegate test = () => reliabilityIndexCalculationExceptionParser.Parse(testDataPath, 1);
@@ -61,7 +61,7 @@
         public void Parse_EmptyOutputFile_OutputNull()
         {
             // Setup
-            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationExceptionParser();
+            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "empty");
 
             // Call
@@ -78,7 +78,7 @@
         public void Parse_ExampleHydraRingOutputFileContainingSectionIds_ReturnsExpectedReliabilityIndexCalculationResult(int sectionId, double result, double actual)
         {
             // Setup
-            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationExceptionParser();
+            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "exampleOutputTable");
 
             // Call
@@ -96,7 +96,7 @@
         public void Parse_ExampleHydraRingOutputFileContainingExtraWhiteLine_ReturnsExpectedReliabilityIndexCalculationResult()
         {
             // Setup
-            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationExceptionParser();
+            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "exampleOutputTableWithWhiteLine");
 
             // Call
@@ -114,7 +114,7 @@
         public void Parse_ExampleHydraRingOutputFileNotContainingSectionId_OutputNull()
         {
             // Setup
-            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationExceptionParser();
+            var reliabilityIndexCalculationExceptionParser = new ReliabilityIndexCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "exampleOutputTable");
 
             // Call
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/WaveConditionsCalculationExceptionParserTest.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/WaveConditionsCalculationExceptionParserTest.cs	(.../WaveConditionsCalculationExceptionParserTest.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/WaveConditionsCalculationExceptionParserTest.cs	(.../WaveConditionsCalculationExceptionParserTest.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -37,7 +37,7 @@
         public void DefaultConstructor_SetDefaultValues()
         {
             // Call
-            var parser = new WaveConditionsCalculationExceptionParser();
+            var parser = new WaveConditionsCalculationParser();
 
             // Assert
             Assert.IsInstanceOf<IHydraRingFileParser>(parser);
@@ -48,7 +48,7 @@
         public void Parse_NotExistingOutputFile_OutputNull()
         {
             // Setup
-            var parser = new WaveConditionsCalculationExceptionParser();
+            var parser = new WaveConditionsCalculationParser();
 
             // Call
             parser.Parse(testDataPath, sectionId);
@@ -61,7 +61,7 @@
         public void Parse_EmptyOutputFile_OutputNull()
         {
             // Setup
-            var parser = new WaveConditionsCalculationExceptionParser();
+            var parser = new WaveConditionsCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "empty");
 
             // Call
@@ -76,7 +76,7 @@
         public void Parse_ValidHydraRingOutputFile_OutputSetWithExpectedCalculationResult()
         {
             // Setup
-            var parser = new WaveConditionsCalculationExceptionParser();
+            var parser = new WaveConditionsCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "valid");
 
             // Call
@@ -93,7 +93,7 @@
         public void Parse_InvalidHydraRingOutputFileWaveAngleMissing_OutputNull()
         {
             // Setup
-            var parser = new WaveConditionsCalculationExceptionParser();
+            var parser = new WaveConditionsCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "output-no-waveAngle");
 
             // Call
@@ -108,7 +108,7 @@
         public void Parse_InvalidHydraRingOutputFileWaveHeightMissing_OutputNull()
         {
             // Setup
-            var parser = new WaveConditionsCalculationExceptionParser();
+            var parser = new WaveConditionsCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "output-no-waveHeight");
 
             // Call
@@ -123,7 +123,7 @@
         public void Parse_InvalidHydraRingOutputFileWavePeakPeriodMissing_OutputNull()
         {
             // Setup
-            var parser = new WaveConditionsCalculationExceptionParser();
+            var parser = new WaveConditionsCalculationParser();
             var workingDirectory = Path.Combine(testDataPath, "output-no-wavePeakPeriod");
 
             // Call
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -rba95a59f738989357f485c3aa3cb06961af930a2 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision ba95a59f738989357f485c3aa3cb06961af930a2)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -193,10 +193,6 @@
       <Project>{22E191F2-B2E3-413C-9511-4C2CDEDB2EFF}</Project>
       <Name>Ringtoets.ClosingStructures.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Service.TestUtil\Ringtoets.Common.Service.TestUtil.csproj">
-      <Project>{73E7E100-C015-4874-A548-AD6E33E7955E}</Project>
-      <Name>Ringtoets.Common.Service.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
       <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationActivity.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivity.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -32,7 +32,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a stability stone cover wave conditions calculation.
     /// </summary>
-    public class StabilityStoneCoverWaveConditionsCalculationActivity : NewHydraRingActivity
+    public class StabilityStoneCoverWaveConditionsCalculationActivity : HydraRingActivityBase
     {
         private readonly StabilityStoneCoverWaveConditionsCalculation calculation;
         private readonly string hlcdFilePath;
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r1b0460d5f81926d0366ab10e4b0e9f6d75809c71
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationActivity.cs)	(revision 1b0460d5f81926d0366ab10e4b0e9f6d75809c71)
@@ -32,7 +32,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a wave impact asphalt cover wave conditions calculation.
     /// </summary>
-    public class WaveImpactAsphaltCoverWaveConditionsCalculationActivity : NewHydraRingActivity
+    public class WaveImpactAsphaltCoverWaveConditionsCalculationActivity : HydraRingActivityBase
     {
         private readonly WaveImpactAsphaltCoverWaveConditionsCalculation calculation;
         private readonly string hlcdFilePath;