Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingConfiguration.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingDikeSection.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingProfilePoint.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Common/HydraRingVariable.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/AssessmentLevelCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDeviationType.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDeviationType.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDeviationType.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,35 @@
+// 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.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Enumeration that defines the deviation types supported by Hydra-Ring.
+    /// </summary>
+    /// <remarks>
+    /// The integer values correspond to deviation ids defined within Hydra-Ring.
+    /// </remarks>
+    public enum HydraRingDeviationType
+    {
+        Standard = 0,
+        Variation = 1
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDikeSection.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDikeSection.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDikeSection.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,161 @@
+// 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.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Container for Hydra-Ring dike (cross) section data.
+    /// </summary>
+    public class HydraRingDikeSection
+    {
+        private readonly int sectionId;
+        private readonly string sectionName;
+        private readonly double sectionBeginCoordinate;
+        private readonly double sectionEndCoordinate;
+        private readonly double sectionLength;
+        private readonly double crossSectionXCoordinate;
+        private readonly double crossSectionYCoordinate;
+        private readonly double crossSectionNormal;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="HydraRingDikeSection"/> class.
+        /// </summary>
+        /// <param name="sectionId">The id of the dike section.</param>
+        /// <param name="sectionName">The name of the dike section.</param>
+        /// <param name="sectionBeginCoordinate">The begin coordinate of the dike section.</param>
+        /// <param name="sectionEndCoordinate">The end coordinate of the dike section.</param>
+        /// <param name="sectionLength">The length of the dike section.</param>
+        /// <param name="crossSectionXCoordinate">The x coordinate of the dike cross section.</param>
+        /// <param name="crossSectionYCoordinate">the y coordinate of the dike cross section.</param>
+        /// <param name="crossSectionNormal">The normal of the dike cross section.</param>
+        public HydraRingDikeSection(int sectionId, string sectionName, double sectionBeginCoordinate, double sectionEndCoordinate, double sectionLength, double crossSectionXCoordinate, double crossSectionYCoordinate, double crossSectionNormal)
+        {
+            this.sectionId = sectionId;
+            this.sectionName = sectionName;
+            this.sectionBeginCoordinate = sectionBeginCoordinate;
+            this.sectionEndCoordinate = sectionEndCoordinate;
+            this.sectionLength = sectionLength;
+            this.crossSectionXCoordinate = crossSectionXCoordinate;
+            this.crossSectionYCoordinate = crossSectionYCoordinate;
+            this.crossSectionNormal = crossSectionNormal;
+        }
+
+        /// <summary>
+        /// Gets the id of the dike section.
+        /// </summary>
+        public int SectionId
+        {
+            get
+            {
+                return sectionId;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the dike section.
+        /// </summary>
+        /// <remarks>
+        /// This name is used in the input file and the output file of Hydra-Ring calculations.
+        /// </remarks>
+        public string SectionName
+        {
+            get
+            {
+                return sectionName;
+            }
+        }
+
+        /// <summary>
+        /// Gets the begin coordinate of the dike section.
+        /// </summary>
+        /// <remarks>
+        /// If only a dike cross section is considered, this property should be set equal to <see cref="CrossSectionXCoordinate"/>.
+        /// </remarks>
+        public double SectionBeginCoordinate
+        {
+            get
+            {
+                return sectionBeginCoordinate;
+            }
+        }
+
+        /// <summary>
+        /// Gets the end coordinate of the dike section.
+        /// </summary>
+        /// <remarks>
+        /// If only a dike cross section is considered, this property should be set equal to <see cref="CrossSectionYCoordinate"/>.
+        /// </remarks>
+        public double SectionEndCoordinate
+        {
+            get
+            {
+                return sectionEndCoordinate;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length of the dike section.
+        /// </summary>
+        public double SectionLength
+        {
+            get
+            {
+                return sectionLength;
+            }
+        }
+
+        /// <summary>
+        /// Gets the x coordinate of the dike cross section.
+        /// </summary>
+        public double CrossSectionXCoordinate
+        {
+            get
+            {
+                return crossSectionXCoordinate;
+            }
+        }
+
+        /// <summary>
+        /// Gets the y coordinate of the dike cross section.
+        /// </summary>
+        public double CrossSectionYCoordinate
+        {
+            get
+            {
+                return crossSectionYCoordinate;
+            }
+        }
+
+        /// <summary>
+        /// Gets the normal of the dike cross section.
+        /// </summary>
+        /// <remarks>
+        /// The normal corresponds to the angle of the straight line perpendicular to the dike stretch at the location of the dike cross section (with respect to the north).
+        /// </remarks>
+        public double CrossSectionNormal
+        {
+            get
+            {
+                return crossSectionNormal;
+            }
+        }
+    }
+}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDistributionType.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDistributionType.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingDistributionType.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,36 @@
+// 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.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Enumeration that defines the distribution types supported by Hydra-Ring.
+    /// </summary>
+    /// <remarks>
+    /// The integer values correspond to distribution ids defined within Hydra-Ring.
+    /// </remarks>
+    public enum HydraRingDistributionType
+    {
+        Deterministic = 0,
+        Normal = 2,
+        LogNormal = 4 // Also applies to shifted log normal distributions
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingFailureMechanismType.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,43 @@
+// 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.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Enumeration that defines the failure mechanism types supported by Hydra-Ring.
+    /// </summary>
+    /// <remarks>
+    /// The integer values DON'T correspond to failure mechanism ids defined within Hydra-Ring.
+    /// </remarks>
+    public enum HydraRingFailureMechanismType
+    {
+        AssessmentLevel,
+        QVariant,
+        WaveHeight,
+        WavePeakPeriod,
+        WaveSpectralPeriod,
+        DikesOvertopping,
+        DikesPiping,
+        StructuresOvertopping,
+        StructuresClosure,
+        StructuresStructuralFailure
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingProfilePoint.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingProfilePoint.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingProfilePoint.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,76 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Container for Hydra-Ring profile point related data.
+    /// </summary>
+    public class HydraRingProfilePoint
+    {
+        private readonly double x;
+        private readonly double z;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="HydraRingProfilePoint"/> class.
+        /// </summary>
+        /// <param name="x">The x coordinate.</param>
+        /// <param name="z">The z coordinate.</param>
+        public HydraRingProfilePoint(double x, double z)
+        {
+            this.x = x;
+            this.z = z;
+        }
+
+        /// <summary>
+        /// Gets the x coordinate.
+        /// </summary>
+        public double X
+        {
+            get
+            {
+                return x;
+            }
+        }
+
+        /// <summary>
+        /// Gets the z coordinate.
+        /// </summary>
+        public double Z
+        {
+            get
+            {
+                return z;
+            }
+        }
+
+        /// <summary>
+        /// Gets the roughness.
+        /// </summary>
+        public virtual double Roughness
+        {
+            get
+            {
+                return 1.0;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,36 @@
+// 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.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Enumeration that defines the time integration scheme types supported by Hydra-Ring.
+    /// </summary>
+    /// <remarks>
+    /// The integer values correspond to time integration scheme ids defined within Hydra-Ring.
+    /// </remarks>
+    public enum HydraRingTimeIntegrationSchemeType
+    {
+        FBC = 1,
+        APT = 2,
+        NTI = 3
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingUncertaintiesType.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingUncertaintiesType.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingUncertaintiesType.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,37 @@
+// 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.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Enumeration that defines the uncertainties types supported by Hydra-Ring.
+    /// </summary>
+    /// <remarks>
+    /// The integer values correspond to uncertainties ids defined within Hydra-Ring.
+    /// </remarks>
+    public enum HydraRingUncertaintiesType
+    {
+        None = 0, // "No uncertainties"
+        All = 1, // "All uncertainties"
+        Model = 2, // "Only model uncertainties"
+        Statistic = 3 // "Only statistical uncertainties"
+    }
+}
\ No newline at end of file
Fisheye: Tag 56f86024f7598b3d5dd16940ddfa96c4fc72592d refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingVariable.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraulicCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingCalculation.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingCalculation.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingCalculation.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,108 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Ringtoets.HydraRing.Calculation.Data;
+
+namespace Ringtoets.HydraRing.Calculation
+{
+    /// <summary>
+    /// Container of all data necessary for performing a Hydra-Ring calculation.
+    /// </summary>
+    public abstract class HydraRingCalculation
+    {
+        private readonly int hydraulicBoundaryLocationId;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="HydraRingCalculation"/> class.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocationId">The id of the hydraulic station to use during the calculation.</param>
+        protected HydraRingCalculation(int hydraulicBoundaryLocationId)
+        {
+            this.hydraulicBoundaryLocationId = hydraulicBoundaryLocationId;
+        }
+
+        /// <summary>
+        /// Gets the <see cref="HydraRingFailureMechanismType"/>.
+        /// </summary>
+        public abstract HydraRingFailureMechanismType FailureMechanismType { get; }
+
+        /// <summary>
+        /// Gets the id of the hydraulic station to use during the calculation.
+        /// </summary>
+        public int HydraulicBoundaryLocationId
+        {
+            get
+            {
+                return hydraulicBoundaryLocationId;
+            }
+        }
+
+        /// <summary>
+        /// Gets the dike section to perform the calculation for.
+        /// </summary>
+        public abstract HydraRingDikeSection DikeSection { get; }
+
+        /// <summary>
+        /// Gets the variables to use during the calculation.
+        /// </summary>
+        public virtual IEnumerable<HydraRingVariable> Variables
+        {
+            get
+            {
+                yield break;
+            }
+        }
+
+        /// <summary>
+        /// Gets the profile points to use during the calculation.
+        /// </summary>
+        public virtual IEnumerable<HydraRingProfilePoint> ProfilePoints
+        {
+            get
+            {
+                yield break;
+            }
+        }
+
+        /// <summary>
+        /// Gets the target reliability index to use during the calculation.
+        /// </summary>
+        /// <remarks>Only relevant for type 2 computations.</remarks>
+        public virtual double Beta
+        {
+            get
+            {
+                return double.NaN;
+            }
+        }
+
+        /// <summary>
+        /// Gets the sub mechanism model id corresponding to the provided sub mechanism id.
+        /// </summary>
+        /// <param name="subMechanismId">The sub mechanim id to get the sub mechanism model id for.</param>
+        /// <returns>The corresponding sub mechanism model id or <c>null</c> otherwise.</returns>
+        public virtual int? GetSubMechanismModelId(int subMechanismId)
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 56f86024f7598b3d5dd16940ddfa96c4fc72592d refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/AssessmentLevelCalculation.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/AssessmentLevelCalculation.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/AssessmentLevelCalculation.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,73 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Ringtoets.HydraRing.Calculation.Data;
+
+namespace Ringtoets.HydraRing.Calculation.Hydraulics
+{
+    /// <summary>
+    /// Container of all data necessary for performing an assessment level calculation via Hydra-Ring.
+    /// </summary>
+    public class AssessmentLevelCalculation : HydraulicCalculation
+    {
+        private readonly HydraRingDikeSection dikeSection;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="AssessmentLevelCalculation"/> class.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocationId">The id of the hydraulic station to use during the calculation.</param>
+        /// <param name="beta">The target reliability index to use during the calculation.</param>
+        public AssessmentLevelCalculation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId, beta)
+        {
+            dikeSection = new HydraRingDikeSection(HydraulicBoundaryLocationId, HydraulicBoundaryLocationId.ToString(), double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN);
+        }
+
+        public override HydraRingFailureMechanismType FailureMechanismType
+        {
+            get
+            {
+                return HydraRingFailureMechanismType.AssessmentLevel;
+            }
+        }
+
+        public override HydraRingDikeSection DikeSection
+        {
+            get
+            {
+                return dikeSection;
+            }
+        }
+
+        public override IEnumerable<HydraRingVariable> Variables
+        {
+            get
+            {
+                yield return new AssessmentLevelVariable();
+            }
+        }
+
+        private class AssessmentLevelVariable : HydraRingVariable
+        {
+            public AssessmentLevelVariable() : base(26, HydraRingDistributionType.Deterministic, 0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN) { }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/HydraulicCalculation.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/HydraulicCalculation.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/HydraulicCalculation.cs	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -0,0 +1,49 @@
+// 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.
+
+namespace Ringtoets.HydraRing.Calculation.Hydraulics
+{
+    /// <summary>
+    /// Container of all data necessary for performing an hydraulic data calculation via Hydra-Ring.
+    /// </summary>
+    public abstract class HydraulicCalculation : HydraRingCalculation
+    {
+        private readonly double beta;
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="HydraulicCalculation"/> class.
+        /// </summary>
+        /// <param name="hydraulicBoundaryLocationId">The id of the hydraulic station to use during the calculation.</param>
+        /// <param name="beta">The target reliability index to use during the calculation.</param>
+        protected HydraulicCalculation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId)
+        {
+            this.beta = beta;
+        }
+
+        public override double Beta
+        {
+            get
+            {
+                return beta;
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r6d95a1695a43dacc80bd5dd3a118deb98d99702d -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 6d95a1695a43dacc80bd5dd3a118deb98d99702d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -39,27 +39,27 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Common\HydraRingDikeSection.cs" />
-    <Compile Include="Common\HydraRingProfilePoint.cs" />
-    <Compile Include="Data\AssessmentLevelCalculation.cs" />
-    <Compile Include="Common\HydraRingCalculation.cs" />
+    <Compile Include="Data\HydraRingDikeSection.cs" />
+    <Compile Include="Data\HydraRingProfilePoint.cs" />
+    <Compile Include="Hydraulics\AssessmentLevelCalculation.cs" />
+    <Compile Include="HydraRingCalculation.cs" />
     <Compile Include="Settings\VariableDefaults.cs" />
     <Compile Include="Settings\VariableDefaultsProvider.cs" />
-    <Compile Include="Types\HydraRingDistributionType.cs" />
-    <Compile Include="Types\HydraRingDeviationType.cs" />
-    <Compile Include="Common\HydraRingVariable.cs" />
+    <Compile Include="Data\HydraRingDistributionType.cs" />
+    <Compile Include="Data\HydraRingDeviationType.cs" />
+    <Compile Include="Data\HydraRingVariable.cs" />
     <Compile Include="Settings\FailureMechanismDefaults.cs" />
     <Compile Include="Settings\FailureMechanismDefaultsProvider.cs" />
     <Compile Include="Settings\FailureMechanismSettings.cs" />
     <Compile Include="Settings\FailureMechanismSettingsProvider.cs" />
     <Compile Include="Settings\SubMechanismSettingsProvider.cs" />
-    <Compile Include="Types\HydraRingFailureMechanismType.cs" />
-    <Compile Include="Common\HydraRingConfiguration.cs" />
+    <Compile Include="Data\HydraRingFailureMechanismType.cs" />
+    <Compile Include="HydraRingConfiguration.cs" />
     <Compile Include="Settings\SubMechanismSettings.cs" />
-    <Compile Include="Data\HydraulicCalculation.cs" />
+    <Compile Include="Hydraulics\HydraulicCalculation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Types\HydraRingTimeIntegrationSchemeType.cs" />
-    <Compile Include="Types\HydraRingUncertaintiesType.cs" />
+    <Compile Include="Data\HydraRingTimeIntegrationSchemeType.cs" />
+    <Compile Include="Data\HydraRingUncertaintiesType.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Version\Core.Common.Version.csproj">
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaults.cs
===================================================================
diff -u -r0807ea5c37a7436c1984ba931dab56887ab53762 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaults.cs	(.../FailureMechanismDefaults.cs)	(revision 0807ea5c37a7436c1984ba931dab56887ab53762)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaults.cs	(.../FailureMechanismDefaults.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Settings
 {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaultsProvider.cs
===================================================================
diff -u -r0807ea5c37a7436c1984ba931dab56887ab53762 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaultsProvider.cs	(.../FailureMechanismDefaultsProvider.cs)	(revision 0807ea5c37a7436c1984ba931dab56887ab53762)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismDefaultsProvider.cs	(.../FailureMechanismDefaultsProvider.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Settings
 {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettings.cs
===================================================================
diff -u -r315c97cc1170e8d835360b43435dc816bfaf196c -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettings.cs	(.../FailureMechanismSettings.cs)	(revision 315c97cc1170e8d835360b43435dc816bfaf196c)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettings.cs	(.../FailureMechanismSettings.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -1,3 +1,24 @@
+// 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.
+
 namespace Ringtoets.HydraRing.Calculation.Settings
 {
     /// <summary>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettingsProvider.cs
===================================================================
diff -u -r315c97cc1170e8d835360b43435dc816bfaf196c -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettingsProvider.cs	(.../FailureMechanismSettingsProvider.cs)	(revision 315c97cc1170e8d835360b43435dc816bfaf196c)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/FailureMechanismSettingsProvider.cs	(.../FailureMechanismSettingsProvider.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Settings
 {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/SubMechanismSettingsProvider.cs
===================================================================
diff -u -r6cec21ca5e9396202bd248dfabc181857bf433a5 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/SubMechanismSettingsProvider.cs	(.../SubMechanismSettingsProvider.cs)	(revision 6cec21ca5e9396202bd248dfabc181857bf433a5)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/SubMechanismSettingsProvider.cs	(.../SubMechanismSettingsProvider.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Settings
 {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/VariableDefaultsProvider.cs
===================================================================
diff -u -rab7b81150cff6adc7137c9c144d5d436503aaa32 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/VariableDefaultsProvider.cs	(.../VariableDefaultsProvider.cs)	(revision ab7b81150cff6adc7137c9c144d5d436503aaa32)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Settings/VariableDefaultsProvider.cs	(.../VariableDefaultsProvider.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Settings
 {
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Types/HydraRingDeviationType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Types/HydraRingDistributionType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Types/HydraRingFailureMechanismType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Types/HydraRingTimeIntegrationSchemeType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dd33f3b9d039c570742b8233da23326538c848cf refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Types/HydraRingUncertaintiesType.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationTest.cs
===================================================================
diff -u -r6d95a1695a43dacc80bd5dd3a118deb98d99702d -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationTest.cs	(.../HydraRingCalculationTest.cs)	(revision 6d95a1695a43dacc80bd5dd3a118deb98d99702d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingCalculationTest.cs	(.../HydraRingCalculationTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,8 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Common;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Common
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs
===================================================================
diff -u -r6d95a1695a43dacc80bd5dd3a118deb98d99702d -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs	(.../HydraRingConfigurationTest.cs)	(revision 6d95a1695a43dacc80bd5dd3a118deb98d99702d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingConfigurationTest.cs	(.../HydraRingConfigurationTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -22,9 +22,8 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Common;
 using Ringtoets.HydraRing.Calculation.Data;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Hydraulics;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Common
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingDikeSectionTest.cs
===================================================================
diff -u -ra86ee48c248b3095d7db43023c64780534dd2e59 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingDikeSectionTest.cs	(.../HydraRingDikeSectionTest.cs)	(revision a86ee48c248b3095d7db43023c64780534dd2e59)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingDikeSectionTest.cs	(.../HydraRingDikeSectionTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Common;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Common
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingProfilePointTest.cs
===================================================================
diff -u -r6241d8b1d8a7329857bc6dc8ef1648893f8365dd -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingProfilePointTest.cs	(.../HydraRingProfilePointTest.cs)	(revision 6241d8b1d8a7329857bc6dc8ef1648893f8365dd)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingProfilePointTest.cs	(.../HydraRingProfilePointTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,7 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Common;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Common
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingVariableTest.cs
===================================================================
diff -u -r2c6b53332f530b9060259e3d821fc78e204245db -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingVariableTest.cs	(.../HydraRingVariableTest.cs)	(revision 2c6b53332f530b9060259e3d821fc78e204245db)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Common/HydraRingVariableTest.cs	(.../HydraRingVariableTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,8 +20,7 @@
 // All rights reserved.
 
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Common;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Common
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs
===================================================================
diff -u -r6d95a1695a43dacc80bd5dd3a118deb98d99702d -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs	(.../HydraRingConfigurationIntegrationTest.cs)	(revision 6d95a1695a43dacc80bd5dd3a118deb98d99702d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationIntegrationTest.cs	(.../HydraRingConfigurationIntegrationTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -21,9 +21,8 @@
 
 using System;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Common;
 using Ringtoets.HydraRing.Calculation.Data;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Hydraulics;
 
 namespace Ringtoets.HydraRing.Calculation.Test
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsProviderTest.cs
===================================================================
diff -u -re6f8ac7ecbea09b8c7500713e9c2a48844b67eed -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsProviderTest.cs	(.../FailureMechanismDefaultsProviderTest.cs)	(revision e6f8ac7ecbea09b8c7500713e9c2a48844b67eed)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismDefaultsProviderTest.cs	(.../FailureMechanismDefaultsProviderTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -21,8 +21,8 @@
 
 using System.Collections.Generic;
 using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Settings;
-using Ringtoets.HydraRing.Calculation.Types;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Settings
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismSettingsProviderTest.cs
===================================================================
diff -u -r315c97cc1170e8d835360b43435dc816bfaf196c -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismSettingsProviderTest.cs	(.../FailureMechanismSettingsProviderTest.cs)	(revision 315c97cc1170e8d835360b43435dc816bfaf196c)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/FailureMechanismSettingsProviderTest.cs	(.../FailureMechanismSettingsProviderTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Settings;
-using Ringtoets.HydraRing.Calculation.Types;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Settings
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/SubMechanismSettingsProviderTest.cs
===================================================================
diff -u -r6cec21ca5e9396202bd248dfabc181857bf433a5 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/SubMechanismSettingsProviderTest.cs	(.../SubMechanismSettingsProviderTest.cs)	(revision 6cec21ca5e9396202bd248dfabc181857bf433a5)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/SubMechanismSettingsProviderTest.cs	(.../SubMechanismSettingsProviderTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Settings;
-using Ringtoets.HydraRing.Calculation.Types;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Settings
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/VariableDefaultsProviderTest.cs
===================================================================
diff -u -rab7b81150cff6adc7137c9c144d5d436503aaa32 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/VariableDefaultsProviderTest.cs	(.../VariableDefaultsProviderTest.cs)	(revision ab7b81150cff6adc7137c9c144d5d436503aaa32)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Settings/VariableDefaultsProviderTest.cs	(.../VariableDefaultsProviderTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -20,8 +20,8 @@
 // All rights reserved.
 
 using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Settings;
-using Ringtoets.HydraRing.Calculation.Types;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Settings
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingDeviationTypeTest.cs
===================================================================
diff -u -r02e4e3830d745db66a35986a2ffdfb9e484ad48a -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingDeviationTypeTest.cs	(.../HydraRingDeviationTypeTest.cs)	(revision 02e4e3830d745db66a35986a2ffdfb9e484ad48a)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingDeviationTypeTest.cs	(.../HydraRingDeviationTypeTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -21,7 +21,7 @@
 
 using System;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Types
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingDistributionTypeTest.cs
===================================================================
diff -u -r02e4e3830d745db66a35986a2ffdfb9e484ad48a -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingDistributionTypeTest.cs	(.../HydraRingDistributionTypeTest.cs)	(revision 02e4e3830d745db66a35986a2ffdfb9e484ad48a)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingDistributionTypeTest.cs	(.../HydraRingDistributionTypeTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -21,7 +21,7 @@
 
 using System;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Types
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingFailureMechanismTypeTest.cs
===================================================================
diff -u -r907f25f4a15204ce1b1ba29d0ada4410d1914930 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingFailureMechanismTypeTest.cs	(.../HydraRingFailureMechanismTypeTest.cs)	(revision 907f25f4a15204ce1b1ba29d0ada4410d1914930)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingFailureMechanismTypeTest.cs	(.../HydraRingFailureMechanismTypeTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -21,7 +21,7 @@
 
 using System;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Types
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingTimeIntegrationSchemeTypeTest.cs
===================================================================
diff -u -r907f25f4a15204ce1b1ba29d0ada4410d1914930 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingTimeIntegrationSchemeTypeTest.cs	(.../HydraRingTimeIntegrationSchemeTypeTest.cs)	(revision 907f25f4a15204ce1b1ba29d0ada4410d1914930)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingTimeIntegrationSchemeTypeTest.cs	(.../HydraRingTimeIntegrationSchemeTypeTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -21,7 +21,7 @@
 
 using System;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Types
 {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingUncertaintiesTypeTest.cs
===================================================================
diff -u -r907f25f4a15204ce1b1ba29d0ada4410d1914930 -rdd33f3b9d039c570742b8233da23326538c848cf
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingUncertaintiesTypeTest.cs	(.../HydraRingUncertaintiesTypeTest.cs)	(revision 907f25f4a15204ce1b1ba29d0ada4410d1914930)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Types/HydraRingUncertaintiesTypeTest.cs	(.../HydraRingUncertaintiesTypeTest.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
@@ -21,7 +21,7 @@
 
 using System;
 using NUnit.Framework;
-using Ringtoets.HydraRing.Calculation.Types;
+using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Types
 {