Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -36,15 +36,15 @@ public void Constructor_ExpectedValues() { // Setup - const double norm = 1.0 / 10000; + const double targetProbability = 1.0 / 10000; const int sectionId = 1; const long hydraulicBoundaryLocationId = 1234; // Call - var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(sectionId, hydraulicBoundaryLocationId, norm); + var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(sectionId, hydraulicBoundaryLocationId, targetProbability); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(assessmentLevelCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculationInput.FailureMechanismType); Assert.AreEqual(9, assessmentLevelCalculationInput.CalculationTypeId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -38,7 +38,7 @@ public void Constructor_Always_ExpectedValues() { // Setup - const double norm = 1.0 / 10000; + const double targetProbability = 1.0 / 10000; const int hydraulicBoundaryLocationId = 1000; const double sectionNormal = 21.1; @@ -74,7 +74,7 @@ var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3); // Call - var input = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, sectionNormal, + var input = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, targetProbability, sectionNormal, expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater, modelFactorCriticalOvertopping, factorFbMean, factorFbStandardDeviation, @@ -89,7 +89,7 @@ exponentModelFactorShallowLowerBoundary, exponentModelFactorShallowUpperBoundary); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(input); Assert.AreEqual(9, input.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs (.../DunesBoundaryConditionsCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -35,15 +35,15 @@ public void Constructor_ExpectedValues() { // Setup - const double norm = 1.0 / 10000; + const double targetProbability = 1.0 / 10000; const int sectionId = 1; const long hydraulicBoundaryLocationId = 1234; // Call - var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, norm); + var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, targetProbability); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(dunesBoundaryConditionsCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.DunesBoundaryConditions, dunesBoundaryConditionsCalculationInput.FailureMechanismType); Assert.AreEqual(2, dunesBoundaryConditionsCalculationInput.CalculationTypeId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs =================================================================== diff -u -ra13cd67ba27f2febb8caa646b4b066f848f4ad69 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision a13cd67ba27f2febb8caa646b4b066f848f4ad69) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -39,7 +39,7 @@ public void Constructor_Always_ExpectedValues() { // Setup - const double norm = 1.0 / 10000; + const double targetProbability = 1.0 / 10000; const int hydraulicBoundaryLocationId = 1000; const double sectionNormal = 19.9; @@ -73,7 +73,7 @@ var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3); // Call - var input = new HydraulicLoadsCalculationInputImplementation(hydraulicBoundaryLocationId, norm, sectionNormal, + var input = new HydraulicLoadsCalculationInputImplementation(hydraulicBoundaryLocationId, targetProbability, sectionNormal, expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater, modelFactorCriticalOvertopping, factorFbMean, factorFbStandardDeviation, @@ -87,7 +87,7 @@ exponentModelFactorShallowLowerBoundary, exponentModelFactorShallowUpperBoundary); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(input); Assert.AreEqual(9, input.CalculationTypeId); Assert.AreEqual(1017, input.FaultTreeModelId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -38,7 +38,7 @@ public void Constructor_Always_ExpectedValues() { // Setup - const double norm = 1.0 / 10000; + const double targetProbability = 1.0 / 10000; const int hydraulicBoundaryLocationId = 1000; const double sectionNormal = 20.0; @@ -73,7 +73,7 @@ var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3); // Call - var input = new OvertoppingRateCalculationInput(hydraulicBoundaryLocationId, norm, sectionNormal, + var input = new OvertoppingRateCalculationInput(hydraulicBoundaryLocationId, targetProbability, sectionNormal, expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater, dikeHeight, modelFactorCriticalOvertopping, @@ -88,7 +88,7 @@ exponentModelFactorShallowLowerBoundary, exponentModelFactorShallowUpperBoundary); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(input); Assert.AreEqual(2, input.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -36,15 +36,15 @@ public void Constructor_ExpectedValues() { // Setup - const double norm = 1.0 / 10000; + const double targetProbability = 1.0 / 10000; const int sectionId = 1; const long hydraulicBoundaryLocationId = 1234; // Call - var waveHeightCalculationInput = new WaveHeightCalculationInput(sectionId, hydraulicBoundaryLocationId, norm); + var waveHeightCalculationInput = new WaveHeightCalculationInput(sectionId, hydraulicBoundaryLocationId, targetProbability); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(waveHeightCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.WaveHeight, waveHeightCalculationInput.FailureMechanismType); Assert.AreEqual(9, waveHeightCalculationInput.CalculationTypeId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs =================================================================== diff -u -ra13cd67ba27f2febb8caa646b4b066f848f4ad69 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs (.../ReliabilityIndexCalculationInputTest.cs) (revision a13cd67ba27f2febb8caa646b4b066f848f4ad69) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs (.../ReliabilityIndexCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -35,14 +35,14 @@ [TestCase(-50, 1.0 / 1)] [TestCase(0, 1.0 / -90)] [TestCase(200000, double.NaN)] - public void Constructed_UsingDifferentReturnPeriodAndLocationId_ReturnDifferentBetaAndDefaultValues(int locationId, double norm) + public void Constructed_UsingDifferentReturnPeriodAndLocationId_ReturnDifferentBetaAndDefaultValues(int locationId, double targetProbability) { // Call - var reliabilityIndexCalculationInput = new ReliabilityIndexCalculationInputImplementation(locationId, norm); + var reliabilityIndexCalculationInput = new ReliabilityIndexCalculationInputImplementation(locationId, targetProbability); // Assert Assert.IsInstanceOf(reliabilityIndexCalculationInput); - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.AreEqual(locationId, reliabilityIndexCalculationInput.HydraulicBoundaryLocationId); Assert.AreEqual(9, reliabilityIndexCalculationInput.CalculationTypeId); CollectionAssert.IsEmpty(reliabilityIndexCalculationInput.Variables); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs =================================================================== diff -u -ra13cd67ba27f2febb8caa646b4b066f848f4ad69 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision a13cd67ba27f2febb8caa646b4b066f848f4ad69) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -41,7 +41,7 @@ const int sectionId = 111; const double sectionNormal = 90; const int hydraulicBoundaryLocationId = 222; - const double norm = 0.333; + const double targetProbability = 0.333; IEnumerable forelandPoints = Enumerable.Empty(); var breakWater = new HydraRingBreakWater(1, 4.4); const double waterLevel = 5.5; @@ -52,15 +52,15 @@ var waveConditionsCalculationInput = new WaveConditionsCalculationInputImplementation(sectionId, sectionNormal, hydraulicBoundaryLocationId, - norm, + targetProbability, forelandPoints, breakWater, waterLevel, a, b); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(waveConditionsCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCalculationInput.FailureMechanismType); Assert.AreEqual(8, waveConditionsCalculationInput.CalculationTypeId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -40,7 +40,7 @@ const int sectionId = 111; const double sectionNormal = 90; const int hydraulicBoundaryLocationId = 222; - const double norm = 0.333; + const double targetProbability = 0.333; IEnumerable forelandPoints = Enumerable.Empty(); var breakWater = new HydraRingBreakWater(1, 4.4); @@ -53,7 +53,7 @@ var waveConditionsCosineCalculationInput = new WaveConditionsCosineCalculationInput(sectionId, sectionNormal, hydraulicBoundaryLocationId, - norm, + targetProbability, forelandPoints, breakWater, waterLevel, @@ -62,7 +62,7 @@ c); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(waveConditionsCosineCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCosineCalculationInput.FailureMechanismType); Assert.AreEqual(8, waveConditionsCosineCalculationInput.CalculationTypeId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -40,7 +40,7 @@ const int sectionId = 111; const double sectionNormal = 90; const int hydraulicBoundaryLocationId = 222; - const double norm = 1.0 / 333; + const double targetProbability = 1.0 / 333; IEnumerable forelandPoints = Enumerable.Empty(); var breakWater = new HydraRingBreakWater(1, 4.4); const double waterLevel = 5.5; @@ -53,7 +53,7 @@ var waveConditionsTrapezoidCalculationInput = new WaveConditionsTrapezoidCalculationInput(sectionId, sectionNormal, hydraulicBoundaryLocationId, - norm, + targetProbability, forelandPoints, breakWater, waterLevel, @@ -63,7 +63,7 @@ beta2); // Assert - double expectedBeta = StatisticsConverter.ProbabilityToReliability(norm); + double expectedBeta = StatisticsConverter.ProbabilityToReliability(targetProbability); Assert.IsInstanceOf(waveConditionsTrapezoidCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsTrapezoidCalculationInput.FailureMechanismType); Assert.AreEqual(8, waveConditionsTrapezoidCalculationInput.CalculationTypeId); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r1d3719d151d64d0c2636e62fc3b73816d35931a4 -ra205dae99ccc2c7523343c19059a1248f6ce76c9 --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 1d3719d151d64d0c2636e62fc3b73816d35931a4) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision a205dae99ccc2c7523343c19059a1248f6ce76c9) @@ -409,7 +409,7 @@ const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; - const double norm = 1.0 / 1000; + const double targetProbability = 1.0 / 1000; const double modelFactorCriticalOvertopping = 4.4; const double factorFbMean = 5.5; const double factorFbStandardDeviation = 6.6; @@ -443,7 +443,7 @@ var numericsSetting = new NumericsSetting(1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25); hydraRingConfigurationService.AddHydraRingCalculationInput( - new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, sectionNormal, + new DikeHeightCalculationInput(hydraulicBoundaryLocationId, targetProbability, sectionNormal, profilePoints, forelandPoints, breakWater, modelFactorCriticalOvertopping, factorFbMean, factorFbStandardDeviation, @@ -572,7 +572,7 @@ const int hydraulicBoundaryLocationId = 700004; const double sectionNormal = 3.3; - const double norm = 1.0 / 1000; + const double targetProbability = 1.0 / 1000; const double dikeHeight = 4.4; const double modelFactorCriticalOvertopping = 5.5; const double factorFbMean = 6.6; @@ -605,7 +605,7 @@ var numericsSetting = new NumericsSetting(1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 3000, 10000, 0.1, -6, 6, 25); hydraRingConfigurationService.AddHydraRingCalculationInput( - new OvertoppingRateCalculationInput(hydraulicBoundaryLocationId, norm, sectionNormal, + new OvertoppingRateCalculationInput(hydraulicBoundaryLocationId, targetProbability, sectionNormal, profilePoints, forelandPoints, breakWater, dikeHeight, modelFactorCriticalOvertopping,