Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -re6a591b93ec33becef19b4d71f3d49de0fbd7f10 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision e6a591b93ec33becef19b4d71f3d49de0fbd7f10)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -72,7 +72,7 @@
     <Compile Include="Create\GrassCoverErosionOutwards\GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs" />
     <Compile Include="Create\HeightStructures\HeightStructureCreateExtensions.cs" />
     <Compile Include="Create\HydraulicBoundaryLocationOutputCreateExtensions.cs" />
-    <Compile Include="Create\IllustrationPoints\GeneralResultSubMechanismIllustrationPointCreateExtensions.cs" />
+    <Compile Include="Create\IllustrationPoints\GeneralResultCreateExtensions.cs" />
     <Compile Include="Create\IllustrationPoints\IllustrationPointResultCreateExtensions.cs" />
     <Compile Include="Create\IllustrationPoints\SubMechanismIllustrationPointCreateExtensions.cs" />
     <Compile Include="Create\IllustrationPoints\SubMechanismIllustrationPointStochastCreateExtensions.cs" />
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -89,7 +89,7 @@
         }
 
         private static void CreateGeneralResultSubMechanismIllustrationPoint(IHydraulicLocationOutputEntity entity,
-                                                                             GeneralResultSubMechanismIllustrationPoint illustrationPoint)
+                                                                             GeneralResult<TopLevelSubMechanismIllustrationPoint> illustrationPoint)
         {
             if (illustrationPoint != null)
             {
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/GeneralResultCreateExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/GeneralResultCreateExtensions.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/GeneralResultCreateExtensions.cs	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -0,0 +1,90 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Application.Ringtoets.Storage.DbContext;
+using Core.Common.Utils.Extensions;
+using Ringtoets.Common.Data.IllustrationPoints;
+
+namespace Application.Ringtoets.Storage.Create.IllustrationPoints
+{
+    /// <summary>
+    /// Extension methods for <see cref="GeneralResult{T}"/>
+    /// related to creating an instance of <see cref="GeneralResultSubMechanismIllustrationPointEntity"/>.
+    /// </summary>
+    internal static class GeneralResultCreateExtensions
+    {
+        /// <summary>
+        /// Creates a <see cref="GeneralResultSubMechanismIllustrationPointEntity"/> based on the 
+        /// information of <paramref name="generalResultSubMechanismIllustrationPoint"/>.
+        /// </summary>
+        /// <param name="generalResultSubMechanismIllustrationPoint">The general result sub mechanism
+        /// to create a database entity for.</param>
+        /// <returns>A new <see cref="GeneralResultSubMechanismIllustrationPointEntity"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="generalResultSubMechanismIllustrationPoint"/>
+        /// is <c>null</c>.</exception>
+        internal static GeneralResultSubMechanismIllustrationPointEntity CreateGeneralResultSubMechanismIllustrationPointEntity(
+            this GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResultSubMechanismIllustrationPoint)
+        {
+            if (generalResultSubMechanismIllustrationPoint == null)
+            {
+                throw new ArgumentNullException(nameof(generalResultSubMechanismIllustrationPoint));
+            }
+
+            WindDirection governingWindDirection = generalResultSubMechanismIllustrationPoint.GoverningWindDirection;
+            var entity = new GeneralResultSubMechanismIllustrationPointEntity
+            {
+                GoverningWindDirectionName = governingWindDirection.Name.DeepClone(),
+                GoverningWindDirectionAngle = governingWindDirection.Angle
+            };
+
+            AddEntitiesForStochasts(entity, generalResultSubMechanismIllustrationPoint.Stochasts);
+            AddEntitiesForTopLevelSubMechanismIllustrationPoints(
+                entity,
+                generalResultSubMechanismIllustrationPoint.TopLevelIllustrationPoints);
+
+            return entity;
+        }
+
+        private static void AddEntitiesForStochasts(GeneralResultSubMechanismIllustrationPointEntity entity,
+                                                    IEnumerable<Stochast> stochasts)
+        {
+            var order = 0;
+            foreach (Stochast stochast in stochasts)
+            {
+                entity.StochastEntities.Add(stochast.CreateStochastEntity(order++));
+            }
+        }
+
+        private static void AddEntitiesForTopLevelSubMechanismIllustrationPoints(
+            GeneralResultSubMechanismIllustrationPointEntity entity,
+            IEnumerable<TopLevelSubMechanismIllustrationPoint> illustrationPoints)
+        {
+            var order = 0;
+            foreach (TopLevelSubMechanismIllustrationPoint illustrationPoint in illustrationPoints)
+            {
+                entity.TopLevelSubMechanismIllustrationPointEntities.Add(
+                    illustrationPoint.CreateTopLevelSubMechanismIllustrationPointEntity(order++));
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/GeneralResultSubMechanismIllustrationPointCreateExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensions.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensions.cs	(.../GeneralResultSubMechanismIllustrationPointEntityReadExtensions.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensions.cs	(.../GeneralResultSubMechanismIllustrationPointEntityReadExtensions.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -29,20 +29,21 @@
 {
     /// <summary>
     /// Extension methods for <see cref="GeneralResultSubMechanismIllustrationPointEntity"/>
-    /// related to creating a <see cref="GeneralResultSubMechanismIllustrationPoint"/>.
+    /// related to creating a <see cref="GeneralResult{T}"/> for top level sub 
+    /// mechanism illustration point.
     /// </summary>
     internal static class GeneralResultSubMechanismIllustrationPointEntityReadExtensions
     {
         /// <summary>
         /// Reads the <see cref="GeneralResultSubMechanismIllustrationPointEntity"/> and uses 
-        /// the information to construct a <see cref="GeneralResultSubMechanismIllustrationPoint"/>.
+        /// the information to construct a <see cref="GeneralResult{T}"/>.
         /// </summary>
         /// <param name="entity">The <see cref="GeneralResultSubMechanismIllustrationPointEntity"/>
-        /// to create a <see cref="GeneralResultSubMechanismIllustrationPoint"/> for.</param>
+        /// to create a <see cref="GeneralResult{T}"/> for.</param>
         /// <returns>A new <see cref="GetReadTopLevelSubMechanismIllustrationPoint"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when 
         /// <paramref name="entity"/> is <c>null</c>.</exception>
-        public static GeneralResultSubMechanismIllustrationPoint Read(
+        public static GeneralResult<TopLevelSubMechanismIllustrationPoint> Read(
             this GeneralResultSubMechanismIllustrationPointEntity entity)
         {
             if (entity == null)
@@ -57,9 +58,9 @@
             IEnumerable<TopLevelSubMechanismIllustrationPoint> illustrationPoints =
                 GetReadTopLevelSubMechanismIllustrationPoint(entity.TopLevelSubMechanismIllustrationPointEntities);
 
-            return new GeneralResultSubMechanismIllustrationPoint(governingWindDirection,
-                                                                  stochasts,
-                                                                  illustrationPoints);
+            return new GeneralResult<TopLevelSubMechanismIllustrationPoint>(governingWindDirection,
+                                                                            stochasts,
+                                                                            illustrationPoints);
         }
 
         private static IEnumerable<Stochast> GetReadStochasts(IEnumerable<StochastEntity> stochastEntities)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r2c08730c6c2269937fa4f117aed1557876c567ea -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 2c08730c6c2269937fa4f117aed1557876c567ea)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -90,7 +90,7 @@
     <Compile Include="Create\GrassCoverErosionOutwards\GrassCoverErosionOutwardsWaveConditionsOutputCreateExtensionsTest.cs" />
     <Compile Include="Create\HeightStructures\HeightStructureCreateExtensionsTest.cs" />
     <Compile Include="Create\HydraulicBoundaryLocationOutputCreateExtensionsTest.cs" />
-    <Compile Include="Create\IllustrationPoints\GeneralResultSubMechanismIllustrationPointCreateExtensionsTest.cs" />
+    <Compile Include="Create\IllustrationPoints\GeneralResultCreateExtensionsTest.cs" />
     <Compile Include="Create\IllustrationPoints\IllustrationPointResultCreateExtensionsTest.cs" />
     <Compile Include="Create\IllustrationPoints\SubMechanismIllustrationPointCreateExtensionsTest.cs" />
     <Compile Include="Create\IllustrationPoints\SubMechanismIllustrationPointStochastCreateExtensionsTest.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs
===================================================================
diff -u -r764734654afcbed716109739b89a1da51942303b -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationCreateExtensionsTest.cs)	(revision 764734654afcbed716109739b89a1da51942303b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs	(.../HydraulicBoundaryLocationCreateExtensionsTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -455,7 +455,7 @@
             Assert.AreEqual(output.CalculationConvergence, (CalculationConvergence) entity.CalculationConvergence);
         }
 
-        private static void AssertGeneralResultSubMechanismIllustrationPoint(GeneralResultSubMechanismIllustrationPoint illustrationPoint,
+        private static void AssertGeneralResultSubMechanismIllustrationPoint(GeneralResult<TopLevelSubMechanismIllustrationPoint> illustrationPoint,
                                                                              GeneralResultSubMechanismIllustrationPointEntity entity)
         {
             WindDirection governingWindDirection = illustrationPoint.GoverningWindDirection;
@@ -464,7 +464,7 @@
                             governingWindDirection.Angle.GetAccuracy());
 
             Assert.AreEqual(illustrationPoint.Stochasts.Count(), entity.StochastEntities.Count);
-            Assert.AreEqual(illustrationPoint.TopLevelSubMechanismIllustrationPoints.Count(),
+            Assert.AreEqual(illustrationPoint.TopLevelIllustrationPoints.Count(),
                             entity.TopLevelSubMechanismIllustrationPointEntities.Count);
         }
     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/GeneralResultCreateExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/GeneralResultCreateExtensionsTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/GeneralResultCreateExtensionsTest.cs	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -0,0 +1,192 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Application.Ringtoets.Storage.Create.IllustrationPoints;
+using Application.Ringtoets.Storage.DbContext;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.IllustrationPoints;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Data.TestUtil.IllustrationPoints;
+
+namespace Application.Ringtoets.Storage.Test.Create.IllustrationPoints
+{
+    [TestFixture]
+    public class GeneralResultCreateExtensionsTest
+    {
+        [Test]
+        public void CreateGeneralResultSubMechanismIllustrationPointEntity_GeneralResultSubMechanismIllustraionPointNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = null;
+
+            // Call
+            TestDelegate call = () => generalResult.CreateGeneralResultSubMechanismIllustrationPointEntity();
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("generalResultSubMechanismIllustrationPoint", exception.ParamName);
+        }
+
+        [Test]
+        public void CreateGeneralResultSubMechanismIllustrationPointEntity_ValidGeneralResultSubMechanismIllustrationPoint_ReturnsEntityWithoutStochastsAndTopLevelSubMechanismIllustrationPointEntities()
+        {
+            // Setup
+            var random = new Random(21);
+            var governingWindDirection = new WindDirection("SSE", random.NextDouble());
+
+            var generalResult =
+                new GeneralResult<TopLevelSubMechanismIllustrationPoint>(governingWindDirection,
+                                                                         Enumerable.Empty<Stochast>(),
+                                                                         Enumerable.Empty<TopLevelSubMechanismIllustrationPoint>());
+
+            // Call
+            GeneralResultSubMechanismIllustrationPointEntity entity =
+                generalResult.CreateGeneralResultSubMechanismIllustrationPointEntity();
+
+            // Assert
+            AssertWindDirection(governingWindDirection, entity);
+
+            CollectionAssert.IsEmpty(entity.StochastEntities);
+            CollectionAssert.IsEmpty(entity.TopLevelSubMechanismIllustrationPointEntities);
+        }
+
+        [Test]
+        public void CreateGeneralResultSubMechanismIllustrationPointEntity_ValidGeneralResultSubMechanismIllustrationPointWithStochasts_ReturnsEntityWithStochastsEntities()
+        {
+            // Setup
+            var random = new Random(21);
+            var governingWindDirection = new WindDirection("SSE", random.NextDouble());
+
+            var stochastOne = new Stochast("stochastOne", random.NextDouble(), random.NextDouble());
+            var stochastTwo = new Stochast("stochastTwo", random.NextDouble(), random.NextDouble());
+            var stochasts = new[]
+            {
+                stochastOne,
+                stochastTwo
+            };
+
+            var generalResult =
+                new GeneralResult<TopLevelSubMechanismIllustrationPoint>(governingWindDirection,
+                                                                         stochasts,
+                                                                         Enumerable.Empty<TopLevelSubMechanismIllustrationPoint>());
+
+            // Call
+            GeneralResultSubMechanismIllustrationPointEntity entity =
+                generalResult.CreateGeneralResultSubMechanismIllustrationPointEntity();
+
+            // Assert
+            AssertWindDirection(governingWindDirection, entity);
+
+            StochastEntity[] stochastEntities = entity.StochastEntities.ToArray();
+            Assert.AreEqual(stochasts.Length, stochastEntities.Length);
+            for (var i = 0; i < stochasts.Length; i++)
+            {
+                Stochast stochast = stochasts[i];
+                StochastEntity stochastEntity = stochastEntities[i];
+
+                AssertCreatedStochastEntity(stochast, i, stochastEntity);
+            }
+        }
+
+        [Test]
+        public void CreateGeneralResultSubMechanismIllustrationPointEntity_ValidGeneralResultSubMechanismIllustrationPointWithIllustrationPoints_ReturnsEntityWithTopLevelSubMechanismIllustrationPointEntities()
+        {
+            // Setup
+            var random = new Random(21);
+            var governingWindDirection = new WindDirection("SSE", random.NextDouble());
+
+            var illustrationPointOne = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
+                                                                                 "IllustrationPointOne",
+                                                                                 new TestSubMechanismIllustrationPoint());
+            var illustrationPointTwo = new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(),
+                                                                                 "IllustrationPointTwo",
+                                                                                 new TestSubMechanismIllustrationPoint());
+            var illustrationPoints = new[]
+            {
+                illustrationPointOne,
+                illustrationPointTwo
+            };
+
+            var generalResult =
+                new GeneralResult<TopLevelSubMechanismIllustrationPoint>(governingWindDirection,
+                                                                         Enumerable.Empty<SubMechanismIllustrationPointStochast>(),
+                                                                         illustrationPoints);
+
+            // Call
+            GeneralResultSubMechanismIllustrationPointEntity entity =
+                generalResult.CreateGeneralResultSubMechanismIllustrationPointEntity();
+
+            // Assert
+            AssertWindDirection(governingWindDirection, entity);
+
+            TopLevelSubMechanismIllustrationPointEntity[] illustrationPointEntities =
+                entity.TopLevelSubMechanismIllustrationPointEntities.ToArray();
+            Assert.AreEqual(illustrationPoints.Length, illustrationPointEntities.Length);
+            for (var i = 0; i < illustrationPoints.Length; i++)
+            {
+                TopLevelSubMechanismIllustrationPoint illustrationPoint = illustrationPoints[i];
+                TopLevelSubMechanismIllustrationPointEntity illustrationPointEntity = illustrationPointEntities[i];
+
+                AssertCreatedTopLevelSubMechanismIllustrationPointEntity(illustrationPoint, i, illustrationPointEntity);
+            }
+        }
+
+        private static void AssertWindDirection(WindDirection expectedWindDirection,
+                                                GeneralResultSubMechanismIllustrationPointEntity entity)
+        {
+            TestHelper.AssertAreEqualButNotSame(expectedWindDirection.Name, entity.GoverningWindDirectionName);
+            Assert.AreEqual(expectedWindDirection.Angle, entity.GoverningWindDirectionAngle,
+                            expectedWindDirection.Angle.GetAccuracy());
+        }
+
+        private static void AssertCreatedStochastEntity(Stochast stochast,
+                                                        int expectedOrder,
+                                                        StochastEntity createdStochastEntity)
+        {
+            TestHelper.AssertAreEqualButNotSame(stochast.Name, createdStochastEntity.Name);
+            Assert.AreEqual(stochast.Duration, createdStochastEntity.Duration,
+                            stochast.Duration.GetAccuracy());
+            Assert.AreEqual(stochast.Alpha, createdStochastEntity.Alpha,
+                            stochast.Alpha.GetAccuracy());
+            Assert.AreEqual(expectedOrder, createdStochastEntity.Order);
+        }
+
+        private static void AssertCreatedTopLevelSubMechanismIllustrationPointEntity(TopLevelSubMechanismIllustrationPoint illustrationPoint,
+                                                                                     int expectedOrder,
+                                                                                     TopLevelSubMechanismIllustrationPointEntity illustrationPointEntity)
+        {
+            TestHelper.AssertAreEqualButNotSame(illustrationPoint.ClosingSituation,
+                                                illustrationPointEntity.ClosingSituation);
+
+            WindDirection expectedWindDirection = illustrationPoint.WindDirection;
+            TestHelper.AssertAreEqualButNotSame(expectedWindDirection.Name, illustrationPointEntity.WindDirectionName);
+            Assert.AreEqual(expectedWindDirection.Angle, illustrationPointEntity.WindDirectionAngle,
+                            expectedWindDirection.Angle.GetAccuracy());
+
+            Assert.IsNotNull(illustrationPointEntity.SubMechanismIllustrationPointEntity);
+
+            Assert.AreEqual(expectedOrder, illustrationPointEntity.Order);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/GeneralResultSubMechanismIllustrationPointCreateExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r764734654afcbed716109739b89a1da51942303b -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 764734654afcbed716109739b89a1da51942303b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -1845,8 +1845,8 @@
 
         #region IllustrationPoints
 
-        private static void AssertGeneralResultSubMechanismIllustrationPoint(GeneralResultSubMechanismIllustrationPoint expectedGeneralResult,
-                                                                             GeneralResultSubMechanismIllustrationPoint actualGeneralResult)
+        private static void AssertGeneralResultSubMechanismIllustrationPoint(GeneralResult<TopLevelSubMechanismIllustrationPoint> expectedGeneralResult,
+                                                                             GeneralResult<TopLevelSubMechanismIllustrationPoint> actualGeneralResult)
         {
             if (expectedGeneralResult == null)
             {
@@ -1867,9 +1867,9 @@
             }
 
             TopLevelSubMechanismIllustrationPoint[] expectedTopLevelSubMechanismIllustrationPoints =
-                expectedGeneralResult.TopLevelSubMechanismIllustrationPoints.ToArray();
+                expectedGeneralResult.TopLevelIllustrationPoints.ToArray();
             TopLevelSubMechanismIllustrationPoint[] actualTopLevelSubMechanismIllustrationPoints =
-                actualGeneralResult.TopLevelSubMechanismIllustrationPoints.ToArray();
+                actualGeneralResult.TopLevelIllustrationPoints.ToArray();
             int expectedNrOfTopLevelSubMechanismIllustrationPoints = expectedTopLevelSubMechanismIllustrationPoints.Length;
             Assert.AreEqual(expectedNrOfTopLevelSubMechanismIllustrationPoints,
                             actualTopLevelSubMechanismIllustrationPoints.Length);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs
===================================================================
diff -u -r764734654afcbed716109739b89a1da51942303b -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision 764734654afcbed716109739b89a1da51942303b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs	(.../HydraulicLocationEntityReadExtensionsTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -295,7 +295,7 @@
         }
 
         private static void AssertGeneralResultSubMechanismIllustrationPoint(GeneralResultSubMechanismIllustrationPointEntity expected,
-                                                                             GeneralResultSubMechanismIllustrationPoint illustrationPoint)
+                                                                             GeneralResult<TopLevelSubMechanismIllustrationPoint> illustrationPoint)
         {
             if (expected == null)
             {
@@ -309,7 +309,7 @@
                             actualGoverningWindDirection.Angle.GetAccuracy());
 
             Assert.AreEqual(expected.TopLevelSubMechanismIllustrationPointEntities.Count,
-                            illustrationPoint.TopLevelSubMechanismIllustrationPoints.Count());
+                            illustrationPoint.TopLevelIllustrationPoints.Count());
             Assert.AreEqual(expected.StochastEntities.Count, illustrationPoint.Stochasts.Count());
         }
     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs	(.../GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs	(.../GeneralResultSubMechanismIllustrationPointEntityReadExtensionsTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -59,15 +59,15 @@
             };
 
             // Call
-            GeneralResultSubMechanismIllustrationPoint generalResult = entity.Read();
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = entity.Read();
 
             // Assert
             WindDirection actualGoverningWindDirection = generalResult.GoverningWindDirection;
             Assert.AreEqual(entity.GoverningWindDirectionName, actualGoverningWindDirection.Name);
             Assert.AreEqual(entity.GoverningWindDirectionAngle, actualGoverningWindDirection.Angle,
                             actualGoverningWindDirection.Angle.GetAccuracy());
             CollectionAssert.IsEmpty(generalResult.Stochasts);
-            CollectionAssert.IsEmpty(generalResult.TopLevelSubMechanismIllustrationPoints);
+            CollectionAssert.IsEmpty(generalResult.TopLevelIllustrationPoints);
         }
 
         [Test]
@@ -108,14 +108,13 @@
             };
 
             // Call
-            GeneralResultSubMechanismIllustrationPoint generalResult = entity.Read();
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = entity.Read();
 
             // Assert
             WindDirection actualGoverningWindDirection = generalResult.GoverningWindDirection;
             Assert.AreEqual(entity.GoverningWindDirectionName, actualGoverningWindDirection.Name);
             Assert.AreEqual(entity.GoverningWindDirectionAngle, actualGoverningWindDirection.Angle,
                             actualGoverningWindDirection.Angle.GetAccuracy());
-            CollectionAssert.IsEmpty(generalResult.TopLevelSubMechanismIllustrationPoints);
 
             Stochast[] stochasts = generalResult.Stochasts.ToArray();
             Assert.AreEqual(2, stochasts.Length);
@@ -170,17 +169,16 @@
             };
 
             // Call
-            GeneralResultSubMechanismIllustrationPoint generalResult = entity.Read();
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult = entity.Read();
 
             // Assert
             WindDirection actualGoverningWindDirection = generalResult.GoverningWindDirection;
             Assert.AreEqual(entity.GoverningWindDirectionName, actualGoverningWindDirection.Name);
             Assert.AreEqual(entity.GoverningWindDirectionAngle, actualGoverningWindDirection.Angle,
                             actualGoverningWindDirection.Angle.GetAccuracy());
-            CollectionAssert.IsEmpty(generalResult.Stochasts);
 
             TopLevelSubMechanismIllustrationPoint[] illustrationPoints =
-                generalResult.TopLevelSubMechanismIllustrationPoints.ToArray();
+                generalResult.TopLevelIllustrationPoints.ToArray();
             Assert.AreEqual(2, illustrationPoints.Length);
             AssertReadTopLevelSubMechanismIllustrationPoint(illustrationPointEntityOne, illustrationPoints[0]);
             AssertReadTopLevelSubMechanismIllustrationPoint(illustrationPointEntityOne, illustrationPoints[1]);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs
===================================================================
diff -u -r764734654afcbed716109739b89a1da51942303b -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision 764734654afcbed716109739b89a1da51942303b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs	(.../RingtoetsProjectTestHelperTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -382,7 +382,7 @@
             Assert.AreEqual(CalculationConvergence.NotCalculated, output.CalculationConvergence);
         }
 
-        private static void AssertGeneralResultSubMechanismIllustrationPoint(GeneralResultSubMechanismIllustrationPoint generalResult)
+        private static void AssertGeneralResultSubMechanismIllustrationPoint(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
             WindDirection actualGoverningWindDirection = generalResult.GoverningWindDirection;
             Assert.AreEqual("SSE", actualGoverningWindDirection.Name);
@@ -394,7 +394,7 @@
             Assert.AreEqual(13, stochast.Duration, stochast.Duration.GetAccuracy());
 
             TopLevelSubMechanismIllustrationPoint actualTopLevelSubMechanismIllustrationPoint =
-                generalResult.TopLevelSubMechanismIllustrationPoints.Single();
+                generalResult.TopLevelIllustrationPoints.Single();
             Assert.AreEqual("Closing situation", actualTopLevelSubMechanismIllustrationPoint.ClosingSituation);
             Assert.AreEqual("60", actualTopLevelSubMechanismIllustrationPoint.WindDirection.Name);
             Assert.AreEqual(60, actualTopLevelSubMechanismIllustrationPoint.WindDirection.Angle,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r764734654afcbed716109739b89a1da51942303b -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 764734654afcbed716109739b89a1da51942303b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -377,7 +377,7 @@
             return hydraulicBoundaryDatabase;
         }
 
-        private static GeneralResultSubMechanismIllustrationPoint GetConfiguredGeneralResultSubMechanismIllustrationPoint()
+        private static GeneralResult<TopLevelSubMechanismIllustrationPoint> GetConfiguredGeneralResultSubMechanismIllustrationPoint()
         {
             var illustrationPointResult = new IllustrationPointResult("Description of result", 5);
             var subMechanismIllustrationPointStochast = new SubMechanismIllustrationPointStochast("Name of a submechanism stochast", 10, 9, 8);
@@ -397,15 +397,15 @@
 
             var governingWindDirection = new WindDirection("SSE", 120);
             var stochast = new Stochast("Name of stochast", 13, 37);
-            return new GeneralResultSubMechanismIllustrationPoint(governingWindDirection,
-                                                                  new[]
-                                                                  {
-                                                                      stochast
-                                                                  },
-                                                                  new[]
-                                                                  {
-                                                                      topLevelIllustrationPoint
-                                                                  });
+            return new GeneralResult<TopLevelSubMechanismIllustrationPoint>(governingWindDirection,
+                                                                            new[]
+                                                                            {
+                                                                                stochast
+                                                                            },
+                                                                            new[]
+                                                                            {
+                                                                                topLevelIllustrationPoint
+                                                                            });
         }
 
         private static AssessmentLayerOneState GetAssessmentLayerOneState()
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs
===================================================================
diff -u -r4a73a8a56bdfc43d45d691fa4dbc251bbb261085 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs	(.../HydraulicBoundaryLocationOutput.cs)	(revision 4a73a8a56bdfc43d45d691fa4dbc251bbb261085)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs	(.../HydraulicBoundaryLocationOutput.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -99,7 +99,7 @@
         /// <summary>
         /// Gets the general results with the sub mechanism illustration points.
         /// </summary>
-        public GeneralResultSubMechanismIllustrationPoint GeneralResultSubMechanismIllustrationPoint { get; private set; }
+        public GeneralResult<TopLevelSubMechanismIllustrationPoint> GeneralResultSubMechanismIllustrationPoint { get; private set; }
 
         /// <summary>
         /// Gets the value indicating whether the output contains illustration points.
@@ -118,7 +118,7 @@
         /// <param name="generalResultSubMechanismIllustrationPoint"></param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="generalResultSubMechanismIllustrationPoint"/> 
         /// is <c>null</c>.</exception>
-        public void SetIllustrationPoints(GeneralResultSubMechanismIllustrationPoint generalResultSubMechanismIllustrationPoint)
+        public void SetIllustrationPoints(GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResultSubMechanismIllustrationPoint)
         {
             if (generalResultSubMechanismIllustrationPoint == null)
             {
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/IllustrationPoints/GeneralResultSubMechanismIllustrationPoint.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/IllustrationPoints/GeneralResultSubMechanismIllustrationPointExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -rf95a6fe33de7536ebff9698dccdb74b492cbb7e7 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision f95a6fe33de7536ebff9698dccdb74b492cbb7e7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -71,8 +71,6 @@
     <Compile Include="IllustrationPoints\FaultTreeIllustrationPoint.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointNode.cs" />
     <Compile Include="IllustrationPoints\GeneralResult.cs" />
-    <Compile Include="IllustrationPoints\GeneralResultSubMechanismIllustrationPoint.cs" />
-    <Compile Include="IllustrationPoints\GeneralResultSubMechanismIllustrationPointExtensions.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointBase.cs" />
     <Compile Include="IllustrationPoints\SubMechanismIllustrationPoint.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointResult.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -198,20 +198,20 @@
         }
 
         /// <summary>
-        /// Sets a <see cref="GeneralResultSubMechanismIllustrationPoint"/> based on the information 
+        /// Sets a <see cref="GeneralResult{T}"/> based on the information 
         /// of <paramref name="hydraRingGeneralResult"/> to the <paramref name="hydraulicBoundaryLocationOutput"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocationOutput">The <see cref="HydraulicBoundaryLocationOutput"/> 
-        /// for which to set the <see cref="GeneralResultSubMechanismIllustrationPoint"/>.</param>
+        /// for which to set the <see cref="GeneralResult{T}"/>.</param>
         /// <param name="hydraRingGeneralResult">The <see cref="HydraRingGeneralResult"/> to base the 
-        /// <see cref="GeneralResultSubMechanismIllustrationPoint"/> to create on.</param>
+        /// <see cref="GeneralResult{T}"/> to create on.</param>
         private static void SetIllustrationPointsResult(HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput,
                                                         HydraRingGeneralResult hydraRingGeneralResult)
         {
             if (hydraRingGeneralResult != null)
             {
-                GeneralResultSubMechanismIllustrationPoint generalResult =
-                    GeneralResultSubmechanismIllustrationPointConverter.Create(hydraRingGeneralResult);
+                GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult =
+                    GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
                 hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult);
             }
         }
Fisheye: Tag 8ba742d2139563c9571e32f074c7c4b3077f45ee refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/GeneralResultSubmechanismIllustrationPointConverter.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj
===================================================================
diff -u -rc883bd5e03754a2a020f36683abb0e4c9d324d2d -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision c883bd5e03754a2a020f36683abb0e4c9d324d2d)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/Ringtoets.Common.Service.csproj	(.../Ringtoets.Common.Service.csproj)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -50,7 +50,7 @@
     <Compile Include="HydraulicBoundaryDatabaseConnectionValidator.cs" />
     <Compile Include="IllustrationPoints\CombinationTypeConverter.cs" />
     <Compile Include="IllustrationPoints\FaultTreeIllustrationPointConverter.cs" />
-    <Compile Include="IllustrationPoints\GeneralResultSubmechanismIllustrationPointConverter.cs" />
+    <Compile Include="IllustrationPoints\GeneralResultConverter.cs" />
     <Compile Include="IllustrationPoints\SubMechanismIllustrationPointConverter.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointResultConverter.cs" />
     <Compile Include="IllustrationPoints\StochastConverter.cs" />
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r6eabea7a72771b62ff8b173b9b37f5b89ed403f3 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 6eabea7a72771b62ff8b173b9b37f5b89ed403f3)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -199,20 +199,20 @@
         }
 
         /// <summary>
-        /// Sets a <see cref="GeneralResultSubMechanismIllustrationPoint"/> based on the information 
+        /// Sets a <see cref="GeneralResult{T}"/> based on the information 
         /// of <paramref name="hydraRingGeneralResult"/> to the <paramref name="hydraulicBoundaryLocationOutput"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocationOutput">The <see cref="HydraulicBoundaryLocationOutput"/> 
-        /// for which to set the <see cref="GeneralResultSubMechanismIllustrationPoint"/>.</param>
+        /// for which to set the <see cref="GeneralResult{T}"/>.</param>
         /// <param name="hydraRingGeneralResult">The <see cref="HydraRingGeneralResult"/> to base the 
-        /// <see cref="GeneralResultSubMechanismIllustrationPoint"/> to create on.</param>
+        /// <see cref="GeneralResult{T}"/> to create on.</param>
         private static void SetIllustrationPointsResult(HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput,
                                                         HydraRingGeneralResult hydraRingGeneralResult)
         {
             if (hydraRingGeneralResult != null)
             {
-                GeneralResultSubMechanismIllustrationPoint generalResult =
-                    GeneralResultSubmechanismIllustrationPointConverter.Create(hydraRingGeneralResult);
+                GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult =
+                    GeneralResultConverter.CreateGeneralResultTopLevelSubMechanismIllustrationPoint(hydraRingGeneralResult);
                 hydraulicBoundaryLocationOutput.SetIllustrationPoints(generalResult);
             }
         }
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultSubMechanismIllustrationPointExtensionsTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/IllustrationPoints/GeneralResultSubMechanismIllustrationPointTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -rf95a6fe33de7536ebff9698dccdb74b492cbb7e7 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision f95a6fe33de7536ebff9698dccdb74b492cbb7e7)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -81,8 +81,6 @@
     <Compile Include="Hydraulics\HydraulicBoundaryLocationTest.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointNodeTest.cs" />
     <Compile Include="IllustrationPoints\FaultTreeIllustrationPointTest.cs" />
-    <Compile Include="IllustrationPoints\GeneralResultSubMechanismIllustrationPointExtensionsTest.cs" />
-    <Compile Include="IllustrationPoints\GeneralResultSubMechanismIllustrationPointTest.cs" />
     <Compile Include="IllustrationPoints\GeneralResultTest.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointBaseTest.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointResultTest.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPointTest.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPointTest.cs	(.../TestGeneralResultSubMechanismIllustrationPointTest.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPointTest.cs	(.../TestGeneralResultSubMechanismIllustrationPointTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -37,10 +37,10 @@
             var generalResult = new TestGeneralResultSubMechanismIllustrationPoint();
 
             // Assert
-            Assert.IsInstanceOf<GeneralResultSubMechanismIllustrationPoint>(generalResult);
+            Assert.IsInstanceOf<GeneralResult<TopLevelSubMechanismIllustrationPoint>>(generalResult);
             AssertWindDirection(WindDirectionTestFactory.CreateTestWindDirection(), generalResult.GoverningWindDirection);
             CollectionAssert.IsEmpty(generalResult.Stochasts);
-            CollectionAssert.IsEmpty(generalResult.TopLevelSubMechanismIllustrationPoints);
+            CollectionAssert.IsEmpty(generalResult.TopLevelIllustrationPoints);
         }
 
         [Test]
@@ -54,10 +54,10 @@
             var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints);
 
             // Assert
-            Assert.IsInstanceOf<GeneralResultSubMechanismIllustrationPoint>(generalResult);
+            Assert.IsInstanceOf<GeneralResult<TopLevelSubMechanismIllustrationPoint>>(generalResult);
             AssertWindDirection(WindDirectionTestFactory.CreateTestWindDirection(), generalResult.GoverningWindDirection);
             CollectionAssert.IsEmpty(generalResult.Stochasts);
-            Assert.AreSame(topLevelIllustrationPoints, generalResult.TopLevelSubMechanismIllustrationPoints);
+            Assert.AreSame(topLevelIllustrationPoints, generalResult.TopLevelIllustrationPoints);
         }
 
         private static void AssertWindDirection(WindDirection expected, WindDirection actual)
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs	(.../TestGeneralResultSubMechanismIllustrationPoint.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestGeneralResultSubMechanismIllustrationPoint.cs	(.../TestGeneralResultSubMechanismIllustrationPoint.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -29,7 +29,7 @@
     /// <summary>
     /// A simple general result which can be used for testing.
     /// </summary>
-    public class TestGeneralResultSubMechanismIllustrationPoint : GeneralResultSubMechanismIllustrationPoint
+    public class TestGeneralResultSubMechanismIllustrationPoint : GeneralResult<TopLevelSubMechanismIllustrationPoint>
     {
         /// <summary>
         /// Creates a new instance of <see cref="TestGeneralResultSubMechanismIllustrationPoint"/>.
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/LocationsViewTest.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/LocationsViewTest.cs	(.../LocationsViewTest.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/LocationsViewTest.cs	(.../LocationsViewTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -188,7 +188,7 @@
             object selection = view.Selection;
 
             // Then
-            Assert.AreSame(calculatableObject.GeneralResult.TopLevelSubMechanismIllustrationPoints.ElementAt(1), selection);
+            Assert.AreSame(calculatableObject.GeneralResult.TopLevelIllustrationPoints.ElementAt(1), selection);
         }
 
         [Test]
@@ -314,7 +314,7 @@
             {
                 new TestCalculatableObject
                 {
-                    GeneralResult = new GeneralResultSubMechanismIllustrationPoint(
+                    GeneralResult = new GeneralResult<TopLevelSubMechanismIllustrationPoint>(
                         WindDirectionTestFactory.CreateTestWindDirection(),
                         Enumerable.Empty<Stochast>(),
                         new[]
@@ -333,7 +333,7 @@
                 },
                 new TestCalculatableObject
                 {
-                    GeneralResult = new GeneralResultSubMechanismIllustrationPoint(
+                    GeneralResult = new GeneralResult<TopLevelSubMechanismIllustrationPoint>(
                         WindDirectionTestFactory.CreateTestWindDirection(),
                         Enumerable.Empty<Stochast>(),
                         new[]
@@ -371,7 +371,7 @@
         {
             public bool IsChecked { get; }
 
-            public GeneralResultSubMechanismIllustrationPoint GeneralResult { get; set; }
+            public GeneralResult<TopLevelSubMechanismIllustrationPoint> GeneralResult { get; set; }
         }
 
         private class TestLocationsView : LocationsView<TestCalculatableObject>
@@ -423,7 +423,7 @@
                 if (calculatableObject?.GeneralResult != null)
                 {
                     return calculatableObject.GeneralResult
-                                             .TopLevelSubMechanismIllustrationPoints
+                                             .TopLevelIllustrationPoints
                                              .Select(topLevelSubMechanismIllustrationPoint =>
                                                          new IllustrationPointControlItem(topLevelSubMechanismIllustrationPoint,
                                                                                           topLevelSubMechanismIllustrationPoint.WindDirection.Name,
Fisheye: Tag 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/CreateGeneralResultSubmechanismIllustrationPointConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 8ba742d2139563c9571e32f074c7c4b3077f45ee refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/GeneralResultConverterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj
===================================================================
diff -u -rc883bd5e03754a2a020f36683abb0e4c9d324d2d -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision c883bd5e03754a2a020f36683abb0e4c9d324d2d)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/Ringtoets.Common.Service.Test.csproj	(.../Ringtoets.Common.Service.Test.csproj)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -66,7 +66,7 @@
     <Compile Include="HydraRingSettingsDatabaseHelperTest.cs" />
     <Compile Include="HydraulicBoundaryDatabaseConnectionValidatorTest.cs" />
     <Compile Include="IllustrationPoints\CombinationTypeConverterTest.cs" />
-    <Compile Include="IllustrationPoints\CreateGeneralResultSubmechanismIllustrationPointConverterTest.cs" />
+    <Compile Include="IllustrationPoints\GeneralResultConverterTest.cs" />
     <Compile Include="IllustrationPoints\FaultTreeIllustrationPointConverterTest.cs" />
     <Compile Include="IllustrationPoints\SubMechanismIllustrationPointConverterTest.cs" />
     <Compile Include="IllustrationPoints\IllustrationPointResultConverterTest.cs" />
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -136,7 +136,7 @@
             }
         }
 
-        protected override GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints()
+        protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints()
         {
             if (data.HydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput
                 && data.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.HasIllustrationPoints)
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextProperties.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -162,7 +162,7 @@
             get
             {
                 return GetGeneralResultSubMechanismIllustrationPoints()
-                    .TopLevelSubMechanismIllustrationPoints
+                    .TopLevelIllustrationPoints
                     .Select(p => new TopLevelSubMechanismIllustrationPointProperties
                     {
                         Data = p
@@ -206,7 +206,7 @@
         /// </summary>
         /// <returns>The general illustration points if it has obtained as part of the calculation, <c>null</c>
         /// otherwise.</returns>
-        protected abstract GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints();
+        protected abstract GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints();
 
         public class ConstructionProperties
         {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContextProperties.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -136,7 +136,7 @@
             }
         }
 
-        protected override GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints()
+        protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints()
         {
             if (data.HydraulicBoundaryLocation.WaveHeightCalculation.HasOutput
                 && data.HydraulicBoundaryLocation.WaveHeightCalculation.Output.HasIllustrationPoints)
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -200,7 +200,7 @@
             if (designWaterLevelCalculation.HasOutput
                 && designWaterLevelOutput.HasIllustrationPoints)
             {
-                return designWaterLevelOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelSubMechanismIllustrationPoints.Select(
+                return designWaterLevelOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelIllustrationPoints.Select(
                     topLevelSubMechanismIllustrationPoint =>
                     {
                         SubMechanismIllustrationPoint subMechanismIllustrationPoint =
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -170,7 +170,7 @@
             if (waveHeightCalculation.HasOutput
                 && waveHeightOutput.HasIllustrationPoints)
             {
-                return waveHeightOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelSubMechanismIllustrationPoints.Select(
+                return waveHeightOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelIllustrationPoints.Select(
                     topLevelSubMechanismIllustrationPoint =>
                     {
                         SubMechanismIllustrationPoint subMechanismIllustrationPoint =
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -136,7 +136,7 @@
 
             if (withIllustrationPoints)
             {
-                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResultSubMechanismIllustrationPoint(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
+                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResult<TopLevelSubMechanismIllustrationPoint>(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
             }
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y)
             {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextPropertiesTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -271,7 +271,7 @@
 
             public bool WithGeneralResult;
 
-            protected override GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints()
+            protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints()
             {
                 return WithGeneralResult ? new TestGeneralResultSubMechanismIllustrationPoint() : null;
             }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -136,7 +136,7 @@
 
             if (withIllustrationPoints)
             {
-                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResultSubMechanismIllustrationPoint(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
+                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResult<TopLevelSubMechanismIllustrationPoint>(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
             }
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y)
             {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -551,9 +551,9 @@
         }
 
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
-            GeneralResultSubMechanismIllustrationPoint generalResult)
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
-            return generalResult.TopLevelSubMechanismIllustrationPoints
+            return generalResult.TopLevelIllustrationPoints
                                 .Select(topLevelIllustrationPoint =>
                                 {
                                     SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -550,9 +550,9 @@
         }
 
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
-            GeneralResultSubMechanismIllustrationPoint generalResult)
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
-            return generalResult.TopLevelSubMechanismIllustrationPoints
+            return generalResult.TopLevelIllustrationPoints
                                 .Select(topLevelIllustrationPoint =>
                                 {
                                     SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs	(.../DesignWaterLevelLocationContextProperties.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/DesignWaterLevelLocationContextProperties.cs	(.../DesignWaterLevelLocationContextProperties.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -133,7 +133,7 @@
             }
         }
 
-        protected override GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints()
+        protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints()
         {
             if (data.HydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput
                 && data.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.HasIllustrationPoints)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs
===================================================================
diff -u -r4a73a8a56bdfc43d45d691fa4dbc251bbb261085 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs	(.../HydraulicBoundaryLocationProperties.cs)	(revision 4a73a8a56bdfc43d45d691fa4dbc251bbb261085)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs	(.../HydraulicBoundaryLocationProperties.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -197,7 +197,7 @@
             get
             {
                 return GetGeneralResultSubMechanismIllustrationPoints()
-                    .TopLevelSubMechanismIllustrationPoints
+                    .TopLevelIllustrationPoints
                     .Select(p => new TopLevelSubMechanismIllustrationPointProperties
                     {
                         Data = p
@@ -211,7 +211,7 @@
         /// </summary>
         /// <returns>The general illustration points if it has obtained as part of the calculation, <c>null</c>
         /// otherwise.</returns>
-        protected abstract GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints();
+        protected abstract GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints();
 
         public override string ToString()
         {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs	(.../WaveHeightLocationContextProperties.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WaveHeightLocationContextProperties.cs	(.../WaveHeightLocationContextProperties.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -134,7 +134,7 @@
             }
         }
 
-        protected override GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints()
+        protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints()
         {
             if (data.HydraulicBoundaryLocation.WaveHeightCalculation.HasOutput
                 && data.HydraulicBoundaryLocation.WaveHeightCalculation.Output.HasIllustrationPoints)
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -121,7 +121,7 @@
             if (designWaterLevelCalculation.HasOutput
                 && designWaterLevelOutput.HasIllustrationPoints)
             {
-                return designWaterLevelOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelSubMechanismIllustrationPoints.Select(
+                return designWaterLevelOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelIllustrationPoints.Select(
                     topLevelSubMechanismIllustrationPoint =>
                     {
                         SubMechanismIllustrationPoint subMechanismIllustrationPoint =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -103,7 +103,7 @@
             if (waveHeightCalculation.HasOutput
                 && waveHeightOutput.HasIllustrationPoints)
             {
-                return waveHeightOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelSubMechanismIllustrationPoints.Select(
+                return waveHeightOutput.GeneralResultSubMechanismIllustrationPoint.TopLevelIllustrationPoints.Select(
                     topLevelSubMechanismIllustrationPoint =>
                     {
                         SubMechanismIllustrationPoint subMechanismIllustrationPoint =
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -140,7 +140,7 @@
 
             if (withIllustrationPoints)
             {
-                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResultSubMechanismIllustrationPoint(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
+                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResult<TopLevelSubMechanismIllustrationPoint>(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
             }
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y)
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs	(.../HydraulicBoundaryLocationPropertiesTest.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs	(.../HydraulicBoundaryLocationPropertiesTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -253,7 +253,7 @@
 
             public bool WithGeneralResult;
 
-            protected override GeneralResultSubMechanismIllustrationPoint GetGeneralResultSubMechanismIllustrationPoints()
+            protected override GeneralResult<TopLevelSubMechanismIllustrationPoint> GetGeneralResultSubMechanismIllustrationPoints()
             {
                 return WithGeneralResult ? new TestGeneralResultSubMechanismIllustrationPoint() : null;
             }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs
===================================================================
diff -u -rb7988d7a5616c8c305dac4419a15d5eda07e88bc -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs	(.../WaveHeightLocationContextPropertiesTest.cs)	(revision b7988d7a5616c8c305dac4419a15d5eda07e88bc)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs	(.../WaveHeightLocationContextPropertiesTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -143,7 +143,7 @@
 
             if (withIllustrationPoints)
             {
-                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResultSubMechanismIllustrationPoint(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
+                hydraulicBoundaryLocationOutput.SetIllustrationPoints(new GeneralResult<TopLevelSubMechanismIllustrationPoint>(new WindDirection(governingWindDirection, 2), stochasts, illustrationPoints));
             }
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y)
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -424,9 +424,9 @@
         }
 
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
-            GeneralResultSubMechanismIllustrationPoint generalResult)
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
-            return generalResult.TopLevelSubMechanismIllustrationPoints
+            return generalResult.TopLevelIllustrationPoints
                                 .Select(topLevelIllustrationPoint =>
                                 {
                                     SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -rfee74e8fb98844af091f9b061d9470540dfdd6f0 -r2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision fee74e8fb98844af091f9b061d9470540dfdd6f0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 2e5f2b59e81cda48f3d7ee03afa4db88abc7b1a8)
@@ -420,9 +420,9 @@
         }
 
         private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
-            GeneralResultSubMechanismIllustrationPoint generalResult)
+            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
         {
-            return generalResult.TopLevelSubMechanismIllustrationPoints
+            return generalResult.TopLevelIllustrationPoints
                                 .Select(topLevelIllustrationPoint =>
                                 {
                                     SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;