Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r4b095752c115dd672400da5a4acc1560e4c9ce2c -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 4b095752c115dd672400da5a4acc1560e4c9ce2c)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -68,7 +68,7 @@
     <Compile Include="Create\GrassCoverErosionOutwards\GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs" />
     <Compile Include="Create\HeightStructures\GeneralHeightStructuresInputCreateExtensions.cs" />
     <Compile Include="Create\HeightStructures\HeightStructureCreateExtensions.cs" />
-    <Compile Include="Create\HeightStructures\HeightStructuresCalculationCreateExtensions.cs">
+    <Compile Include="Create\StructuresCalculationCreateExtensions.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Create\ProbabilityAssessmentOutputCreateExtensions.cs" />
Fisheye: Tag 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresCalculationCreateExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresCalculationCreateExtensions.cs	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -0,0 +1,119 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Core.Common.Utils.Extensions;
+using Ringtoets.Common.Data.Structures;
+using Ringtoets.HeightStructures.Data;
+
+namespace Application.Ringtoets.Storage.Create
+{
+    /// <summary>
+    /// Extension methods for <see cref="StructuresCalculation{T}"/> related
+    /// to creating structures calculation entities.
+    /// </summary>
+    internal static class StructuresCalculationCreateExtensions
+    {
+        /// <summary>
+        /// Creates a <see cref="HeightStructuresCalculationEntity"/> based
+        /// 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 StructuresCalculation<HeightStructuresInput> calculation, PersistenceRegistry registry, int order)
+        {
+            if (registry == null)
+            {
+                throw new ArgumentNullException("registry");
+            }
+
+            var entity = new HeightStructuresCalculationEntity
+            {
+                Name = calculation.Name.DeepClone(),
+                Comments = calculation.Comments.DeepClone(),
+                Order = order
+            };
+            SetInputValues(entity, calculation.InputParameters, registry);
+
+            if (calculation.HasOutput)
+            {
+                entity.HeightStructuresOutputEntities.Add(calculation.Output.Create<HeightStructuresOutputEntity>(registry));
+            }
+
+            registry.Register(entity, calculation);
+
+            return entity;
+        }
+
+        private static void SetInputValues(HeightStructuresCalculationEntity entity, HeightStructuresInput input, PersistenceRegistry registry)
+        {
+            if (input.HydraulicBoundaryLocation != null)
+            {
+                entity.HydraulicLocationEntity = registry.Get<HydraulicLocationEntity>(input.HydraulicBoundaryLocation);
+            }
+            if (input.Structure != null)
+            {
+                entity.HeightStructureEntity = registry.Get(input.Structure);
+            }
+            if (input.ForeshoreProfile != null)
+            {
+                entity.ForeshoreProfileEntity = registry.Get(input.ForeshoreProfile);
+            }
+            entity.StructureNormalOrientation = input.StructureNormalOrientation.Value.ToNaNAsNull();
+
+            entity.ModelFactorSuperCriticalFlowMean = input.ModelFactorSuperCriticalFlow.Mean.Value.ToNaNAsNull();
+
+            entity.AllowedLevelIncreaseStorageMean = input.AllowedLevelIncreaseStorage.Mean.Value.ToNaNAsNull();
+            entity.AllowedLevelIncreaseStorageStandardDeviation = input.AllowedLevelIncreaseStorage.StandardDeviation.Value.ToNaNAsNull();
+
+            entity.StorageStructureAreaMean = input.StorageStructureArea.Mean.Value.ToNaNAsNull();
+            entity.StorageStructureAreaCoefficientOfVariation = input.StorageStructureArea.CoefficientOfVariation.Value.ToNaNAsNull();
+
+            entity.FlowWidthAtBottomProtectionMean = input.FlowWidthAtBottomProtection.Mean.Value.ToNaNAsNull();
+            entity.FlowWidthAtBottomProtectionStandardDeviation = input.FlowWidthAtBottomProtection.StandardDeviation.Value.ToNaNAsNull();
+
+            entity.CriticalOvertoppingDischargeMean = input.CriticalOvertoppingDischarge.Mean.Value.ToNaNAsNull();
+            entity.CriticalOvertoppingDischargeCoefficientOfVariation = input.CriticalOvertoppingDischarge.CoefficientOfVariation.Value.ToNaNAsNull();
+
+            entity.FailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion;
+
+            entity.WidthFlowAperturesMean = input.WidthFlowApertures.Mean.Value.ToNaNAsNull();
+            entity.WidthFlowAperturesCoefficientOfVariation = input.WidthFlowApertures.CoefficientOfVariation.Value.ToNaNAsNull();
+
+            entity.StormDurationMean = input.StormDuration.Mean.Value.ToNaNAsNull();
+
+            entity.LevelCrestStructureMean = input.LevelCrestStructure.Mean.Value.ToNaNAsNull();
+            entity.LevelCrestStructureStandardDeviation = input.LevelCrestStructure.StandardDeviation.Value.ToNaNAsNull();
+
+            entity.DeviationWaveDirection = input.DeviationWaveDirection.Value.ToNaNAsNull();
+
+            entity.BreakWaterHeight = input.BreakWater.Height.Value.ToNaNAsNull();
+            entity.BreakWaterType = Convert.ToInt16(input.BreakWater.Type);
+            entity.UseBreakWater = Convert.ToByte(input.UseBreakWater);
+            entity.UseForeshore = Convert.ToByte(input.UseForeshore);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r4b095752c115dd672400da5a4acc1560e4c9ce2c -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 4b095752c115dd672400da5a4acc1560e4c9ce2c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -84,7 +84,7 @@
     <Compile Include="Create\GrassCoverErosionOutwards\GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest.cs" />
     <Compile Include="Create\HeightStructures\GeneralHeightStructuresInputCreateExtensionsTest.cs" />
     <Compile Include="Create\HeightStructures\HeightStructureCreateExtensionsTest.cs" />
-    <Compile Include="Create\HeightStructures\HeightStructuresCalculationCreateExtensionsTest.cs">
+    <Compile Include="Create\StructuresCalculationCreateExtensionsTest.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Create\ProbabilityAssessmentOutputCreateExtensionsTest.cs" />
Fisheye: Tag 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresCalculationCreateExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -0,0 +1,364 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.Create;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.TestUtil;
+using Core.Common.Base.Data;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.DikeProfiles;
+using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Structures;
+using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Data.TestUtil;
+using Ringtoets.HydraRing.Data;
+
+namespace Application.Ringtoets.Storage.Test.Create
+{
+    [TestFixture]
+    public class StructuresCalculationCreateExtensionsTest
+    {
+        [Test]
+        public void Create_PersistenceRegistryNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>();
+
+            // Call
+            TestDelegate call = () => calculation.Create(null, 0);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("registry", paramName);
+        }
+
+        [Test]
+        [TestCase("I have no comments", null, 0, 827364)]
+        [TestCase("I have a comment", "I am comment", 98, 231)]
+        public void Create_ValidCalculation_ReturnEntity(string name, string comments, int order, int randomSeed)
+        {
+            // Setup
+            var random = new Random(randomSeed);
+
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                Name = name,
+                Comments = comments,
+                InputParameters =
+                {
+                    StructureNormalOrientation = (RoundedDouble) random.GetFromRange(0, 360),
+                    ModelFactorSuperCriticalFlow =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(-9999.9999, 9999.9999)
+                    },
+                    AllowedLevelIncreaseStorage =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999),
+                        StandardDeviation = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999)
+                    },
+                    StorageStructureArea =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999),
+                        CoefficientOfVariation = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999)
+                    },
+                    FlowWidthAtBottomProtection =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999),
+                        StandardDeviation = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999)
+                    },
+                    CriticalOvertoppingDischarge =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999),
+                        CoefficientOfVariation = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999)
+                    },
+                    FailureProbabilityStructureWithErosion = random.NextDouble(),
+                    WidthFlowApertures =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(-9999.9999, 9999.9999),
+                        CoefficientOfVariation = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999)
+                    },
+                    StormDuration =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999),
+                        CoefficientOfVariation = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999)
+                    },
+                    DeviationWaveDirection = (RoundedDouble) random.NextDouble(),
+                    LevelCrestStructure =
+                    {
+                        Mean = (RoundedDouble) random.GetFromRange(-9999.9999, 9999.9999),
+                        StandardDeviation = (RoundedDouble) random.GetFromRange(1e-6, 9999.9999)
+                    },
+                    UseBreakWater = true,
+                    UseForeshore = false,
+                    BreakWater =
+                    {
+                        Height = (RoundedDouble) random.NextDouble(),
+                        Type = BreakWaterType.Dam
+                    }
+                }
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            HeightStructuresCalculationEntity entity = calculation.Create(registry, order);
+
+            // Assert
+            Assert.AreEqual(0, entity.HeightStructuresCalculationEntityId);
+            Assert.AreEqual(name, entity.Name);
+            Assert.AreEqual(comments, entity.Comments);
+            Assert.AreEqual(order, entity.Order);
+
+            HeightStructuresInput input = calculation.InputParameters;
+            Assert.AreEqual(input.StructureNormalOrientation.Value, entity.StructureNormalOrientation);
+            Assert.AreEqual(input.ModelFactorSuperCriticalFlow.Mean.Value, entity.ModelFactorSuperCriticalFlowMean);
+            Assert.AreEqual(input.AllowedLevelIncreaseStorage.Mean.Value, entity.AllowedLevelIncreaseStorageMean);
+            Assert.AreEqual(input.AllowedLevelIncreaseStorage.StandardDeviation.Value, entity.AllowedLevelIncreaseStorageStandardDeviation);
+            Assert.AreEqual(input.StorageStructureArea.Mean.Value, entity.StorageStructureAreaMean);
+            Assert.AreEqual(input.StorageStructureArea.CoefficientOfVariation.Value, entity.StorageStructureAreaCoefficientOfVariation);
+            Assert.AreEqual(input.FlowWidthAtBottomProtection.Mean.Value, entity.FlowWidthAtBottomProtectionMean);
+            Assert.AreEqual(input.FlowWidthAtBottomProtection.StandardDeviation.Value, entity.FlowWidthAtBottomProtectionStandardDeviation);
+            Assert.AreEqual(input.CriticalOvertoppingDischarge.Mean.Value, entity.CriticalOvertoppingDischargeMean);
+            Assert.AreEqual(input.CriticalOvertoppingDischarge.CoefficientOfVariation.Value, entity.CriticalOvertoppingDischargeCoefficientOfVariation);
+            Assert.AreEqual(input.FailureProbabilityStructureWithErosion, entity.FailureProbabilityStructureWithErosion);
+            Assert.AreEqual(input.WidthFlowApertures.Mean.Value, entity.WidthFlowAperturesMean);
+            Assert.AreEqual(input.WidthFlowApertures.CoefficientOfVariation.Value, entity.WidthFlowAperturesCoefficientOfVariation);
+            Assert.AreEqual(input.StormDuration.Mean.Value, entity.StormDurationMean);
+
+            Assert.AreEqual(input.LevelCrestStructure.Mean.Value, entity.LevelCrestStructureMean);
+            Assert.AreEqual(input.LevelCrestStructure.StandardDeviation.Value, entity.LevelCrestStructureStandardDeviation);
+            Assert.AreEqual(input.DeviationWaveDirection.Value, entity.DeviationWaveDirection);
+
+            Assert.IsNull(entity.CalculationGroupEntity);
+            Assert.IsNull(entity.ForeshoreProfileEntityId);
+            Assert.IsNull(entity.HeightStructureEntityId);
+            Assert.IsNull(entity.HydraulicLocationEntityId);
+
+            Assert.AreEqual(input.BreakWater.Height.Value, entity.BreakWaterHeight);
+            Assert.AreEqual((short) input.BreakWater.Type, entity.BreakWaterType);
+            Assert.AreEqual(Convert.ToByte(input.UseBreakWater), entity.UseBreakWater);
+            Assert.AreEqual(Convert.ToByte(input.UseForeshore), entity.UseForeshore);
+        }
+
+        [Test]
+        public void Create_NaNParameters_EntityWithNullFields()
+        {
+            // Setup
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                InputParameters =
+                {
+                    StructureNormalOrientation = RoundedDouble.NaN,
+                    ModelFactorSuperCriticalFlow =
+                    {
+                        Mean = RoundedDouble.NaN
+                    },
+                    AllowedLevelIncreaseStorage =
+                    {
+                        Mean = RoundedDouble.NaN,
+                        StandardDeviation = RoundedDouble.NaN
+                    },
+                    StorageStructureArea =
+                    {
+                        Mean = RoundedDouble.NaN,
+                        CoefficientOfVariation = RoundedDouble.NaN
+                    },
+                    FlowWidthAtBottomProtection =
+                    {
+                        Mean = RoundedDouble.NaN,
+                        StandardDeviation = RoundedDouble.NaN
+                    },
+                    CriticalOvertoppingDischarge =
+                    {
+                        Mean = RoundedDouble.NaN,
+                        CoefficientOfVariation = RoundedDouble.NaN
+                    },
+                    WidthFlowApertures =
+                    {
+                        Mean = RoundedDouble.NaN,
+                        CoefficientOfVariation = RoundedDouble.NaN
+                    },
+                    StormDuration =
+                    {
+                        Mean = RoundedDouble.NaN,
+                        CoefficientOfVariation = RoundedDouble.NaN
+                    },
+                    LevelCrestStructure =
+                    {
+                        Mean = RoundedDouble.NaN,
+                        StandardDeviation = RoundedDouble.NaN
+                    },
+                    DeviationWaveDirection = RoundedDouble.NaN,
+                    BreakWater =
+                    {
+                        Height = RoundedDouble.NaN
+                    }
+                }
+            };
+            var registry = new PersistenceRegistry();
+
+            // Call
+            HeightStructuresCalculationEntity entity = calculation.Create(registry, 0);
+
+            // Assert
+            Assert.IsNull(entity.StructureNormalOrientation);
+            Assert.IsNull(entity.ModelFactorSuperCriticalFlowMean);
+            Assert.IsNull(entity.AllowedLevelIncreaseStorageMean);
+            Assert.IsNull(entity.AllowedLevelIncreaseStorageStandardDeviation);
+            Assert.IsNull(entity.StorageStructureAreaMean);
+            Assert.IsNull(entity.StorageStructureAreaCoefficientOfVariation);
+            Assert.IsNull(entity.FlowWidthAtBottomProtectionMean);
+            Assert.IsNull(entity.FlowWidthAtBottomProtectionStandardDeviation);
+            Assert.IsNull(entity.CriticalOvertoppingDischargeMean);
+            Assert.IsNull(entity.CriticalOvertoppingDischargeCoefficientOfVariation);
+            Assert.IsNull(entity.WidthFlowAperturesMean);
+            Assert.IsNull(entity.WidthFlowAperturesCoefficientOfVariation);
+            Assert.IsNull(entity.StormDurationMean);
+            Assert.IsNull(entity.DeviationWaveDirection);
+            Assert.IsNull(entity.LevelCrestStructureMean);
+            Assert.IsNull(entity.LevelCrestStructureStandardDeviation);
+
+            Assert.IsNull(entity.BreakWaterHeight);
+        }
+
+        [Test]
+        public void Create_StringPropertiesDoNotShareReference()
+        {
+            // Setup
+            const string name = "A";
+            const string comment = "B";
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                Name = name,
+                Comments = comment
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            HeightStructuresCalculationEntity entity = calculation.Create(registry, 0);
+
+            // Assert
+            Assert.AreNotSame(name, entity.Name,
+                              "To create stable binary representations/fingerprints, it's really important that strings are not shared.");
+            Assert.AreEqual(name, entity.Name);
+
+            Assert.AreNotSame(comment, entity.Comments,
+                              "To create stable binary representations/fingerprints, it's really important that strings are not shared.");
+            Assert.AreEqual(comment, entity.Comments);
+        }
+
+        [Test]
+        public void Create_CalculationWithAlreadySavedHydraulicBoundaryLocation_ReturnEntityWithHydraulicLocationEntity()
+        {
+            // Setup
+            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 1, 1);
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = hydraulicBoundaryLocation
+                }
+            };
+
+            var hydraulicLocationEntity = new HydraulicLocationEntity();
+            var registry = new PersistenceRegistry();
+            registry.Register(hydraulicLocationEntity, hydraulicBoundaryLocation);
+
+            // Call
+            HeightStructuresCalculationEntity entity = calculation.Create(registry, 0);
+
+            // Assert
+            Assert.AreSame(hydraulicLocationEntity, entity.HydraulicLocationEntity);
+        }
+
+        [Test]
+        public void Create_CalculationWithAlreadySavedHeightStructure_ReturnEntityWithHeightStructureEntity()
+        {
+            // Setup
+            var heightStructure = new TestHeightStructure();
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                InputParameters =
+                {
+                    Structure = heightStructure
+                }
+            };
+
+            var heightStructureEntity = new HeightStructureEntity();
+            var registry = new PersistenceRegistry();
+            registry.Register(heightStructureEntity, heightStructure);
+
+            // Call
+            HeightStructuresCalculationEntity entity = calculation.Create(registry, 0);
+
+            // Assert
+            Assert.AreSame(heightStructureEntity, entity.HeightStructureEntity);
+        }
+
+        [Test]
+        public void Create_CalculationWithAlreadySavedForeshoreProfile_ReturnEntityWithForeshoreProfileEntity()
+        {
+            // Setup
+            var foreshoreProfile = new TestForeshoreProfile();
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                InputParameters =
+                {
+                    ForeshoreProfile = foreshoreProfile
+                }
+            };
+
+            var foreshoreProfileEntity = new ForeshoreProfileEntity();
+            var registry = new PersistenceRegistry();
+            registry.Register(foreshoreProfileEntity, foreshoreProfile);
+
+            // Call
+            HeightStructuresCalculationEntity entity = calculation.Create(registry, 0);
+
+            // Assert
+            Assert.AreSame(foreshoreProfileEntity, entity.ForeshoreProfileEntity);
+        }
+
+        [Test]
+        public void Create_CalculationWithOutput_ReturnEntity()
+        {
+            // Setup
+            var random = new Random(159);
+            var calculation = new StructuresCalculation<HeightStructuresInput>
+            {
+                Output = new ProbabilityAssessmentOutput(random.NextDouble(), random.NextDouble(),
+                                                         random.NextDouble(), random.NextDouble(),
+                                                         random.NextDouble())
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            HeightStructuresCalculationEntity entity = calculation.Create(registry, 0);
+
+            // Assert
+            Assert.AreEqual(1, entity.HeightStructuresOutputEntities.Count);
+        }
+    }
+}
\ No newline at end of file
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r5d36087eefd43dcb327163ef5e9c4e52407ccc96 -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 5d36087eefd43dcb327163ef5e9c4e52407ccc96)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs	(.../AddNewDemoAssessmentSectionCommandTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -282,7 +282,7 @@
 
             Assert.AreEqual(1, demoAssessmentSection.HeightStructures.CalculationsGroup.Children.Count);
             StructuresCalculation<HeightStructuresInput> calculation = demoAssessmentSection.HeightStructures
-                                                                           .CalculationsGroup.GetCalculations()
+                                                                           .Calculations
                                                                            .OfType<StructuresCalculation<HeightStructuresInput>>()
                                                                            .First();
             AssertExpectedHeightStructuresInput(calculation.InputParameters);
@@ -327,7 +327,7 @@
 
             Assert.AreEqual(1, demoAssessmentSection.ClosingStructures.CalculationsGroup.Children.Count);
             StructuresCalculation<ClosingStructuresInput> calculation = demoAssessmentSection.ClosingStructures
-                                                                            .CalculationsGroup.GetCalculations()
+                                                                            .Calculations
                                                                             .OfType<StructuresCalculation<ClosingStructuresInput>>()
                                                                             .First();
             AssertExpectedClosingStructuresInput(calculation.InputParameters);
@@ -474,7 +474,7 @@
             Assert.AreEqual(1, demoAssessmentSection.StabilityPointStructures.CalculationsGroup.Children.Count);
             AssertExpectedStabilityPointStructureValues(demoAssessmentSection.StabilityPointStructures.StabilityPointStructures[0]);
             StructuresCalculation<StabilityPointStructuresInput> calculation = demoAssessmentSection.StabilityPointStructures
-                                                                                   .CalculationsGroup.GetCalculations()
+                                                                                   .Calculations
                                                                                    .OfType<StructuresCalculation<StabilityPointStructuresInput>>()
                                                                                    .First();
             AssertExpectedStabilityPointStructuresInput(calculation.InputParameters);
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs	(.../ClosingStructuresFailureMechanism.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -56,7 +56,7 @@
         {
             get
             {
-                return CalculationsGroup.GetCalculations().OfType<StructuresCalculation<ClosingStructuresInput>>();
+                return CalculationsGroup.GetCalculations().Cast<StructuresCalculation<ClosingStructuresInput>>();
             }
         }
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r60233a739e6b40a3182f53bb9ebd923703bd745c -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 60233a739e6b40a3182f53bb9ebd923703bd745c)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -24,7 +24,6 @@
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using Core.Common.Base;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms.ProgressDialog;
@@ -446,8 +445,7 @@
 
         private StrictContextMenuItem CreateGenerateClosingStructuresCalculationsItem(ClosingStructuresCalculationGroupContext nodeData)
         {
-            ObservableList<ClosingStructure> closingStructures = nodeData.FailureMechanism.ClosingStructures;
-            bool structuresAvailable = closingStructures.Any();
+            bool structuresAvailable = nodeData.FailureMechanism.ClosingStructures.Any();
 
             string closingStructuresCalculationGroupContextToolTip = structuresAvailable
                                                                          ? RingtoetsCommonFormsResources.StructuresPlugin_Generate_calculations_for_selected_structures
@@ -456,7 +454,7 @@
             return new StrictContextMenuItem(RingtoetsCommonFormsResources.CalculationsGroup_Generate_calculations,
                                              closingStructuresCalculationGroupContextToolTip,
                                              RingtoetsCommonFormsResources.GenerateScenariosIcon,
-                                             (sender, args) => { ShowClosingStructuresSelectionDialog(nodeData); })
+                                             (sender, args) => ShowClosingStructuresSelectionDialog(nodeData))
             {
                 Enabled = structuresAvailable
             };
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs
===================================================================
diff -u -r3e2b418a9bbc27e2e990b15325b1350e6d56dc3d -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision 3e2b418a9bbc27e2e990b15325b1350e6d56dc3d)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs	(.../ClosingStructuresCalculationActivity.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -86,7 +86,7 @@
 
         protected override void PerformCalculation()
         {
-            ClosingStructuresDataSynchronizationService.ClearCalculationOutput(calculation);
+            calculation.ClearOutput();
 
             calculationService.Calculate(calculation,
                                          assessmentSection,
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs
===================================================================
diff -u -r2ebc37cd8cfea18e73b2db4975be5a48272ba9ba -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs	(.../ClosingStructuresDataSynchronizationService.cs)	(revision 2ebc37cd8cfea18e73b2db4975be5a48272ba9ba)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresDataSynchronizationService.cs	(.../ClosingStructuresDataSynchronizationService.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -56,29 +56,12 @@
                                                 .Where(c => c.HasOutput)
                                                 .ToArray();
 
-            affectedItems.ForEachElementDo(ClearCalculationOutput);
+            affectedItems.ForEachElementDo(item => item.ClearOutput());
 
             return affectedItems;
         }
 
         /// <summary>
-        /// Clears the output of the given <see cref="StructuresCalculation{T}"/>.
-        /// </summary>
-        /// <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(StructuresCalculation<ClosingStructuresInput> calculation)
-        {
-            if (calculation == null)
-            {
-                throw new ArgumentNullException("calculation");
-            }
-
-            calculation.Output = null;
-        }
-
-        /// <summary>
         /// Clears the <see cref="HydraulicBoundaryLocation"/> for all the calculations in
         /// the <see cref="StructuresCalculation{T}"/>.
         /// </summary>
@@ -130,7 +113,7 @@
 
                 if (calculation.HasOutput)
                 {
-                    ClearCalculationOutput(calculation);
+                    calculation.ClearOutput();
                     calculationChanged = true;
                 }
 
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresFailureMechanismTest.cs	(.../ClosingStructuresFailureMechanismTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -114,7 +114,6 @@
                     {
                         new CalculationGroup(),
                         new StructuresCalculation<ClosingStructuresInput>(),
-                        mocks.StrictMock<ICalculation>(),
                         new StructuresCalculation<ClosingStructuresInput>()
                     }
                 }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructureDataSynchronizationServiceTest.cs	(.../ClosingStructureDataSynchronizationServiceTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -81,17 +81,6 @@
         }
 
         [Test]
-        public void ClearCalculationOutput_CalculationNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => ClosingStructuresDataSynchronizationService.ClearCalculationOutput(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("calculation", exception.ParamName);
-        }
-
-        [Test]
         public void ClearCalculationOutput_WithCalculation_ClearsOutput()
         {
             // Setup
@@ -101,7 +90,7 @@
             };
 
             // Call
-            ClosingStructuresDataSynchronizationService.ClearCalculationOutput(calculation);
+            calculation.ClearOutput();
 
             // Assert
             Assert.IsNull(calculation.Output);
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculationInput.cs
===================================================================
diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculationInput.cs	(.../IStructuresCalculationInput.cs)	(revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/IStructuresCalculationInput.cs	(.../IStructuresCalculationInput.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -23,8 +23,15 @@
 
 namespace Ringtoets.Common.Data.Structures
 {
+    /// <summary>
+    /// Interface describing an object that is the input to a structures calculation.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
     public interface IStructuresCalculationInput<out T> : ICalculationInput where T: StructureBase
     {
+        /// <summary>
+        /// Gets the structure.
+        /// </summary>
         T Structure { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs
===================================================================
diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs	(.../StructuresFailureMechanismSectionResult.cs)	(revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs	(.../StructuresFailureMechanismSectionResult.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -29,6 +29,8 @@
     /// This class holds the information of the result of the <see cref="FailureMechanismSection"/>
     /// for a structures assessment.
     /// </summary>
+    /// <remarks>This class is generic with {T} specifying the type op structure 
+    /// whose calculation is chosen to be representative for the whole section.</remarks>
     public class StructuresFailureMechanismSectionResult<T> : FailureMechanismSectionResult where T : ICalculationInput, new()
     {
         /// <summary>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs
===================================================================
diff -u -r86984ca293c30b4f9b47da7825cbae1404fffe08 -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs	(.../StructureSelectionDialogTest.cs)	(revision 86984ca293c30b4f9b47da7825cbae1404fffe08)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/StructureSelectionDialogTest.cs	(.../StructureSelectionDialogTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -79,8 +79,10 @@
         [Test]
         public void Constructor_DataGridViewCorrectlyInitialized()
         {
-            // Setup & Call
+            // Setup
             using (var viewParent = new Form())
+
+            // Call
             using (var dialog = new StructureSelectionDialog(viewParent, Enumerable.Empty<StructureBase>()))
             {
                 dialog.Show();
@@ -119,8 +121,9 @@
             };
             var structure = new TestStructure(constructionProperties);
 
-            // Call
             using (var viewParent = new Form())
+
+            // Call
             using (var dialog = new StructureSelectionDialog(viewParent, new[]
             {
                 structure
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -55,7 +55,7 @@
         {
             get
             {
-                return CalculationsGroup.GetCalculations().OfType<StructuresCalculation<HeightStructuresInput>>();
+                return CalculationsGroup.GetCalculations().Cast<StructuresCalculation<HeightStructuresInput>>();
             }
         }
 
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs
===================================================================
diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresScenariosView.cs	(.../HeightStructuresScenariosView.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -130,7 +130,7 @@
                 ICalculation[] calculations = data.GetCalculations().ToArray();
 
                 Dictionary<string, IList<ICalculation>> calculationsPerSegment =
-                    StructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.OfType<StructuresCalculation<HeightStructuresInput>>());
+                    StructuresHelper.CollectCalculationsPerSection(failureMechanism.Sections, calculations.Cast<StructuresCalculation<HeightStructuresInput>>());
 
                 List<HeightStructuresScenarioRow> scenarioRows =
                     FailureMechanism.SectionResults.Select(sectionResult => new HeightStructuresScenarioRow(sectionResult)).ToList();
Fisheye: Tag 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 refers to a dead (removed) revision in file `Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 refers to a dead (removed) revision in file `Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj
===================================================================
diff -u -re4e785f127ce9a2d0d1734c1b51e02d910a31bbe -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision e4e785f127ce9a2d0d1734c1b51e02d910a31bbe)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/Ringtoets.HeightStructures.Plugin.csproj	(.../Ringtoets.HeightStructures.Plugin.csproj)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -43,11 +43,6 @@
     </Compile>
     <Compile Include="HeightStructuresPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -136,13 +131,6 @@
       <Link>Copying.licenseheader</Link>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs
===================================================================
diff -u -r3e2b418a9bbc27e2e990b15325b1350e6d56dc3d -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision 3e2b418a9bbc27e2e990b15325b1350e6d56dc3d)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs	(.../HeightStructuresCalculationActivity.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -84,7 +84,7 @@
 
         protected override void PerformCalculation()
         {
-            HeightStructuresDataSynchronizationService.ClearCalculationOutput(calculation);
+            calculation.ClearOutput();
 
             calculationService.Calculate(calculation,
                                          assessmentSection,
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs
===================================================================
diff -u -r440f228de8eb72ed5be40270b20a46113917333e -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 440f228de8eb72ed5be40270b20a46113917333e)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs	(.../HeightStructuresCalculationService.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -92,7 +92,7 @@
         /// <param name="assessmentSection">The <see cref="IAssessmentSection"/> that holds information about the norm used in the calculation.</param>
         /// <param name="failureMechanism"> The <see cref="HeightStructuresFailureMechanism"/> that holds the information about the contribution 
         /// and the general inputs used in the calculation.</param>
-        /// <param name="hlcdFilePath">The filepath of the HLCD file that should be used for performing the calculation.</param>
+        /// <param name="hlcdFilePath">The file path of the HLCD file that should be used for performing the calculation.</param>
         internal void Calculate(StructuresCalculation<HeightStructuresInput> calculation,
                                 IAssessmentSection assessmentSection,
                                 HeightStructuresFailureMechanism failureMechanism,
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs	(.../HeightStructuresDataSynchronizationService.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs	(.../HeightStructuresDataSynchronizationService.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -56,29 +56,12 @@
                                                 .Where(c => c.HasOutput)
                                                 .ToArray();
 
-            affectedItems.ForEachElementDo(ClearCalculationOutput);
+            affectedItems.ForEachElementDo(item => item.ClearOutput());
 
             return affectedItems;
         }
 
         /// <summary>
-        /// Clears the output of the given <see cref="StructuresCalculation{T}"/>.
-        /// </summary>
-        /// <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(StructuresCalculation<HeightStructuresInput> calculation)
-        {
-            if (calculation == null)
-            {
-                throw new ArgumentNullException("calculation");
-            }
-
-            calculation.Output = null;
-        }
-
-        /// <summary>
         /// Clears the <see cref="HydraulicBoundaryLocation"/> for all the calculations in
         /// the <see cref="HeightStructuresFailureMechanism"/>.
         /// </summary>
@@ -130,7 +113,7 @@
 
                 if (calculation.HasOutput)
                 {
-                    ClearCalculationOutput(calculation);
+                    calculation.ClearOutput();
                     calculationChanged = true;
                 }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -112,7 +112,6 @@
                     {
                         new CalculationGroup(),
                         new StructuresCalculation<HeightStructuresInput>(),
-                        mocks.StrictMock<ICalculation>(),
                         new StructuresCalculation<HeightStructuresInput>()
                     }
                 }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresDataSynchronizationServiceTest.cs	(.../HeightStructuresDataSynchronizationServiceTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -81,17 +81,6 @@
         }
 
         [Test]
-        public void ClearCalculationOutput_CalculationNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate test = () => HeightStructuresDataSynchronizationService.ClearCalculationOutput(null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("calculation", exception.ParamName);
-        }
-
-        [Test]
         public void ClearCalculationOutput_WithCalculation_ClearsOutput()
         {
             // Setup
@@ -101,7 +90,7 @@
             };
 
             // Call
-            HeightStructuresDataSynchronizationService.ClearCalculationOutput(calculation);
+            calculation.ClearOutput();
 
             // Assert
             Assert.IsNull(calculation.Output);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryLocationsWriter.cs
===================================================================
diff -u -r8db89aecb3565f4784cedd541e7407e8360b6a6f -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryLocationsWriter.cs	(.../HydraulicBoundaryLocationsWriter.cs)	(revision 8db89aecb3565f4784cedd541e7407e8360b6a6f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryLocationsWriter.cs	(.../HydraulicBoundaryLocationsWriter.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -88,9 +88,9 @@
 
             var pointShapeFileWriter = new PointShapeFileWriter();
 
-            foreach (MapPointData mapLineData in hydraulicBoundaryLocations.Select(CreateMapPointData))
+            foreach (MapPointData mapPointData in hydraulicBoundaryLocations.Select(CreateMapPointData))
             {
-                pointShapeFileWriter.CopyToFeature(mapLineData);
+                pointShapeFileWriter.CopyToFeature(mapPointData);
             }
 
             pointShapeFileWriter.SaveAs(filePath);
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs	(.../StabilityPointStructuresFailureMechanism.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -56,7 +56,7 @@
         {
             get
             {
-                return CalculationsGroup.GetCalculations().OfType<StructuresCalculation<StabilityPointStructuresInput>>();
+                return CalculationsGroup.GetCalculations().Cast<StructuresCalculation<StabilityPointStructuresInput>>();
             }
         }
 
Fisheye: Tag 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj
===================================================================
diff -u -rb78eb7cbd59f1bd31e72631b67b7e12b5b4477a5 -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.csproj)	(revision b78eb7cbd59f1bd31e72631b67b7e12b5b4477a5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/Ringtoets.StabilityPointStructures.Plugin.csproj	(.../Ringtoets.StabilityPointStructures.Plugin.csproj)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -42,11 +42,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="StabilityPointStructuresPlugin.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -126,12 +121,6 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs
===================================================================
diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismTest.cs	(.../StabilityPointStructuresFailureMechanismTest.cs)	(revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3)
@@ -113,7 +113,6 @@
                     {
                         new CalculationGroup(),
                         new StructuresCalculation<StabilityPointStructuresInput>(),
-                        mocks.Stub<ICalculation>(),
                         new StructuresCalculation<StabilityPointStructuresInput>()
                     }
                 }