Index: Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs =================================================================== diff -u -r948224ba18427dc94d0d4bbaf77f57f9f601a5b2 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 948224ba18427dc94d0d4bbaf77f57f9f601a5b2) +++ Riskeer/Common/src/Riskeer.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -104,19 +104,14 @@ } /// - /// Gets the norm which has been defined on the assessment section. + /// Gets the normative probability which has been defined on the assessment section. /// /// Thrown when the new value is not in /// the interval [0.000001, 0.1] or is . - public double Norm - { - get - { - return NormativeProbabilityType == NormativeProbabilityType.MaximumAllowableFloodingProbability - ? MaximumAllowableFloodingProbability - : SignalFloodingProbability; - } - } + public double NormativeProbability => + NormativeProbabilityType == NormativeProbabilityType.MaximumAllowableFloodingProbability + ? MaximumAllowableFloodingProbability + : SignalFloodingProbability; /// /// Gets or sets the normative probability type which has been defined on the assessment section. Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Contribution/FailureMechanismContributionTest.cs (.../FailureMechanismContributionTest.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -83,7 +83,7 @@ var result = new FailureMechanismContribution(probability, probability); // Assert - Assert.AreEqual(probability, result.Norm); + Assert.AreEqual(probability, result.NormativeProbability); Assert.AreEqual(probability, result.SignalFloodingProbability); Assert.AreEqual(probability, result.MaximumAllowableFloodingProbability); Assert.AreEqual(NormativeProbabilityType.MaximumAllowableFloodingProbability, result.NormativeProbabilityType); @@ -196,7 +196,7 @@ [Test] [TestCase(NormativeProbabilityType.SignalFloodingProbability, 0.01)] [TestCase(NormativeProbabilityType.MaximumAllowableFloodingProbability, 0.1)] - public void Norm_DifferentNormativeProbabilityTypes_ReturnNorm(NormativeProbabilityType normativeProbabilityType, double expectedProbability) + public void NormativeProbability_DifferentNormativeProbabilityTypes_ReturnNorm(NormativeProbabilityType normativeProbabilityType, double expectedProbability) { // Setup var failureMechanismContribution = new FailureMechanismContribution(0.1, 0.01) @@ -205,10 +205,10 @@ }; // Call - double norm = failureMechanismContribution.Norm; + double normativeProbability = failureMechanismContribution.NormativeProbability; // Assert - Assert.AreEqual(expectedProbability, norm); + Assert.AreEqual(expectedProbability, normativeProbability); } private static IEnumerable GetValidProbabilityEdgeValues() Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs =================================================================== diff -u -r07256b6a9cc4abaff600e7c9a266cef54295b3c3 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs (.../GrassCoverErosionInwardsCalculationConfigurationHelper.cs) (revision 07256b6a9cc4abaff600e7c9a266cef54295b3c3) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs (.../GrassCoverErosionInwardsCalculationConfigurationHelper.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -68,8 +68,8 @@ InputParameters = { DikeProfile = profile, - DikeHeightTargetProbability = failureMechanismContribution.Norm, - OvertoppingRateTargetProbability = failureMechanismContribution.Norm + DikeHeightTargetProbability = failureMechanismContribution.NormativeProbability, + OvertoppingRateTargetProbability = failureMechanismContribution.NormativeProbability } }; calculationGroup.Children.Add(calculation); Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r04baa9e821738407ab5b6754ffa55acf22229a9f -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -224,7 +224,7 @@ calculation.InputParameters.ShouldDikeHeightBeCalculated = calculationConfiguration.ShouldDikeHeightBeCalculated.Value; } - double dikeHeightTargetProbability = calculationConfiguration.DikeHeightTargetProbability ?? failureMechanismContribution.Norm; + double dikeHeightTargetProbability = calculationConfiguration.DikeHeightTargetProbability ?? failureMechanismContribution.NormativeProbability; try { @@ -260,7 +260,7 @@ calculation.InputParameters.ShouldOvertoppingRateBeCalculated = calculationConfiguration.ShouldOvertoppingRateBeCalculated.Value; } - double overtoppingRateTargetProbability = calculationConfiguration.OvertoppingRateTargetProbability ?? failureMechanismContribution.Norm; + double overtoppingRateTargetProbability = calculationConfiguration.OvertoppingRateTargetProbability ?? failureMechanismContribution.NormativeProbability; try { Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r841fadc937a0f35244810144a2ea82b9ccd5da80 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 841fadc937a0f35244810144a2ea82b9ccd5da80) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -850,7 +850,7 @@ private static void AddCalculation(GrassCoverErosionInwardsCalculationGroupContext context) { - double targetProbability = context.AssessmentSection.FailureMechanismContribution.Norm; + double targetProbability = context.AssessmentSection.FailureMechanismContribution.NormativeProbability; var calculation = new GrassCoverErosionInwardsCalculationScenario { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsCalculationConfigurationHelperTest.cs =================================================================== diff -u -rebfd500b10e6634a584b5dd904d445078769ae90 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsCalculationConfigurationHelperTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationHelperTest.cs) (revision ebfd500b10e6634a584b5dd904d445078769ae90) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsCalculationConfigurationHelperTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationHelperTest.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -95,14 +95,14 @@ var calculation1 = (GrassCoverErosionInwardsCalculationScenario) calculationGroup.Children.First(); Assert.AreEqual("name", calculation1.Name); Assert.AreEqual(dikeProfile1, calculation1.InputParameters.DikeProfile); - Assert.AreEqual(failureMechanismContribution.Norm, calculation1.InputParameters.DikeHeightTargetProbability); - Assert.AreEqual(failureMechanismContribution.Norm, calculation1.InputParameters.OvertoppingRateTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, calculation1.InputParameters.DikeHeightTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, calculation1.InputParameters.OvertoppingRateTargetProbability); var calculation2 = (GrassCoverErosionInwardsCalculationScenario) calculationGroup.Children.Last(); Assert.AreEqual("name (1)", calculation2.Name); Assert.AreEqual(dikeProfile2, calculation2.InputParameters.DikeProfile); - Assert.AreEqual(failureMechanismContribution.Norm, calculation2.InputParameters.DikeHeightTargetProbability); - Assert.AreEqual(failureMechanismContribution.Norm, calculation2.InputParameters.OvertoppingRateTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, calculation2.InputParameters.DikeHeightTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, calculation2.InputParameters.OvertoppingRateTargetProbability); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r4d3c79ba89108714dd2187ef5728811a8111e2f0 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 4d3c79ba89108714dd2187ef5728811a8111e2f0) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -1764,8 +1764,8 @@ "An item with the same name default name already exists, therefore '(1)' needs to be appended."); var calculation = (GrassCoverErosionInwardsCalculation) newlyAddedItem; - Assert.AreEqual(failureMechanismContribution.Norm, calculation.InputParameters.DikeHeightTargetProbability); - Assert.AreEqual(failureMechanismContribution.Norm, calculation.InputParameters.OvertoppingRateTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, calculation.InputParameters.DikeHeightTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, calculation.InputParameters.OvertoppingRateTargetProbability); } } } @@ -1840,8 +1840,8 @@ var generatedCalculation = failureMechanism.CalculationsGroup.Children[2] as GrassCoverErosionInwardsCalculationScenario; Assert.IsNotNull(generatedCalculation); Assert.AreSame(dikeProfile1, generatedCalculation.InputParameters.DikeProfile); - Assert.AreEqual(failureMechanismContribution.Norm, generatedCalculation.InputParameters.DikeHeightTargetProbability); - Assert.AreEqual(failureMechanismContribution.Norm, generatedCalculation.InputParameters.OvertoppingRateTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, generatedCalculation.InputParameters.DikeHeightTargetProbability); + Assert.AreEqual(failureMechanismContribution.NormativeProbability, generatedCalculation.InputParameters.OvertoppingRateTargetProbability); } } } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/IFailureMechanismContributionNormChangeHandler.cs =================================================================== diff -u -rfd0878d829eff722d33331e9a95f7b75ad6c6e9c -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/IFailureMechanismContributionNormChangeHandler.cs (.../IFailureMechanismContributionNormChangeHandler.cs) (revision fd0878d829eff722d33331e9a95f7b75ad6c6e9c) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/IFailureMechanismContributionNormChangeHandler.cs (.../IFailureMechanismContributionNormChangeHandler.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -26,7 +26,7 @@ namespace Riskeer.Integration.Forms.PropertyClasses { /// - /// Interface for an object that can properly change the + /// Interface for an object that can properly change the /// of an . /// public interface IFailureMechanismContributionNormChangeHandler Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs =================================================================== diff -u -rfd0878d829eff722d33331e9a95f7b75ad6c6e9c -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision fd0878d829eff722d33331e9a95f7b75ad6c6e9c) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -38,7 +38,7 @@ namespace Riskeer.Integration.Plugin.Handlers { /// - /// Class responsible for changing the + /// Class responsible for changing the /// value of the of an /// and clearing all data dependent on the original norm value. /// Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs =================================================================== diff -u -rc19a15f433aa99397c748216930aefa91d44231a -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs (.../SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs) (revision c19a15f433aa99397c748216930aefa91d44231a) +++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs (.../SemiProbabilisticPipingFailureMechanismSectionResultCalculateProbabilityStrategy.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -78,7 +78,7 @@ public double CalculateProfileProbability() { - return sectionResult.GetInitialFailureMechanismResultProbability(calculationScenarios, assessmentSection.FailureMechanismContribution.Norm); + return sectionResult.GetInitialFailureMechanismResultProbability(calculationScenarios, assessmentSection.FailureMechanismContribution.NormativeProbability); } public double CalculateSectionProbability() Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/SemiProbabilisticPipingScenarioRow.cs =================================================================== diff -u -r45a6ff0c1d73e7a36d0b1684fd70c7d3b548f79d -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/SemiProbabilisticPipingScenarioRow.cs (.../SemiProbabilisticPipingScenarioRow.cs) (revision 45a6ff0c1d73e7a36d0b1684fd70c7d3b548f79d) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/SemiProbabilisticPipingScenarioRow.cs (.../SemiProbabilisticPipingScenarioRow.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -118,7 +118,7 @@ private void CreateDerivedOutput() { derivedOutput = CalculationScenario.HasOutput - ? DerivedSemiProbabilisticPipingOutputFactory.Create(CalculationScenario.Output, assessmentSection.FailureMechanismContribution.Norm) + ? DerivedSemiProbabilisticPipingOutputFactory.Create(CalculationScenario.Output, assessmentSection.FailureMechanismContribution.NormativeProbability) : null; } } Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r841fadc937a0f35244810144a2ea82b9ccd5da80 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 841fadc937a0f35244810144a2ea82b9ccd5da80) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -110,7 +110,7 @@ }; yield return new PropertyInfo { - CreateInstance = context => new SemiProbabilisticPipingOutputProperties(context.WrappedData, context.AssessmentSection.FailureMechanismContribution.Norm) + CreateInstance = context => new SemiProbabilisticPipingOutputProperties(context.WrappedData, context.AssessmentSection.FailureMechanismContribution.NormativeProbability) }; yield return new PropertyInfo { Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/SemiProbabilisticPipingScenarioRowTest.cs =================================================================== diff -u -r45a6ff0c1d73e7a36d0b1684fd70c7d3b548f79d -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/SemiProbabilisticPipingScenarioRowTest.cs (.../SemiProbabilisticPipingScenarioRowTest.cs) (revision 45a6ff0c1d73e7a36d0b1684fd70c7d3b548f79d) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/SemiProbabilisticPipingScenarioRowTest.cs (.../SemiProbabilisticPipingScenarioRowTest.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -146,7 +146,7 @@ var row = new SemiProbabilisticPipingScenarioRow(calculation, failureMechanism, failureMechanismSection, assessmentSection); // Assert - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.NormativeProbability); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); @@ -208,7 +208,7 @@ row.Update(); // Then - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.NormativeProbability); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); @@ -238,7 +238,7 @@ var row = new SemiProbabilisticPipingScenarioRow(calculation, failureMechanism, failureMechanismSection, assessmentSection); // Precondition - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.NormativeProbability); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); @@ -279,7 +279,7 @@ var row = new SemiProbabilisticPipingScenarioRow(calculation, failureMechanism, failureMechanismSection, assessmentSection); // Precondition - DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); + DerivedSemiProbabilisticPipingOutput expectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.NormativeProbability); Assert.AreEqual(expectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(expectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(expectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); @@ -295,7 +295,7 @@ row.Update(); // Then - DerivedSemiProbabilisticPipingOutput newExpectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.Norm); + DerivedSemiProbabilisticPipingOutput newExpectedDerivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculation.Output, assessmentSection.FailureMechanismContribution.NormativeProbability); Assert.AreEqual(newExpectedDerivedOutput.PipingProbability, row.FailureProbability); Assert.AreEqual(newExpectedDerivedOutput.UpliftProbability, row.FailureProbabilityUplift); Assert.AreEqual(newExpectedDerivedOutput.HeaveProbability, row.FailureProbabilityHeave); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1 -r6d8de27865ca65fd02bc73207e1063d5453e4648 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 6d8de27865ca65fd02bc73207e1063d5453e4648) @@ -907,9 +907,9 @@ StandardDeviation = (RoundedDouble) 2.2 }, ShouldDikeHeightBeCalculated = true, - DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.Norm, + DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.NormativeProbability, ShouldOvertoppingRateBeCalculated = true, - OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.Norm, + OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.NormativeProbability, UseForeshore = true, UseBreakWater = true }, @@ -944,10 +944,10 @@ UseBreakWater = true, ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, ShouldDikeHeightBeCalculated = true, - DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.Norm, + DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.NormativeProbability, ShouldDikeHeightIllustrationPointsBeCalculated = true, ShouldOvertoppingRateBeCalculated = true, - OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.Norm, + OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.NormativeProbability, ShouldOvertoppingRateIllustrationPointsBeCalculated = true }, Output = new GrassCoverErosionInwardsOutput(new OvertoppingOutput(0.45, true, 1.1, GetConfiguredGeneralResultFaultTreeIllustrationPoint()), @@ -970,8 +970,8 @@ }, InputParameters = { - DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.Norm, - OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.Norm + DikeHeightTargetProbability = assessmentSection.FailureMechanismContribution.NormativeProbability, + OvertoppingRateTargetProbability = assessmentSection.FailureMechanismContribution.NormativeProbability } }); }