Fisheye: Tag 49084c971c0de5668befdcf5c8d6b65debf0b659 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Probability/NormProbabilityInput.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInput.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInput.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInput.cs	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -0,0 +1,93 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Ringtoets.Common.Data.Properties;
+
+namespace Ringtoets.Common.Data.Probability
+{
+    /// <summary>
+    /// Class that holds all probability assessment calculation specific input parameters.
+    /// </summary>
+    public class ProbabilityAssessmentInput
+    {
+        private double contribution;
+        private int n;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ProbabilityAssessmentInput"/> class.
+        /// </summary>
+        public ProbabilityAssessmentInput()
+        {
+            N = 2;
+            Norm = 0;
+            Contribution = double.NaN;
+        }
+
+        /// <summary>
+        /// Gets or sets the 'N' parameter used to factor in the 'length effect'.
+        /// </summary>
+        /// <exception cref="ArgumentException">Thrown when the <paramref name="value"/> is not in interval 
+        /// [1-20].</exception>
+        public int N
+        {
+            get
+            {
+                return n;
+            }
+            set
+            {
+                if (value < 1 || value > 20)
+                {
+                    throw new ArgumentOutOfRangeException("value", Resources.N_Value_should_be_in_interval_1_20);
+                }
+                n = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the contribution of failure mechanism as a percentage (0-100) to the total of the 
+        /// failure probability of the assessment section.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when the <paramref name="value"/> is not 
+        /// in interval [1-100].</exception>
+        public double Contribution
+        {
+            get
+            {
+                return contribution;
+            }
+            set
+            {
+                if (value < 0 || value > 100)
+                {
+                    throw new ArgumentOutOfRangeException("value", Resources.Contribution_Value_should_be_in_interval_0_100);
+                }
+                contribution = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the return period to assess for.
+        /// </summary>
+        public int Norm { get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -74,7 +74,7 @@
     <Compile Include="Probabilistics\NormalDistributionDesignVariable.cs" />
     <Compile Include="Probabilistics\ShiftedLogNormalDistribution.cs" />
     <Compile Include="Probabilistics\ShiftedLogNormalDistributionDesignVariable.cs" />
-    <Compile Include="Probability\NormProbabilityInput.cs" />
+    <Compile Include="Probability\ProbabilityAssessmentInput.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
Fisheye: Tag 49084c971c0de5668befdcf5c8d6b65debf0b659 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/NormProbabilityInputTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputTest.cs	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -0,0 +1,111 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Probability;
+using Ringtoets.Common.Data.Properties;
+
+namespace Ringtoets.Common.Data.Test.Probability
+{
+    [TestFixture]
+    public class ProbabilityAssessmentInputTest
+    {
+        [Test]
+        public void Constructor_DefaultPropertiesSet()
+        {
+            // Call
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+
+            // Assert
+            Assert.AreEqual(double.NaN, probabilityAssessmentInput.Contribution);
+            Assert.AreEqual(2, probabilityAssessmentInput.N);
+            Assert.AreEqual(0, probabilityAssessmentInput.Norm);
+        }
+
+        [Test]
+        [TestCase(1)]
+        [TestCase(10)]
+        [TestCase(20)]
+        public void N_ValueInsideValidRegion_DoesNotThrow(int value)
+        {
+            // Setup
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+
+            // Call
+            TestDelegate test = () => probabilityAssessmentInput.N = value;
+
+            // Assert
+            Assert.DoesNotThrow(test);
+            Assert.AreEqual(value, probabilityAssessmentInput.N);
+        }
+
+        [Test]
+        [TestCase(0)]
+        [TestCase(21)]
+        public void N_ValueOutsideValidRegion_ThrowsArgumentOutOfRangeException(int value)
+        {
+            // Setup
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+
+            // Call
+            TestDelegate test = () => probabilityAssessmentInput.N = value;
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(test, 
+                Resources.N_Value_should_be_in_interval_1_20);
+        }
+
+        [Test]
+        [TestCase(0)]
+        [TestCase(50)]
+        [TestCase(100)]
+        public void Contribution_ValueInsideValidRegion_DoesNotThrow(int value)
+        {
+            // Setup
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+
+            // Call
+            TestDelegate test = () => probabilityAssessmentInput.Contribution = value;
+
+            // Assert
+            Assert.DoesNotThrow(test);
+            Assert.AreEqual(value, probabilityAssessmentInput.Contribution);
+        }
+        
+        [Test]
+        [TestCase(-1)]
+        [TestCase(101)]
+        public void Contribution_ValueOutsideValidRegion_ThrowsArgumentOutOfRangeException(int value)
+        {
+            // Setup
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+
+            // Call
+            TestDelegate test = () => probabilityAssessmentInput.Contribution = value;
+
+            // Assert
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(test,
+                Resources.Contribution_Value_should_be_in_interval_0_100);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -77,7 +77,7 @@
     <Compile Include="Probabilistics\NormalDistributionTest.cs" />
     <Compile Include="Probabilistics\ShiftedLogNormalDistributionDesignVariableTest.cs" />
     <Compile Include="Probabilistics\ShiftedLogNormalDistributionTest.cs" />
-    <Compile Include="Probability\NormProbabilityInputTest.cs" />
+    <Compile Include="Probability\ProbabilityAssessmentInputTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs
===================================================================
diff -u -rdd8bb1e310fb6ebef30770f6f739255979946552 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision dd8bb1e310fb6ebef30770f6f739255979946552)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -46,7 +46,7 @@
         /// <item><paramref name="normProbabilityInput"/> is <c>null</c>.</item>
         /// </list> </exception>
         public GrassCoverErosionInwardsCalculation(GeneralGrassCoverErosionInwardsInput generalInputParameters,
-                                                   NormProbabilityInput normProbabilityInput)
+                                                   ProbabilityAssessmentInput normProbabilityInput)
         {
             if (normProbabilityInput == null)
             {
@@ -66,7 +66,7 @@
         /// <summary>
         /// Gets the length-effect parameters.
         /// </summary>
-        public NormProbabilityInput NormProbabilityInput { get; private set; }
+        public ProbabilityAssessmentInput NormProbabilityInput { get; private set; }
 
         /// <summary>
         /// Gets or sets <see cref="ProbabilisticOutput"/>, which contains the results of a probabilistic calculation.
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs
===================================================================
diff -u -r3739d94e5ef665dc97d80c8c3f7bc6ef4b19d93c -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision 3739d94e5ef665dc97d80c8c3f7bc6ef4b19d93c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -44,7 +44,7 @@
         {
             CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false);
             GeneralInput = new GeneralGrassCoverErosionInwardsInput();
-            NormProbabilityInput = new NormProbabilityInput();
+            NormProbabilityInput = new ProbabilityAssessmentInput();
             sectionResults = new List<GrassCoverErosionInwardsFailureMechanismSectionResult>();
         }
 
@@ -76,7 +76,7 @@
         /// <summary>
         /// Gets the length-effect parameters.
         /// </summary>
-        public NormProbabilityInput NormProbabilityInput { get; private set; }
+        public ProbabilityAssessmentInput NormProbabilityInput { get; private set; }
 
         public CalculationGroup CalculationsGroup { get; private set; }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs
===================================================================
diff -u -re33142dbef9179542701614bc0585df5e3c1bae5 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs	(.../GrassCoverErosionInwardsCalculationTest.cs)	(revision e33142dbef9179542701614bc0585df5e3c1bae5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs	(.../GrassCoverErosionInwardsCalculationTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -36,18 +36,18 @@
         public void Constructor_NullGeneralInput_ThrowsArgumentNullException()
         {
             // Setup
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
 
             // Call
-            TestDelegate test = () => new GrassCoverErosionInwardsCalculation(null, normProbabilityInput);
+            TestDelegate test = () => new GrassCoverErosionInwardsCalculation(null, probabilityAssessmentInput);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("generalInputParameters", exception.ParamName);
         }
 
         [Test]
-        public void Constructor_NullNormProbabilityInput_ThrowsArgumentNullException()
+        public void Constructor_NullProbabilityAssessmentInput_ThrowsArgumentNullException()
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
@@ -65,10 +65,10 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
 
             // Call
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput);
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput);
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
@@ -78,7 +78,7 @@
             Assert.IsFalse(calculation.HasOutput);
             Assert.IsNull(calculation.Comments);
             Assert.IsNull(calculation.Output);
-            Assert.AreSame(normProbabilityInput, calculation.NormProbabilityInput);
+            Assert.AreSame(probabilityAssessmentInput, calculation.NormProbabilityInput);
             AssertDemoInput(calculation.InputParameters);
         }
 
@@ -90,8 +90,8 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput);
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput);
 
             // Call
             calculation.Name = name;
@@ -108,8 +108,8 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput);
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput);
 
             // Call
             calculation.Comments = comments;
@@ -123,8 +123,8 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestProbabilisticOutput()
             };
@@ -141,8 +141,8 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = null
             };
@@ -156,8 +156,8 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestProbabilisticOutput()
             };
@@ -171,8 +171,8 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput);
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput);
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0);
             calculation.InputParameters.HydraulicBoundaryLocation = hydraulicBoundaryLocation;
 
@@ -191,8 +191,8 @@
         {
             // Setup
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput);
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput);
             var inputParameters = calculation.InputParameters;
 
             // Call
@@ -208,8 +208,8 @@
             // Setup
             var output = new ProbabilisticOutput(2.0, 3.0, 1.4, 50.3, 16.3);
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = output
             };
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs
===================================================================
diff -u -r89e5c41b732ccf30350026e8d35a01d9a180fdfc -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision 89e5c41b732ccf30350026e8d35a01d9a180fdfc)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -46,7 +46,7 @@
             Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayCode, failureMechanism.Code);
             CollectionAssert.IsEmpty(failureMechanism.Calculations);
             Assert.IsInstanceOf<GeneralGrassCoverErosionInwardsInput>(failureMechanism.GeneralInput);
-            Assert.IsInstanceOf<NormProbabilityInput>(failureMechanism.NormProbabilityInput);
+            Assert.IsInstanceOf<ProbabilityAssessmentInput>(failureMechanism.NormProbabilityInput);
             Assert.AreEqual("Berekeningen", failureMechanism.CalculationsGroup.Name);
             Assert.IsEmpty(failureMechanism.CalculationsGroup.Children);
         }
@@ -107,9 +107,9 @@
                     Children =
                     {
                         new CalculationGroup(),
-                        new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput()),
+                        new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput()),
                         mocks.StrictMock<ICalculation>(),
-                        new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+                        new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
                     }
                 }
             };
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/GrassCoverErosionInwardsCalculationFactoryTest.cs
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/GrassCoverErosionInwardsCalculationFactoryTest.cs	(.../GrassCoverErosionInwardsCalculationFactoryTest.cs)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/GrassCoverErosionInwardsCalculationFactoryTest.cs	(.../GrassCoverErosionInwardsCalculationFactoryTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using NUnit.Framework;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.HydraRing.Data;
@@ -41,7 +40,7 @@
 
             // Assert
             var emptyCalculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                           new NormProbabilityInput());
+                                                                           new ProbabilityAssessmentInput());
             AssertGrassCoverErosionInwardsCalculationAreEqual(emptyCalculation, calculation);
         }
 
@@ -58,7 +57,7 @@
             };
 
             var validCalculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                           new NormProbabilityInput())
+                                                                           new ProbabilityAssessmentInput())
             {
                 InputParameters =
                 {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/GrassCoverErosionInwardsCalculationFactory.cs
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/GrassCoverErosionInwardsCalculationFactory.cs	(.../GrassCoverErosionInwardsCalculationFactory.cs)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/GrassCoverErosionInwardsCalculationFactory.cs	(.../GrassCoverErosionInwardsCalculationFactory.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using Core.Common.Base.Data;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.HydraRing.Data;
@@ -39,7 +38,7 @@
         public static GrassCoverErosionInwardsCalculation CreateCalculationWithInvalidData()
         {
             return new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                           new NormProbabilityInput());
+                                                           new ProbabilityAssessmentInput());
         }
 
         /// <summary>
@@ -54,7 +53,7 @@
             };
 
             return new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                           new NormProbabilityInput())
+                                                           new ProbabilityAssessmentInput())
             {
                 InputParameters =
                 {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs
===================================================================
diff -u -r4936ea40e490dd8a3ed500e1c5a8f8390ff31491 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs	(.../GrassCoverErosionInwardsCalculationContextTest.cs)	(revision 4936ea40e490dd8a3ed500e1c5a8f8390ff31491)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationContextTest.cs	(.../GrassCoverErosionInwardsCalculationContextTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -22,7 +22,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Data;
@@ -47,7 +46,7 @@
             // Setup
             var calculationMock = mocksRepository.StrictMock<GrassCoverErosionInwardsCalculation>(
                 new GeneralGrassCoverErosionInwardsInput(),
-                new NormProbabilityInput());
+                new ProbabilityAssessmentInput());
             var failureMechanismMock = mocksRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             mocksRepository.ReplayAll();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs
===================================================================
diff -u -r704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs	(.../BreakWaterPropertiesTest.cs)	(revision 704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs	(.../BreakWaterPropertiesTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -63,7 +63,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             var inputMock = mockRepository.StrictMock<GrassCoverErosionInwardsInput>(generalInput);
             mockRepository.ReplayAll();
 
@@ -89,7 +89,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput(generalInput);
@@ -121,7 +121,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             var inputMock = mockRepository.StrictMock<GrassCoverErosionInwardsInput>(generalInput);
             mockRepository.ReplayAll();
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs
===================================================================
diff -u -rc4575c18c9ec585bd4cdc0edb2142c8a5ae9bacf -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs	(.../DikeGeometryPropertiesTest.cs)	(revision c4575c18c9ec585bd4cdc0edb2142c8a5ae9bacf)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs	(.../DikeGeometryPropertiesTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -63,7 +63,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput(generalInput);
@@ -87,7 +87,7 @@
             mockRepository.ReplayAll();
 
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, new NormProbabilityInput());
+            var calculation = new GrassCoverErosionInwardsCalculation(generalInput, new ProbabilityAssessmentInput());
             calculation.InputParameters.SetDikeGeometry(new[]
             {
                 new RoughnessProfileSection(new Point2D(0, 0), new Point2D(1, 1), 2)
@@ -120,7 +120,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput(generalInput);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs
===================================================================
diff -u -r4936ea40e490dd8a3ed500e1c5a8f8390ff31491 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs	(.../ForeshorePropertiesTest.cs)	(revision 4936ea40e490dd8a3ed500e1c5a8f8390ff31491)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs	(.../ForeshorePropertiesTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -64,7 +64,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             var inputMock = mockRepository.StrictMock<GrassCoverErosionInwardsInput>(generalInput);
             mockRepository.ReplayAll();
 
@@ -89,7 +89,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput(generalInput);
@@ -114,7 +114,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput(generalInput);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationContextPropertiesTest.cs
===================================================================
diff -u -r4936ea40e490dd8a3ed500e1c5a8f8390ff31491 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationContextPropertiesTest.cs	(.../GrassCoverErosionInwardsCalculationContextPropertiesTest.cs)	(revision 4936ea40e490dd8a3ed500e1c5a8f8390ff31491)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationContextPropertiesTest.cs	(.../GrassCoverErosionInwardsCalculationContextPropertiesTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -24,7 +24,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
@@ -60,7 +59,7 @@
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var properties = new GrassCoverErosionInwardsCalculationContextProperties();
@@ -83,7 +82,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var normProbabilityInput = new NormProbabilityInput();
+            var normProbabilityInput = new ProbabilityAssessmentInput();
             mockRepository.ReplayAll();
 
             var calculation = new GrassCoverErosionInwardsCalculation(generalInput, normProbabilityInput);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -re33142dbef9179542701614bc0585df5e3c1bae5 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision e33142dbef9179542701614bc0585df5e3c1bae5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -63,7 +63,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput(generalInput);
@@ -121,7 +121,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             mockRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput(generalInput);
@@ -153,7 +153,7 @@
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             var failureMechanismMock = mockRepository.StrictMock<GrassCoverErosionInwardsFailureMechanism>();
             var generalInput = new GeneralGrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput());
+            var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput());
             var inputMock = mockRepository.StrictMock<GrassCoverErosionInwardsInput>(generalInput);
             mockRepository.ReplayAll();
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r22e74c93c1d64ba15968ffd29bfdd6e1e79b84e3 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 22e74c93c1d64ba15968ffd29bfdd6e1e79b84e3)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -108,7 +108,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput());
+            var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput());
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -138,7 +138,7 @@
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+            var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
             {
                 Output = new ProbabilisticOutput(0, 0, 0, 0, 0)
             };
@@ -174,7 +174,7 @@
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilderMock = mocks.Stub<IContextMenuBuilder>();
 
@@ -214,7 +214,7 @@
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
@@ -262,7 +262,7 @@
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
 
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var guiMock = mocks.StrictMock<IGui>();
@@ -302,7 +302,7 @@
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
 
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
 
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -342,7 +342,7 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
 
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
 
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -391,7 +391,7 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
 
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -447,7 +447,7 @@
                 HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
             };
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput())
+                                                                      new ProbabilityAssessmentInput())
             {
                 Output = new ProbabilisticOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN),
                 InputParameters =
@@ -496,7 +496,7 @@
             // Setup
             var group = new CalculationGroup();
             var elementToBeRemoved = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                             new NormProbabilityInput());
+                                                                             new ProbabilityAssessmentInput());
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var observerMock = mocks.StrictMock<IObserver>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
@@ -513,7 +513,7 @@
 
             group.Children.Add(elementToBeRemoved);
             group.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                       new NormProbabilityInput()));
+                                                                       new ProbabilityAssessmentInput()));
             group.Attach(observerMock);
 
             // Precondition
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4f2904ef28c50aef5b755ff4b6ef74c976995f7f -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4f2904ef28c50aef5b755ff4b6ef74c976995f7f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -347,7 +347,7 @@
             {
                 Children =
                 {
-                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -388,7 +388,7 @@
             {
                 Children =
                 {
-                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -399,7 +399,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(
                 new GeneralGrassCoverErosionInwardsInput(),
-                new NormProbabilityInput()));
+                new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
@@ -442,7 +442,7 @@
             {
                 Children =
                 {
-                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -453,7 +453,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(
                 new GeneralGrassCoverErosionInwardsInput(),
-                new NormProbabilityInput()));
+                new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
@@ -497,7 +497,7 @@
             {
                 Children =
                 {
-                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+                    new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -516,7 +516,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(
                 new GeneralGrassCoverErosionInwardsInput(),
-                new NormProbabilityInput()));
+                new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
@@ -564,7 +564,7 @@
                 new Point2D(0, 0)
             }));
 
-            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
             {
                 Name = "A",
                 InputParameters =
@@ -573,7 +573,7 @@
                 }
             });
 
-            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
             {
                 Name = "B",
                 InputParameters =
@@ -677,7 +677,7 @@
             var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group,
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
-            var calculationItem = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+            var calculationItem = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
             {
                 Name = "Nieuwe berekening"
             };
@@ -761,7 +761,7 @@
                                                                                      assessmentSectionMock);
             var calculation = new GrassCoverErosionInwardsCalculation(
                 new GeneralGrassCoverErosionInwardsInput(),
-                new NormProbabilityInput());
+                new ProbabilityAssessmentInput());
 
             observerMock.Expect(o => o.UpdateObserver());
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r11099a0b6835599e5784af867c3ee3bf66a5fcc4 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 11099a0b6835599e5784af867c3ee3bf66a5fcc4)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -379,7 +379,7 @@
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                                                    new NormProbabilityInput()));
+                                                                                                    new ProbabilityAssessmentInput()));
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -416,7 +416,7 @@
                 new Point2D(0, 0)
             }));
             failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                                                    new NormProbabilityInput()));
+                                                                                                    new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
@@ -455,7 +455,7 @@
                 new Point2D(0, 0)
             }));
             failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                                                    new NormProbabilityInput()));
+                                                                                                    new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
@@ -496,7 +496,7 @@
                 new Point2D(0, 0)
             }));
             failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                                                    new NormProbabilityInput()));
+                                                                                                    new ProbabilityAssessmentInput()));
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
@@ -548,15 +548,15 @@
             });
             failureMechanism.AddSection(section);
 
-            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
             {
                 Name = "A",
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2)
                 }
             });
-            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(), new ProbabilityAssessmentInput())
             {
                 Name = "B",
                 InputParameters =
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4936ea40e490dd8a3ed500e1c5a8f8390ff31491 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs)	(revision 4936ea40e490dd8a3ed500e1c5a8f8390ff31491)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsInputContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -27,7 +27,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
@@ -84,7 +83,7 @@
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             var grassCoverErosionInwardsInputContext = new GrassCoverErosionInwardsInputContext(
                 mocksRepository.StrictMock<GrassCoverErosionInwardsInput>(generalInput),
-                mocksRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput()),
+                mocksRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput()),
                 new GrassCoverErosionInwardsFailureMechanism(),
                 assessmentSectionMock);
 
@@ -106,7 +105,7 @@
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             var grassCoverErosionInwardsInputContext = new GrassCoverErosionInwardsInputContext(
                 mocksRepository.StrictMock<GrassCoverErosionInwardsInput>(generalInput),
-                mocksRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new NormProbabilityInput()),
+                mocksRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput, new ProbabilityAssessmentInput()),
                 new GrassCoverErosionInwardsFailureMechanism(),
                 assessmentSectionMock);
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsOutputCalculationServiceTest.cs
===================================================================
diff -u -r3739d94e5ef665dc97d80c8c3f7bc6ef4b19d93c -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsOutputCalculationServiceTest.cs	(.../GrassCoverErosionInwardsOutputCalculationServiceTest.cs)	(revision 3739d94e5ef665dc97d80c8c3f7bc6ef4b19d93c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsOutputCalculationServiceTest.cs	(.../GrassCoverErosionInwardsOutputCalculationServiceTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -55,7 +55,7 @@
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput())
+                                                                      new ProbabilityAssessmentInput())
             {
                 NormProbabilityInput =
                 {
@@ -86,7 +86,7 @@
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput())
+                                                                      new ProbabilityAssessmentInput())
             {
                 NormProbabilityInput =
                 {
@@ -111,7 +111,7 @@
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
 
             // Call
             GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, reliability);
@@ -128,7 +128,7 @@
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput());
+                                                                      new ProbabilityAssessmentInput());
 
             // Call
             GrassCoverErosionInwardsOutputCalculationService.Calculate(calculation, reliability);
@@ -151,7 +151,7 @@
         {
             // Setup
             var calculation = new GrassCoverErosionInwardsCalculation(new GeneralGrassCoverErosionInwardsInput(),
-                                                                      new NormProbabilityInput())
+                                                                      new ProbabilityAssessmentInput())
             {
                 NormProbabilityInput =
                 {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs
===================================================================
diff -u -r873b8bf10a9c767214fa5a3a1e6cf340e060657f -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision 873b8bf10a9c767214fa5a3a1e6cf340e060657f)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -43,7 +43,7 @@
         /// <item><paramref name="generalInputParameters"/> is <c>null</c>.</item>
         /// <item><paramref name="normProbabilityInput"/> is <c>null</c>.</item>
         /// </list> </exception>
-        public HeightStructuresCalculation(GeneralHeightStructuresInput generalInputParameters, NormProbabilityInput normProbabilityInput)
+        public HeightStructuresCalculation(GeneralHeightStructuresInput generalInputParameters, ProbabilityAssessmentInput normProbabilityInput)
         {
             if (normProbabilityInput == null)
             {
@@ -63,7 +63,7 @@
         /// <summary>
         /// Gets the length-effect parameters.
         /// </summary>
-        public NormProbabilityInput NormProbabilityInput { get; private set; }
+        public ProbabilityAssessmentInput NormProbabilityInput { get; private set; }
 
         /// <summary>
         /// Gets or sets <see cref="ProbabilisticOutput"/>, which contains the results of a height structures calculation.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -r8047e7fd59525ed424105aaefc4ee88b9ae8def6 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 8047e7fd59525ed424105aaefc4ee88b9ae8def6)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -44,7 +44,7 @@
         {
             sectionResults = new List<HeightStructuresFailureMechanismSectionResult>();
             CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false);
-            NormProbabilityInput = new NormProbabilityInput();
+            NormProbabilityInput = new ProbabilityAssessmentInput();
             GeneralInput = new GeneralHeightStructuresInput();
         }
 
@@ -71,7 +71,7 @@
         /// <summary>
         /// Gets the length-effect parameters.
         /// </summary>
-        public NormProbabilityInput NormProbabilityInput { get; private set; }
+        public ProbabilityAssessmentInput NormProbabilityInput { get; private set; }
 
         /// <summary>
         /// Gets the height structures calculation input parameters that apply to each calculation.
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs
===================================================================
diff -u -rd55719870031108810684119674758d0f0ba9a66 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision d55719870031108810684119674758d0f0ba9a66)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -34,18 +34,18 @@
         public void Constructor_NullGeneralInput_ThrowsArgumentNullException()
         {
             // Setup
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
 
             // Call
-            TestDelegate test = () => new HeightStructuresCalculation(null, normProbabilityInput);
+            TestDelegate test = () => new HeightStructuresCalculation(null, probabilityAssessmentInput);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("generalInputParameters", exception.ParamName);
         }
 
         [Test]
-        public void Constructor_NullNormProbabilityInput_ThrowsArgumentNullException()
+        public void Constructor_NullProbabilityAssessmentInput_ThrowsArgumentNullException()
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
@@ -63,17 +63,17 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
 
             // Call
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput);
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput);
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
-            Assert.AreEqual(normProbabilityInput, calculation.NormProbabilityInput);
+            Assert.AreEqual(probabilityAssessmentInput, calculation.NormProbabilityInput);
             Assert.IsNull(calculation.Comments);
             Assert.IsFalse(calculation.HasOutput);
             AssertDemoInput(calculation.InputParameters);
@@ -84,8 +84,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -102,8 +102,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = null
             };
@@ -117,8 +117,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -132,8 +132,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput);
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput);
 
             // Call
             ICalculationInput input = calculation.GetObservableInput();
@@ -147,8 +147,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision b9d20365707e77623054f96f0c8b544e86658e67)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -101,17 +101,17 @@
             // Setup
             var mocks = new MockRepository();
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
             var failureMechanism = new HeightStructuresFailureMechanism
             {
                 CalculationsGroup =
                 {
                     Children =
                     {
                         new CalculationGroup(),
-                        new HeightStructuresCalculation(generalInput, normProbabilityInput),
+                        new HeightStructuresCalculation(generalInput, probabilityAssessmentInput),
                         mocks.StrictMock<ICalculation>(),
-                        new HeightStructuresCalculation(generalInput, normProbabilityInput)
+                        new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
                     }
                 }
             };
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r22e74c93c1d64ba15968ffd29bfdd6e1e79b84e3 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 22e74c93c1d64ba15968ffd29bfdd6e1e79b84e3)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -252,7 +252,7 @@
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                              new NormProbabilityInput());
+                                                              new ProbabilityAssessmentInput());
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var guiMock = mocks.StrictMock<IGui>();
@@ -292,7 +292,7 @@
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
 
             var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                              new NormProbabilityInput());
+                                                              new ProbabilityAssessmentInput());
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -332,7 +332,7 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
 
             var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                              new NormProbabilityInput());
+                                                              new ProbabilityAssessmentInput());
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -381,7 +381,7 @@
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
             var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                              new NormProbabilityInput());
+                                                              new ProbabilityAssessmentInput());
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
@@ -437,7 +437,7 @@
                 HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
             };
             var calculation = new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                              new NormProbabilityInput())
+                                                              new ProbabilityAssessmentInput())
             {
                 Output = new ProbabilisticOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN),
                 InputParameters =
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4f2904ef28c50aef5b755ff4b6ef74c976995f7f -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4f2904ef28c50aef5b755ff4b6ef74c976995f7f)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -347,7 +347,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -388,7 +388,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -399,7 +399,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(
                 new GeneralHeightStructuresInput(),
-                new NormProbabilityInput()));
+                new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
@@ -442,7 +442,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -453,7 +453,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(
                 new GeneralHeightStructuresInput(),
-                new NormProbabilityInput()));
+                new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
@@ -497,7 +497,7 @@
             {
                 Children =
                 {
-                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+                    new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
                 }
             };
 
@@ -516,7 +516,7 @@
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(
                 new GeneralHeightStructuresInput(),
-                new NormProbabilityInput()));
+                new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
@@ -564,7 +564,7 @@
                 new Point2D(0, 0)
             }));
 
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
             {
                 Name = "A",
                 InputParameters =
@@ -573,7 +573,7 @@
                 }
             });
 
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
             {
                 Name = "B",
                 InputParameters =
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r11099a0b6835599e5784af867c3ee3bf66a5fcc4 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 11099a0b6835599e5784af867c3ee3bf66a5fcc4)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -379,7 +379,7 @@
             var guiMock = mocksRepository.StrictMock<IGui>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                                                            new NormProbabilityInput()));
+                                                                                            new ProbabilityAssessmentInput()));
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
 
             var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
@@ -416,7 +416,7 @@
                 new Point2D(0, 0)
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                                                                    new NormProbabilityInput()));
+                                                                                            new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
@@ -455,7 +455,7 @@
                 new Point2D(0, 0)
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                                                                    new NormProbabilityInput()));
+                                                                                            new ProbabilityAssessmentInput()));
 
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase());
@@ -496,7 +496,7 @@
                 new Point2D(0, 0)
             }));
             failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(),
-                                                                                                    new NormProbabilityInput()));
+                                                                                            new ProbabilityAssessmentInput()));
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
@@ -548,15 +548,15 @@
             });
             failureMechanism.AddSection(section);
 
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
             {
                 Name = "A",
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "nonExisting", 1, 2)
                 }
             });
-            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new NormProbabilityInput())
+            failureMechanism.CalculationsGroup.Children.Add(new HeightStructuresCalculation(new GeneralHeightStructuresInput(), new ProbabilityAssessmentInput())
             {
                 Name = "B",
                 InputParameters =
@@ -607,4 +607,4 @@
         private const int contextMenuCalculateAllIndex = 3;
         private const int contextMenuClearAllIndex = 4;
     }
-}
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7ddd944b70d252ae493bba48ea9b31c01634082d -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision 7ddd944b70d252ae493bba48ea9b31c01634082d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -80,11 +80,11 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 new HeightStructuresInput(new GeneralHeightStructuresInput()),
-                new HeightStructuresCalculation(generalInput, normProbabilityInput),
+                new HeightStructuresCalculation(generalInput, probabilityAssessmentInput),
                 new HeightStructuresFailureMechanism(),
                 assessmentSectionMock);
 
@@ -104,10 +104,10 @@
             // Setup
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
             var heightStructuresInputContext = new HeightStructuresInputContext(
                 new HeightStructuresInput(new GeneralHeightStructuresInput()),
-                new HeightStructuresCalculation(generalInput, normProbabilityInput),
+                new HeightStructuresCalculation(generalInput, probabilityAssessmentInput),
                 new HeightStructuresFailureMechanism(),
                 assessmentSectionMock);