Index: Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs
===================================================================
diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -r55c178c8718a4ddb95cf2a99afb9fbdb92915b43
--- Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs (.../ProbabilityAssessmentService.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/ProbabilityAssessmentService.cs (.../ProbabilityAssessmentService.cs) (revision 55c178c8718a4ddb95cf2a99afb9fbdb92915b43)
@@ -32,15 +32,15 @@
///
/// Calculates based on the provided parameters.
///
- /// The return period to assess for.
+ /// The return period to assess for.
/// The contribution of the failure mechanism as a percentage (0-100)
/// to the total of the failure probability of the assessment section.
/// The 'N' parameter used to factor in the 'length effect'.
/// The reliability to use for the calculation.
/// The calculated .
- public static ProbabilityAssessmentOutput Calculate(int norm, double contribution, double lengthEffectN, double reliability)
+ public static ProbabilityAssessmentOutput Calculate(int returnPeriod, double contribution, double lengthEffectN, double reliability)
{
- var requiredProbability = RequiredProbability(contribution/100.0, norm, lengthEffectN);
+ var requiredProbability = RequiredProbability(contribution/100.0, returnPeriod, lengthEffectN);
var probability = ReliabilityToProbability(reliability);
var requiredReliability = ProbabilityToReliability(requiredProbability);
var factorOfSafety = FactorOfSafety(reliability, requiredReliability);
@@ -52,9 +52,9 @@
factorOfSafety);
}
- private static double RequiredProbability(double contribution, int norm, double lengthEffectN)
+ private static double RequiredProbability(double contribution, int returnPeriod, double lengthEffectN)
{
- return contribution*(1.0/norm)/lengthEffectN;
+ return contribution*(1.0/returnPeriod)/lengthEffectN;
}
private static double ReliabilityToProbability(double reliability)
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/ProbabilityAssessmentServiceTest.cs
===================================================================
diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -r55c178c8718a4ddb95cf2a99afb9fbdb92915b43
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/ProbabilityAssessmentServiceTest.cs (.../ProbabilityAssessmentServiceTest.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/ProbabilityAssessmentServiceTest.cs (.../ProbabilityAssessmentServiceTest.cs) (revision 55c178c8718a4ddb95cf2a99afb9fbdb92915b43)
@@ -36,10 +36,10 @@
[TestCase(20000, 100, 1, 0.00005000000)]
[TestCase(20000, 24, 2, 0.00000600000)]
[TestCase(20000, 24, 1, 0.00001200000)]
- public void RequiredProbability_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, int lengthEffectN, double expectedResult)
+ public void RequiredProbability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double contribution, int lengthEffectN, double expectedResult)
{
// Call
- var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(norm, contribution, lengthEffectN, double.NaN);
+ var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(returnPeriod, contribution, lengthEffectN, double.NaN);
// Assert
Assert.AreEqual(expectedResult, probabilityAssessmentOutput.RequiredProbability, 1e-6);
@@ -54,10 +54,10 @@
[TestCase(20000, 100, 1, 3.890591886)]
[TestCase(20000, 24, 2, 4.377587847)]
[TestCase(20000, 24, 1, 4.2240038)]
- public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, int lengthEffectN, double expectedResult)
+ public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double contribution, int lengthEffectN, double expectedResult)
{
// Call
- var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(norm, contribution, lengthEffectN, double.NaN);
+ var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(returnPeriod, contribution, lengthEffectN, double.NaN);
// Assert
Assert.AreEqual(expectedResult, probabilityAssessmentOutput.RequiredReliability, probabilityAssessmentOutput.RequiredReliability.GetAccuracy());
@@ -96,10 +96,10 @@
[TestCase(20000, 100, 2, 4.149409984, 1.023124169)]
[TestCase(20000, 24, 2, 4.107479655, 0.938297482)]
[TestCase(20000, 24, 2, 4.149409984, 0.947875892)]
- public void FactorOfSafety_DifferentInputs_ReturnsExpectedValue(int norm, double contribution, int lengthEffectN, double reliability, double expectedResult)
+ public void FactorOfSafety_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double contribution, int lengthEffectN, double reliability, double expectedResult)
{
// Call
- var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(norm, contribution, lengthEffectN, reliability);
+ var probabilityAssessmentOutput = ProbabilityAssessmentService.Calculate(returnPeriod, contribution, lengthEffectN, reliability);
// Assert
Assert.AreEqual(expectedResult, probabilityAssessmentOutput.FactorOfSafety, probabilityAssessmentOutput.FactorOfSafety.GetAccuracy());
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -rd72a7a2a430e8adaaf5357c10feb66e1f715d3b6 -r55c178c8718a4ddb95cf2a99afb9fbdb92915b43
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision d72a7a2a430e8adaaf5357c10feb66e1f715d3b6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 55c178c8718a4ddb95cf2a99afb9fbdb92915b43)
@@ -435,20 +435,20 @@
{
var calculations = GetAllPipingCalculations(failureMechanismContext.WrappedData);
var assessmentInput = failureMechanismContext.WrappedData.PipingProbabilityAssessmentInput;
- var norm = failureMechanismContext.Parent.FailureMechanismContribution.Norm;
+ var returnPeriod = failureMechanismContext.Parent.FailureMechanismContribution.Norm;
var contribution = failureMechanismContext.WrappedData.Contribution;
- CalculateAll(calculations, assessmentInput, norm, contribution);
+ CalculateAll(calculations, assessmentInput, returnPeriod, contribution);
}
private void CalculateAll(CalculationGroup group, PipingCalculationGroupContext context)
{
var calculations = group.GetCalculations().OfType().ToArray();
var assessmentInput = context.FailureMechanism.PipingProbabilityAssessmentInput;
- var norm = context.AssessmentSection.FailureMechanismContribution.Norm;
+ var returnPeriod = context.AssessmentSection.FailureMechanismContribution.Norm;
var contribution = context.FailureMechanism.Contribution;
- CalculateAll(calculations, assessmentInput, norm, contribution);
+ CalculateAll(calculations, assessmentInput, returnPeriod, contribution);
}
private static void ValidateAll(IEnumerable pipingCalculations)
@@ -459,14 +459,14 @@
}
}
- private void CalculateAll(IEnumerable calculations, PipingProbabilityAssessmentInput assessmentInput, int norm, double contribution)
+ private void CalculateAll(IEnumerable calculations, PipingProbabilityAssessmentInput assessmentInput, int returnPeriod, double contribution)
{
ActivityProgressDialogRunner.Run(
Gui.MainWindow,
calculations
.Select(pc => new PipingCalculationActivity(pc,
assessmentInput,
- norm,
+ returnPeriod,
contribution))
.ToList());
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs
===================================================================
diff -u -r669abaf20f73e5b35a7ce4c0e78690097da77ef7 -r55c178c8718a4ddb95cf2a99afb9fbdb92915b43
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision 669abaf20f73e5b35a7ce4c0e78690097da77ef7)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision 55c178c8718a4ddb95cf2a99afb9fbdb92915b43)
@@ -30,7 +30,7 @@
///
public class PipingCalculationActivity : Activity
{
- private readonly int norm;
+ private readonly int returnPeriod;
private readonly double contribution;
private readonly PipingCalculation calculation;
private readonly PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput;
@@ -41,12 +41,12 @@
/// The piping data used for the calculation.
/// General input that influences the probability estimate for a piping
/// assessment.
- /// The return period to assess for.
+ /// The return period to assess for.
/// The contribution of piping as a percentage (0-100) to the total of the failure probability
/// of the assessment section.
/// Thrown when any
/// or is null.
- public PipingCalculationActivity(PipingCalculation calculation, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput, int norm, double contribution)
+ public PipingCalculationActivity(PipingCalculation calculation, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput, int returnPeriod, double contribution)
{
if (calculation == null)
{
@@ -59,7 +59,7 @@
this.calculation = calculation;
this.pipingProbabilityAssessmentInput = pipingProbabilityAssessmentInput;
- this.norm = norm;
+ this.returnPeriod = returnPeriod;
this.contribution = contribution;
Name = calculation.Name;
@@ -77,7 +77,7 @@
PipingDataSynchronizationService.ClearCalculationOutput(calculation);
PipingCalculationService.Calculate(calculation);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, returnPeriod, contribution);
}
protected override void OnCancel()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs
===================================================================
diff -u -r73bd0a761a4333c065632708f014b599e4bb4e83 -r55c178c8718a4ddb95cf2a99afb9fbdb92915b43
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision 73bd0a761a4333c065632708f014b599e4bb4e83)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision 55c178c8718a4ddb95cf2a99afb9fbdb92915b43)
@@ -70,7 +70,9 @@
/// The constant b.
/// The length of the assessment section.
/// The contribution of piping to the total failure.
- private PipingSemiProbabilisticCalculationService(double upliftFactorOfSafety, double heaveFactorOfSafety, double sellmeijerFactorOfSafety, int returnPeriod, double constantA, double constantB, double assessmentSectionLength, double contribution)
+ private PipingSemiProbabilisticCalculationService(double upliftFactorOfSafety, double heaveFactorOfSafety,
+ double sellmeijerFactorOfSafety, int returnPeriod, double constantA,
+ double constantB, double assessmentSectionLength, double contribution)
{
this.heaveFactorOfSafety = heaveFactorOfSafety;
this.upliftFactorOfSafety = upliftFactorOfSafety;
@@ -89,11 +91,12 @@
/// probabilistic calculation is successful, is set.
/// General input that influences the probability estimate for a piping
/// assessment.
- /// The return period to assess for.
+ /// The return period to assess for.
/// The contribution of piping as a percentage (0-100) to the total of the failure probability
/// of the assessment section.
/// Thrown when calculation has no output from a piping calculation.
- public static void Calculate(PipingCalculation calculation, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput, int norm, double contribution)
+ public static void Calculate(PipingCalculation calculation, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput,
+ int returnPeriod, double contribution)
{
ValidateOutputOnCalculation(calculation);
@@ -103,7 +106,7 @@
pipingOutput.UpliftFactorOfSafety,
pipingOutput.HeaveFactorOfSafety,
pipingOutput.SellmeijerFactorOfSafety,
- norm,
+ returnPeriod,
pipingProbabilityAssessmentInput.A,
pipingProbabilityAssessmentInput.B,
pipingProbabilityAssessmentInput.SectionLength,
@@ -142,7 +145,7 @@
}
///
- /// Calculates the required reliability based on the norm and length of the assessment section and the contribution of piping.
+ /// Calculates the required reliability based on the return period and length of the assessment section and the contribution of piping.
///
private void CalculateRequiredReliability()
{
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -r11d42ab635dac57e2decba16eaf672da35ee8580 -r55c178c8718a4ddb95cf2a99afb9fbdb92915b43
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 11d42ab635dac57e2decba16eaf672da35ee8580)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 55c178c8718a4ddb95cf2a99afb9fbdb92915b43)
@@ -118,8 +118,8 @@
validPipingCalculation.Output = null;
validPipingCalculation.SemiProbabilisticOutput = null;
- int norm = new Random(21).Next(100, 300000);
- var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), norm, double.NaN);
+ int returnPeriod = new Random(21).Next(100, 300000);
+ var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), returnPeriod, double.NaN);
activity.Run();
// Call
Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs
===================================================================
diff -u -r8723c31042f8aa4174e6d51a42f20d3665ec2da0 -r55c178c8718a4ddb95cf2a99afb9fbdb92915b43
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision 8723c31042f8aa4174e6d51a42f20d3665ec2da0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision 55c178c8718a4ddb95cf2a99afb9fbdb92915b43)
@@ -36,13 +36,13 @@
[TestCase(30000, 1.0, 4.13743266617776E-05)]
[TestCase(20000, 1.2, 9.53352884976163E-06)]
[TestCase(20000, 1.0, 5.24016937211752E-05)]
- public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult)
+ public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double factorOfSafety, double expectedResult)
{
// Setup
var calculatorResult = new PipingOutput(double.NaN, factorOfSafety, double.NaN, double.NaN, double.NaN, double.NaN);
var calculation = AsPipingCalculation(calculatorResult);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), returnPeriod, double.NaN);
// Call
double result = calculation.SemiProbabilisticOutput.UpliftProbability;
@@ -56,13 +56,13 @@
[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)
+ public void HeaveProbability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double factorOfSafety, double expectedResult)
{
// Setup
var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, factorOfSafety, double.NaN, double.NaN);
var calculation = AsPipingCalculation(calculatorResult);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), returnPeriod, double.NaN);
// Call
double result = calculation.SemiProbabilisticOutput.HeaveProbability;
@@ -76,13 +76,13 @@
[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)
+ public void SellmeijerProbability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double factorOfSafety, double expectedResult)
{
// Setup
var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, factorOfSafety);
var calculation = AsPipingCalculation(calculatorResult);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), returnPeriod, double.NaN);
// Call
double result = calculation.SemiProbabilisticOutput.SellmeijerProbability;
@@ -98,13 +98,13 @@
[TestCase(20000, 1.2, 0.6, 0.9, 4.275544655)]
[TestCase(20000, 1.2, 1.4, 0.9, 5.203962658)]
[TestCase(20000, 1.2, 0.6, 1.1, 4.673091832)]
- public void PipingReliability_DifferentInputs_ReturnsExpectedValue(int norm, double fosUplift, double fosHeave, double fosSellmeijer, double expectedResult)
+ public void PipingReliability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double fosUplift, double fosHeave, double fosSellmeijer, double expectedResult)
{
// Setup
var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer);
var calculation = AsPipingCalculation(calculatorResult);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), returnPeriod, double.NaN);
// Call
RoundedDouble result = calculation.SemiProbabilisticOutput.PipingReliability;
@@ -117,7 +117,7 @@
[TestCase(30000, 6000, 24, 4.777)]
[TestCase(20000, 6000, 12, 4.835)]
[TestCase(20000, 8000, 24, 4.748)]
- public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int norm, double assessmentSectionLength, double contribution, double expectedResult)
+ public void RequiredReliability_DifferentInputs_ReturnsExpectedValue(int returnPeriod, double assessmentSectionLength, double contribution, double expectedResult)
{
// Setup
var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN);
@@ -127,7 +127,7 @@
};
var calculation = AsPipingCalculation(calculatorResult);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, returnPeriod, contribution);
// Call
RoundedDouble result = calculation.SemiProbabilisticOutput.RequiredReliability;
@@ -140,7 +140,7 @@
public void PipingFactorOfSafety_SampleInput_ReturnsExpectedValue()
{
// Setup
- int norm = 30000;
+ int returnPeriod = 30000;
double assessmentSectionLength = 6000;
double contribution = 24;
double fosUplift = 1.2;
@@ -155,7 +155,7 @@
};
var calculation = AsPipingCalculation(calculatorResult);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, returnPeriod, contribution);
// Call
RoundedDouble result = calculation.SemiProbabilisticOutput.PipingFactorOfSafety;
@@ -167,7 +167,7 @@
[Test]
[Combinatorial]
public void PipingFactorOfSafety_DifferentInputs_ReturnsExpectedValue(
- [Values(20000, 30000)] int norm,
+ [Values(20000, 30000)] int returnPeriod,
[Values(6000, 8000)] double assessmentSectionLength,
[Values(12, 24)] double contribution,
[Values(1.2, 1.0)] double fosUplift,
@@ -182,7 +182,7 @@
};
var calculation = AsPipingCalculation(calculatorResult);
- PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, norm, contribution);
+ PipingSemiProbabilisticCalculationService.Calculate(calculation, pipingProbabilityAssessmentInput, returnPeriod, contribution);
// Call
RoundedDouble result = calculation.SemiProbabilisticOutput.PipingFactorOfSafety;