Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInputExtensions.cs
===================================================================
diff -u -r4e9d3556e3cee0365fc0f26d0bad19b50594e12d -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInputExtensions.cs (.../ProbabilityAssessmentInputExtensions.cs) (revision 4e9d3556e3cee0365fc0f26d0bad19b50594e12d)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInputExtensions.cs (.../ProbabilityAssessmentInputExtensions.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -29,15 +29,15 @@
public static class ProbabilityAssessmentInputExtensions
{
///
- /// Calculates the section specific N based on the general probability assessment input
- /// and the length of the section.
+ /// Calculates the N based on the general probability assessment input
+ /// and the length of the section or segment.
///
/// The probability assessment input parameters.
- /// The length of the section in meters.
- /// The section specific N.
+ /// The length in meters.
+ /// The 'N' parameter used to factor in the 'length effect'.
/// Thrown when
/// is null.
- public static double GetSectionSpecificN(this ProbabilityAssessmentInput probabilityAssessmentInput, double length)
+ public static double GetN(this ProbabilityAssessmentInput probabilityAssessmentInput, double length)
{
if (probabilityAssessmentInput == null)
{
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs
===================================================================
diff -u -r9fafa15446cd4461c6c320271902fd15b6dff43f -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs (.../FailureMechanismSectionProbabilityAssessmentProperties.cs) (revision 9fafa15446cd4461c6c320271902fd15b6dff43f)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FailureMechanismSectionProbabilityAssessmentProperties.cs (.../FailureMechanismSectionProbabilityAssessmentProperties.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -63,7 +63,7 @@
{
get
{
- return new RoundedDouble(2, probabilityAssessmentInput.GetSectionSpecificN(data.Length));
+ return new RoundedDouble(2, probabilityAssessmentInput.GetN(data.Length));
}
}
}
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputExtensionsTest.cs
===================================================================
diff -u -r4e9d3556e3cee0365fc0f26d0bad19b50594e12d -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputExtensionsTest.cs (.../ProbabilityAssessmentInputExtensionsTest.cs) (revision 4e9d3556e3cee0365fc0f26d0bad19b50594e12d)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputExtensionsTest.cs (.../ProbabilityAssessmentInputExtensionsTest.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -30,10 +30,10 @@
public class ProbabilityAssessmentInputExtensionsTest
{
[Test]
- public void GetSectionSpecificN_ProbabilityAssessmentInputNull_ThrowsArgumentNullException()
+ public void GetN_ProbabilityAssessmentInputNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => ((ProbabilityAssessmentInput) null).GetSectionSpecificN(new Random(39).NextDouble());
+ TestDelegate call = () => ((ProbabilityAssessmentInput) null).GetN(new Random(39).NextDouble());
// Assert
var exception = Assert.Throws(call);
@@ -45,13 +45,13 @@
[TestCase(0.5, 750, 300, 1.2)]
[TestCase(0.9, -200, 750, -2.375)]
[TestCase(0.8, 0, 100, double.PositiveInfinity)]
- public void GetSectionSpecificN_WithValues_ReturnsExpectedResult(double a, double b, double length, double expectedN)
+ public void GetN_WithValues_ReturnsExpectedResult(double a, double b, double length, double expectedN)
{
// Setup
var input = new TestProbabilityAssessmentInput(a, b);
// Call
- double actualN = input.GetSectionSpecificN(length);
+ double actualN = input.GetN(length);
// Assert
Assert.AreEqual(expectedN, actualN);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismProperties.cs
===================================================================
diff -u -r9fafa15446cd4461c6c320271902fd15b6dff43f -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismProperties.cs (.../MacroStabilityOutwardsFailureMechanismProperties.cs) (revision 9fafa15446cd4461c6c320271902fd15b6dff43f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismProperties.cs (.../MacroStabilityOutwardsFailureMechanismProperties.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -166,7 +166,7 @@
get
{
MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = data.MacroStabilityOutwardsProbabilityAssessmentInput;
- return new RoundedDouble(2, probabilityAssessmentInput.GetSectionSpecificN(probabilityAssessmentInput.SectionLength));
+ return new RoundedDouble(2, probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength));
}
}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r98544d1ded83f880238cb8e69f77b58ec1dbcc19 -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityOutwardsFailureMechanismPropertiesTest.cs) (revision 98544d1ded83f880238cb8e69f77b58ec1dbcc19)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAlone/MacroStabilityOutwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityOutwardsFailureMechanismPropertiesTest.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -71,7 +71,7 @@
Assert.AreEqual(probabilityAssessmentInput.A, properties.A);
Assert.AreEqual(probabilityAssessmentInput.B, properties.B);
Assert.AreEqual(2, properties.N.NumberOfDecimalPlaces);
- Assert.AreEqual(probabilityAssessmentInput.GetSectionSpecificN(probabilityAssessmentInput.SectionLength),
+ Assert.AreEqual(probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength),
properties.N,
properties.N.GetAccuracy());
Assert.AreEqual(2, properties.SectionLength.NumberOfDecimalPlaces);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs
===================================================================
diff -u -r9fafa15446cd4461c6c320271902fd15b6dff43f -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs (.../MacroStabilityInwardsFailureMechanismProperties.cs) (revision 9fafa15446cd4461c6c320271902fd15b6dff43f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailureMechanismProperties.cs (.../MacroStabilityInwardsFailureMechanismProperties.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -160,7 +160,7 @@
get
{
MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput = data.MacroStabilityInwardsProbabilityAssessmentInput;
- return new RoundedDouble(2, probabilityAssessmentInput.GetSectionSpecificN(probabilityAssessmentInput.SectionLength));
+ return new RoundedDouble(2, probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength));
}
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r361e46306c582319caa1c97e27bddc18492a68b6 -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs) (revision 361e46306c582319caa1c97e27bddc18492a68b6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsFailureMechanismPropertiesTest.cs (.../MacroStabilityInwardsFailureMechanismPropertiesTest.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -71,7 +71,7 @@
Assert.AreEqual(probabilityAssessmentInput.A, properties.A);
Assert.AreEqual(probabilityAssessmentInput.B, properties.B);
Assert.AreEqual(2, properties.N.NumberOfDecimalPlaces);
- Assert.AreEqual(probabilityAssessmentInput.GetSectionSpecificN(
+ Assert.AreEqual(probabilityAssessmentInput.GetN(
probabilityAssessmentInput.SectionLength),
properties.N,
properties.N.GetAccuracy());
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs
===================================================================
diff -u -r4ca0389a47c2979f47d826f86a84e2e9f7a6f7f6 -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision 4ca0389a47c2979f47d826f86a84e2e9f7a6f7f6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -244,7 +244,7 @@
get
{
PipingProbabilityAssessmentInput probabilityAssessmentInput = data.PipingProbabilityAssessmentInput;
- return new RoundedDouble(2, probabilityAssessmentInput.GetSectionSpecificN(probabilityAssessmentInput.SectionLength));
+ return new RoundedDouble(2, probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength));
}
}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r65ce8c5ab171b234e33e2291998c9d89276db896 -r9f509058d44189f44b16a8da06a60751b17c86c3
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 65ce8c5ab171b234e33e2291998c9d89276db896)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 9f509058d44189f44b16a8da06a60751b17c86c3)
@@ -116,7 +116,7 @@
Assert.AreEqual(probabilityAssessmentInput.A, properties.A);
Assert.AreEqual(probabilityAssessmentInput.B, properties.B);
Assert.AreEqual(2, properties.N.NumberOfDecimalPlaces);
- Assert.AreEqual(probabilityAssessmentInput.GetSectionSpecificN(
+ Assert.AreEqual(probabilityAssessmentInput.GetN(
probabilityAssessmentInput.SectionLength),
properties.N,
properties.N.GetAccuracy());