Fisheye: Tag ef2c6cb7afd29e17ada49f5a18b9e21968122232 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/NormDependentFactorCollection.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs
===================================================================
diff -u -r06abcaadc2936c0bf3fde73916c051f37f698505 -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs	(.../PipingProbabilityAssessmentInput.cs)	(revision 06abcaadc2936c0bf3fde73916c051f37f698505)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs	(.../PipingProbabilityAssessmentInput.cs)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -31,24 +31,6 @@
     /// </summary>
     public class PipingProbabilityAssessmentInput : IStorable
     {
-        private readonly NormDependentFactorCollection heaveNormDependentFactorCollection = new NormDependentFactorCollection(
-            Tuple.Create(100, 0.16),
-            Tuple.Create(300, 0.15),
-            Tuple.Create(1000, 0.13),
-            Tuple.Create(3000, 0.12),
-            Tuple.Create(10000, 0.11),
-            Tuple.Create(30000, 0.10),
-            Tuple.Create(300000, 0.09));
-
-        private readonly NormDependentFactorCollection sellmeijerNormDependentFactorCollection = new NormDependentFactorCollection(
-            Tuple.Create(100, 0.32),
-            Tuple.Create(300, 0.28),
-            Tuple.Create(1000, 0.24),
-            Tuple.Create(3000, 0.21),
-            Tuple.Create(10000, 0.19),
-            Tuple.Create(30000, 0.17),
-            Tuple.Create(300000, 0.13));
-
         private double a;
         private RoundedDouble upliftCriticalSafetyFactor;
 
@@ -121,27 +103,5 @@
         public double SectionLength { get; set; }
 
         public long StorageId { get; set; }
-
-        /// <summary>
-        /// Gets the norm dependent factor which is used in the relation between safety factor and reliability index
-        /// for the Sellmeijer failure mechanism.
-        /// </summary>
-        /// <param name="norm">The norm for which to obtain the factor.</param>
-        /// <returns>A factor which can be used in a semi-probabilistic assessment.</returns>
-        public RoundedDouble GetSellmeijerNormDependentFactor(int norm)
-        {
-            return new RoundedDouble(2, sellmeijerNormDependentFactorCollection.GetFactorFromNorm(norm));
-        }
-
-        /// <summary>
-        /// Gets the norm dependent factor which is used in the relation between safety factor and reliability index 
-        /// for the heave failure mechanism.
-        /// </summary>
-        /// <param name="norm">The norm for which to obtain the factor.</param>
-        /// <returns>A factor which can be used in a semi-probabilistic assessment.</returns>
-        public RoundedDouble GetHeaveNormDependentFactor(int norm)
-        {
-            return new RoundedDouble(2, heaveNormDependentFactorCollection.GetFactorFromNorm(norm));
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj
===================================================================
diff -u -rb1b25abeb595bff11389bbf0e695851995ef5221 -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj	(.../Ringtoets.Piping.Data.csproj)	(revision b1b25abeb595bff11389bbf0e695851995ef5221)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj	(.../Ringtoets.Piping.Data.csproj)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -47,7 +47,6 @@
     </Compile>
     <Compile Include="DerivedPipingInput.cs" />
     <Compile Include="GeneralPipingInput.cs" />
-    <Compile Include="NormDependentFactorCollection.cs" />
     <Compile Include="PipingCalculation.cs" />
     <Compile Include="PipingCalculationScenario.cs" />
     <Compile Include="PipingCalculationScenarioExtensions.cs" />
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cbe47edc5aec1175bceda95452ebe5697eda181d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -289,24 +289,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Normafhankelijke factor die gebruikt wordt bij het omzetten van de veiligheidsfactor voor heave naar een betrouwbaarheidsindex..
-        /// </summary>
-        public static string GeneralPipingInput_HeaveNormDependentFactor_Description {
-            get {
-                return ResourceManager.GetString("GeneralPipingInput_HeaveNormDependentFactor_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Normafhankelijke factor voor heave.
-        /// </summary>
-        public static string GeneralPipingInput_HeaveNormDependentFactor_DisplayName {
-            get {
-                return ResourceManager.GetString("GeneralPipingInput_HeaveNormDependentFactor_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Gemiddelde d70 van de in kleine schaalproeven toegepaste zandsoorten, waarop de formule van Sellmeijer is gefit..
         /// </summary>
         public static string GeneralPipingInput_MeanDiameter70_Description {
@@ -361,24 +343,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Normafhankelijke factor die gebruikt wordt bij het omzetten van de veiligheidsfactor voor terugschrijdende erosie (Sellmeijer) naar een betrouwbaarheidsindex..
-        /// </summary>
-        public static string GeneralPipingInput_SellmeijerNormDependentFactor_Description {
-            get {
-                return ResourceManager.GetString("GeneralPipingInput_SellmeijerNormDependentFactor_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Normafhankelijke factor voor terugschrijdende erosie.
-        /// </summary>
-        public static string GeneralPipingInput_SellmeijerNormDependentFactor_DisplayName {
-            get {
-                return ResourceManager.GetString("GeneralPipingInput_SellmeijerNormDependentFactor_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Reductiefactor Sellmeijer..
         /// </summary>
         public static string GeneralPipingInput_SellmeijerReductionFactor_Description {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision cbe47edc5aec1175bceda95452ebe5697eda181d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -631,16 +631,4 @@
   <data name="GeneralPipingInput_UpliftCriticalSafetyFactor_DisplayName" xml:space="preserve">
     <value>Kritische veiligheidsfactor voor opbarsten [-]</value>
   </data>
-  <data name="GeneralPipingInput_HeaveNormDependentFactor_Description" xml:space="preserve">
-    <value>Normafhankelijke factor die gebruikt wordt bij het omzetten van de veiligheidsfactor voor heave naar een betrouwbaarheidsindex.</value>
-  </data>
-  <data name="GeneralPipingInput_HeaveNormDependentFactor_DisplayName" xml:space="preserve">
-    <value>Normafhankelijke factor voor heave</value>
-  </data>
-  <data name="GeneralPipingInput_SellmeijerNormDependentFactor_Description" xml:space="preserve">
-    <value>Normafhankelijke factor die gebruikt wordt bij het omzetten van de veiligheidsfactor voor terugschrijdende erosie (Sellmeijer) naar een betrouwbaarheidsindex.</value>
-  </data>
-  <data name="GeneralPipingInput_SellmeijerNormDependentFactor_DisplayName" xml:space="preserve">
-    <value>Normafhankelijke factor voor terugschrijdende erosie</value>
-  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs
===================================================================
diff -u -r9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision 9a196c8bc554a2e97ff094d7ffb2e99c42eb04fd)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismContextProperties.cs	(.../PipingFailureMechanismContextProperties.cs)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -170,30 +170,6 @@
             }
         }
 
-        [PropertyOrder(23)]
-        [ResourcesCategory(typeof(Resources), "Categories_SemiProbabilisticParameters")]
-        [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_HeaveNormDependentFactor_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_HeaveNormDependentFactor_Description")]
-        public RoundedDouble HeaveNormDependentFactor
-        {
-            get
-            {
-                return data.WrappedData.PipingProbabilityAssessmentInput.GetHeaveNormDependentFactor(data.Parent.FailureMechanismContribution.Norm);
-            }
-        }
-
-        [PropertyOrder(24)]
-        [ResourcesCategory(typeof(Resources), "Categories_SemiProbabilisticParameters")]
-        [ResourcesDisplayName(typeof(Resources), "GeneralPipingInput_SellmeijerNormDependentFactor_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "GeneralPipingInput_SellmeijerNormDependentFactor_Description")]
-        public RoundedDouble SellmeijerNormDependentFactor
-        {
-            get
-            {
-                return data.WrappedData.PipingProbabilityAssessmentInput.GetSellmeijerNormDependentFactor(data.Parent.FailureMechanismContribution.Norm);
-            }
-        }
-
         #endregion
 
         #region Sellmeijer
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs	(.../PipingSemiProbabilisticCalculationService.cs)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs	(.../PipingSemiProbabilisticCalculationService.cs)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -72,10 +72,8 @@
         /// <param name="constantB">The constant b.</param>
         /// <param name="assessmentSectionLength">The length of the assessment section.</param>
         /// <param name="upliftCriticalSafetyFactor">The critical safety factor which is compared to the safety factor of uplift to determine a probability.</param>
-        /// <param name="heaveNormDependentFactor">The norm dependent factor used in determining the reliability of heave.</param>
-        /// <param name="sellmeijerNormDependentFactor">The norm dependent factor used in determining the reliability of Sellmeijer.</param>
         /// <param name="contribution">The contribution of piping to the total failure.</param>
-        private PipingSemiProbabilisticCalculationService(double upliftFactorOfSafety, double heaveFactorOfSafety, double sellmeijerFactorOfSafety, int returnPeriod, double constantA, double constantB, double assessmentSectionLength, double upliftCriticalSafetyFactor, double heaveNormDependentFactor, double sellmeijerNormDependentFactor, double contribution)
+        private PipingSemiProbabilisticCalculationService(double upliftFactorOfSafety, double heaveFactorOfSafety, double sellmeijerFactorOfSafety, int returnPeriod, double constantA, double constantB, double assessmentSectionLength, double upliftCriticalSafetyFactor, double contribution)
         {
             this.heaveFactorOfSafety = heaveFactorOfSafety;
             this.upliftFactorOfSafety = upliftFactorOfSafety;
@@ -85,8 +83,6 @@
             this.constantB = constantB;
             this.assessmentSectionLength = assessmentSectionLength;
             this.upliftCriticalSafetyFactor = upliftCriticalSafetyFactor;
-            this.heaveNormDependentFactor = heaveNormDependentFactor;
-            this.sellmeijerNormDependentFactor = sellmeijerNormDependentFactor;
             this.contribution = contribution;
         }
 
@@ -116,8 +112,6 @@
                 pipingProbabilityAssessmentInput.B,
                 pipingProbabilityAssessmentInput.SectionLength,
                 pipingProbabilityAssessmentInput.UpliftCriticalSafetyFactor,
-                pipingProbabilityAssessmentInput.GetHeaveNormDependentFactor(norm),
-                pipingProbabilityAssessmentInput.GetSellmeijerNormDependentFactor(norm),
                 contribution/100);
 
             calculator.Calculate();
@@ -167,10 +161,10 @@
         {
             upliftProbability = UpliftProbability();
 
-            heaveReliability = HeaveReliability(heaveFactorOfSafety);
+            heaveReliability = SubMechanismReliability(heaveFactorOfSafety, heaveFactors);
             heaveProbability = ReliabilityToProbability(heaveReliability);
 
-            sellmeijerReliability = SellmeijerReliability(sellmeijerFactorOfSafety);
+            sellmeijerReliability = SubMechanismReliability(sellmeijerFactorOfSafety, sellmeijerFactors);
             sellmeijerProbability = ReliabilityToProbability(sellmeijerReliability);
 
             pipingProbability = PipingProbability(upliftProbability, heaveProbability, sellmeijerProbability);
@@ -203,14 +197,12 @@
             return upliftFactorOfSafety <= upliftCriticalSafetyFactor ? 1 : 0;
         }
 
-        private double HeaveReliability(double factorOfSafety)
+        private double SubMechanismReliability(double factorOfSafety, SubCalculationFactors factors)
         {
-            return 2.08*Math.Log(factorOfSafety/heaveNormDependentFactor);
-        }
+            var norm = (1.0/returnPeriod);
+            var bNorm = ProbabilityToReliability(norm);
 
-        private double SellmeijerReliability(double factorOfSafety)
-        {
-            return 2.7*Math.Log(factorOfSafety/sellmeijerNormDependentFactor);
+            return (1/factors.A)*(Math.Log(factorOfSafety/factors.B) + (factors.C*bNorm));
         }
 
         private static void ValidateOutputOnCalculation(PipingCalculation calculation)
@@ -230,5 +222,30 @@
         {
             return Normal.InvCDF(0, 1, 1 - probability);
         }
+
+        #region sub-calculation constants
+
+        private struct SubCalculationFactors
+        {
+            public double A;
+            public double B;
+            public double C;
+        }
+
+        private readonly SubCalculationFactors heaveFactors = new SubCalculationFactors
+        {
+            A = 0.48,
+            B = 0.37,
+            C = 0.30
+        };
+
+        private readonly SubCalculationFactors sellmeijerFactors = new SubCalculationFactors
+        {
+            A = 0.37,
+            B = 1.04,
+            C = 0.43
+        };
+
+        #endregion
     }
 }
\ No newline at end of file
Fisheye: Tag ef2c6cb7afd29e17ada49f5a18b9e21968122232 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/NormDependentFactorCollectionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingProbabilityAssessmentInputTest.cs
===================================================================
diff -u -r84c39f809b6fda9caf5115ed1af9f65487915f12 -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingProbabilityAssessmentInputTest.cs	(.../PipingProbabilityAssessmentInputTest.cs)	(revision 84c39f809b6fda9caf5115ed1af9f65487915f12)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingProbabilityAssessmentInputTest.cs	(.../PipingProbabilityAssessmentInputTest.cs)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -116,79 +116,5 @@
             // Assert
             Assert.AreEqual(value, pipingProbabilityAssessmentInput.UpliftCriticalSafetyFactor, pipingProbabilityAssessmentInput.UpliftCriticalSafetyFactor.GetAccuracy());
         }
-
-        [Test]
-        [TestCase(99)]
-        [TestCase(300001)]
-        public void GetSellmeijerNormDependentFactor_NormOutOfRange_ThrowsArgumentOutOfRangeException(int norm)
-        {
-            // Setup
-            var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput();
-
-            // Call
-            TestDelegate test = () => pipingProbabilityAssessmentInput.GetSellmeijerNormDependentFactor(norm);
-
-            // Assert
-            var expectedMessage = "The value of norm needs to be in range [100, 300000].";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(test, expectedMessage);
-        }
-
-        [Test]
-        [TestCase(100, 0.32)]
-        [TestCase(300, 0.28)]
-        [TestCase(1000, 0.24)]
-        [TestCase(3000, 0.21)]
-        [TestCase(10000, 0.19)]
-        [TestCase(30000, 0.17)]
-        [TestCase(300000, 0.13)]
-        public void GetSellmeijerNormDependentFactor_NormInRange_ReturnsExpectedValue(int norm, double expectedValue)
-        {
-            // Setup
-            var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput();
-
-            // Call
-            var result = pipingProbabilityAssessmentInput.GetSellmeijerNormDependentFactor(norm);
-
-            // Assert
-            Assert.AreEqual(expectedValue, result.Value);
-            Assert.AreEqual(2, result.NumberOfDecimalPlaces);
-        }
-
-        [Test]
-        [TestCase(99)]
-        [TestCase(300001)]
-        public void GetHeaveNormDependentFactor_NormOutOfRange_ThrowsArgumentOutOfRangeException(int norm)
-        {
-            // Setup
-            var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput();
-
-            // Call
-            TestDelegate test = () => pipingProbabilityAssessmentInput.GetHeaveNormDependentFactor(norm);
-
-            // Assert
-            var expectedMessage = "The value of norm needs to be in range [100, 300000].";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(test, expectedMessage);
-        }
-
-        [Test]
-        [TestCase(100, 0.16)]
-        [TestCase(300, 0.15)]
-        [TestCase(1000, 0.13)]
-        [TestCase(3000, 0.12)]
-        [TestCase(10000, 0.11)]
-        [TestCase(30000, 0.10)]
-        [TestCase(300000, 0.09)]
-        public void GetHeaveNormDependentFactor_NormInRange_ReturnsExpectedValue(int norm, double expectedValue)
-        {
-            // Setup
-            var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput();
-
-            // Call
-            var result = pipingProbabilityAssessmentInput.GetHeaveNormDependentFactor(norm);
-
-            // Assert
-            Assert.AreEqual(expectedValue, result.Value);
-            Assert.AreEqual(2, result.NumberOfDecimalPlaces);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj
===================================================================
diff -u -rb1b25abeb595bff11389bbf0e695851995ef5221 -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj	(.../Ringtoets.Piping.Data.Test.csproj)	(revision b1b25abeb595bff11389bbf0e695851995ef5221)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj	(.../Ringtoets.Piping.Data.Test.csproj)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -60,7 +60,6 @@
     <Compile Include="DerivedPipingInputTest.cs" />
     <Compile Include="Exceptions\RingtoetsPipingSurfaceLineExceptionTest.cs" />
     <Compile Include="GeneralPipingInputTest.cs" />
-    <Compile Include="NormDependentFactorCollectionTest.cs" />
     <Compile Include="PipingCalculationScenarioExtensionsTest.cs" />
     <Compile Include="PipingCalculationScenarioTest.cs" />
     <Compile Include="PipingCalculationTest.cs" />
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs	(.../PipingFailureMechanismContextPropertiesTest.cs)	(revision cbe47edc5aec1175bceda95452ebe5697eda181d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismContextPropertiesTest.cs	(.../PipingFailureMechanismContextPropertiesTest.cs)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -88,8 +88,6 @@
             Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.UpliftCriticalSafetyFactor, properties.UpliftCriticalSafetyFactor);
             Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.A, properties.A);
             Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.B, properties.B);
-            Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetHeaveNormDependentFactor(norm), properties.HeaveNormDependentFactor);
-            Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetSellmeijerNormDependentFactor(norm), properties.SellmeijerNormDependentFactor);
 
             mockRepository.VerifyAll();
         }
@@ -107,7 +105,7 @@
             // Assert
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
-            Assert.AreEqual(19, dynamicProperties.Count);
+            Assert.AreEqual(17, dynamicProperties.Count);
 
             var generalCategory = "Algemeen";
             var heaveCategory = "Heave";
@@ -165,77 +163,63 @@
             Assert.AreEqual("b [m]", bProperty.DisplayName);
             Assert.AreEqual("De parameter 'b' die gebruikt wordt voor het lengte-effect in berekening van de maximaal toelaatbare faalkans.", bProperty.Description);
 
-            PropertyDescriptor heaveNormDependentFactor = dynamicProperties[7];
-            Assert.IsNotNull(heaveNormDependentFactor);
-            Assert.IsTrue(heaveNormDependentFactor.IsReadOnly);
-            Assert.AreEqual(semiProbabilisticCategory, heaveNormDependentFactor.Category);
-            Assert.AreEqual("Normafhankelijke factor voor heave", heaveNormDependentFactor.DisplayName);
-            Assert.AreEqual("Normafhankelijke factor die gebruikt wordt bij het omzetten van de veiligheidsfactor voor heave naar een betrouwbaarheidsindex.", heaveNormDependentFactor.Description);
-
-            PropertyDescriptor sellmeijerNormDependentFactor = dynamicProperties[8];
-            Assert.IsNotNull(sellmeijerNormDependentFactor);
-            Assert.IsTrue(sellmeijerNormDependentFactor.IsReadOnly);
-            Assert.AreEqual(semiProbabilisticCategory, sellmeijerNormDependentFactor.Category);
-            Assert.AreEqual("Normafhankelijke factor voor terugschrijdende erosie", sellmeijerNormDependentFactor.DisplayName);
-            Assert.AreEqual("Normafhankelijke factor die gebruikt wordt bij het omzetten van de veiligheidsfactor voor terugschrijdende erosie (Sellmeijer) naar een betrouwbaarheidsindex.", sellmeijerNormDependentFactor.Description);
-
-            PropertyDescriptor criticalHeaveGradientProperty = dynamicProperties[9];
+            PropertyDescriptor criticalHeaveGradientProperty = dynamicProperties[7];
             Assert.IsNotNull(criticalHeaveGradientProperty);
             Assert.IsTrue(criticalHeaveGradientProperty.IsReadOnly);
             Assert.AreEqual(heaveCategory, criticalHeaveGradientProperty.Category);
             Assert.AreEqual("Kritiek verhang m.b.t. heave [-]", criticalHeaveGradientProperty.DisplayName);
             Assert.AreEqual("Kritiek verhang met betrekking tot heave.", criticalHeaveGradientProperty.Description);
 
-            PropertyDescriptor criticalSafetyFactorUpliftProperty = dynamicProperties[10];
+            PropertyDescriptor criticalSafetyFactorUpliftProperty = dynamicProperties[8];
             Assert.IsNotNull(criticalSafetyFactorUpliftProperty);
             Assert.IsFalse(criticalSafetyFactorUpliftProperty.IsReadOnly);
             Assert.AreEqual(upliftCategory, criticalSafetyFactorUpliftProperty.Category);
             Assert.AreEqual("Kritische veiligheidsfactor voor opbarsten [-]", criticalSafetyFactorUpliftProperty.DisplayName);
             Assert.AreEqual("De veiligheidsfactor die wordt vergeleken met de berekende stabiliteitsfactor van het submechanisme opbarsten.", criticalSafetyFactorUpliftProperty.Description);
 
-            PropertyDescriptor volumetricWeightSandParticlesProperty = dynamicProperties[11];
+            PropertyDescriptor volumetricWeightSandParticlesProperty = dynamicProperties[9];
             Assert.IsNotNull(volumetricWeightSandParticlesProperty);
             Assert.IsTrue(volumetricWeightSandParticlesProperty.IsReadOnly);
             Assert.AreEqual(sellmeijerCategory, volumetricWeightSandParticlesProperty.Category);
             Assert.AreEqual("Volumiek gewicht van de zandkorrels onder water [kN/m³]", volumetricWeightSandParticlesProperty.DisplayName);
             Assert.AreEqual("Het (ondergedompelde) volumegewicht van zandkorrelmateriaal van een zandlaag.", volumetricWeightSandParticlesProperty.Description);
 
-            PropertyDescriptor whitesDragCoefficientProperty = dynamicProperties[12];
+            PropertyDescriptor whitesDragCoefficientProperty = dynamicProperties[10];
             Assert.IsNotNull(whitesDragCoefficientProperty);
             Assert.IsTrue(whitesDragCoefficientProperty.IsReadOnly);
             Assert.AreEqual(sellmeijerCategory, whitesDragCoefficientProperty.Category);
             Assert.AreEqual("Coëfficiënt van White [-]", whitesDragCoefficientProperty.DisplayName);
             Assert.AreEqual("Sleepkrachtfactor volgens White.", whitesDragCoefficientProperty.Description);
 
-            PropertyDescriptor beddingAngleProperty = dynamicProperties[13];
+            PropertyDescriptor beddingAngleProperty = dynamicProperties[11];
             Assert.IsNotNull(beddingAngleProperty);
             Assert.IsTrue(beddingAngleProperty.IsReadOnly);
             Assert.AreEqual(sellmeijerCategory, beddingAngleProperty.Category);
             Assert.AreEqual("Rolweerstandshoek [°]", beddingAngleProperty.DisplayName);
             Assert.AreEqual("Hoek in het krachtenevenwicht die aangeeft hoeveel weerstand de korrels bieden tegen rollen; ook beddingshoek genoemd.", beddingAngleProperty.Description);
 
-            PropertyDescriptor waterKinematicViscosityProperty = dynamicProperties[14];
+            PropertyDescriptor waterKinematicViscosityProperty = dynamicProperties[12];
             Assert.IsNotNull(waterKinematicViscosityProperty);
             Assert.IsTrue(waterKinematicViscosityProperty.IsReadOnly);
             Assert.AreEqual(sellmeijerCategory, waterKinematicViscosityProperty.Category);
             Assert.AreEqual("Kinematische viscositeit van water bij 10° C [m²/s]", waterKinematicViscosityProperty.DisplayName);
             Assert.AreEqual("Kinematische viscositeit van water bij 10° C.", waterKinematicViscosityProperty.Description);
 
-            PropertyDescriptor gravityProperty = dynamicProperties[15];
+            PropertyDescriptor gravityProperty = dynamicProperties[13];
             Assert.IsNotNull(gravityProperty);
             Assert.IsTrue(gravityProperty.IsReadOnly);
             Assert.AreEqual(sellmeijerCategory, gravityProperty.Category);
             Assert.AreEqual("Valversnelling [m/s²]", gravityProperty.DisplayName);
             Assert.AreEqual("Valversnelling.", gravityProperty.Description);
 
-            PropertyDescriptor meanDiameter70Property = dynamicProperties[16];
+            PropertyDescriptor meanDiameter70Property = dynamicProperties[14];
             Assert.IsNotNull(meanDiameter70Property);
             Assert.IsTrue(meanDiameter70Property.IsReadOnly);
             Assert.AreEqual(sellmeijerCategory, meanDiameter70Property.Category);
             Assert.AreEqual("Referentiewaarde voor 70%-fraktiel in Sellmeijer regel [m]", meanDiameter70Property.DisplayName);
             Assert.AreEqual("Gemiddelde d70 van de in kleine schaalproeven toegepaste zandsoorten, waarop de formule van Sellmeijer is gefit.", meanDiameter70Property.Description);
 
-            PropertyDescriptor reductionFactorSellmeijerProperty = dynamicProperties[17];
+            PropertyDescriptor reductionFactorSellmeijerProperty = dynamicProperties[15];
             Assert.IsNotNull(reductionFactorSellmeijerProperty);
             Assert.IsTrue(reductionFactorSellmeijerProperty.IsReadOnly);
             Assert.AreEqual(sellmeijerCategory, reductionFactorSellmeijerProperty.Category);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs
===================================================================
diff -u -r0cdb24eee9b746ab5d21381ca51c6836dd460292 -ref2c6cb7afd29e17ada49f5a18b9e21968122232
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs	(.../PipingSemiProbabilisticCalculationServiceTest.cs)	(revision 0cdb24eee9b746ab5d21381ca51c6836dd460292)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs	(.../PipingSemiProbabilisticCalculationServiceTest.cs)	(revision ef2c6cb7afd29e17ada49f5a18b9e21968122232)
@@ -56,10 +56,10 @@
         }
 
         [Test]
-        [TestCase(30000, 0.6, 9.69402E-05)]
-        [TestCase(30000, 0.4, 0.001966461)]
-        [TestCase(1000, 0.6, 0.000733478)]
-        [TestCase(1000, 0.4, 0.009699472)]
+        [TestCase(30000, 0.6, 0.000233010568259)]
+        [TestCase(30000, 0.4, 0.003967252123066)]
+        [TestCase(20000, 0.6, 0.000292193848324)]
+        [TestCase(20000, 0.4, 0.004742775184826)]
         public void HeaveProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult)
         {
             // Setup
@@ -76,10 +76,10 @@
         }
 
         [Test]
-        [TestCase(30000, 0.9, 3.40071E-06)]
-        [TestCase(30000, 0.6, 0.000330755)]
-        [TestCase(1000, 0.9, 0.000179351)]
-        [TestCase(1000, 0.6, 0.006680766)]
+        [TestCase(30000, 0.9, 1.0988217217028E-05)]
+        [TestCase(30000, 0.6, 8.22098269097995E-04)]
+        [TestCase(20000, 0.9, 1.80799783465546E-05)]
+        [TestCase(20000, 0.6, 1.20312928722076E-03)]
         public void SellmeijerProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult)
         {
             // Setup
@@ -96,12 +96,12 @@
         }
 
         [Test]
-        [TestCase(30000, 1.2, 0.6, 0.9, 4.499810081)]
-        [TestCase(30000, 1.2, 1.4, 0.9, 5.489239245)]
-        [TestCase(30000, 1.2, 0.6, 1.1, 5.041620959)]
-        [TestCase(1000, 1.2, 0.6, 0.9, 3.568740768)]
-        [TestCase(1000, 1.2, 1.4, 0.9, 4.943521575)]
-        [TestCase(1000, 1.2, 0.6, 1.1, 4.110551646)]
+        [TestCase(30000, 1.4, 0.6, 0.9, double.PositiveInfinity)]
+        [TestCase(30000, 1.1, 1.4, 0.9, 5.264767065)]
+        [TestCase(30000, 1.1, 0.6, 1.1, 4.786155161)]
+        [TestCase(20000, 1.4, 0.6, 0.9, double.PositiveInfinity)]
+        [TestCase(20000, 1.1, 1.4, 0.9, 5.203962658)]
+        [TestCase(20000, 1.1, 0.6, 1.1, 4.673091832)]
         public void PipingReliability_DifferentInputs_ReturnsExpectedValue(int norm, double fosUplift, double fosHeave, double fosSellmeijer, double expectedResult)
         {
             // Setup
@@ -150,7 +150,7 @@
             double fosUplift = 1.2;
             double fosHeave = 0.6;
             double fosSellmeijer = 0.9;
-            double expectedResult = 0.941940161;
+            double expectedResult = 0.888;
 
             var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer);
             var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput
@@ -197,28 +197,6 @@
         }
 
         [Test]
-        public void Calculate_CompleteInput_ReturnsPipingSemiProbabilisticOutputWithValues()
-        {
-            // Setup
-            var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput
-            {
-                SectionLength = 6000
-            };
-            var pipingOutput = new PipingOutput(double.NaN, 1.2, double.NaN, 0.6, double.NaN, 0.9);
-            var pipingCalculation = new PipingCalculation(new GeneralPipingInput())
-            {
-                Output = pipingOutput
-            };
-
-            // Call
-            PipingSemiProbabilisticCalculationService.Calculate(pipingCalculation, pipingProbabilityAssessmentInput, 30000, 24);
-
-            // Assert
-            RoundedDouble result = pipingCalculation.SemiProbabilisticOutput.PipingFactorOfSafety;
-            Assert.AreEqual(0.942, result, result.GetAccuracy());
-        }
-
-        [Test]
         public void Calculate_MissingOutput_ThrowsArgumentException()
         {
             // Setup