Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/CalculationGroupCreateExtensions.cs
===================================================================
diff -u -rdeb869b51292750cd872df973bb838464b732643 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/CalculationGroupCreateExtensions.cs	(.../CalculationGroupCreateExtensions.cs)	(revision deb869b51292750cd872df973bb838464b732643)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/CalculationGroupCreateExtensions.cs	(.../CalculationGroupCreateExtensions.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -29,6 +29,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Utils.Extensions;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HeightStructures.Data;
@@ -95,7 +96,7 @@
                 {
                     entity.GrassCoverErosionOutwardsWaveConditionsCalculationEntities.Add(childGrassCoverErosionOutwardsCalculation.Create(registry, i));
                 }
-                var childHeightStructuresCalculation = calculationBase as HeightStructuresCalculation;
+                var childHeightStructuresCalculation = calculationBase as StructuresCalculation<HeightStructuresInput>;
                 if (childHeightStructuresCalculation != null)
                 {
                     entity.HeightStructuresCalculationEntities.Add(childHeightStructuresCalculation.Create(registry, i));
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresCalculationCreateExtensions.cs
===================================================================
diff -u -r6913ef75b5ec527ab771006f3430cfafef8b680c -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresCalculationCreateExtensions.cs	(.../HeightStructuresCalculationCreateExtensions.cs)	(revision 6913ef75b5ec527ab771006f3430cfafef8b680c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresCalculationCreateExtensions.cs	(.../HeightStructuresCalculationCreateExtensions.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -22,27 +22,28 @@
 using System;
 using Application.Ringtoets.Storage.DbContext;
 using Core.Common.Utils.Extensions;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 
 namespace Application.Ringtoets.Storage.Create.HeightStructures
 {
     /// <summary>
-    /// Extension methods for <see cref="HeightStructuresCalculation"/> related
+    /// Extension methods for <see cref="StructuresCalculation{T}"/> related
     /// to creating a <see cref="HeightStructuresCalculationEntity"/>.
     /// </summary>
     internal static class HeightStructuresCalculationCreateExtensions
     {
         /// <summary>
         /// Creates a <see cref="HeightStructuresCalculationEntity"/> based
-        /// on the information of the <see cref="HeightStructuresCalculation"/>.
+        /// on the information of the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
         /// <param name="calculation">The calculation to create a database entity for.</param>
         /// <param name="registry">The object keeping track of create operations.</param>
         /// <param name="order">The index at where <paramref name="calculation"/> resides
         /// in its parent container.</param>
         /// <returns>A new <see cref="HeightStructuresCalculationEntity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="registry"/> is <c>null</c>.</exception>
-        internal static HeightStructuresCalculationEntity Create(this HeightStructuresCalculation calculation, PersistenceRegistry registry, int order)
+        internal static HeightStructuresCalculationEntity Create(this StructuresCalculation<HeightStructuresInput> calculation, PersistenceRegistry registry, int order)
         {
             if (registry == null)
             {
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs
===================================================================
diff -u -rdeb869b51292750cd872df973bb838464b732643 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision deb869b51292750cd872df973bb838464b732643)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/CalculationGroupCreateExtensionsTest.cs	(.../CalculationGroupCreateExtensionsTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HeightStructures.Data;
@@ -425,11 +426,11 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation
+                    new StructuresCalculation<HeightStructuresInput>
                     {
                         Name = "A"
                     },
-                    new HeightStructuresCalculation
+                    new StructuresCalculation<HeightStructuresInput>
                     {
                         Name = "B"
                     }
@@ -462,12 +463,12 @@
                 Children =
                 {
                     new CalculationGroup("A", true),
-                    new HeightStructuresCalculation
+                    new StructuresCalculation<HeightStructuresInput>
                     {
                         Name = "B"
                     },
                     new CalculationGroup("C", false),
-                    new HeightStructuresCalculation
+                    new StructuresCalculation<HeightStructuresInput>
                     {
                         Name = "D"
                     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r6913ef75b5ec527ab771006f3430cfafef8b680c -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresCalculationCreateExtensionsTest.cs	(.../HeightStructuresCalculationCreateExtensionsTest.cs)	(revision 6913ef75b5ec527ab771006f3430cfafef8b680c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresCalculationCreateExtensionsTest.cs	(.../HeightStructuresCalculationCreateExtensionsTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -27,6 +27,7 @@
 using Core.Common.Base.Data;
 using NUnit.Framework;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HydraRing.Data;
@@ -40,7 +41,7 @@
         public void Create_PersistenceRegistryNull_ThrowArgumentNullException()
         {
             // Setup
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             TestDelegate call = () => calculation.Create(null, 0);
@@ -58,7 +59,7 @@
             // Setup
             var random = new Random(randomSeed);
 
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = name,
                 Comments = comments,
@@ -162,7 +163,7 @@
         public void Create_NaNParameters_EntityWithNullFields()
         {
             // Setup
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -245,7 +246,7 @@
             // Setup
             const string name = "A";
             const string comment = "B";
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = name,
                 Comments = comment
@@ -271,7 +272,7 @@
         {
             // Setup
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 1, 1);
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -295,7 +296,7 @@
         {
             // Setup
             var heightStructure = new TestHeightStructure();
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -319,7 +320,7 @@
         {
             // Setup
             var foreshoreProfile = new TestForeshoreProfile();
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -radd325fb1e135f779adf7c89446886ff15a9b17c -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision add325fb1e135f779adf7c89446886ff15a9b17c)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probabilistics;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.IO.FileImporters;
 using Ringtoets.Common.IO.ReferenceLines;
 using Ringtoets.GrassCoverErosionInwards.Data;
@@ -238,7 +239,7 @@
             HeightStructuresFailureMechanism failureMechanism = demoAssessmentSection.HeightStructures;
             failureMechanism.HeightStructures.Add(CreateDemoHeightStructure());
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.NotifyObservers();
@@ -294,7 +295,7 @@
             ClosingStructuresFailureMechanism failureMechanism = demoAssessmentSection.ClosingStructures;
             failureMechanism.ClosingStructures.Add(CreateDemoClosingStructure());
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.NotifyObservers();
@@ -410,7 +411,7 @@
             StabilityPointStructuresFailureMechanism failureMechanism = demoAssessmentSection.StabilityPointStructures;
             failureMechanism.StabilityPointStructures.Add(CreateDemoStabilityPointStructure());
 
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.NotifyObservers();
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r2698972311ca90c3af1171c554c4dec237e34111 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 2698972311ca90c3af1171c554c4dec237e34111)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -34,6 +34,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probabilistics;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
@@ -280,9 +281,9 @@
             AssertExpectedHeightStructureValues(demoAssessmentSection.HeightStructures.HeightStructures[0]);
 
             Assert.AreEqual(1, demoAssessmentSection.HeightStructures.CalculationsGroup.Children.Count);
-            HeightStructuresCalculation calculation = demoAssessmentSection.HeightStructures
+            StructuresCalculation<HeightStructuresInput> calculation = demoAssessmentSection.HeightStructures
                                                                            .CalculationsGroup.GetCalculations()
-                                                                           .OfType<HeightStructuresCalculation>()
+                                                                           .OfType<StructuresCalculation<HeightStructuresInput>>()
                                                                            .First();
             AssertExpectedHeightStructuresInput(calculation.InputParameters);
         }
@@ -323,9 +324,9 @@
             AssertExpectedClosingStructureValues(demoAssessmentSection.ClosingStructures.ClosingStructures[0]);
 
             Assert.AreEqual(1, demoAssessmentSection.ClosingStructures.CalculationsGroup.Children.Count);
-            ClosingStructuresCalculation calculation = demoAssessmentSection.ClosingStructures
+            StructuresCalculation<ClosingStructuresInput> calculation = demoAssessmentSection.ClosingStructures
                                                                             .CalculationsGroup.GetCalculations()
-                                                                            .OfType<ClosingStructuresCalculation>()
+                                                                            .OfType<StructuresCalculation<ClosingStructuresInput>>()
                                                                             .First();
             AssertExpectedClosingStructuresInput(calculation.InputParameters);
         }
@@ -468,9 +469,9 @@
         {
             Assert.AreEqual(1, demoAssessmentSection.StabilityPointStructures.CalculationsGroup.Children.Count);
             AssertExpectedStabilityPointStructureValues(demoAssessmentSection.StabilityPointStructures.StabilityPointStructures[0]);
-            StabilityPointStructuresCalculation calculation = demoAssessmentSection.StabilityPointStructures
+            StructuresCalculation<StabilityPointStructuresInput> calculation = demoAssessmentSection.StabilityPointStructures
                                                                                    .CalculationsGroup.GetCalculations()
-                                                                                   .OfType<StabilityPointStructuresCalculation>()
+                                                                                   .OfType<StructuresCalculation<StabilityPointStructuresInput>>()
                                                                                    .First();
             AssertExpectedStabilityPointStructuresInput(calculation.InputParameters);
         }
Fisheye: Tag ab20c4eb4ca81bd3845d50210d2bdb301177af6a refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs
===================================================================
diff -u -rb6a9219d1e628e4430ccf880e8ea390cec04fc04 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision b6a9219d1e628e4430ccf880e8ea390cec04fc04)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -26,6 +26,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Data
@@ -55,7 +56,7 @@
         {
             get
             {
-                return CalculationsGroup.GetCalculations().OfType<ClosingStructuresCalculation>();
+                return CalculationsGroup.GetCalculations().OfType<StructuresCalculation<ClosingStructuresInput>>();
             }
         }
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -rfe1332c1e9b14365a62f6ce03c9494393223179e -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs	(.../ClosingStructuresFailureMechanismSectionResult.cs)	(revision fe1332c1e9b14365a62f6ce03c9494393223179e)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs	(.../ClosingStructuresFailureMechanismSectionResult.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.ClosingStructures.Data
 {
@@ -54,9 +55,9 @@
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="ClosingStructuresCalculation"/>, which is chosen 
+        /// Gets or sets the <see cref="StructuresCalculation{T}"/>, which is chosen 
         /// to be representative for the whole section.
         /// </summary>
-        public ClosingStructuresCalculation Calculation { get; set; }
+        public StructuresCalculation<ClosingStructuresInput> Calculation { get; set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj	(.../Ringtoets.ClosingStructures.Data.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj	(.../Ringtoets.ClosingStructures.Data.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -40,7 +40,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="ClosingStructure.cs" />
-    <Compile Include="ClosingStructuresCalculation.cs" />
     <Compile Include="ClosingStructuresFailureMechanism.cs" />
     <Compile Include="ClosingStructuresFailureMechanismSectionResult.cs" />
     <Compile Include="ClosingStructuresInput.cs" />
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationContext.cs	(.../ClosingStructuresCalculationContext.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -22,25 +22,26 @@
 using System;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="ClosingStructuresCalculation"/>
+    /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class ClosingStructuresCalculationContext : FailureMechanismItemContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>,
-                                                       ICalculationContext<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>
+    public class ClosingStructuresCalculationContext : FailureMechanismItemContextBase<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>,
+                                                       ICalculationContext<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresCalculationContext"/>.
         /// </summary>
-        /// <param name="wrappedData">The <see cref="ClosingStructuresCalculation"/> instance wrapped by this context object.</param>
+        /// <param name="wrappedData">The <see cref="StructuresCalculation{T}"/> instance wrapped by this context object.</param>
         /// <param name="failureMechanism">The failure mechanism which the calculation belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public ClosingStructuresCalculationContext(ClosingStructuresCalculation wrappedData,
+        public ClosingStructuresCalculationContext(StructuresCalculation<ClosingStructuresInput> wrappedData,
                                                    ClosingStructuresFailureMechanism failureMechanism,
                                                    IAssessmentSection assessmentSection)
             : base(wrappedData, failureMechanism, assessmentSection) {}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs
===================================================================
diff -u -ra9591008569d7b58499fa258b0530ba273850d21 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs	(.../ClosingStructuresInputContext.cs)	(revision a9591008569d7b58499fa258b0530ba273850d21)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresInputContext.cs	(.../ClosingStructuresInputContext.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -22,6 +22,7 @@
 using System;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
@@ -30,7 +31,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="ClosingStructuresInput"/>
     /// in order to be able to configure closing structures calculations.
     /// </summary>
-    public class ClosingStructuresInputContext : InputContextBase<ClosingStructuresInput, ClosingStructuresCalculation, ClosingStructuresFailureMechanism>
+    public class ClosingStructuresInputContext : InputContextBase<ClosingStructuresInput, StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="ClosingStructuresInputContext"/>.
@@ -41,7 +42,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public ClosingStructuresInputContext(ClosingStructuresInput wrappedData,
-                                             ClosingStructuresCalculation calculation,
+                                             StructuresCalculation<ClosingStructuresInput> calculation,
                                              ClosingStructuresFailureMechanism failureMechanism,
                                              IAssessmentSection assessmentSection)
             : base(wrappedData, calculation, failureMechanism, assessmentSection) { }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs
===================================================================
diff -u -r3b1b80d82960d3bfa4906e06e37e73e4729eb3ad -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs	(.../ClosingStructuresInputContextProperties.cs)	(revision 3b1b80d82960d3bfa4906e06e37e73e4729eb3ad)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs	(.../ClosingStructuresInputContextProperties.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -32,6 +32,7 @@
 using Ringtoets.ClosingStructures.Utils;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PropertyClasses;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -40,7 +41,7 @@
     /// <summary>
     /// ViewModel of <see cref="ClosingStructuresInputContext"/> for properties panel.
     /// </summary>
-    public class ClosingStructuresInputContextProperties : StructuresInputBaseProperties<ClosingStructure, ClosingStructuresInput, ClosingStructuresCalculation, ClosingStructuresFailureMechanism>
+    public class ClosingStructuresInputContextProperties : StructuresInputBaseProperties<ClosingStructure, ClosingStructuresInput, StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>
     {
         private const int hydraulicBoundaryLocationPropertyIndex = 1;
         private const int stormDurationPropertyIndex = 2;
@@ -159,8 +160,8 @@
                 {
                     Data = data.WrappedData.DrainCoefficient
                 };
-            }
         }
+        }
 
         [PropertyOrder(factorStormDurationOpenStructurePropertyIndex)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_ModelSettings")]
@@ -171,9 +172,9 @@
             get
             {
                 return data.WrappedData.FactorStormDurationOpenStructure;
-            }
+        }
             set
-            {
+        {
                 data.WrappedData.FactorStormDurationOpenStructure = value;
                 data.WrappedData.NotifyObservers();
             }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs
===================================================================
diff -u -r8c76ed44224c5f2e96bd030b00c9bb8565e71330 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs	(.../ClosingStructuresScenarioRow.cs)	(revision 8c76ed44224c5f2e96bd030b00c9bb8565e71330)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenarioRow.cs	(.../ClosingStructuresScenarioRow.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
 
 namespace Ringtoets.ClosingStructures.Forms.Views
@@ -29,7 +30,7 @@
     /// Container of a <see cref="ClosingStructuresFailureMechanismSectionResult"/>,
     /// which takes care of the representation of properties in a grid.
     /// </summary>
-    public class ClosingStructuresScenarioRow : IScenarioRow<ClosingStructuresCalculation>
+    public class ClosingStructuresScenarioRow : IScenarioRow<StructuresCalculation<ClosingStructuresInput>>
     {
         private readonly ClosingStructuresFailureMechanismSectionResult sectionResult;
 
@@ -55,7 +56,7 @@
             }
         }
 
-        public ClosingStructuresCalculation Calculation
+        public StructuresCalculation<ClosingStructuresInput> Calculation
         {
             get
             {
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.cs
===================================================================
diff -u -r93baa4ee308eff5a157e37bd2b4fe148a45806af -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.cs	(.../ClosingStructuresScenariosView.cs)	(revision 93baa4ee308eff5a157e37bd2b4fe148a45806af)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresScenariosView.cs	(.../ClosingStructuresScenariosView.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -28,6 +28,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Utils;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.ClosingStructures.Forms.Views
 {
@@ -130,7 +131,7 @@
 
                 Dictionary<string, IList<ICalculation>> calculationsPerSegment =
                     ClosingStructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections,
-                                                                          calculations.OfType<ClosingStructuresCalculation>());
+                                                                          calculations.OfType<StructuresCalculation<ClosingStructuresInput>>());
 
                 var scenarioRows = failureMechanism.SectionResults.Select(sr => new ClosingStructuresScenarioRow(sr)).ToList();
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -ra9591008569d7b58499fa258b0530ba273850d21 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision a9591008569d7b58499fa258b0530ba273850d21)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -39,6 +39,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
@@ -196,7 +197,7 @@
         }
 
         private void CalculateAll(ClosingStructuresFailureMechanism failureMechanism,
-                                  IEnumerable<ClosingStructuresCalculation> calculations,
+                                  IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations,
                                   IAssessmentSection assessmentSection)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
@@ -308,7 +309,7 @@
             return builder.AddToggleRelevancyOfFailureMechanismItem(closingStructuresFailureMechanismContext, RemoveAllViewsForItem)
                           .AddSeparator()
                           .AddValidateAllCalculationsInFailureMechanismItem(closingStructuresFailureMechanismContext,
-                                                                            c => ValidateAll(c.WrappedData.Calculations.OfType<ClosingStructuresCalculation>(), c.Parent),
+                                                                            c => ValidateAll(c.WrappedData.Calculations.OfType<StructuresCalculation<ClosingStructuresInput>>(), c.Parent),
                                                                             ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
                           .AddPerformAllCalculationsInFailureMechanismItem(closingStructuresFailureMechanismContext,
                                                                            CalculateAll,
@@ -338,7 +339,7 @@
                           .Build();
         }
 
-        private static void ValidateAll(IEnumerable<ClosingStructuresCalculation> closingStructuresCalculations, IAssessmentSection assessmentSection)
+        private static void ValidateAll(IEnumerable<StructuresCalculation<ClosingStructuresInput>> closingStructuresCalculations, IAssessmentSection assessmentSection)
         {
             foreach (var calculation in closingStructuresCalculations)
             {
@@ -353,7 +354,7 @@
 
         private void CalculateAll(ClosingStructuresFailureMechanismContext context)
         {
-            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<ClosingStructuresCalculation>(), context.Parent);
+            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<StructuresCalculation<ClosingStructuresInput>>(), context.Parent);
         }
 
         #endregion
@@ -366,7 +367,7 @@
 
             foreach (ICalculationBase calculationItem in context.WrappedData.Children)
             {
-                var calculation = calculationItem as ClosingStructuresCalculation;
+                var calculation = calculationItem as StructuresCalculation<ClosingStructuresInput>;
                 var group = calculationItem as CalculationGroup;
 
                 if (calculation != null)
@@ -409,7 +410,7 @@
             builder.AddSeparator()
                    .AddValidateAllCalculationsInGroupItem(
                        context,
-                       c => ValidateAll(c.WrappedData.GetCalculations().OfType<ClosingStructuresCalculation>(), c.AssessmentSection),
+                       c => ValidateAll(c.WrappedData.GetCalculations().OfType<StructuresCalculation<ClosingStructuresInput>>(), c.AssessmentSection),
                        ValidateAllDataAvailableAndGetErrorMessage)
                    .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessage)
                    .AddClearAllCalculationOutputInGroupItem(group)
@@ -436,12 +437,12 @@
 
         private void CalculateAll(CalculationGroup group, ClosingStructuresCalculationGroupContext context)
         {
-            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<ClosingStructuresCalculation>(), context.AssessmentSection);
+            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<StructuresCalculation<ClosingStructuresInput>>(), context.AssessmentSection);
         }
 
         private static void AddCalculation(ClosingStructuresCalculationGroupContext context)
         {
-            var calculation = new ClosingStructuresCalculation
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
             };
@@ -454,11 +455,11 @@
             var parentGroupContext = (ClosingStructuresCalculationGroupContext) parentNodeData;
 
             parentGroupContext.WrappedData.Children.Remove(context.WrappedData);
-            foreach (var calculation in context.WrappedData.GetCalculations().Cast<ClosingStructuresCalculation>())
+            foreach (var calculation in context.WrappedData.GetCalculations().Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 ClosingStructuresHelper.Delete(context.FailureMechanism.SectionResults,
                                                calculation,
-                                               context.FailureMechanism.Calculations.Cast<ClosingStructuresCalculation>());
+                                               context.FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
             }
 
             parentGroupContext.WrappedData.Children.Remove(context.WrappedData);
@@ -496,7 +497,7 @@
         {
             var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl));
 
-            ClosingStructuresCalculation calculation = context.WrappedData;
+            StructuresCalculation<ClosingStructuresInput> calculation = context.WrappedData;
 
             return builder.AddValidateCalculationItem(
                 context,
@@ -515,7 +516,7 @@
                           .Build();
         }
 
-        private void Calculate(ClosingStructuresCalculation calculation, ClosingStructuresCalculationContext context)
+        private void Calculate(StructuresCalculation<ClosingStructuresInput> calculation, ClosingStructuresCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
                                              new ClosingStructuresCalculationActivity(calculation,
@@ -537,7 +538,7 @@
                 calculationGroupContext.WrappedData.Children.Remove(context.WrappedData);
                 ClosingStructuresHelper.Delete(context.FailureMechanism.SectionResults,
                                                context.WrappedData,
-                                               context.FailureMechanism.Calculations.Cast<ClosingStructuresCalculation>());
+                                               context.FailureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>());
                 calculationGroupContext.NotifyObservers();
             }
         }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs
===================================================================
diff -u -rf80835301ae973b5439593e81fb640b7ab044340 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision f80835301ae973b5439593e81fb640b7ab044340)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Ringtoets.ClosingStructures.Utils;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Calculation.Activities;
 
 namespace Ringtoets.ClosingStructures.Service
@@ -34,7 +35,7 @@
     /// </summary>
     public class ClosingStructuresCalculationActivity : HydraRingActivityBase
     {
-        private readonly ClosingStructuresCalculation calculation;
+        private readonly StructuresCalculation<ClosingStructuresInput> calculation;
         private readonly ClosingStructuresCalculationService calculationService;
         private readonly ClosingStructuresFailureMechanism failureMechanism;
         private readonly IAssessmentSection assessmentSection;
@@ -48,7 +49,7 @@
         /// <param name="failureMechanism">The failure mechanism the calculation belongs to.</param>
         /// <param name="assessmentSection">The assessment section the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
-        public ClosingStructuresCalculationActivity(ClosingStructuresCalculation calculation, string hlcdDirectory,
+        public ClosingStructuresCalculationActivity(StructuresCalculation<ClosingStructuresInput> calculation, string hlcdDirectory,
                                                     ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             if (calculation == null)
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs
===================================================================
diff -u -r83024e3b1086e1dba93b83df874bd4781f67aa63 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs	(.../ClosingStructuresCalculationService.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -27,6 +27,7 @@
 using Ringtoets.ClosingStructures.Service.Properties;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Service;
 using Ringtoets.HydraRing.Calculation.Calculator;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -49,18 +50,18 @@
         private bool canceled;
 
         /// <summary>
-        /// Performs a height structures calculation based on the supplied <see cref="ClosingStructuresCalculation"/> and sets 
-        /// <see cref="ClosingStructuresCalculation.Output"/> if the calculation was successful. Error and status information is 
+        /// Performs a height structures calculation based on the supplied <see cref="StructuresCalculation{T}"/> and sets 
+        /// <see cref="StructuresCalculation{T}.Output"/> if the calculation was successful. Error and status information is 
         /// logged during the execution of the operation.
         /// </summary>
-        /// <param name="calculation">The <see cref="ClosingStructuresCalculation"/> that holds all the information required to perform the calculation.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> that holds all the information required to perform the calculation.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> that holds information about the norm used in the calculation.</param>
         /// <param name="failureMechanismSection">The <see cref="FailureMechanismSection"/> to create input with.</param>
         /// <param name="generalInput">The <see cref="GeneralClosingStructuresInput"/> to create the input with for the calculation.</param>
         /// <param name="failureMechanismContribution">The amount of contribution for this failure mechanism in the assessment section.</param>
         /// <param name="hlcdDirectory">The directory of the HLCD file that should be used for performing the calculation.</param>
         /// <exception cref="NotSupportedException"></exception>
-        public void Calculate(ClosingStructuresCalculation calculation,
+        public void Calculate(StructuresCalculation<ClosingStructuresInput> calculation,
                               IAssessmentSection assessmentSection,
                               FailureMechanismSection failureMechanismSection,
                               GeneralClosingStructuresInput generalInput,
@@ -127,7 +128,7 @@
             canceled = true;
         }
 
-        public bool Validate(ClosingStructuresCalculation calculation, IAssessmentSection assessmentSection)
+        public bool Validate(StructuresCalculation<ClosingStructuresInput> calculation, IAssessmentSection assessmentSection)
         {
             CalculationServiceHelper.LogValidationBeginTime(calculation.Name);
             var messages = ValidateInput(calculation.InputParameters, assessmentSection);
@@ -137,7 +138,7 @@
             return !messages.Any();
         }
 
-        private static StructuresClosureVerticalWallCalculationInput CreateClosureVerticalWallCalculationInput(ClosingStructuresCalculation calculation,
+        private static StructuresClosureVerticalWallCalculationInput CreateClosureVerticalWallCalculationInput(StructuresCalculation<ClosingStructuresInput> calculation,
                                                                                                                FailureMechanismSection failureMechanismSection,
                                                                                                                GeneralClosingStructuresInput generalInput)
         {
@@ -168,7 +169,7 @@
                 calculation.InputParameters.DeviationWaveDirection);
         }
 
-        private static StructuresClosureLowSillCalculationInput CreateLowSillCalculationInput(ClosingStructuresCalculation calculation,
+        private static StructuresClosureLowSillCalculationInput CreateLowSillCalculationInput(StructuresCalculation<ClosingStructuresInput> calculation,
                                                                                               FailureMechanismSection failureMechanismSection,
                                                                                               GeneralClosingStructuresInput generalInput)
         {
@@ -198,7 +199,7 @@
                 calculation.InputParameters.WidthFlowApertures.Mean, calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation);
         }
 
-        private static StructuresClosureFloodedCulvertCalculationInput CreateFloodedCulvertCalculationInput(ClosingStructuresCalculation calculation,
+        private static StructuresClosureFloodedCulvertCalculationInput CreateFloodedCulvertCalculationInput(StructuresCalculation<ClosingStructuresInput> calculation,
                                                                                                             FailureMechanismSection failureMechanismSection,
                                                                                                             GeneralClosingStructuresInput generalInput)
         {
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs
===================================================================
diff -u -r73597729ce18d3ee00d8036bca8341e9c12f2953 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs	(.../ClosingStructuresDataSynchronizationService.cs)	(revision 73597729ce18d3ee00d8036bca8341e9c12f2953)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs	(.../ClosingStructuresDataSynchronizationService.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using System.Linq;
 using Core.Common.Utils.Extensions;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.ClosingStructures.Service
@@ -43,15 +44,15 @@
         /// clearing the output.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<ClosingStructuresCalculation> ClearAllCalculationOutput(ClosingStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<ClosingStructuresInput>> ClearAllCalculationOutput(ClosingStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
             var affectedItems = failureMechanism.Calculations
-                                                .Cast<ClosingStructuresCalculation>()
+                                                .Cast<StructuresCalculation<ClosingStructuresInput>>()
                                                 .Where(c => c.HasOutput)
                                                 .ToArray();
 
@@ -61,13 +62,13 @@
         }
 
         /// <summary>
-        /// Clears the output of the given <see cref="ClosingStructuresCalculation"/>.
+        /// Clears the output of the given <see cref="StructuresCalculation{T}"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="ClosingStructuresCalculation"/> to clear
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> to clear
         /// the output for.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/>
         /// is <c>null</c>.</exception>
-        public static void ClearCalculationOutput(ClosingStructuresCalculation calculation)
+        public static void ClearCalculationOutput(StructuresCalculation<ClosingStructuresInput> calculation)
         {
             if (calculation == null)
             {
@@ -79,23 +80,23 @@
 
         /// <summary>
         /// Clears the <see cref="HydraulicBoundaryLocation"/> for all the calculations in
-        /// the <see cref="ClosingStructuresCalculation"/>.
+        /// the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
         /// <param name="failureMechanism">The <see cref="ClosingStructuresFailureMechanism"/>
         /// which contains the calculations.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of calculations which are affected by
         /// removing <see cref="HydraulicBoundaryLocation"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<ClosingStructuresCalculation> ClearHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<ClosingStructuresInput>> ClearHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
             var affectedItems = failureMechanism.Calculations
-                                                .Cast<ClosingStructuresCalculation>()
+                                                .Cast<StructuresCalculation<ClosingStructuresInput>>()
                                                 .Where(c => c.InputParameters.HydraulicBoundaryLocation != null)
                                                 .ToArray();
 
@@ -106,24 +107,24 @@
 
         /// <summary>
         /// Clears the <see cref="HydraulicBoundaryLocation"/> and output for all the calculations
-        /// in the <see cref="ClosingStructuresCalculation"/>.
+        /// in the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
-        /// <param name="failureMechanism">The <see cref="ClosingStructuresCalculation"/>
+        /// <param name="failureMechanism">The <see cref="StructuresCalculation{T}"/>
         /// which contains the calculations.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> of calculations which are affected by
         /// removing data.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<ClosingStructuresCalculation> ClearAllCalculationOutputAndHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<ClosingStructuresInput>> ClearAllCalculationOutputAndHydraulicBoundaryLocations(ClosingStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
-            Collection<ClosingStructuresCalculation> affectedItems = new Collection<ClosingStructuresCalculation>();
+            Collection<StructuresCalculation<ClosingStructuresInput>> affectedItems = new Collection<StructuresCalculation<ClosingStructuresInput>>();
 
-            foreach (var calculation in failureMechanism.Calculations.Cast<ClosingStructuresCalculation>())
+            foreach (var calculation in failureMechanism.Calculations.Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 var calculationChanged = false;
 
@@ -148,7 +149,7 @@
             return affectedItems;
         }
 
-        private static void ClearHydraulicBoundaryLocation(ClosingStructuresCalculation calculation)
+        private static void ClearHydraulicBoundaryLocation(StructuresCalculation<ClosingStructuresInput> calculation)
         {
             calculation.InputParameters.HydraulicBoundaryLocation = null;
         }
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Utils/ClosingStructuresHelper.cs
===================================================================
diff -u -r73597729ce18d3ee00d8036bca8341e9c12f2953 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Utils/ClosingStructuresHelper.cs	(.../ClosingStructuresHelper.cs)	(revision 73597729ce18d3ee00d8036bca8341e9c12f2953)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Utils/ClosingStructuresHelper.cs	(.../ClosingStructuresHelper.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -26,17 +26,18 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Utils;
 using Ringtoets.ClosingStructures.Data;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.ClosingStructures.Utils
 {
     /// <summary>
     /// Class holds helper methods to match <see cref="FailureMechanismSection"/> objects 
-    /// with <see cref="ClosingStructuresCalculation"/> objects. 
+    /// with <see cref="StructuresCalculation{T}"/> objects. 
     /// </summary>
     public static class ClosingStructuresHelper
     {
         /// <summary>
-        /// Determine which <see cref="ClosingStructuresCalculation"/> objects are available for a
+        /// Determine which <see cref="StructuresCalculation{T}"/> objects are available for a
         /// <see cref="FailureMechanismSection"/>.
         /// </summary>
         /// <param name="sections">The <see cref="FailureMechanismSection"/> objects.</param>
@@ -49,23 +50,23 @@
         /// <exception cref="ArgumentException">Thrown when an element in <paramref name="sections"/> is 
         /// <c>null</c>.</exception>
         public static Dictionary<string, IList<ICalculation>> CollectCalculationsPerSection(IEnumerable<FailureMechanismSection> sections,
-                                                                                            IEnumerable<ClosingStructuresCalculation> calculations)
+                                                                                            IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations)
         {
             return AssignUnassignCalculations.CollectCalculationsPerSection(sections, AsCalculationsWithLocations(calculations));
         }
 
         /// <summary>
-        /// Determine which <see cref="FailureMechanismSection"/> geometrically contains the <see cref="ClosingStructuresCalculation"/>.
+        /// Determine which <see cref="FailureMechanismSection"/> geometrically contains the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
         /// <param name="sections">The <see cref="FailureMechanismSection"/> objects 
         /// whose <see cref="FailureMechanismSection"/> are considered.</param>
-        /// <param name="calculation">The <see cref="ClosingStructuresCalculation"/>.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/>.</param>
         /// <returns>The containing <see cref="FailureMechanismSection"/>, or <c>null</c> if none found.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sections"/> is <c>null</c></exception>
         /// <exception cref="ArgumentException">Thrown when an element in <paramref name="sections"/> is <c>null</c>.
         /// </exception>
         public static FailureMechanismSection FailureMechanismSectionForCalculation(IEnumerable<FailureMechanismSection> sections,
-                                                                                    ClosingStructuresCalculation calculation)
+                                                                                    StructuresCalculation<ClosingStructuresInput> calculation)
         {
             CalculationWithLocation calculationWithLocation = AsCalculationWithLocation(calculation);
             if (calculationWithLocation != null)
@@ -80,13 +81,13 @@
         /// <paramref name="calculation"/> assigned, or should have the <paramref name="calculation"/> assigned.
         /// </summary>
         /// <param name="sectionResults">The <see cref="IEnumerable{T}"/> of <see cref="ClosingStructuresFailureMechanismSectionResult"/> to iterate while 
-        /// possibly updating the <see cref="ClosingStructuresCalculation"/> assigned to it.</param>
-        /// <param name="calculation">The <see cref="ClosingStructuresCalculation"/> which has a location that has been updated.</param>
+        /// possibly updating the <see cref="StructuresCalculation{T}"/> assigned to it.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> which has a location that has been updated.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResults"/> is <c>null</c></exception>
         /// <exception cref="ArgumentException">Thrown when element in <paramref name="sectionResults"/> is 
         /// <c>null</c>.</exception>
         public static void Update(IEnumerable<ClosingStructuresFailureMechanismSectionResult> sectionResults,
-                                  ClosingStructuresCalculation calculation)
+                                  StructuresCalculation<ClosingStructuresInput> calculation)
         {
             ValidateSectionResults(sectionResults);
 
@@ -103,16 +104,16 @@
         /// </summary>
         /// <param name="sectionResults">The <see cref="IEnumerable{T}"/> of <see cref="ClosingStructuresFailureMechanismSectionResult"/> to iterate while 
         /// removing the reference to the <paramref name="calculation"/> if present.</param>
-        /// <param name="calculation">The <see cref="ClosingStructuresCalculation"/> which has a location that has been updated.</param>
-        /// <param name="calculations">The <see cref="IEnumerable{T}"/> of <see cref="ClosingStructuresCalculation"/> that were left after removing
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> which has a location that has been updated.</param>
+        /// <param name="calculations">The <see cref="IEnumerable{T}"/> of <see cref="StructuresCalculation{T}"/> that were left after removing
         /// <paramref name="calculation"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c> or when an element 
         /// in <paramref name="calculations"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when element in <paramref name="sectionResults"/> is 
         /// <c>null</c>.</exception>
         public static void Delete(IEnumerable<ClosingStructuresFailureMechanismSectionResult> sectionResults,
-                                  ClosingStructuresCalculation calculation,
-                                  IEnumerable<ClosingStructuresCalculation> calculations)
+                                  StructuresCalculation<ClosingStructuresInput> calculation,
+                                  IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations)
         {
             ValidateSectionResults(sectionResults);
 
@@ -126,11 +127,11 @@
         /// Transforms the <paramref name="calculations"/> into <see cref="CalculationWithLocation"/> and filter out the calculations
         /// for which a <see cref="CalculationWithLocation"/> could not be made.
         /// </summary>
-        /// <param name="calculations">The <see cref="ClosingStructuresCalculation"/> collection to transform.</param>
+        /// <param name="calculations">The <see cref="StructuresCalculation{T}"/> collection to transform.</param>
         /// <returns>A collection of <see cref="CalculationWithLocation"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/> is <c>null</c> or when
         /// an element in <paramref name="calculations"/> is <c>null</c>.</exception>
-        private static IEnumerable<CalculationWithLocation> AsCalculationsWithLocations(IEnumerable<ClosingStructuresCalculation> calculations)
+        private static IEnumerable<CalculationWithLocation> AsCalculationsWithLocations(IEnumerable<StructuresCalculation<ClosingStructuresInput>> calculations)
         {
             if (calculations == null)
             {
@@ -151,7 +152,7 @@
             }
         }
 
-        private static CalculationWithLocation AsCalculationWithLocation(ClosingStructuresCalculation calculation)
+        private static CalculationWithLocation AsCalculationWithLocation(StructuresCalculation<ClosingStructuresInput> calculation)
         {
             if (calculation == null)
             {
@@ -169,7 +170,7 @@
             return new SectionResultWithCalculationAssignment(
                 failureMechanismSectionResult,
                 result => ((ClosingStructuresFailureMechanismSectionResult)result).Calculation,
-                (result, calculation) => ((ClosingStructuresFailureMechanismSectionResult)result).Calculation = (ClosingStructuresCalculation)calculation);
+                (result, calculation) => ((ClosingStructuresFailureMechanismSectionResult)result).Calculation = (StructuresCalculation<ClosingStructuresInput>)calculation);
         }
     }
 }
\ No newline at end of file
Fisheye: Tag ab20c4eb4ca81bd3845d50210d2bdb301177af6a refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresCalculationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rfe1332c1e9b14365a62f6ce03c9494393223179e -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs	(.../ClosingStructuresFailureMechanismSectionResultTest.cs)	(revision fe1332c1e9b14365a62f6ce03c9494393223179e)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismSectionResultTest.cs	(.../ClosingStructuresFailureMechanismSectionResultTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -23,6 +23,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.ClosingStructures.Data.Test
 {
@@ -53,7 +54,7 @@
 
             var result = new ClosingStructuresFailureMechanismSectionResult(section);
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             result.Calculation = calculation;
@@ -88,7 +89,7 @@
 
             var result = new ClosingStructuresFailureMechanismSectionResult(section)
             {
-                Calculation = new ClosingStructuresCalculation
+                Calculation = new StructuresCalculation<ClosingStructuresInput>
                 {
                     Output = new ProbabilityAssessmentOutput(1.0, 1.0, double.NaN, 1.0, 1.0)
                 }
@@ -110,7 +111,7 @@
             double probability = 0.65;
             var result = new ClosingStructuresFailureMechanismSectionResult(section)
             {
-                Calculation = new ClosingStructuresCalculation
+                Calculation = new StructuresCalculation<ClosingStructuresInput>
                 {
                     Output = new ProbabilityAssessmentOutput(1.0, 1.0, probability, 1.0, 1.0)
                 }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs
===================================================================
diff -u -rb6a9219d1e628e4430ccf880e8ea390cec04fc04 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision b6a9219d1e628e4430ccf880e8ea390cec04fc04)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.ClosingStructures.Data.Test
 {
@@ -112,9 +113,9 @@
                     Children =
                     {
                         new CalculationGroup(),
-                        new ClosingStructuresCalculation(),
+                        new StructuresCalculation<ClosingStructuresInput>(),
                         mocks.StrictMock<ICalculation>(),
-                        new ClosingStructuresCalculation()
+                        new StructuresCalculation<ClosingStructuresInput>()
                     }
                 }
             };
@@ -126,7 +127,7 @@
 
             // Assert
             Assert.AreEqual(2, calculations.Count);
-            Assert.IsTrue(calculations.All(c => c is ClosingStructuresCalculation));
+            Assert.IsTrue(calculations.All(c => c is StructuresCalculation<ClosingStructuresInput>));
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/Ringtoets.ClosingStructures.Data.Test.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/Ringtoets.ClosingStructures.Data.Test.csproj	(.../Ringtoets.ClosingStructures.Data.Test.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/Ringtoets.ClosingStructures.Data.Test.csproj	(.../Ringtoets.ClosingStructures.Data.Test.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -52,7 +52,6 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="ClosingStructuresCalculationTest.cs" />
     <Compile Include="ClosingStructuresFailureMechanismSectionResultTest.cs" />
     <Compile Include="ClosingStructuresFailureMechanismTest.cs" />
     <Compile Include="ClosingStructuresInputTest.cs" />
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs
===================================================================
diff -u -r83024e3b1086e1dba93b83df874bd4781f67aa63 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs	(.../TestClosingStructureCalculationTest.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureCalculationTest.cs	(.../TestClosingStructureCalculationTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 
 namespace Ringtoets.ClosingStructures.Data.TestUtil.Test
@@ -37,7 +38,7 @@
             var calculation = new TestClosingStructuresCalculation();
 
             // Assert
-            Assert.IsInstanceOf<ClosingStructuresCalculation>(calculation);
+            Assert.IsInstanceOf<StructuresCalculation<ClosingStructuresInput>>(calculation);
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
             Assert.IsNull(calculation.Comments);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs
===================================================================
diff -u -r83024e3b1086e1dba93b83df874bd4781f67aa63 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs	(.../TestClosingStructuresCalculation.cs)	(revision 83024e3b1086e1dba93b83df874bd4781f67aa63)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/TestClosingStructuresCalculation.cs	(.../TestClosingStructuresCalculation.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -20,11 +20,12 @@
 // All rights reserved.
 
 using Core.Common.Base.Data;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.ClosingStructures.Data.TestUtil
 {
-    public class TestClosingStructuresCalculation : ClosingStructuresCalculation
+    public class TestClosingStructuresCalculation : StructuresCalculation<ClosingStructuresInput>
     {
         public TestClosingStructuresCalculation()
         {
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationContextTest.cs	(.../ClosingStructuresCalculationContextTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -24,6 +24,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.PresentationObjects
@@ -39,15 +40,15 @@
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
             // Call
             var context = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismItemContextBase<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
-            Assert.IsInstanceOf<ICalculationContext<ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<ICalculationContext<StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>>(context);
             Assert.AreEqual(calculation, context.WrappedData);
             Assert.AreEqual(failureMechanism, context.FailureMechanism);
             Assert.AreEqual(assessmentSectionMock, context.AssessmentSection);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs
===================================================================
diff -u -ra9591008569d7b58499fa258b0530ba273850d21 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs	(.../ClosingStructuresInputContextTest.cs)	(revision a9591008569d7b58499fa258b0530ba273850d21)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresInputContextTest.cs	(.../ClosingStructuresInputContextTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -24,6 +24,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.PresentationObjects
@@ -39,14 +40,14 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
             // Call
             var context = new ClosingStructuresInputContext(calculation.InputParameters, calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<InputContextBase<ClosingStructuresInput, ClosingStructuresCalculation, ClosingStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<InputContextBase<ClosingStructuresInput, StructuresCalculation<ClosingStructuresInput>, ClosingStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation.InputParameters, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r70ea116c3be1432b17de4b44e0c7b13902b8baf9 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision 70ea116c3be1432b17de4b44e0c7b13902b8baf9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -37,6 +37,7 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Data;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
@@ -407,7 +408,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -451,7 +452,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
 
@@ -495,7 +496,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -542,7 +543,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8245c9add5586e4e544ab41195fb0af2b2a459e9 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 8245c9add5586e4e544ab41195fb0af2b2a459e9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -44,6 +44,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
@@ -133,7 +134,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var calculationContext = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Call
@@ -160,7 +161,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new ClosingStructuresCalculation
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
             {
                 Output = new TestClosingStructuresOutput()
             };
@@ -190,7 +191,7 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
@@ -228,7 +229,7 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -273,7 +274,7 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -316,7 +317,7 @@
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -359,7 +360,7 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -412,7 +413,7 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -446,7 +447,7 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
@@ -483,7 +484,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -519,7 +520,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -566,7 +567,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             var nodeData = new ClosingStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -745,7 +746,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var elementToBeRemoved = new ClosingStructuresCalculation();
+            var elementToBeRemoved = new StructuresCalculation<ClosingStructuresInput>();
             var observerMock = mocks.StrictMock<IObserver>();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             var calculationContext = new ClosingStructuresCalculationContext(elementToBeRemoved,
@@ -760,7 +761,7 @@
             mocks.ReplayAll();
 
             group.Children.Add(elementToBeRemoved);
-            group.Children.Add(new ClosingStructuresCalculation());
+            group.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
             group.Attach(observerMock);
 
             // Precondition
@@ -781,7 +782,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var elementToBeRemoved = new ClosingStructuresCalculation();
+            var elementToBeRemoved = new StructuresCalculation<ClosingStructuresInput>();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var calculationContext = new ClosingStructuresCalculationContext(elementToBeRemoved,
                                                                              failureMechanism,
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8245c9add5586e4e544ab41195fb0af2b2a459e9 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8245c9add5586e4e544ab41195fb0af2b2a459e9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -41,6 +41,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Data;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -146,7 +147,7 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var group = new CalculationGroup();
             var childGroup = new CalculationGroup();
-            var childCalculation = new ClosingStructuresCalculation();
+            var childCalculation = new StructuresCalculation<ClosingStructuresInput>();
 
             group.Children.Add(childGroup);
             group.Children.Add(calculationItemMock);
@@ -377,7 +378,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -421,7 +422,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -430,7 +431,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = null;
@@ -475,7 +476,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -484,7 +485,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -531,7 +532,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -548,7 +549,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
@@ -594,7 +595,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -632,7 +633,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -641,7 +642,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
@@ -679,7 +680,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -688,7 +689,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
@@ -728,7 +729,7 @@
             {
                 Children =
                 {
-                    new ClosingStructuresCalculation()
+                    new StructuresCalculation<ClosingStructuresInput>()
                 }
             };
 
@@ -745,7 +746,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new ClosingStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<ClosingStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
@@ -991,7 +992,7 @@
             var nodeData = new ClosingStructuresCalculationGroupContext(group,
                                                                         failureMechanism,
                                                                         assessmentSectionMock);
-            var calculation = new ClosingStructuresCalculation
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
             {
                 Name = "Nieuwe berekening"
             };
@@ -1019,7 +1020,7 @@
                     // Assert
                     Assert.AreEqual(2, group.Children.Count);
                     var newlyAddedItem = group.Children.Last();
-                    Assert.IsInstanceOf<ClosingStructuresCalculation>(newlyAddedItem);
+                    Assert.IsInstanceOf<StructuresCalculation<ClosingStructuresInput>>(newlyAddedItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
                 }
@@ -1083,7 +1084,7 @@
                 new Point2D(0, 0)
             }));
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
             group.Children.Add(calculation);
             failureMechanism.SectionResults.First().Calculation = calculation;
 
@@ -1109,7 +1110,7 @@
             var parentNodeData = new ClosingStructuresCalculationGroupContext(parentGroup,
                                                                               failureMechanism,
                                                                               assessmentSectionMock);
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             observerMock.Expect(o => o.UpdateObserver());
 
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenarioRowTest.cs
===================================================================
diff -u -r8c76ed44224c5f2e96bd030b00c9bb8565e71330 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenarioRowTest.cs	(.../ClosingStructuresScenarioRowTest.cs)	(revision 8c76ed44224c5f2e96bd030b00c9bb8565e71330)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenarioRowTest.cs	(.../ClosingStructuresScenarioRowTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -27,6 +27,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Forms.Views;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.Views
@@ -51,7 +52,7 @@
             // Assert
             Assert.AreSame(sectionResult.Section.Name, row.Name);
             Assert.AreSame(sectionResult.Calculation, row.Calculation);
-            Assert.IsInstanceOf<IScenarioRow<ClosingStructuresCalculation>>(row);
+            Assert.IsInstanceOf<IScenarioRow<StructuresCalculation<ClosingStructuresInput>>>(row);
         }
 
         [Test]
@@ -78,7 +79,7 @@
 
             var row = new ClosingStructuresScenarioRow(sectionResult);
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             row.Calculation = calculation;
@@ -107,7 +108,7 @@
 
             var row = new ClosingStructuresScenarioRow(sectionResult);
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             row.Calculation = calculation;
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs
===================================================================
diff -u -r93baa4ee308eff5a157e37bd2b4fe148a45806af -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs	(.../ClosingStructuresScenariosViewTest.cs)	(revision 93baa4ee308eff5a157e37bd2b4fe148a45806af)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresScenariosViewTest.cs	(.../ClosingStructuresScenariosViewTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -31,6 +31,7 @@
 using Ringtoets.ClosingStructures.Forms.Views;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.Views
@@ -220,8 +221,8 @@
                 view.Data = failureMechanism.CalculationsGroup;
                 view.FailureMechanism = failureMechanism;
 
-                var calculationA = (ClosingStructuresCalculation)failureMechanism.CalculationsGroup.Children[0];
-                var calculationB = (ClosingStructuresCalculation)failureMechanism.CalculationsGroup.Children[1];
+                var calculationA = (StructuresCalculation<ClosingStructuresInput>)failureMechanism.CalculationsGroup.Children[0];
+                var calculationB = (StructuresCalculation<ClosingStructuresInput>)failureMechanism.CalculationsGroup.Children[1];
 
                 calculationA.InputParameters.Structure = calculationB.InputParameters.Structure;
 
@@ -247,8 +248,8 @@
                 view.Data = failureMechanism.CalculationsGroup;
                 view.FailureMechanism = failureMechanism;
 
-                var calculationB = ((ClosingStructuresCalculation)failureMechanism.CalculationsGroup.Children[1]);
-                var calculationC = new ClosingStructuresCalculation
+                var calculationB = ((StructuresCalculation<ClosingStructuresInput>)failureMechanism.CalculationsGroup.Children[1]);
+                var calculationC = new StructuresCalculation<ClosingStructuresInput>
                 {
                     Name = "CalculationC",
                     InputParameters =
@@ -305,15 +306,15 @@
             ClosingStructuresFailureMechanism failureMechanism = new ClosingStructuresFailureMechanism();
             var matchingPointA = new Point2D(0, 0);
             var matchingPointB = new Point2D(20, 20);
-            var calculationA = new ClosingStructuresCalculation
+            var calculationA = new StructuresCalculation<ClosingStructuresInput>
             {
                 Name = "CalculationA",
                 InputParameters =
                 {
                     Structure = CreateStructure(matchingPointA)
                 }
             };
-            var calculationB = new ClosingStructuresCalculation
+            var calculationB = new StructuresCalculation<ClosingStructuresInput>
             {
                 Name = "CalculationB",
                 InputParameters =
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r8245c9add5586e4e544ab41195fb0af2b2a459e9 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision 8245c9add5586e4e544ab41195fb0af2b2a459e9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs	(.../ClosingStructuresCalculationActivityIntegrationTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -34,6 +34,7 @@
 using Ringtoets.ClosingStructures.Service;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.IO.FileImporters;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.HydraRing.Data;
@@ -66,7 +67,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             var activity = new ClosingStructuresCalculationActivity(calculation, "", failureMechanism, assessmentSection);
 
@@ -104,7 +105,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new ClosingStructuresCalculation()
+            var calculation = new StructuresCalculation<ClosingStructuresInput>()
             {
                 InputParameters =
                 {
@@ -299,7 +300,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new ClosingStructuresCalculation()
+            var calculation = new StructuresCalculation<ClosingStructuresInput>()
             {
                 InputParameters =
                 {
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs
===================================================================
diff -u -r73597729ce18d3ee00d8036bca8341e9c12f2953 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision 73597729ce18d3ee00d8036bca8341e9c12f2953)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using NUnit.Framework;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Data;
 
 namespace Ringtoets.ClosingStructures.Service.Test
@@ -48,27 +49,27 @@
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation1 = new ClosingStructuresCalculation
+            var calculation1 = new StructuresCalculation<ClosingStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation2 = new ClosingStructuresCalculation
+            var calculation2 = new StructuresCalculation<ClosingStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation3 = new ClosingStructuresCalculation();
+            var calculation3 = new StructuresCalculation<ClosingStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<ClosingStructuresCalculation> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutput(failureMechanism);
+            IEnumerable<StructuresCalculation<ClosingStructuresInput>> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutput(failureMechanism);
 
             // Assert
-            foreach (ClosingStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<ClosingStructuresCalculation>())
+            foreach (StructuresCalculation<ClosingStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 Assert.IsNull(calculation.Output);
             }
@@ -94,7 +95,7 @@
         public void ClearCalculationOutput_WithCalculation_ClearsOutput()
         {
             // Setup
-            var calculation = new ClosingStructuresCalculation
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -124,33 +125,33 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
 
-            var calculation1 = new ClosingStructuresCalculation
+            var calculation1 = new StructuresCalculation<ClosingStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation2 = new ClosingStructuresCalculation
+            var calculation2 = new StructuresCalculation<ClosingStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation3 = new ClosingStructuresCalculation();
+            var calculation3 = new StructuresCalculation<ClosingStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<ClosingStructuresCalculation> affectedItems = ClosingStructuresDataSynchronizationService.ClearHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<ClosingStructuresInput>> affectedItems = ClosingStructuresDataSynchronizationService.ClearHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (ClosingStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<ClosingStructuresCalculation>())
+            foreach (StructuresCalculation<ClosingStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
             }
@@ -179,7 +180,7 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
 
-            var calculation1 = new ClosingStructuresCalculation
+            var calculation1 = new StructuresCalculation<ClosingStructuresInput>
             {
                 InputParameters =
                 {
@@ -188,7 +189,7 @@
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation2 = new ClosingStructuresCalculation
+            var calculation2 = new StructuresCalculation<ClosingStructuresInput>
             {
                 InputParameters =
                 {
@@ -197,17 +198,17 @@
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation3 = new ClosingStructuresCalculation();
+            var calculation3 = new StructuresCalculation<ClosingStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<ClosingStructuresCalculation> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<ClosingStructuresInput>> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (ClosingStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<ClosingStructuresCalculation>())
+            foreach (StructuresCalculation<ClosingStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
                 Assert.IsNull(calculation.Output);
@@ -226,33 +227,33 @@
             var failureMechanism = new ClosingStructuresFailureMechanism();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
 
-            var calculation1 = new ClosingStructuresCalculation
+            var calculation1 = new StructuresCalculation<ClosingStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation2 = new ClosingStructuresCalculation
+            var calculation2 = new StructuresCalculation<ClosingStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation3 = new ClosingStructuresCalculation();
+            var calculation3 = new StructuresCalculation<ClosingStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<ClosingStructuresCalculation> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<ClosingStructuresInput>> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (ClosingStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<ClosingStructuresCalculation>())
+            foreach (StructuresCalculation<ClosingStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
             }
@@ -269,27 +270,27 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            var calculation1 = new ClosingStructuresCalculation
+            var calculation1 = new StructuresCalculation<ClosingStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation2 = new ClosingStructuresCalculation
+            var calculation2 = new StructuresCalculation<ClosingStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation3 = new ClosingStructuresCalculation();
+            var calculation3 = new StructuresCalculation<ClosingStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<ClosingStructuresCalculation> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<ClosingStructuresInput>> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (ClosingStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<ClosingStructuresCalculation>())
+            foreach (StructuresCalculation<ClosingStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<ClosingStructuresInput>>())
             {
                 Assert.IsNull(calculation.Output);
             }
@@ -306,16 +307,16 @@
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            var calculation1 = new ClosingStructuresCalculation();
-            var calculation2 = new ClosingStructuresCalculation();
-            var calculation3 = new ClosingStructuresCalculation();
+            var calculation1 = new StructuresCalculation<ClosingStructuresInput>();
+            var calculation2 = new StructuresCalculation<ClosingStructuresInput>();
+            var calculation3 = new StructuresCalculation<ClosingStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<ClosingStructuresCalculation> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<ClosingStructuresInput>> affectedItems = ClosingStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
             CollectionAssert.IsEmpty(affectedItems);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityTest.cs
===================================================================
diff -u -r8c7c25ff896b8967361c5c8f4e6ef261ff6f5164 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityTest.cs	(.../ClosingStructuresCalculationActivityTest.cs)	(revision 8c7c25ff896b8967361c5c8f4e6ef261ff6f5164)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityTest.cs	(.../ClosingStructuresCalculationActivityTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.ClosingStructures.Service.Test
 {
@@ -40,7 +41,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             var activity = new ClosingStructuresCalculationActivity(calculation, "", failureMechanism, assessmentSectionMock);
@@ -82,7 +83,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             TestDelegate call = () => new ClosingStructuresCalculationActivity(calculation, null, failureMechanism, assessmentSectionMock);
@@ -101,7 +102,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             TestDelegate call = () => new ClosingStructuresCalculationActivity(calculation, "", null, assessmentSectionMock);
@@ -117,7 +118,7 @@
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             TestDelegate call = () => new ClosingStructuresCalculationActivity(calculation, "", failureMechanism, null);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r8245c9add5586e4e544ab41195fb0af2b2a459e9 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 8245c9add5586e4e544ab41195fb0af2b2a459e9)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Structures;
@@ -59,7 +60,7 @@
 
             const string name = "<very nice name>";
 
-            ClosingStructuresCalculation calculation = new ClosingStructuresCalculation
+            var calculation = new StructuresCalculation<ClosingStructuresInput>
             {
                 Name = name,
                 InputParameters =
@@ -98,7 +99,7 @@
 
             const string name = "<very nice name>";
 
-            ClosingStructuresCalculation calculation = new TestClosingStructuresCalculation()
+            var calculation = new TestClosingStructuresCalculation()
             {
                 Name = name,
                 InputParameters =
@@ -142,7 +143,7 @@
             }));
             FailureMechanismSection failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
 
-            ClosingStructuresCalculation calculation = new TestClosingStructuresCalculation()
+            var calculation = new TestClosingStructuresCalculation()
             {
                 InputParameters =
                 {
@@ -187,7 +188,7 @@
                 new Point2D(1, 1)
             }));
 
-            ClosingStructuresCalculation calculation = new TestClosingStructuresCalculation()
+            var calculation = new TestClosingStructuresCalculation()
             {
                 InputParameters =
                 {
@@ -281,7 +282,7 @@
                 new Point2D(1, 1)
             }));
 
-            ClosingStructuresCalculation calculation = new TestClosingStructuresCalculation()
+            var calculation = new TestClosingStructuresCalculation()
             {
                 InputParameters =
                 {
@@ -375,7 +376,7 @@
                 new Point2D(1, 1)
             }));
 
-            ClosingStructuresCalculation calculation = new TestClosingStructuresCalculation()
+            var calculation = new TestClosingStructuresCalculation()
             {
                 InputParameters =
                 {
@@ -581,7 +582,7 @@
             }));
             FailureMechanismSection failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
 
-            ClosingStructuresCalculation calculation = new TestClosingStructuresCalculation()
+            var calculation = new TestClosingStructuresCalculation()
             {
                 InputParameters =
                 {
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Utils.Test/ClosingStructuresHelperTest.cs
===================================================================
diff -u -r73597729ce18d3ee00d8036bca8341e9c12f2953 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Utils.Test/ClosingStructuresHelperTest.cs	(.../ClosingStructuresHelperTest.cs)	(revision 73597729ce18d3ee00d8036bca8341e9c12f2953)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Utils.Test/ClosingStructuresHelperTest.cs	(.../ClosingStructuresHelperTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -28,6 +28,7 @@
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.ClosingStructures.Data.TestUtil;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.ClosingStructures.Utils.Test
 {
@@ -43,7 +44,7 @@
             // Call
             TestDelegate test = () => ClosingStructuresHelper.CollectCalculationsPerSection(
                 null,
-                new ClosingStructuresCalculation[]
+                new StructuresCalculation<ClosingStructuresInput>[]
                 {
                     null
                 });
@@ -92,7 +93,7 @@
             // Call
             TestDelegate test = () => ClosingStructuresHelper.CollectCalculationsPerSection(
                 twoSections,
-                new ClosingStructuresCalculation[]
+                new StructuresCalculation<ClosingStructuresInput>[]
                 {
                     null
                 });
@@ -145,7 +146,7 @@
         public void FailureMechanismSectionForCalculation_ValidSectionWithoutCalculationStructureSet_ReturnsNull()
         {
             // Setup
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             FailureMechanismSection failureMechanismSection =
@@ -160,7 +161,7 @@
         {
             // Setup
             var emptySections = new FailureMechanismSection[0];
-            var calculation = new ClosingStructuresCalculation();
+            var calculation = new StructuresCalculation<ClosingStructuresInput>();
 
             // Call
             FailureMechanismSection failureMechanismSection =
@@ -326,7 +327,7 @@
                     sectionResult
                 },
                 calculationInSectionA,
-                new ClosingStructuresCalculation[]
+                new StructuresCalculation<ClosingStructuresInput>[]
                 {
                     null
                 });
@@ -353,7 +354,7 @@
                     failureMechanismSectionResult
                 },
                 calculationInSectionA,
-                Enumerable.Empty<ClosingStructuresCalculation>());
+                Enumerable.Empty<StructuresCalculation<ClosingStructuresInput>>());
 
             // Assert
             Assert.IsNull(failureMechanismSectionResult.Calculation);
@@ -413,15 +414,15 @@
             failureMechanismSectionB
         };
 
-        private readonly ClosingStructuresCalculation calculationInSectionA = new ClosingStructuresCalculation
+        private readonly StructuresCalculation<ClosingStructuresInput> calculationInSectionA = new StructuresCalculation<ClosingStructuresInput>
         {
             InputParameters =
             {
                 Structure = new TestClosingStructure(new Point2D(1.1, 2.2))
             }
         };
 
-        private readonly ClosingStructuresCalculation calculationInSectionB = new ClosingStructuresCalculation
+        private readonly StructuresCalculation<ClosingStructuresInput> calculationInSectionB = new StructuresCalculation<ClosingStructuresInput>
         {
             InputParameters =
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r04bb0523abe526947e76b0701728506e7293792c -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 04bb0523abe526947e76b0701728506e7293792c)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -85,6 +85,7 @@
     </Compile>
     <Compile Include="DikeProfiles\RoughnessPoint.cs" />
     <Compile Include="StructureBase.cs" />
+    <Compile Include="Structures\StructuresCalculation.cs" />
     <Compile Include="Structures\StructuresInputBase.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresCalculation.cs	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -0,0 +1,86 @@
+// 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;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Properties;
+
+namespace Ringtoets.Common.Data.Structures
+{
+    /// <summary>
+    /// This class holds information about a calculation for a structures failure mechanism.
+    /// </summary>
+    public class StructuresCalculation<T> : Observable, ICalculation where T : class, new()
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StructuresCalculation{T}"/> class.
+        /// </summary>
+        public StructuresCalculation()
+        {
+            InputParameters = new T();
+            Name = Resources.Calculation_DefaultName;
+        }
+
+        /// <summary>
+        /// Gets the input parameters to perform a structures calculation with.
+        /// </summary>
+        public T InputParameters { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="ProbabilityAssessmentOutput"/>, 
+        /// which contains the output of a structures calculation.
+        /// </summary>
+        public ProbabilityAssessmentOutput Output { get; set; }
+
+        public string Name { get; set; }
+
+        public string Comments { get; set; }
+
+        public bool HasOutput
+        {
+            get
+            {
+                return Output != null;
+            }
+        }
+
+        public void ClearOutput()
+        {
+            Output = null;
+        }
+
+        public ICalculationInput GetObservableInput()
+        {
+            return (ICalculationInput) InputParameters;
+        }
+
+        public ICalculationOutput GetObservableOutput()
+        {
+            return Output;
+        }
+
+        public override string ToString()
+        {
+            return Name;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -78,6 +78,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DikeProfiles\RoughnessPointTest.cs" />
     <Compile Include="StructureBaseTest.cs" />
+    <Compile Include="Structures\StructuresCalculationTest.cs" />
     <Compile Include="Structures\StructuresInputBaseTest.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresCalculationTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresCalculationTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresCalculationTest.cs	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -0,0 +1,158 @@
+// 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;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
+
+namespace Ringtoets.Common.Data.Test.Structures
+{
+    [TestFixture]
+    public class StructuresCalculationTest
+    {
+        [Test]
+        public void Constructor_Default_ExpectedValues()
+        {
+            // Call
+            var calculation = new TestStructuresCalculation();
+
+            // Assert
+            Assert.IsInstanceOf<Observable>(calculation);
+            Assert.AreEqual("Nieuwe berekening", calculation.Name);
+            Assert.IsNotNull(calculation.InputParameters);
+            Assert.IsNull(calculation.Comments);
+            Assert.IsFalse(calculation.HasOutput);
+            Assert.IsNull(calculation.Output);
+        }
+
+        [Test]
+        public void ClearOutput_Always_SetsOutputToNull()
+        {
+            // Setup
+            var calculation = new TestStructuresCalculation
+            {
+                Output = new TestStructuresOutput()
+            };
+
+            // Call
+            calculation.ClearOutput();
+
+            // Assert
+            Assert.IsNull(calculation.Output);
+        }
+
+        [Test]
+        public void HasOutput_OutputNull_ReturnsFalse()
+        {
+            // Setup
+            var calculation = new TestStructuresCalculation
+            {
+                Output = null
+            };
+
+            // Call
+            bool calculationHasOutput = calculation.HasOutput;
+
+            // Assert
+            Assert.IsFalse(calculationHasOutput);
+        }
+
+        [Test]
+        public void HasOutput_OutputSet_ReturnsTrue()
+        {
+            // Setup
+            var calculation = new TestStructuresCalculation
+            {
+                Output = new TestStructuresOutput()
+            };
+
+            // Call 
+            bool calculationHasOutput = calculation.HasOutput;
+
+            // Assert
+            Assert.IsTrue(calculationHasOutput);
+        }
+
+        [Test]
+        public void GetObservableInput_Always_ReturnsInputParameters()
+        {
+            // Setup
+            var calculation = new TestStructuresCalculation();
+
+            // Call
+            ICalculationInput input = calculation.GetObservableInput();
+
+            // Assert
+            Assert.AreSame(calculation.InputParameters, input);
+        }
+
+        [Test]
+        public void GetObservableOutput_Always_ReturnsOutput()
+        {
+            // Setup
+            var calculation = new TestStructuresCalculation
+            {
+                Output = new TestStructuresOutput()
+            };
+
+            // Call
+            ICalculationOutput output = calculation.GetObservableOutput();
+
+            // Assert
+            Assert.AreSame(calculation.Output, output);
+        }
+
+        [Test]
+        public void ToString_Always_ReturnName()
+        {
+            // Setup
+            var expectedName = "someTestName";
+            var calculation = new TestStructuresCalculation
+            {
+                Name = expectedName
+            };
+
+            // Call
+            var result = calculation.ToString();
+
+            // Assert
+            Assert.AreEqual(expectedName, result);
+        }
+
+        private class TestStructuresCalculation : StructuresCalculation<TestStructuresInput> {}
+
+        private class TestStructuresInput : ICalculationInput
+        {
+            public void Attach(IObserver observer) {}
+
+            public void Detach(IObserver observer) {}
+
+            public void NotifyObservers() {}
+        }
+
+        private class TestStructuresOutput : ProbabilityAssessmentOutput
+        {
+            public TestStructuresOutput() : base(0, 0, 0, 0, 0) {}
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag ab20c4eb4ca81bd3845d50210d2bdb301177af6a refers to a dead (removed) revision in file `Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -rbe6802ad8677e06b335c8123ec49e7106ad79ad7 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision be6802ad8677e06b335c8123ec49e7106ad79ad7)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data.Properties;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -54,7 +55,7 @@
         {
             get
             {
-                return CalculationsGroup.GetCalculations().OfType<HeightStructuresCalculation>();
+                return CalculationsGroup.GetCalculations().OfType<StructuresCalculation<HeightStructuresInput>>();
             }
         }
 
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -rd9c981f7b4c64d16e55fca0cb51eb9f4c9aec28f -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs	(.../HeightStructuresFailureMechanismSectionResult.cs)	(revision d9c981f7b4c64d16e55fca0cb51eb9f4c9aec28f)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResult.cs	(.../HeightStructuresFailureMechanismSectionResult.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.HeightStructures.Data
 {
@@ -53,9 +54,9 @@
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="HeightStructuresCalculation"/>, which is chosen 
+        /// Gets or sets the <see cref="StructuresCalculation{T}"/>, which is chosen 
         /// to be representative for the whole section.
         /// </summary>
-        public HeightStructuresCalculation Calculation { get; set; }
+        public StructuresCalculation<HeightStructuresInput> Calculation { get; set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj	(.../Ringtoets.HeightStructures.Data.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Ringtoets.HeightStructures.Data.csproj	(.../Ringtoets.HeightStructures.Data.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -41,7 +41,6 @@
     </Compile>
     <Compile Include="GeneralHeightStructuresInput.cs" />
     <Compile Include="HeightStructure.cs" />
-    <Compile Include="HeightStructuresCalculation.cs" />
     <Compile Include="HeightStructuresFailureMechanism.cs" />
     <Compile Include="HeightStructuresFailureMechanismSectionResult.cs" />
     <Compile Include="HeightStructuresInput.cs" />
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,26 +21,27 @@
 
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 
 namespace Ringtoets.HeightStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="HeightStructuresCalculation"/>
+    /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class HeightStructuresCalculationContext : FailureMechanismItemContextBase<HeightStructuresCalculation, HeightStructuresFailureMechanism>,
-                                                      ICalculationContext<HeightStructuresCalculation, HeightStructuresFailureMechanism>
+    public class HeightStructuresCalculationContext : FailureMechanismItemContextBase<StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>,
+                                                      ICalculationContext<StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresCalculationContext"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="HeightStructuresCalculation"/> instance wrapped by this context object.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> instance wrapped by this context object.</param>
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public HeightStructuresCalculationContext(HeightStructuresCalculation calculation,
+        public HeightStructuresCalculationContext(StructuresCalculation<HeightStructuresInput> calculation,
                                                   HeightStructuresFailureMechanism failureMechanism,
                                                   IAssessmentSection assessmentSection)
             : base(calculation, failureMechanism, assessmentSection) {}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs
===================================================================
diff -u -r7823eab06c968c167d9d5b24a30acaa344478dc0 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision 7823eab06c968c167d9d5b24a30acaa344478dc0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 
@@ -30,7 +31,7 @@
     /// Presentation object for all data required to configure an instance of <see cref="HeightStructuresInput"/>
     /// in order to be able to configure height structures calculations.
     /// </summary>
-    public class HeightStructuresInputContext : InputContextBase<HeightStructuresInput, HeightStructuresCalculation, HeightStructuresFailureMechanism>
+    public class HeightStructuresInputContext : InputContextBase<HeightStructuresInput, StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresInputContext"/>.
@@ -41,7 +42,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public HeightStructuresInputContext(HeightStructuresInput wrappedData,
-                                            HeightStructuresCalculation calculation,
+                                            StructuresCalculation<HeightStructuresInput> calculation,
                                             HeightStructuresFailureMechanism failureMechanism,
                                             IAssessmentSection assessmentSection)
             : base(wrappedData, calculation, failureMechanism, assessmentSection) {}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs
===================================================================
diff -u -r94280a98283d1dbe5381cbc46f59b996f5f43b19 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision 94280a98283d1dbe5381cbc46f59b996f5f43b19)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs	(.../HeightStructuresInputContextProperties.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,10 +25,10 @@
 using Core.Common.Gui.Attributes;
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
-using Ringtoets.HeightStructures.Forms.Properties;
 using Ringtoets.HeightStructures.Utils;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -37,7 +37,7 @@
     /// <summary>
     /// ViewModel of <see cref="HeightStructuresInputContext"/> for properties panel.
     /// </summary>
-    public class HeightStructuresInputContextProperties : StructuresInputBaseProperties<HeightStructure, HeightStructuresInput, HeightStructuresCalculation, HeightStructuresFailureMechanism>
+    public class HeightStructuresInputContextProperties : StructuresInputBaseProperties<HeightStructure, HeightStructuresInput, StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>
     {
         private const int structurePropertyIndex = 1;
         private const int structureLocationPropertyIndex = 2;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenarioRow.cs
===================================================================
diff -u -r38600213ce6ca43c1819c81dd95c8ce786650ac3 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenarioRow.cs	(.../HeightStructuresScenarioRow.cs)	(revision 38600213ce6ca43c1819c81dd95c8ce786650ac3)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenarioRow.cs	(.../HeightStructuresScenarioRow.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
 using Ringtoets.HeightStructures.Data;
 
@@ -30,7 +31,7 @@
     /// Container of a <see cref="HeightStructuresFailureMechanismSectionResult"/>,
     /// which takes care of the representation of properties in a grid.
     /// </summary>
-    internal class HeightStructuresScenarioRow : IScenarioRow<HeightStructuresCalculation>
+    internal class HeightStructuresScenarioRow : IScenarioRow<StructuresCalculation<HeightStructuresInput>>
     {
         private readonly HeightStructuresFailureMechanismSectionResult sectionResult;
 
@@ -62,7 +63,7 @@
         /// <summary>
         /// Gets or sets the normative calculation for the section.
         /// </summary>
-        public HeightStructuresCalculation Calculation
+        public StructuresCalculation<HeightStructuresInput> Calculation
         {
             get
             {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs
===================================================================
diff -u -rf211e80f654ef76473f816c8846521a28232d591 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision f211e80f654ef76473f816c8846521a28232d591)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -26,6 +26,7 @@
 using Core.Common.Base;
 using Core.Common.Controls.Views;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Utils;
 
@@ -129,7 +130,7 @@
                 var calculations = data.GetCalculations();
 
                 Dictionary<string, IList<ICalculation>> calculationsPerSegment =
-                    HeightStructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.OfType<HeightStructuresCalculation>());
+                    HeightStructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.OfType<StructuresCalculation<HeightStructuresInput>>());
 
                 List<HeightStructuresScenarioRow> scenarioRows =
                     FailureMechanism.SectionResults.Select(sectionResult => new HeightStructuresScenarioRow(sectionResult)).ToList();
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r7823eab06c968c167d9d5b24a30acaa344478dc0 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision 7823eab06c968c167d9d5b24a30acaa344478dc0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -34,6 +34,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
@@ -183,7 +184,7 @@
         }
 
         private void CalculateAll(HeightStructuresFailureMechanism failureMechanism,
-                                  IEnumerable<HeightStructuresCalculation> calculations,
+                                  IEnumerable<StructuresCalculation<HeightStructuresInput>> calculations,
                                   IAssessmentSection assessmentSection)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
@@ -193,7 +194,7 @@
                                                                                                                  assessmentSection)).ToArray());
         }
 
-        private static void ValidateAll(IEnumerable<HeightStructuresCalculation> heightStructuresCalculations, IAssessmentSection assessmentSection)
+        private static void ValidateAll(IEnumerable<StructuresCalculation<HeightStructuresInput>> heightStructuresCalculations, IAssessmentSection assessmentSection)
         {
             foreach (var calculation in heightStructuresCalculations)
             {
@@ -326,7 +327,7 @@
                           .AddSeparator()
                           .AddValidateAllCalculationsInFailureMechanismItem(
                               context,
-                              c => ValidateAll(c.WrappedData.Calculations.OfType<HeightStructuresCalculation>(), c.Parent),
+                              c => ValidateAll(c.WrappedData.Calculations.OfType<StructuresCalculation<HeightStructuresInput>>(), c.Parent),
                               ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
                           .AddPerformAllCalculationsInFailureMechanismItem(context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
                           .AddClearAllCalculationOutputInFailureMechanismItem(context.WrappedData)
@@ -361,7 +362,7 @@
 
         private void CalculateAll(HeightStructuresFailureMechanismContext context)
         {
-            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<HeightStructuresCalculation>(), context.Parent);
+            CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType<StructuresCalculation<HeightStructuresInput>>(), context.Parent);
         }
 
         #endregion
@@ -374,7 +375,7 @@
 
             foreach (ICalculationBase calculationItem in context.WrappedData.Children)
             {
-                var calculation = calculationItem as HeightStructuresCalculation;
+                var calculation = calculationItem as StructuresCalculation<HeightStructuresInput>;
                 var group = calculationItem as CalculationGroup;
 
                 if (calculation != null)
@@ -422,7 +423,7 @@
             builder.AddSeparator()
                    .AddValidateAllCalculationsInGroupItem(
                        context,
-                       c => ValidateAll(c.WrappedData.GetCalculations().OfType<HeightStructuresCalculation>(), c.AssessmentSection),
+                       c => ValidateAll(c.WrappedData.GetCalculations().OfType<StructuresCalculation<HeightStructuresInput>>(), c.AssessmentSection),
                        ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddClearAllCalculationOutputInGroupItem(group)
@@ -478,7 +479,7 @@
         {
             foreach (var structure in structures)
             {
-                var calculation = new HeightStructuresCalculation
+                var calculation = new StructuresCalculation<HeightStructuresInput>
                 {
                     Name = NamingHelper.GetUniqueName(calculations, structure.Name, c => c.Name),
                     InputParameters =
@@ -496,18 +497,18 @@
             var parentGroupContext = (HeightStructuresCalculationGroupContext) parentNodeData;
 
             parentGroupContext.WrappedData.Children.Remove(context.WrappedData);
-            foreach (var calculation in context.WrappedData.GetCalculations().Cast<HeightStructuresCalculation>())
+            foreach (var calculation in context.WrappedData.GetCalculations().Cast<StructuresCalculation<HeightStructuresInput>>())
             {
                 HeightStructuresHelper.Delete(context.FailureMechanism.SectionResults,
                                               calculation,
-                                              context.FailureMechanism.Calculations.Cast<HeightStructuresCalculation>());
+                                              context.FailureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
             }
             parentGroupContext.NotifyObservers();
         }
 
         private static void AddCalculation(HeightStructuresCalculationGroupContext context)
         {
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
             };
@@ -522,7 +523,7 @@
 
         private void CalculateAll(CalculationGroup group, HeightStructuresCalculationGroupContext context)
         {
-            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<HeightStructuresCalculation>(), context.AssessmentSection);
+            CalculateAll(context.FailureMechanism, group.GetCalculations().OfType<StructuresCalculation<HeightStructuresInput>>(), context.AssessmentSection);
         }
 
         #endregion
@@ -556,7 +557,7 @@
         {
             var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl));
 
-            HeightStructuresCalculation calculation = context.WrappedData;
+            StructuresCalculation<HeightStructuresInput> calculation = context.WrappedData;
 
             return builder.AddValidateCalculationItem(
                 context,
@@ -580,7 +581,7 @@
             return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism);
         }
 
-        private void Calculate(HeightStructuresCalculation calculation, HeightStructuresCalculationContext context)
+        private void Calculate(StructuresCalculation<HeightStructuresInput> calculation, HeightStructuresCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow, new HeightStructuresCalculationActivity(calculation,
                                                                                                      Path.GetDirectoryName(context.AssessmentSection.HydraulicBoundaryDatabase.FilePath),
@@ -594,7 +595,7 @@
             if (calculationGroupContext != null)
             {
                 calculationGroupContext.WrappedData.Children.Remove(context.WrappedData);
-                HeightStructuresHelper.Delete(context.FailureMechanism.SectionResults, context.WrappedData, context.FailureMechanism.Calculations.Cast<HeightStructuresCalculation>());
+                HeightStructuresHelper.Delete(context.FailureMechanism.SectionResults, context.WrappedData, context.FailureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
                 calculationGroupContext.NotifyObservers();
             }
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs
===================================================================
diff -u -r5dcbf2204ef1f29a353b60657e0cb830db7af73b -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision 5dcbf2204ef1f29a353b60657e0cb830db7af73b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -23,6 +23,7 @@
 using Core.Common.Base.Service;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Utils;
 using Ringtoets.HydraRing.Calculation.Activities;
@@ -34,7 +35,7 @@
     /// </summary>
     public class HeightStructuresCalculationActivity : HydraRingActivityBase
     {
-        private readonly HeightStructuresCalculation calculation;
+        private readonly StructuresCalculation<HeightStructuresInput> calculation;
         private readonly string hlcdDirectory;
         private readonly HeightStructuresFailureMechanism failureMechanism;
         private readonly IAssessmentSection assessmentSection;
@@ -48,7 +49,7 @@
         /// <param name="failureMechanism">The failure mechanism the calculation belongs to.</param>
         /// <param name="assessmentSection">The assessment section the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
-        public HeightStructuresCalculationActivity(HeightStructuresCalculation calculation, string hlcdDirectory,
+        public HeightStructuresCalculationActivity(StructuresCalculation<HeightStructuresInput> calculation, string hlcdDirectory,
                                                    HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
         {
             if (calculation == null)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r1a6804681b0758a5761e39099e4b6de65f9cf4a2 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 1a6804681b0758a5761e39099e4b6de65f9cf4a2)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using log4net;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Service;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Service.Properties;
@@ -55,10 +56,10 @@
         /// Performs validation over the values on the given <paramref name="calculation"/>. Error and status information is logged during
         /// the execution of the operation.
         /// </summary>
-        /// <param name="calculation">The <see cref="HeightStructuresCalculation"/> for which to validate the values.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> for which to validate the values.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> for which to validate the values.</param>
         /// <returns><c>True</c>c> if <paramref name="calculation"/> has no validation errors; <c>False</c>c> otherwise.</returns>
-        public bool Validate(HeightStructuresCalculation calculation, IAssessmentSection assessmentSection)
+        public bool Validate(StructuresCalculation<HeightStructuresInput> calculation, IAssessmentSection assessmentSection)
         {
             CalculationServiceHelper.LogValidationBeginTime(calculation.Name);
 
@@ -83,16 +84,16 @@
         }
 
         /// <summary>
-        /// Performs a height structures calculation based on the supplied <see cref="HeightStructuresCalculation"/> and sets <see cref="HeightStructuresCalculation.Output"/>
+        /// Performs a height structures calculation based on the supplied <see cref="StructuresCalculation{T}"/> and sets <see cref="StructuresCalculation{T}.Output"/>
         /// if the calculation was successful. Error and status information is logged during the execution of the operation.
         /// </summary>
-        /// <param name="calculation">The <see cref="HeightStructuresCalculation"/> that holds all the information required to perform the calculation.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> that holds all the information required to perform the calculation.</param>
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> that holds information about the norm used in the calculation.</param>
         /// <param name="failureMechanismSection">The <see cref="FailureMechanismSection"/> to create input with.</param>
         /// <param name="generalInput">The <see cref="GeneralHeightStructuresInput"/> to create the input with for the calculation.</param>
         /// <param name="failureMechanismContribution">The amount of contribution for this failure mechanism in the assessment section.</param>
         /// <param name="hlcdDirectory">The directory of the HLCD file that should be used for performing the calculation.</param>
-        internal void Calculate(HeightStructuresCalculation calculation,
+        internal void Calculate(StructuresCalculation<HeightStructuresInput> calculation,
                                 IAssessmentSection assessmentSection,
                                 FailureMechanismSection failureMechanismSection,
                                 GeneralHeightStructuresInput generalInput,
@@ -134,7 +135,7 @@
             }
         }
 
-        private static StructuresOvertoppingCalculationInput CreateInput(HeightStructuresCalculation calculation, FailureMechanismSection failureMechanismSection, GeneralHeightStructuresInput generalInput)
+        private static StructuresOvertoppingCalculationInput CreateInput(StructuresCalculation<HeightStructuresInput> calculation, FailureMechanismSection failureMechanismSection, GeneralHeightStructuresInput generalInput)
         {
             return new StructuresOvertoppingCalculationInput(
                 calculation.InputParameters.HydraulicBoundaryLocation.Id,
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs
===================================================================
diff -u -r1f2e8750b43af706757de6251ce5b6ac2dabea29 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs	(.../HeightStructuresDataSynchronizationService.cs)	(revision 1f2e8750b43af706757de6251ce5b6ac2dabea29)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs	(.../HeightStructuresDataSynchronizationService.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -24,6 +24,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using Core.Common.Utils.Extensions;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HydraRing.Data;
 
@@ -43,15 +44,15 @@
         /// clearing the output.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<HeightStructuresCalculation> ClearAllCalculationOutput(HeightStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<HeightStructuresInput>> ClearAllCalculationOutput(HeightStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
             var affectedItems = failureMechanism.Calculations
-                                                .Cast<HeightStructuresCalculation>()
+                                                .Cast<StructuresCalculation<HeightStructuresInput>>()
                                                 .Where(c => c.HasOutput)
                                                 .ToArray();
 
@@ -61,13 +62,13 @@
         }
 
         /// <summary>
-        /// Clears the output of the given <see cref="HeightStructuresCalculation"/>.
+        /// Clears the output of the given <see cref="StructuresCalculation{T}"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="HeightStructuresCalculation"/> to clear
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> to clear
         /// the output for.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculation"/>
         /// is <c>null</c>.</exception>
-        public static void ClearCalculationOutput(HeightStructuresCalculation calculation)
+        public static void ClearCalculationOutput(StructuresCalculation<HeightStructuresInput> calculation)
         {
             if (calculation == null)
             {
@@ -87,15 +88,15 @@
         /// removing <see cref="HydraulicBoundaryLocation"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<HeightStructuresCalculation> ClearHydraulicBoundaryLocations(HeightStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<HeightStructuresInput>> ClearHydraulicBoundaryLocations(HeightStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
             var affectedItems = failureMechanism.Calculations
-                                                .Cast<HeightStructuresCalculation>()
+                                                .Cast<StructuresCalculation<HeightStructuresInput>>()
                                                 .Where(c => c.InputParameters.HydraulicBoundaryLocation != null)
                                                 .ToArray();
 
@@ -114,16 +115,16 @@
         /// removing data.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/>
         /// is <c>null</c>.</exception>
-        public static IEnumerable<HeightStructuresCalculation> ClearAllCalculationOutputAndHydraulicBoundaryLocations(HeightStructuresFailureMechanism failureMechanism)
+        public static IEnumerable<StructuresCalculation<HeightStructuresInput>> ClearAllCalculationOutputAndHydraulicBoundaryLocations(HeightStructuresFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
                 throw new ArgumentNullException("failureMechanism");
             }
 
-            Collection<HeightStructuresCalculation> affectedItems = new Collection<HeightStructuresCalculation>();
+            var affectedItems = new Collection<StructuresCalculation<HeightStructuresInput>>();
 
-            foreach (var calculation in failureMechanism.Calculations.Cast<HeightStructuresCalculation>())
+            foreach (var calculation in failureMechanism.Calculations.Cast<StructuresCalculation<HeightStructuresInput>>())
             {
                 var calculationChanged = false;
 
@@ -148,7 +149,7 @@
             return affectedItems;
         }
 
-        private static void ClearHydraulicBoundaryLocation(HeightStructuresCalculation calculation)
+        private static void ClearHydraulicBoundaryLocation(StructuresCalculation<HeightStructuresInput> calculation)
         {
             calculation.InputParameters.HydraulicBoundaryLocation = null;
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Utils/HeightStructuresHelper.cs
===================================================================
diff -u -r53785e0fd2752f08a43b649e0c4cd56955ec374d -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Utils/HeightStructuresHelper.cs	(.../HeightStructuresHelper.cs)	(revision 53785e0fd2752f08a43b649e0c4cd56955ec374d)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Utils/HeightStructuresHelper.cs	(.../HeightStructuresHelper.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -24,19 +24,20 @@
 using System.Linq;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Utils;
 using Ringtoets.HeightStructures.Data;
 
 namespace Ringtoets.HeightStructures.Utils
 {
     /// <summary>
     /// Class holds helper methods to match <see cref="FailureMechanismSection"/> objects 
-    /// with <see cref="HeightStructuresCalculation"/> objects. 
+    /// with <see cref="StructuresCalculation{T}"/> objects. 
     /// </summary>
     public static class HeightStructuresHelper
     {
         /// <summary>
-        /// Determine which <see cref="HeightStructuresCalculation"/> objects are available for a
+        /// Determine which <see cref="StructuresCalculation{T}"/> objects are available for a
         /// <see cref="FailureMechanismSection"/>.
         /// </summary>
         /// <param name="sections">The <see cref="FailureMechanismSection"/> objects.</param>
@@ -49,23 +50,23 @@
         /// <exception cref="ArgumentException">Thrown when an element in <paramref name="sections"/> is 
         /// <c>null</c>.</exception>
         public static Dictionary<string, IList<ICalculation>> CollectCalculationsPerSection(IEnumerable<FailureMechanismSection> sections,
-                                                                                            IEnumerable<HeightStructuresCalculation> calculations)
+                                                                                            IEnumerable<StructuresCalculation<HeightStructuresInput>> calculations)
         {
             return AssignUnassignCalculations.CollectCalculationsPerSection(sections, AsCalculationsWithLocations(calculations));
         }
 
         /// <summary>
-        /// Determine which <see cref="FailureMechanismSection"/> geometrically contains the <see cref="HeightStructuresCalculation"/>.
+        /// Determine which <see cref="FailureMechanismSection"/> geometrically contains the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
         /// <param name="sections">The <see cref="FailureMechanismSection"/> objects 
         /// whose <see cref="FailureMechanismSection"/> are considered.</param>
-        /// <param name="calculation">The <see cref="HeightStructuresCalculation"/>.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/>.</param>
         /// <returns>The containing <see cref="FailureMechanismSection"/>, or <c>null</c> if none found.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sections"/> is <c>null</c></exception>
         /// <exception cref="ArgumentException">Thrown when an element in <paramref name="sections"/> is <c>null</c>.
         /// </exception>
         public static FailureMechanismSection FailureMechanismSectionForCalculation(IEnumerable<FailureMechanismSection> sections,
-                                                                                    HeightStructuresCalculation calculation)
+                                                                                    StructuresCalculation<HeightStructuresInput> calculation)
         {
             CalculationWithLocation calculationWithLocation = AsCalculationWithLocation(calculation);
             if (calculationWithLocation != null)
@@ -80,13 +81,13 @@
         /// <paramref name="calculation"/> assigned, or should have the <paramref name="calculation"/> assigned.
         /// </summary>
         /// <param name="sectionResults">The <see cref="IEnumerable{T}"/> of <see cref="HeightStructuresFailureMechanismSectionResult"/> to iterate while 
-        /// possibly updating the <see cref="HeightStructuresCalculation"/> assigned to it.</param>
-        /// <param name="calculation">The <see cref="HeightStructuresCalculation"/> which has a location that has been updated.</param>
+        /// possibly updating the <see cref="StructuresCalculation{T}"/> assigned to it.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> which has a location that has been updated.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="sectionResults"/> is <c>null</c></exception>
         /// <exception cref="ArgumentException">Thrown when element in <paramref name="sectionResults"/> is 
         /// <c>null</c>.</exception>
         public static void Update(IEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults,
-                                  HeightStructuresCalculation calculation)
+                                  StructuresCalculation<HeightStructuresInput> calculation)
         {
             ValidateSectionResults(sectionResults);
 
@@ -103,16 +104,16 @@
         /// </summary>
         /// <param name="sectionResults">The <see cref="IEnumerable{T}"/> of <see cref="HeightStructuresFailureMechanismSectionResult"/> to iterate while 
         /// removing the reference to the <paramref name="calculation"/> if present.</param>
-        /// <param name="calculation">The <see cref="HeightStructuresCalculation"/> which has a location that has been updated.</param>
-        /// <param name="calculations">The <see cref="IEnumerable{T}"/> of <see cref="HeightStructuresCalculation"/> that were left after removing
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> which has a location that has been updated.</param>
+        /// <param name="calculations">The <see cref="IEnumerable{T}"/> of <see cref="StructuresCalculation{T}"/> that were left after removing
         /// <paramref name="calculation"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c> or when an element 
         /// in <paramref name="calculations"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when element in <paramref name="sectionResults"/> is 
         /// <c>null</c>.</exception>
         public static void Delete(IEnumerable<HeightStructuresFailureMechanismSectionResult> sectionResults,
-                                  HeightStructuresCalculation calculation,
-                                  IEnumerable<HeightStructuresCalculation> calculations)
+                                  StructuresCalculation<HeightStructuresInput> calculation,
+                                  IEnumerable<StructuresCalculation<HeightStructuresInput>> calculations)
         {
             ValidateSectionResults(sectionResults);
 
@@ -126,11 +127,11 @@
         /// Transforms the <paramref name="calculations"/> into <see cref="CalculationWithLocation"/> and filter out the calculations
         /// for which a <see cref="CalculationWithLocation"/> could not be made.
         /// </summary>
-        /// <param name="calculations">The <see cref="HeightStructuresCalculation"/> collection to transform.</param>
+        /// <param name="calculations">The <see cref="StructuresCalculation{T}"/> collection to transform.</param>
         /// <returns>A collection of <see cref="CalculationWithLocation"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/> is <c>null</c> or when
         /// an element in <paramref name="calculations"/> is <c>null</c>.</exception>
-        private static IEnumerable<CalculationWithLocation> AsCalculationsWithLocations(IEnumerable<HeightStructuresCalculation> calculations)
+        private static IEnumerable<CalculationWithLocation> AsCalculationsWithLocations(IEnumerable<StructuresCalculation<HeightStructuresInput>> calculations)
         {
             if (calculations == null)
             {
@@ -151,7 +152,7 @@
             }
         }
 
-        private static CalculationWithLocation AsCalculationWithLocation(HeightStructuresCalculation calculation)
+        private static CalculationWithLocation AsCalculationWithLocation(StructuresCalculation<HeightStructuresInput> calculation)
         {
             if (calculation == null)
             {
@@ -169,7 +170,7 @@
             return new SectionResultWithCalculationAssignment(
                 failureMechanismSectionResult,
                 result => ((HeightStructuresFailureMechanismSectionResult) result).Calculation,
-                (result, calculation) => ((HeightStructuresFailureMechanismSectionResult) result).Calculation = (HeightStructuresCalculation) calculation);
+                (result, calculation) => ((HeightStructuresFailureMechanismSectionResult)result).Calculation = (StructuresCalculation<HeightStructuresInput>)calculation);
         }
     }
 }
\ No newline at end of file
Fisheye: Tag ab20c4eb4ca81bd3845d50210d2bdb301177af6a refers to a dead (removed) revision in file `Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs
===================================================================
diff -u -rd9c981f7b4c64d16e55fca0cb51eb9f4c9aec28f -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs	(.../HeightStructuresFailureMechanismSectionResultTest.cs)	(revision d9c981f7b4c64d16e55fca0cb51eb9f4c9aec28f)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismSectionResultTest.cs	(.../HeightStructuresFailureMechanismSectionResultTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -23,6 +23,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.HeightStructures.Data.Test
 {
@@ -56,7 +57,7 @@
 
             var result = new HeightStructuresFailureMechanismSectionResult(section);
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             result.Calculation = calculation;
@@ -91,7 +92,7 @@
 
             var result = new HeightStructuresFailureMechanismSectionResult(section)
             {
-                Calculation = new HeightStructuresCalculation
+                Calculation = new StructuresCalculation<HeightStructuresInput>
                 {
                     Output = new ProbabilityAssessmentOutput(1.0, 1.0, double.NaN, 1.0, 1.0)
                 }
@@ -113,7 +114,7 @@
             double probability = 0.65;
             var result = new HeightStructuresFailureMechanismSectionResult(section)
             {
-                Calculation = new HeightStructuresCalculation
+                Calculation = new StructuresCalculation<HeightStructuresInput>
                 {
                     Output = new ProbabilityAssessmentOutput(1.0, 1.0, probability, 1.0, 1.0)
                 }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -rcd4c32e6c897ceff2c5ae483e3bfb586ab9b6598 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision cd4c32e6c897ceff2c5ae483e3bfb586ab9b6598)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.HeightStructures.Data.Test
 {
@@ -110,9 +111,9 @@
                     Children =
                     {
                         new CalculationGroup(),
-                        new HeightStructuresCalculation(),
+                        new StructuresCalculation<HeightStructuresInput>(),
                         mocks.StrictMock<ICalculation>(),
-                        new HeightStructuresCalculation()
+                        new StructuresCalculation<HeightStructuresInput>()
                     }
                 }
             };
@@ -124,7 +125,7 @@
 
             // Assert
             Assert.AreEqual(2, calculations.Count);
-            Assert.IsTrue(calculations.All(c => c is HeightStructuresCalculation));
+            Assert.IsTrue(calculations.All(c => c is StructuresCalculation<HeightStructuresInput>));
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/Ringtoets.HeightStructures.Data.Test.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/Ringtoets.HeightStructures.Data.Test.csproj	(.../Ringtoets.HeightStructures.Data.Test.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/Ringtoets.HeightStructures.Data.Test.csproj	(.../Ringtoets.HeightStructures.Data.Test.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -53,7 +53,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="GeneralHeightStructuresInputTest.cs" />
-    <Compile Include="HeightStructuresCalculationTest.cs" />
     <Compile Include="HeightStructuresFailureMechanismSectionResultTest.cs" />
     <Compile Include="HeightStructuresFailureMechanismTest.cs" />
     <Compile Include="HeightStructuresInputTest.cs" />
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/TestHeightStructuresCalculationTest.cs
===================================================================
diff -u -rc3c2bba57ff003c569aefa73e42ac6122fcf5bfa -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/TestHeightStructuresCalculationTest.cs	(.../TestHeightStructuresCalculationTest.cs)	(revision c3c2bba57ff003c569aefa73e42ac6122fcf5bfa)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil.Test/TestHeightStructuresCalculationTest.cs	(.../TestHeightStructuresCalculationTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.HeightStructures.Data.TestUtil.Test
 {
@@ -33,7 +34,7 @@
             var calculation = new TestHeightStructuresCalculation();
 
             // Assert
-            Assert.IsInstanceOf<HeightStructuresCalculation>(calculation);
+            Assert.IsInstanceOf<StructuresCalculation<HeightStructuresInput>>(calculation);
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
             Assert.IsNull(calculation.Comments);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructuresCalculation.cs
===================================================================
diff -u -r589d56ba6dc9217ff4b68ea15df5a513576a25d1 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructuresCalculation.cs	(.../TestHeightStructuresCalculation.cs)	(revision 589d56ba6dc9217ff4b68ea15df5a513576a25d1)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/TestHeightStructuresCalculation.cs	(.../TestHeightStructuresCalculation.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -20,10 +20,11 @@
 // All rights reserved.
 
 using Core.Common.Base.Data;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.HeightStructures.Data.TestUtil
 {
-    public class TestHeightStructuresCalculation : HeightStructuresCalculation
+    public class TestHeightStructuresCalculation : StructuresCalculation<HeightStructuresInput>
     {
         public TestHeightStructuresCalculation()
         {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -22,6 +22,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -39,15 +40,15 @@
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             // Call
             var context = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismItemContextBase<HeightStructuresCalculation, HeightStructuresFailureMechanism>>(context);
-            Assert.IsInstanceOf<ICalculationContext<HeightStructuresCalculation, HeightStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<ICalculationContext<StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>>(context);
             Assert.AreEqual(calculation, context.WrappedData);
             Assert.AreEqual(failureMechanism, context.FailureMechanism);
             Assert.AreEqual(assessmentSectionMock, context.AssessmentSection);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs
===================================================================
diff -u -r7823eab06c968c167d9d5b24a30acaa344478dc0 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs	(.../HeightStructuresInputContextTest.cs)	(revision 7823eab06c968c167d9d5b24a30acaa344478dc0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresInputContextTest.cs	(.../HeightStructuresInputContextTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -22,6 +22,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -40,7 +41,7 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var failureMechanism = new HeightStructuresFailureMechanism();
 
             // Call
@@ -50,7 +51,7 @@
                                                            assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<InputContextBase<HeightStructuresInput, HeightStructuresCalculation, HeightStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<InputContextBase<HeightStructuresInput, StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation.InputParameters, context.WrappedData);
             Assert.AreSame(calculation, context.Calculation);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r7823eab06c968c167d9d5b24a30acaa344478dc0 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 7823eab06c968c167d9d5b24a30acaa344478dc0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -33,6 +33,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PropertyClasses;
@@ -80,7 +81,7 @@
             var properties = new HeightStructuresInputContextProperties();
 
             // Assert
-            Assert.IsInstanceOf<StructuresInputBaseProperties<HeightStructure, HeightStructuresInput, HeightStructuresCalculation, HeightStructuresFailureMechanism>>(properties);
+            Assert.IsInstanceOf<StructuresInputBaseProperties<HeightStructure, HeightStructuresInput, StructuresCalculation<HeightStructuresInput>, HeightStructuresFailureMechanism>>(properties);
             Assert.IsNull(properties.Data);
         }
 
@@ -92,7 +93,7 @@
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var properties = new HeightStructuresInputContextProperties();
 
             var inputContext = new HeightStructuresInputContext(calculation.InputParameters,
@@ -154,7 +155,7 @@
                     new TestHeightStructure()
                 }
             };
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -219,7 +220,7 @@
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var input = calculation.InputParameters;
             input.Attach(observerMock);
             var inputContext = new HeightStructuresInputContext(input,
@@ -269,7 +270,7 @@
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var inputContext = new HeightStructuresInputContext(calculation.InputParameters,
                                                                 calculation,
                                                                 failureMechanism,
@@ -300,7 +301,7 @@
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var inputContext = new HeightStructuresInputContext(calculation.InputParameters,
                                                                 calculation,
                                                                 failureMechanism,
@@ -329,7 +330,7 @@
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var inputContext = new HeightStructuresInputContext(calculation.InputParameters,
                                                                 calculation,
                                                                 failureMechanism,
@@ -358,7 +359,7 @@
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var inputContext = new HeightStructuresInputContext(calculation.InputParameters,
                                                                 calculation,
                                                                 failureMechanism,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8245c9add5586e4e544ab41195fb0af2b2a459e9 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 8245c9add5586e4e544ab41195fb0af2b2a459e9)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -39,6 +39,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
@@ -118,7 +119,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             // Call
@@ -146,7 +147,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -178,7 +179,7 @@
             var guiMock = mocks.StrictMock<IGui>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
@@ -217,7 +218,7 @@
             var guiMock = mocks.StrictMock<IGui>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -262,7 +263,7 @@
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
             var guiMock = mocks.StrictMock<IGui>();
@@ -302,7 +303,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -340,7 +341,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -389,7 +390,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -420,7 +421,7 @@
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
             var guiMock = mocks.StrictMock<IGui>();
@@ -460,7 +461,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -498,7 +499,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -547,7 +548,7 @@
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
@@ -730,7 +731,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var elementToBeRemoved = new HeightStructuresCalculation();
+            var elementToBeRemoved = new StructuresCalculation<HeightStructuresInput>();
             var observerMock = mocks.StrictMock<IObserver>();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var calculationContext = new HeightStructuresCalculationContext(elementToBeRemoved,
@@ -745,7 +746,7 @@
             mocks.ReplayAll();
 
             group.Children.Add(elementToBeRemoved);
-            group.Children.Add(new HeightStructuresCalculation());
+            group.Children.Add(new StructuresCalculation<HeightStructuresInput>());
             group.Attach(observerMock);
 
             // Precondition
@@ -766,7 +767,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var elementToBeRemoved = new HeightStructuresCalculation();
+            var elementToBeRemoved = new StructuresCalculation<HeightStructuresInput>();
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var calculationContext = new HeightStructuresCalculationContext(elementToBeRemoved,
                                                                             failureMechanism,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r176feef0b55aa8f7a7ebd229d7da1a679ce54303 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 176feef0b55aa8f7a7ebd229d7da1a679ce54303)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -38,6 +38,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
@@ -141,7 +142,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var group = new CalculationGroup();
             var childGroup = new CalculationGroup();
-            var childCalculation = new HeightStructuresCalculation();
+            var childCalculation = new StructuresCalculation<HeightStructuresInput>();
 
             group.Children.Add(childGroup);
             group.Children.Add(calculationItemMock);
@@ -414,7 +415,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -452,7 +453,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -461,7 +462,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
@@ -499,7 +500,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -508,7 +509,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
@@ -548,7 +549,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -565,7 +566,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
@@ -606,7 +607,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -644,7 +645,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -653,7 +654,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
 
@@ -691,7 +692,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -700,7 +701,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
@@ -740,7 +741,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation()
+                    new StructuresCalculation<HeightStructuresInput>()
                 }
             };
 
@@ -757,7 +758,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
             var nodeData = new HeightStructuresCalculationGroupContext(group,
@@ -1007,7 +1008,7 @@
             var nodeData = new HeightStructuresCalculationGroupContext(group,
                                                                        failureMechanism,
                                                                        assessmentSectionStub);
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = "Nieuwe berekening"
             };
@@ -1035,7 +1036,7 @@
                     // Assert
                     Assert.AreEqual(2, group.Children.Count);
                     var newlyAddedItem = group.Children.Last();
-                    Assert.IsInstanceOf<HeightStructuresCalculation>(newlyAddedItem);
+                    Assert.IsInstanceOf<StructuresCalculation<HeightStructuresInput>>(newlyAddedItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
                 }
@@ -1093,7 +1094,7 @@
                     contextMenu.Items[contextGenerateCalculationsIndexRootGroup].PerformClick();
 
                     // Then
-                    var heightStructuresCalculations = failureMechanism.Calculations.OfType<HeightStructuresCalculation>().ToArray();
+                    var heightStructuresCalculations = failureMechanism.Calculations.OfType<StructuresCalculation<HeightStructuresInput>>().ToArray();
                     Assert.AreEqual(1, heightStructuresCalculations.Length);
                     Assert.AreSame(structure1, heightStructuresCalculations[0].InputParameters.Structure);
                 }
@@ -1151,7 +1152,7 @@
                     contextMenu.Items[contextGenerateCalculationsIndexRootGroup].PerformClick();
 
                     // Then
-                    Assert.AreEqual(0, failureMechanism.Calculations.OfType<HeightStructuresCalculation>().Count());
+                    Assert.AreEqual(0, failureMechanism.Calculations.OfType<StructuresCalculation<HeightStructuresInput>>().Count());
                 }
             }
         }
@@ -1177,7 +1178,7 @@
                     {
                         Children =
                         {
-                            new HeightStructuresCalculation
+                            new StructuresCalculation<HeightStructuresInput>
                             {
                                 Name = existingCalculationName
                             }
@@ -1218,7 +1219,7 @@
                     contextMenu.Items[contextGenerateCalculationsIndexRootGroup].PerformClick();
 
                     // Then
-                    var heightStructuresCalculations = failureMechanism.Calculations.OfType<HeightStructuresCalculation>().ToArray();
+                    var heightStructuresCalculations = failureMechanism.Calculations.OfType<StructuresCalculation<HeightStructuresInput>>().ToArray();
                     Assert.AreEqual(2, heightStructuresCalculations.Length);
                     Assert.AreEqual(expectedNewName, heightStructuresCalculations[1].Name);
                 }
@@ -1282,7 +1283,7 @@
                 new Point2D(0, 0)
             }));
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
             group.Children.Add(calculation);
             failureMechanism.SectionResults.First().Calculation = calculation;
 
@@ -1308,7 +1309,7 @@
             var parentNodeData = new HeightStructuresCalculationGroupContext(parentGroup,
                                                                              failureMechanism,
                                                                              assessmentSectionStub);
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             observerMock.Expect(o => o.UpdateObserver());
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r176feef0b55aa8f7a7ebd229d7da1a679ce54303 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 176feef0b55aa8f7a7ebd229d7da1a679ce54303)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -36,6 +36,7 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
@@ -401,7 +402,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -439,7 +440,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
 
@@ -477,7 +478,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -517,7 +518,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
@@ -559,7 +560,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -597,7 +598,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
 
@@ -635,7 +636,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -675,7 +676,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>());
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7823eab06c968c167d9d5b24a30acaa344478dc0 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision 7823eab06c968c167d9d5b24a30acaa344478dc0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Plugin;
@@ -91,7 +92,7 @@
             var assessmentSectionStub = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var heightStructuresCalculation = new HeightStructuresCalculation();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 heightStructuresCalculation.InputParameters,
                 heightStructuresCalculation,
@@ -112,7 +113,7 @@
             var assessmentSectionStub = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var heightStructuresCalculation = new HeightStructuresCalculation();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 heightStructuresCalculation.InputParameters,
                 heightStructuresCalculation,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenarioRowTest.cs
===================================================================
diff -u -rc899b9042ee83f3ac6d6213515d7edacfbe8c414 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenarioRowTest.cs	(.../HeightStructuresScenarioRowTest.cs)	(revision c899b9042ee83f3ac6d6213515d7edacfbe8c414)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenarioRowTest.cs	(.../HeightStructuresScenarioRowTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.Views;
@@ -51,7 +52,7 @@
             // Assert
             Assert.AreSame(sectionResult.Section.Name, row.Name);
             Assert.AreSame(sectionResult.Calculation, row.Calculation);
-            Assert.IsInstanceOf<IScenarioRow<HeightStructuresCalculation>>(row);
+            Assert.IsInstanceOf<IScenarioRow<StructuresCalculation<HeightStructuresInput>>>(row);
         }
 
         [Test]
@@ -78,7 +79,7 @@
 
             var row = new HeightStructuresScenarioRow(sectionResult);
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             row.Calculation = calculation;
@@ -107,7 +108,7 @@
 
             var row = new HeightStructuresScenarioRow(sectionResult);
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             row.Calculation = calculation;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs
===================================================================
diff -u -rc899b9042ee83f3ac6d6213515d7edacfbe8c414 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs	(.../HeightStructuresScenariosViewTest.cs)	(revision c899b9042ee83f3ac6d6213515d7edacfbe8c414)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresScenariosViewTest.cs	(.../HeightStructuresScenariosViewTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
@@ -249,8 +250,8 @@
                 view.Data = failureMechanism.CalculationsGroup;
                 view.FailureMechanism = failureMechanism;
 
-                var calculationA = (HeightStructuresCalculation) failureMechanism.CalculationsGroup.Children[0];
-                var calculationB = (HeightStructuresCalculation) failureMechanism.CalculationsGroup.Children[1];
+                var calculationA = (StructuresCalculation<HeightStructuresInput>)failureMechanism.CalculationsGroup.Children[0];
+                var calculationB = (StructuresCalculation<HeightStructuresInput>)failureMechanism.CalculationsGroup.Children[1];
 
                 calculationA.InputParameters.Structure = calculationB.InputParameters.Structure;
 
@@ -284,8 +285,8 @@
                 view.Data = failureMechanism.CalculationsGroup;
                 view.FailureMechanism = failureMechanism;
 
-                var calculationB = ((HeightStructuresCalculation) failureMechanism.CalculationsGroup.Children[1]);
-                var calculationC = new HeightStructuresCalculation
+                var calculationB = ((StructuresCalculation<HeightStructuresInput>)failureMechanism.CalculationsGroup.Children[1]);
+                var calculationC = new StructuresCalculation<HeightStructuresInput>
                 {
                     Name = "CalculationC"
                 };
@@ -347,15 +348,15 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var matchingPointA = new Point2D(0, 0);
             var matchingPointB = new Point2D(20, 20);
-            var calculationA = new HeightStructuresCalculation
+            var calculationA = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = "CalculationA",
                 InputParameters =
                 {
                     Structure = new TestHeightStructure(matchingPointA)
                 }
             };
-            var calculationB = new HeightStructuresCalculation
+            var calculationB = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = "CalculationB",
                 InputParameters =
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r1a6804681b0758a5761e39099e4b6de65f9cf4a2 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision 1a6804681b0758a5761e39099e4b6de65f9cf4a2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs	(.../HeightStructuresCalculationActivityIntegrationTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -32,6 +32,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.IO.FileImporters;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
@@ -66,7 +67,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             var activity = new HeightStructuresCalculationActivity(calculation, "", failureMechanism, assessmentSection);
 
@@ -104,7 +105,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new HeightStructuresCalculation()
+            var calculation = new StructuresCalculation<HeightStructuresInput>()
             {
                 InputParameters =
                 {
@@ -149,7 +150,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new HeightStructuresCalculation()
+            var calculation = new StructuresCalculation<HeightStructuresInput>()
             {
                 InputParameters =
                 {
@@ -648,7 +649,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs
===================================================================
diff -u -rba2eefab3569d05ed59629b5d02dc8420bc1163a -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs	(.../HeightStructuresScenariosViewIntegrationTest.cs)	(revision ba2eefab3569d05ed59629b5d02dc8420bc1163a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresScenariosViewIntegrationTest.cs	(.../HeightStructuresScenariosViewIntegrationTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.Views;
@@ -105,7 +106,7 @@
                 // Call
                 foreach (var structure in assessmentSection.HeightStructures.HeightStructures)
                 {
-                    calculationsGroup.Children.Add(new HeightStructuresCalculation
+                    calculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>
                     {
                         Name = NamingHelper.GetUniqueName(((CalculationGroup) view.Data).Children, structure.Name, c => c.Name),
                         InputParameters =
@@ -152,7 +153,7 @@
 
                 foreach (var structure in assessmentSection.HeightStructures.HeightStructures)
                 {
-                    calculationsGroup.Children.Add(new HeightStructuresCalculation
+                    calculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>
                     {
                         Name = NamingHelper.GetUniqueName(calculationsGroup.Children, structure.Name, c => c.Name),
                         InputParameters =
@@ -166,7 +167,7 @@
                 // Call
                 foreach (var calculationBase in calculationsGroup.Children)
                 {
-                    var calculation = (HeightStructuresCalculation) calculationBase;
+                    var calculation = (StructuresCalculation<HeightStructuresInput>)calculationBase;
                     calculation.Name += "_changed";
                 }
 
@@ -204,7 +205,7 @@
 
                 foreach (var structure in assessmentSection.HeightStructures.HeightStructures)
                 {
-                    assessmentSection.HeightStructures.CalculationsGroup.Children.Add(new HeightStructuresCalculation
+                    assessmentSection.HeightStructures.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>
                     {
                         Name = NamingHelper.GetUniqueName(assessmentSection.HeightStructures.CalculationsGroup.Children, structure.Name + "Calculation", c => c.Name),
                         InputParameters =
@@ -216,8 +217,8 @@
 
                 // Call
                 var calculationsGroup = assessmentSection.HeightStructures.CalculationsGroup;
-                ((HeightStructuresCalculation) calculationsGroup.Children[1]).InputParameters.Structure =
-                    ((HeightStructuresCalculation) calculationsGroup.Children[0]).InputParameters.Structure;
+                ((StructuresCalculation<HeightStructuresInput>)calculationsGroup.Children[1]).InputParameters.Structure =
+                    ((StructuresCalculation<HeightStructuresInput>)calculationsGroup.Children[0]).InputParameters.Structure;
                 calculationsGroup.NotifyObservers();
 
                 // Assert
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityTest.cs
===================================================================
diff -u -rf109332b5185b4445e2f1b9386dc1fe4063ff20f -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityTest.cs	(.../HeightStructuresCalculationActivityTest.cs)	(revision f109332b5185b4445e2f1b9386dc1fe4063ff20f)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityTest.cs	(.../HeightStructuresCalculationActivityTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -24,6 +24,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 
 namespace Ringtoets.HeightStructures.Service.Test
@@ -40,7 +41,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             var activity = new HeightStructuresCalculationActivity(calculation, "", failureMechanism, assessmentSectionMock);
@@ -82,7 +83,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             TestDelegate call = () => new HeightStructuresCalculationActivity(calculation, null, failureMechanism, assessmentSectionMock);
@@ -101,7 +102,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             TestDelegate call = () => new HeightStructuresCalculationActivity(calculation, "", null, assessmentSectionMock);
@@ -117,7 +118,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             TestDelegate call = () => new HeightStructuresCalculationActivity(calculation, "", failureMechanism, null);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r1a6804681b0758a5761e39099e4b6de65f9cf4a2 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 1a6804681b0758a5761e39099e4b6de65f9cf4a2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -32,6 +32,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
@@ -60,7 +61,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = name,
                 InputParameters =
@@ -100,7 +101,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Name = name,
                 InputParameters =
@@ -139,7 +140,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation()
+            var calculation = new TestHeightStructuresCalculation()
             {
                 Name = name,
                 InputParameters =
@@ -456,7 +457,7 @@
 
             const string name = "<very nice name>";
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation()
+            var calculation = new TestHeightStructuresCalculation()
             {
                 Name = name,
                 InputParameters =
@@ -547,7 +548,7 @@
                 new Point2D(1, 1)
             }));
 
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -611,7 +612,7 @@
                 new Point2D(1, 1)
             }));
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation
+            var calculation = new TestHeightStructuresCalculation
             {
                 InputParameters =
                 {
@@ -697,7 +698,7 @@
                 new Point2D(1, 1)
             }));
 
-            HeightStructuresCalculation calculation = new TestHeightStructuresCalculation
+            var calculation = new TestHeightStructuresCalculation
             {
                 InputParameters =
                 {
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs
===================================================================
diff -u -rfbdcde760eb5401367c8b922504819cd263d58a2 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision fbdcde760eb5401367c8b922504819cd263d58a2)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -24,6 +24,7 @@
 using System.Linq;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HydraRing.Data;
 
@@ -48,27 +49,27 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation1 = new HeightStructuresCalculation
+            var calculation1 = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation2 = new HeightStructuresCalculation
+            var calculation2 = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation3 = new HeightStructuresCalculation();
+            var calculation3 = new StructuresCalculation<HeightStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<HeightStructuresCalculation> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutput(failureMechanism);
+            IEnumerable<StructuresCalculation<HeightStructuresInput>> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutput(failureMechanism);
 
             // Assert
-            foreach (HeightStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<HeightStructuresCalculation>())
+            foreach (StructuresCalculation<HeightStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<HeightStructuresInput>>())
             {
                 Assert.IsNull(calculation.Output);
             }
@@ -94,7 +95,7 @@
         public void ClearCalculationOutput_WithCalculation_ClearsOutput()
         {
             // Setup
-            var calculation = new HeightStructuresCalculation
+            var calculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -124,33 +125,33 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
 
-            var calculation1 = new HeightStructuresCalculation
+            var calculation1 = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation2 = new HeightStructuresCalculation
+            var calculation2 = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation3 = new HeightStructuresCalculation();
+            var calculation3 = new StructuresCalculation<HeightStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<HeightStructuresCalculation> affectedItems = HeightStructuresDataSynchronizationService.ClearHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<HeightStructuresInput>> affectedItems = HeightStructuresDataSynchronizationService.ClearHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (HeightStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<HeightStructuresCalculation>())
+            foreach (StructuresCalculation<HeightStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<HeightStructuresInput>>())
             {
                 Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
             }
@@ -179,7 +180,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
 
-            var calculation1 = new HeightStructuresCalculation
+            var calculation1 = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -188,7 +189,7 @@
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation2 = new HeightStructuresCalculation
+            var calculation2 = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -197,17 +198,17 @@
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation3 = new HeightStructuresCalculation();
+            var calculation3 = new StructuresCalculation<HeightStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<HeightStructuresCalculation> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<HeightStructuresInput>> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (HeightStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<HeightStructuresCalculation>())
+            foreach (StructuresCalculation<HeightStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<HeightStructuresInput>>())
             {
                 Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
                 Assert.IsNull(calculation.Output);
@@ -226,33 +227,33 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
 
-            var calculation1 = new HeightStructuresCalculation
+            var calculation1 = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation2 = new HeightStructuresCalculation
+            var calculation2 = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 }
             };
 
-            var calculation3 = new HeightStructuresCalculation();
+            var calculation3 = new StructuresCalculation<HeightStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<HeightStructuresCalculation> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<HeightStructuresInput>> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (HeightStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<HeightStructuresCalculation>())
+            foreach (StructuresCalculation<HeightStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<HeightStructuresInput>>())
             {
                 Assert.IsNull(calculation.InputParameters.HydraulicBoundaryLocation);
             }
@@ -269,27 +270,27 @@
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var calculation1 = new HeightStructuresCalculation
+            var calculation1 = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation2 = new HeightStructuresCalculation
+            var calculation2 = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var calculation3 = new HeightStructuresCalculation();
+            var calculation3 = new StructuresCalculation<HeightStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<HeightStructuresCalculation> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<HeightStructuresInput>> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
-            foreach (HeightStructuresCalculation calculation in failureMechanism.CalculationsGroup.Children.Cast<HeightStructuresCalculation>())
+            foreach (StructuresCalculation<HeightStructuresInput> calculation in failureMechanism.CalculationsGroup.Children.Cast<StructuresCalculation<HeightStructuresInput>>())
             {
                 Assert.IsNull(calculation.Output);
             }
@@ -306,16 +307,16 @@
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            var calculation1 = new HeightStructuresCalculation();
-            var calculation2 = new HeightStructuresCalculation();
-            var calculation3 = new HeightStructuresCalculation();
+            var calculation1 = new StructuresCalculation<HeightStructuresInput>();
+            var calculation2 = new StructuresCalculation<HeightStructuresInput>();
+            var calculation3 = new StructuresCalculation<HeightStructuresInput>();
 
             failureMechanism.CalculationsGroup.Children.Add(calculation1);
             failureMechanism.CalculationsGroup.Children.Add(calculation2);
             failureMechanism.CalculationsGroup.Children.Add(calculation3);
 
             // Call
-            IEnumerable<HeightStructuresCalculation> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
+            IEnumerable<StructuresCalculation<HeightStructuresInput>> affectedItems = HeightStructuresDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(failureMechanism);
 
             // Assert
             CollectionAssert.IsEmpty(affectedItems);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs
===================================================================
diff -u -r53785e0fd2752f08a43b649e0c4cd56955ec374d -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs	(.../HeightStructuresHelperTest.cs)	(revision 53785e0fd2752f08a43b649e0c4cd56955ec374d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Utils.Test/HeightStructuresHelperTest.cs	(.../HeightStructuresHelperTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -26,6 +26,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 
@@ -43,7 +44,7 @@
             // Call
             TestDelegate test = () => HeightStructuresHelper.CollectCalculationsPerSection(
                 null,
-                new HeightStructuresCalculation[]
+                new StructuresCalculation<HeightStructuresInput>[]
                 {
                     null
                 });
@@ -92,7 +93,7 @@
             // Call
             TestDelegate test = () => HeightStructuresHelper.CollectCalculationsPerSection(
                 twoSections,
-                new HeightStructuresCalculation[]
+                new StructuresCalculation<HeightStructuresInput>[]
                 {
                     null
                 });
@@ -145,7 +146,7 @@
         public void FailureMechanismSectionForCalculation_ValidSectionWithoutCalculationStructureSet_ReturnsNull()
         {
             // Setup
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             FailureMechanismSection failureMechanismSection =
@@ -160,7 +161,7 @@
         {
             // Setup
             var emptySections = new FailureMechanismSection[0];
-            var calculation = new HeightStructuresCalculation();
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
 
             // Call
             FailureMechanismSection failureMechanismSection =
@@ -326,7 +327,7 @@
                     sectionResult
                 },
                 calculationInSectionA,
-                new HeightStructuresCalculation[]
+                new StructuresCalculation<HeightStructuresInput>[]
                 {
                     null
                 });
@@ -353,7 +354,7 @@
                     failureMechanismSectionResult
                 },
                 calculationInSectionA,
-                Enumerable.Empty<HeightStructuresCalculation>());
+                Enumerable.Empty<StructuresCalculation<HeightStructuresInput>>());
 
             // Assert
             Assert.IsNull(failureMechanismSectionResult.Calculation);
@@ -413,15 +414,15 @@
             failureMechanismSectionB
         };
 
-        private readonly HeightStructuresCalculation calculationInSectionA = new HeightStructuresCalculation
+        private readonly StructuresCalculation<HeightStructuresInput> calculationInSectionA = new StructuresCalculation<HeightStructuresInput>
         {
             InputParameters =
             {
                 Structure = new TestHeightStructure(new Point2D(1.1, 2.2))
             }
         };
 
-        private readonly HeightStructuresCalculation calculationInSectionB = new HeightStructuresCalculation
+        private readonly StructuresCalculation<HeightStructuresInput> calculationInSectionB = new StructuresCalculation<HeightStructuresInput>
         {
             InputParameters =
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -rce190360da30edf73fb464cc0fea1d9a795aa5d4 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision ce190360da30edf73fb464cc0fea1d9a795aa5d4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -31,6 +31,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.HeightStructures.Data;
@@ -91,8 +92,8 @@
             {
                 Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), 0)
             };
-            var emptyHeightStructuresCalculation = new HeightStructuresCalculation();
-            var heightStructuresCalculation = new HeightStructuresCalculation
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -203,7 +204,7 @@
 
             PipingCalculation emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             GrassCoverErosionInwardsCalculation emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
-            HeightStructuresCalculation emptyHeightStructuresCalculation = new HeightStructuresCalculation();
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
 
             assessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Add(emptyPipingCalculation);
             assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(emptyGrassCoverErosionInwardsCalculation);
@@ -282,8 +283,8 @@
             {
                 Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), 0)
             };
-            HeightStructuresCalculation emptyHeightStructuresCalculation = new HeightStructuresCalculation();
-            HeightStructuresCalculation heightStructuresCalculation = new HeightStructuresCalculation
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -369,8 +370,8 @@
             {
                 Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), 0)
             };
-            HeightStructuresCalculation emptyHeightStructuresCalculation = new HeightStructuresCalculation();
-            HeightStructuresCalculation heightStructuresCalculation = new HeightStructuresCalculation
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -451,7 +452,7 @@
 
             PipingCalculation emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             GrassCoverErosionInwardsCalculation emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
-            HeightStructuresCalculation emptyHeightStructuresCalculation = new HeightStructuresCalculation();
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
 
             assessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Add(emptyPipingCalculation);
             assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(emptyGrassCoverErosionInwardsCalculation);
@@ -507,7 +508,7 @@
 
             PipingCalculation emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             GrassCoverErosionInwardsCalculation emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
-            HeightStructuresCalculation emptyHeightStructuresCalculation = new HeightStructuresCalculation();
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
 
             assessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Add(emptyPipingCalculation);
             assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(emptyGrassCoverErosionInwardsCalculation);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HeightStructures.Data;
@@ -73,8 +74,8 @@
                 Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), 0)
             };
 
-            var emptyHeightStructuresCalculation = new HeightStructuresCalculation();
-            var heightStructuresCalculation = new HeightStructuresCalculation
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -186,12 +187,12 @@
         {
             // Setup
             var failureMechanism1 = new HeightStructuresFailureMechanism();
-            failureMechanism1.CalculationsGroup.Children.Add(new HeightStructuresCalculation
+            failureMechanism1.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             });
             var failureMechanism2 = new HeightStructuresFailureMechanism();
-            failureMechanism2.CalculationsGroup.Children.Add(new HeightStructuresCalculation
+            failureMechanism2.CalculationsGroup.Children.Add(new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             });
@@ -209,8 +210,8 @@
             IEnumerable<ICalculation> affectedItems = RingtoetsDataSynchronizationService.ClearFailureMechanismCalculationOutputs(assessmentSection);
 
             // Assert
-            HeightStructuresCalculation calculation1 = (HeightStructuresCalculation) failureMechanism1.CalculationsGroup.Children[0];
-            HeightStructuresCalculation calculation2 = (HeightStructuresCalculation) failureMechanism2.CalculationsGroup.Children[0];
+            StructuresCalculation<HeightStructuresInput> calculation1 = (StructuresCalculation<HeightStructuresInput>)failureMechanism1.CalculationsGroup.Children[0];
+            StructuresCalculation<HeightStructuresInput> calculation2 = (StructuresCalculation<HeightStructuresInput>)failureMechanism2.CalculationsGroup.Children[0];
             Assert.IsNull(calculation1.Output);
             Assert.IsNull(calculation2.Output);
             CollectionAssert.AreEqual(new[]
@@ -259,8 +260,8 @@
                 Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), 0)
             };
 
-            var emptyHeightStructuresCalculation = new HeightStructuresCalculation();
-            var heightStructuresCalculation = new HeightStructuresCalculation
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -365,8 +366,8 @@
                 }
             };
 
-            var emptyHeightStructuresCalculation = new HeightStructuresCalculation();
-            var heightStructuresCalculation = new HeightStructuresCalculation
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>
             {
                 InputParameters =
                 {
@@ -453,8 +454,8 @@
                 Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), 0)
             };
 
-            var emptyHeightStructuresCalculation = new HeightStructuresCalculation();
-            var heightStructuresCalculation = new HeightStructuresCalculation
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
+            var heightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -519,7 +520,7 @@
 
             var emptyPipingCalculation = new PipingCalculation(new GeneralPipingInput());
             var emptyGrassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
-            var emptyHeightStructuresCalculation = new HeightStructuresCalculation();
+            var emptyHeightStructuresCalculation = new StructuresCalculation<HeightStructuresInput>();
             var emptyStabilityStoneCoverWaveConditionsCalculation = new StabilityStoneCoverWaveConditionsCalculation();
             var emptyGrassCoverErosionOutwardsCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
             var emptyWaveImpactAshpaltCoverWaveConditionsCalculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj	(.../Ringtoets.StabilityPointStructures.Data.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj	(.../Ringtoets.StabilityPointStructures.Data.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -48,7 +48,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="StabilityPointStructure.cs" />
-    <Compile Include="StabilityPointStructuresCalculation.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanism.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismSectionResult.cs" />
     <Compile Include="StabilityPointStructuresInput.cs" />
Fisheye: Tag ab20c4eb4ca81bd3845d50210d2bdb301177af6a refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs
===================================================================
diff -u -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.StabilityPointStructures.Data.Properties;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -55,7 +56,7 @@
         {
             get
             {
-                return CalculationsGroup.GetCalculations().OfType<StabilityPointStructuresCalculation>();
+                return CalculationsGroup.GetCalculations().OfType<StructuresCalculation<StabilityPointStructuresInput>>();
             }
         }
 
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,26 +21,27 @@
 
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
 
 namespace Ringtoets.StabilityPointStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="StabilityPointStructuresCalculation"/>
+    /// Presentation object for all data required to configure an instance of <see cref="StructuresCalculation{T}"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class StabilityPointStructuresCalculationContext : FailureMechanismItemContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>,
-                                                              ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>
+    public class StabilityPointStructuresCalculationContext : FailureMechanismItemContextBase<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>,
+                                                              ICalculationContext<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresCalculationContext"/>.
         /// </summary>
-        /// <param name="calculation">The <see cref="StabilityPointStructuresCalculation"/> instance wrapped by this context object.</param>
+        /// <param name="calculation">The <see cref="StructuresCalculation{T}"/> instance wrapped by this context object.</param>
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public StabilityPointStructuresCalculationContext(StabilityPointStructuresCalculation calculation,
+        public StabilityPointStructuresCalculationContext(StructuresCalculation<StabilityPointStructuresInput> calculation,
                                                           StabilityPointStructuresFailureMechanism failureMechanism,
                                                           IAssessmentSection assessmentSection)
             : base(calculation, failureMechanism, assessmentSection) {}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(.../StabilityPointStructuresInputContext.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresInputContext.cs	(.../StabilityPointStructuresInputContext.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
 
@@ -41,7 +42,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
         public StabilityPointStructuresInputContext(StabilityPointStructuresInput input,
-                                                    StabilityPointStructuresCalculation calculation,
+                                                    StructuresCalculation<StabilityPointStructuresInput> calculation,
                                                     StabilityPointStructuresFailureMechanism failureMechanism,
                                                     IAssessmentSection assessmentSection)
             : base(input, failureMechanism, assessmentSection)
@@ -57,6 +58,6 @@
         /// <summary>
         /// Gets the calculation item which the context belongs to.
         /// </summary>
-        public StabilityPointStructuresCalculation Calculation { get; private set; }
+        public StructuresCalculation<StabilityPointStructuresInput> Calculation { get; private set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -r81e4be22ff8e2ea37c432625f91e986c95554297 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision 81e4be22ff8e2ea37c432625f91e986c95554297)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -30,6 +30,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TreeNodeInfos;
@@ -207,7 +208,7 @@
             return null;
         }
 
-        private static void ValidateAll(IEnumerable<StabilityPointStructuresCalculation> calculations, IAssessmentSection assessmentSection) {}
+        private static void ValidateAll(IEnumerable<StructuresCalculation<StabilityPointStructuresInput>> calculations, IAssessmentSection assessmentSection) { }
 
         private static void CalculateAll(StabilityPointStructuresFailureMechanismContext context) {}
 
@@ -273,7 +274,7 @@
                           .AddSeparator()
                           .AddValidateAllCalculationsInFailureMechanismItem(
                               failureMechanismContext,
-                              c => ValidateAll(c.WrappedData.Calculations.OfType<StabilityPointStructuresCalculation>(), c.Parent),
+                              c => ValidateAll(c.WrappedData.Calculations.OfType<StructuresCalculation<StabilityPointStructuresInput>>(), c.Parent),
                               ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
                           .AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism)
                           .AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismContext.WrappedData)
@@ -318,7 +319,7 @@
 
             foreach (ICalculationBase calculationItem in context.WrappedData.Children)
             {
-                var calculation = calculationItem as StabilityPointStructuresCalculation;
+                var calculation = calculationItem as StructuresCalculation<StabilityPointStructuresInput>;
                 var group = calculationItem as CalculationGroup;
 
                 if (calculation != null)
@@ -369,7 +370,7 @@
 
             builder.AddSeparator()
                    .AddValidateAllCalculationsInGroupItem(context,
-                                                          c => ValidateAll(c.WrappedData.GetCalculations().OfType<StabilityPointStructuresCalculation>(), c.AssessmentSection),
+                                                          c => ValidateAll(c.WrappedData.GetCalculations().OfType<StructuresCalculation<StabilityPointStructuresInput>>(), c.AssessmentSection),
                                                           ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddPerformAllCalculationsInGroupItem(group, context, CalculateAll, ValidateAllDataAvailableAndGetErrorMessageForCalculationsInGroup)
                    .AddClearAllCalculationOutputInGroupItem(group)
@@ -411,7 +412,7 @@
 
         private static void AddCalculation(StabilityPointStructuresCalculationGroupContext context)
         {
-            var calculation = new StabilityPointStructuresCalculation
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
             };
@@ -455,7 +456,7 @@
         {
             var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl));
 
-            StabilityPointStructuresCalculation calculation = context.WrappedData;
+            StructuresCalculation<StabilityPointStructuresInput> calculation = context.WrappedData;
 
             return builder.AddValidateCalculationItem(context, delegate { }, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
                           .AddPerformCalculationItem(calculation, context, Calculate, ValidateAllDataAvailableAndGetErrorMessageForCalculation)
@@ -476,7 +477,7 @@
             return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism);
         }
 
-        private static void Calculate(StabilityPointStructuresCalculation calculation, StabilityPointStructuresCalculationContext context) {}
+        private static void Calculate(StructuresCalculation<StabilityPointStructuresInput> calculation, StabilityPointStructuresCalculationContext context) { }
 
         private static void CalculationContextOnNodeRemoved(StabilityPointStructuresCalculationContext context, object parentData)
         {
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj
===================================================================
diff -u -r2b2da37541708b8ad95286e731010dd9d27d5070 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj	(.../Ringtoets.StabilityPointStructures.Data.Test.csproj)	(revision 2b2da37541708b8ad95286e731010dd9d27d5070)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/Ringtoets.StabilityPointStructures.Data.Test.csproj	(.../Ringtoets.StabilityPointStructures.Data.Test.csproj)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -54,7 +54,6 @@
     </Compile>
     <Compile Include="GeneralStabilityPointStructuresInputTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StabilityPointStructuresCalculationTest.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismSectionResultTest.cs" />
     <Compile Include="StabilityPointStructuresFailureMechanismTest.cs" />
     <Compile Include="StabilityPointStructuresInputTest.cs" />
Fisheye: Tag ab20c4eb4ca81bd3845d50210d2bdb301177af6a refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresCalculationTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs
===================================================================
diff -u -r51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -25,6 +25,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 
 namespace Ringtoets.StabilityPointStructures.Data.Test
 {
@@ -111,9 +112,9 @@
                     Children =
                     {
                         new CalculationGroup(),
-                        new StabilityPointStructuresCalculation(),
+                        new StructuresCalculation<StabilityPointStructuresInput>(),
                         mocks.Stub<ICalculation>(),
-                        new StabilityPointStructuresCalculation()
+                        new StructuresCalculation<StabilityPointStructuresInput>()
                     }
                 }
             };
@@ -125,7 +126,7 @@
 
             // Assert
             Assert.AreEqual(2, calculations.Count);
-            CollectionAssert.AllItemsAreInstancesOfType(calculations, typeof(StabilityPointStructuresCalculation));
+            CollectionAssert.AllItemsAreInstancesOfType(calculations, typeof(StructuresCalculation<StabilityPointStructuresInput>));
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationContextTest.cs	(.../StabilityPointStructuresCalculationContextTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -22,6 +22,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
@@ -39,15 +40,15 @@
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             // Call
             var context = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Assert
-            Assert.IsInstanceOf<FailureMechanismItemContextBase<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
-            Assert.IsInstanceOf<ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<FailureMechanismItemContextBase<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>>(context);
+            Assert.IsInstanceOf<ICalculationContext<StructuresCalculation<StabilityPointStructuresInput>, StabilityPointStructuresFailureMechanism>>(context);
             Assert.AreSame(calculation, context.WrappedData);
             Assert.AreSame(failureMechanism, context.FailureMechanism);
             Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs
===================================================================
diff -u -rca23b1b155ca87c0aa4665fd919727570f31c781 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(.../StabilityPointStructuresInputContextTest.cs)	(revision ca23b1b155ca87c0aa4665fd919727570f31c781)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresInputContextTest.cs	(.../StabilityPointStructuresInputContextTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -23,6 +23,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
@@ -47,7 +48,7 @@
             mocksRepository.ReplayAll();
 
             var input = new StabilityPointStructuresInput();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             // Call
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r968cbe97d1a910b9bbb0fb52b22ece65126ed675 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -37,6 +37,7 @@
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.StabilityPointStructures.Data;
@@ -112,7 +113,7 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var calculationContext = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -140,7 +141,7 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new StabilityPointStructuresCalculation
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>
             {
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
@@ -172,7 +173,7 @@
             var guiMock = mocks.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
@@ -210,7 +211,7 @@
             var guiMock = mocks.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
@@ -263,7 +264,7 @@
             // Setup
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var guiMock = mocks.StrictMock<IGui>();
 
@@ -299,7 +300,7 @@
             }));
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -336,7 +337,7 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
 
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -381,7 +382,7 @@
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
 
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -410,7 +411,7 @@
             // Setup
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var guiMock = mocks.StrictMock<IGui>();
 
@@ -446,7 +447,7 @@
             }));
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -482,7 +483,7 @@
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -526,7 +527,7 @@
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
-            var calculation = new StabilityPointStructuresCalculation();
+            var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             var nodeData = new StabilityPointStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             using (var treeViewControl = new TreeViewControl())
@@ -553,7 +554,7 @@
         {
             // Setup
             var group = new CalculationGroup();
-            var elementToBeRemoved = new StabilityPointStructuresCalculation();
+            var elementToBeRemoved = new StructuresCalculation<StabilityPointStructuresInput>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var observerMock = mocks.StrictMock<IObserver>();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
@@ -569,7 +570,7 @@
             mocks.ReplayAll();
 
             group.Children.Add(elementToBeRemoved);
-            group.Children.Add(new StabilityPointStructuresCalculation());
+            group.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             group.Attach(observerMock);
 
             // Precondition
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r968cbe97d1a910b9bbb0fb52b22ece65126ed675 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -36,6 +36,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
@@ -135,7 +136,7 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
             var group = new CalculationGroup();
             var childGroup = new CalculationGroup();
-            var childCalculation = new StabilityPointStructuresCalculation();
+            var childCalculation = new StructuresCalculation<StabilityPointStructuresInput>();
 
             group.Children.Add(childGroup);
             group.Children.Add(childCalculation);
@@ -263,7 +264,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -300,7 +301,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -309,7 +310,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = null;
@@ -347,7 +348,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -356,7 +357,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -395,7 +396,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -412,7 +413,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
@@ -453,7 +454,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -490,7 +491,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -499,7 +500,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
@@ -536,7 +537,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -545,7 +546,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -584,7 +585,7 @@
             {
                 Children =
                 {
-                    new StabilityPointStructuresCalculation()
+                    new StructuresCalculation<StabilityPointStructuresInput>()
                 }
             };
 
@@ -601,7 +602,7 @@
             {
                 new Point2D(0, 0)
             }));
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
 
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
@@ -786,7 +787,7 @@
             var nodeData = new StabilityPointStructuresCalculationGroupContext(group,
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
-            var calculationItem = new StabilityPointStructuresCalculation
+            var calculationItem = new StructuresCalculation<StabilityPointStructuresInput>
             {
                 Name = "Nieuwe berekening"
             };
@@ -814,7 +815,7 @@
                     // Assert
                     Assert.AreEqual(2, group.Children.Count);
                     var newlyAddedItem = group.Children.Last();
-                    Assert.IsInstanceOf<StabilityPointStructuresCalculation>(newlyAddedItem);
+                    Assert.IsInstanceOf<StructuresCalculation<StabilityPointStructuresInput>>(newlyAddedItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
                 }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r960caf730560a10eb725d31f3e796c371523ef53 -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 960caf730560a10eb725d31f3e796c371523ef53)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -34,6 +34,7 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.StabilityPointStructures.Data;
@@ -422,7 +423,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
 
             var nodeData = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -456,7 +457,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
             {
                 new Point2D(0, 0)
@@ -495,7 +496,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
             {
                 new Point2D(0, 0)
@@ -536,7 +537,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
             {
                 new Point2D(0, 0)
@@ -583,7 +584,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
 
             var nodeData = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -617,7 +618,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
             {
                 new Point2D(0, 0)
@@ -656,7 +657,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
             {
                 new Point2D(0, 0)
@@ -697,7 +698,7 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
-            failureMechanism.CalculationsGroup.Children.Add(new StabilityPointStructuresCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation<StabilityPointStructuresInput>());
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
             {
                 new Point2D(0, 0)
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfd1f6126ab10cbe29592671b32a81b6cabd630ec -rab20c4eb4ca81bd3845d50210d2bdb301177af6a
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresInputContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresInputContextTreeNodeInfoTest.cs)	(revision fd1f6126ab10cbe29592671b32a81b6cabd630ec)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresInputContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresInputContextTreeNodeInfoTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Structures;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Plugin;
@@ -90,7 +91,7 @@
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             var stabilityPointStructuresInputContext = new StabilityPointStructuresInputContext(
                 mocksRepository.Stub<StabilityPointStructuresInput>(),
-                mocksRepository.Stub<StabilityPointStructuresCalculation>(),
+                mocksRepository.Stub<StructuresCalculation<StabilityPointStructuresInput>>(),
                 new StabilityPointStructuresFailureMechanism(),
                 assessmentSectionMock);
 
@@ -110,7 +111,7 @@
             var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             var stabilityPointStructuresInputContext = new StabilityPointStructuresInputContext(
                 mocksRepository.Stub<StabilityPointStructuresInput>(),
-                mocksRepository.Stub<StabilityPointStructuresCalculation>(),
+                mocksRepository.Stub<StructuresCalculation<StabilityPointStructuresInput>>(),
                 new StabilityPointStructuresFailureMechanism(),
                 assessmentSectionMock);