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);