Index: Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculationOutput.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculationOutput.cs (.../HydraulicBoundaryLocationCalculationOutput.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculationOutput.cs (.../HydraulicBoundaryLocationCalculationOutput.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -35,7 +35,7 @@ /// Creates a new instance of . /// /// The calculation result. - /// The norm used during the calculation. + /// The target probability used during the calculation. /// The reliability index used during the calculation. /// The calculated probability. /// The calculated reliability. Index: Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -53,7 +53,7 @@ /// The hydraulic boundary location calculation to perform. /// The with the /// hydraulic boundary calculation settings. - /// The norm to use during the calculation. + /// The target probability to use during the calculation. /// The object which is used to build log messages. /// Preprocessing is disabled when the preprocessor directory equals . /// Thrown when , @@ -73,7 +73,7 @@ /// Thrown when an error occurs while performing the calculation. public void Calculate(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation, HydraulicBoundaryCalculationSettings calculationSettings, - double norm, + double targetProbability, ICalculationMessageProvider messageProvider) { if (hydraulicBoundaryLocationCalculation == null) @@ -104,7 +104,7 @@ { PerformCalculation(hydraulicBoundaryLocationCalculation, calculationSettings, - norm, + targetProbability, messageProvider); } catch (HydraRingCalculationException) @@ -154,7 +154,7 @@ /// The hydraulic boundary location calculation to perform. /// The with the /// hydraulic boundary calculation settings. - /// The norm of the assessment section. + /// The target probability to use during the calculation. /// The object which is used to build log messages. /// Thrown when: /// @@ -166,12 +166,12 @@ /// Thrown when an error occurs while performing the calculation. private void PerformCalculation(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation, HydraulicBoundaryCalculationSettings calculationSettings, - double norm, + double targetProbability, ICalculationMessageProvider messageProvider) { HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocationCalculation.HydraulicBoundaryLocation; - AssessmentLevelCalculationInput calculationInput = CreateInput(hydraulicBoundaryLocation.Id, norm, calculationSettings); + AssessmentLevelCalculationInput calculationInput = CreateInput(hydraulicBoundaryLocation.Id, targetProbability, calculationSettings); calculator.Calculate(calculationInput); @@ -195,7 +195,7 @@ } HydraulicBoundaryLocationCalculationOutput hydraulicBoundaryLocationCalculationOutput = CreateOutput( - messageProvider, hydraulicBoundaryLocation.Name, calculationInput.Beta, norm, calculator.Converged, generalResult); + messageProvider, hydraulicBoundaryLocation.Name, calculationInput.Beta, targetProbability, calculator.Converged, generalResult); hydraulicBoundaryLocationCalculation.Output = hydraulicBoundaryLocationCalculationOutput; } @@ -266,7 +266,7 @@ /// Creates the input for a design water level calculation. /// /// The id of the hydraulic boundary location. - /// The norm to use during the calculation. + /// The target probability to use during the calculation. /// The with the /// hydraulic boundary calculation settings. /// An . @@ -281,10 +281,10 @@ /// /// private static AssessmentLevelCalculationInput CreateInput(long hydraulicBoundaryLocationId, - double norm, + double targetProbability, HydraulicBoundaryCalculationSettings calculationSettings) { - var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocationId, norm); + var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocationId, targetProbability); HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(assessmentLevelCalculationInput, calculationSettings.HydraulicBoundaryDatabaseFilePath, Index: Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -51,7 +51,7 @@ /// Performs a calculation for wave height. /// /// The hydraulic boundary location calculation to perform. - /// The norm to use during the calculation. + /// The target probability to use during the calculation. /// The with the /// hydraulic boundary calculation settings. /// The object which is used to build log messages. @@ -73,7 +73,7 @@ /// Thrown when an error occurs while performing the calculation. public void Calculate(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation, HydraulicBoundaryCalculationSettings calculationSettings, - double norm, + double targetProbability, ICalculationMessageProvider messageProvider) { if (hydraulicBoundaryLocationCalculation == null) @@ -103,7 +103,7 @@ { PerformCalculation(hydraulicBoundaryLocationCalculation, calculationSettings, - norm, + targetProbability, messageProvider); } catch (HydraRingCalculationException) @@ -153,7 +153,7 @@ /// The hydraulic boundary location calculation to perform. /// The with the /// hydraulic boundary calculation settings. - /// The norm of the assessment section. + /// The target probability to use during the calculation. /// The object which is used to build log messages. /// Thrown when: /// @@ -165,12 +165,12 @@ /// Thrown when an error occurs while performing the calculation. private void PerformCalculation(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation, HydraulicBoundaryCalculationSettings calculationSettings, - double norm, + double targetProbability, ICalculationMessageProvider messageProvider) { HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryLocationCalculation.HydraulicBoundaryLocation; - WaveHeightCalculationInput calculationInput = CreateInput(hydraulicBoundaryLocation.Id, norm, calculationSettings); + WaveHeightCalculationInput calculationInput = CreateInput(hydraulicBoundaryLocation.Id, targetProbability, calculationSettings); calculator.Calculate(calculationInput); @@ -194,7 +194,7 @@ } HydraulicBoundaryLocationCalculationOutput hydraulicBoundaryLocationCalculationOutput = CreateOutput( - messageProvider, hydraulicBoundaryLocation.Name, calculationInput.Beta, norm, calculator.Converged, generalResult); + messageProvider, hydraulicBoundaryLocation.Name, calculationInput.Beta, targetProbability, calculator.Converged, generalResult); hydraulicBoundaryLocationCalculation.Output = hydraulicBoundaryLocationCalculationOutput; } @@ -264,7 +264,7 @@ /// Creates the input for an wave height calculation. /// /// The id of the hydraulic boundary location. - /// The norm to use during the calculation. + /// The target probability to use during the calculation. /// The with the /// hydraulic boundary calculation settings. /// A . @@ -279,10 +279,10 @@ /// /// private static WaveHeightCalculationInput CreateInput(long hydraulicBoundaryLocationId, - double norm, + double targetProbability, HydraulicBoundaryCalculationSettings calculationSettings) { - var waveHeightCalculationInput = new WaveHeightCalculationInput(1, hydraulicBoundaryLocationId, norm); + var waveHeightCalculationInput = new WaveHeightCalculationInput(1, hydraulicBoundaryLocationId, targetProbability); HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(waveHeightCalculationInput, calculationSettings.HydraulicBoundaryDatabaseFilePath, Index: Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -119,7 +119,7 @@ public void Calculate_ValidData_StartsCalculationWithRightParameters(bool usePreprocessor) { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty; @@ -155,11 +155,11 @@ // Call new DesignWaterLevelCalculationService().Calculate(hydraulicBoundaryLocationCalculation, calculationSettings, - norm, + targetProbability, calculationMessageProvider); // Assert - AssessmentLevelCalculationInput expectedInput = CreateInput(hydraulicBoundaryLocation.Id, norm); + AssessmentLevelCalculationInput expectedInput = CreateInput(hydraulicBoundaryLocation.Id, targetProbability); AssessmentLevelCalculationInput actualInput = calculator.ReceivedInputs.Single(); AssertInput(expectedInput, actualInput); Assert.IsFalse(calculator.IsCanceled); @@ -676,9 +676,9 @@ Assert.AreEqual(expectedInput.Beta, hydraRingCalculationInput.Beta); } - private static AssessmentLevelCalculationInput CreateInput(long hydraulicBoundaryLocationId, double norm) + private static AssessmentLevelCalculationInput CreateInput(long hydraulicBoundaryLocationId, double targetProbability) { - return new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocationId, norm); + return new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocationId, targetProbability); } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -120,7 +120,7 @@ public void Calculate_ValidData_StartsCalculationWithRightParameters(bool usePreprocessor) { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty; @@ -155,11 +155,11 @@ { new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocationCalculation, calculationSettings, - norm, + targetProbability, calculationMessageProvider); // Assert - AssessmentLevelCalculationInput expectedInput = CreateInput(hydraulicBoundaryLocation.Id, norm); + AssessmentLevelCalculationInput expectedInput = CreateInput(hydraulicBoundaryLocation.Id, targetProbability); WaveHeightCalculationInput actualInput = calculator.ReceivedInputs.Single(); AssertInput(expectedInput, actualInput); Assert.IsFalse(calculator.IsCanceled); @@ -678,9 +678,9 @@ Assert.AreEqual(expectedInput.Beta, hydraRingCalculationInput.Beta); } - private static AssessmentLevelCalculationInput CreateInput(long hydraulicBoundaryLocationId, double norm) + private static AssessmentLevelCalculationInput CreateInput(long hydraulicBoundaryLocationId, double targetProbability) { - return new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocationId, norm); + return new AssessmentLevelCalculationInput(1, hydraulicBoundaryLocationId, targetProbability); } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Service.TestUtil/CalculationServiceTestHelper.cs =================================================================== diff -u -ra404640996ba486bfca99124475d3807fec13077 -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/Common/test/Riskeer.Common.Service.TestUtil/CalculationServiceTestHelper.cs (.../CalculationServiceTestHelper.cs) (revision a404640996ba486bfca99124475d3807fec13077) +++ Riskeer/Common/test/Riskeer.Common.Service.TestUtil/CalculationServiceTestHelper.cs (.../CalculationServiceTestHelper.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Core.Common.Base.Data; using NUnit.Framework; namespace Riskeer.Common.Service.TestUtil @@ -64,17 +63,5 @@ { Assert.AreEqual("Berekening is beƫindigd.", actualMessage); } - - /// - /// Gets the required probability which is used in profile specific calculations. - /// - /// The assessment section norm. - /// The failure mechanism contribution. - /// The 'N' parameter used to factor in the 'length effect'. - /// The profile specific required probability. - public static double ProfileSpecificRequiredProbability(double norm, double failureMechanismContribution, RoundedDouble n) - { - return norm * (failureMechanismContribution / 100) / n; - } } } \ No newline at end of file Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs =================================================================== diff -u -r624699d87a272bcdb076de216f929ff838f80508 -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision 624699d87a272bcdb076de216f929ff838f80508) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/Views/DuneLocationCalculationsView.cs (.../DuneLocationCalculationsView.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -39,7 +39,7 @@ private readonly Observer failureMechanismObserver; private readonly Observer duneLocationCalculationsObserver; private readonly IObservableEnumerable calculations; - private readonly Func getNormFunc; + private readonly Func getTargetProbabilityFunc; private readonly Func getCalculationIdentifierFunc; private readonly RecursiveObserver, DuneLocationCalculation> duneLocationCalculationObserver; @@ -49,13 +49,13 @@ /// The calculations to show in the view. /// The failure mechanism which the calculations belong to. /// The assessment section which the calculations belong to. - /// for getting the norm to use during calculations. + /// for getting the target probability to use during calculations. /// for getting the calculation identifier to use in all messages. /// Thrown when any parameter is null. public DuneLocationCalculationsView(IObservableEnumerable calculations, DuneErosionFailureMechanism failureMechanism, IAssessmentSection assessmentSection, - Func getNormFunc, + Func getTargetProbabilityFunc, Func getCalculationIdentifierFunc) { if (calculations == null) @@ -73,9 +73,9 @@ throw new ArgumentNullException(nameof(assessmentSection)); } - if (getNormFunc == null) + if (getTargetProbabilityFunc == null) { - throw new ArgumentNullException(nameof(getNormFunc)); + throw new ArgumentNullException(nameof(getTargetProbabilityFunc)); } if (getCalculationIdentifierFunc == null) @@ -86,7 +86,7 @@ InitializeComponent(); this.calculations = calculations; - this.getNormFunc = getNormFunc; + this.getTargetProbabilityFunc = getTargetProbabilityFunc; this.getCalculationIdentifierFunc = getCalculationIdentifierFunc; FailureMechanism = failureMechanism; AssessmentSection = assessmentSection; @@ -175,7 +175,7 @@ { CalculationGuiService?.Calculate(GetSelectedCalculatableObjects(), AssessmentSection, - getNormFunc(), + getTargetProbabilityFunc(), getCalculationIdentifierFunc()); } } Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationService.cs =================================================================== diff -u -re3c8135a137a664bc323012ca829d606ebee6bff -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationService.cs (.../DuneLocationCalculationService.cs) (revision e3c8135a137a664bc323012ca829d606ebee6bff) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationService.cs (.../DuneLocationCalculationService.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -51,7 +51,7 @@ /// Error and status information is logged during the execution of the operation. /// /// The to perform. - /// The norm to use during the calculation. + /// The target probability to use during the calculation. /// The with the /// hydraulic boundary calculation settings. /// The object which is used to build log messages. @@ -75,7 +75,7 @@ /// Thrown when an error occurs while performing /// the calculation. public void Calculate(DuneLocationCalculation duneLocationCalculation, - double norm, + double targetProbability, HydraulicBoundaryCalculationSettings calculationSettings, ICalculationMessageProvider messageProvider) { @@ -107,15 +107,15 @@ try { DunesBoundaryConditionsCalculationInput calculationInput = CreateInput(duneLocation, - norm, + targetProbability, calculationSettings); calculator.Calculate(calculationInput); if (string.IsNullOrEmpty(calculator.LastErrorFileContent)) { duneLocationCalculation.Output = CreateDuneLocationCalculationOutput(duneLocationName, calculationInput.Beta, - norm, + targetProbability, messageProvider); } } @@ -203,7 +203,7 @@ /// Creates the input used in the calculation. /// /// The to create the input for. - /// The norm of the failure mechanism to use. + /// The target probability to use during the calculation. /// The with the /// hydraulic boundary calculation settings. /// A with all needed @@ -219,10 +219,10 @@ /// /// private static DunesBoundaryConditionsCalculationInput CreateInput(DuneLocation duneLocation, - double norm, + double targetProbability, HydraulicBoundaryCalculationSettings calculationSettings) { - var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, norm); + var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, targetProbability); HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(dunesBoundaryConditionsCalculationInput, calculationSettings.HydraulicBoundaryDatabaseFilePath, !string.IsNullOrEmpty(calculationSettings.PreprocessorDirectory)); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs =================================================================== diff -u -r0d86e695196a16400fe845635ac7d58c65b1dddd -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 0d86e695196a16400fe845635ac7d58c65b1dddd) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs (.../DuneLocationCalculationsViewTest.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -132,7 +132,7 @@ } [Test] - public void Constructor_GetNormFuncNull_ThrowsArgumentNullException() + public void Constructor_GetTargetProbabilityFunc_ThrowsArgumentNullException() { // Setup var assessmentSection = mocks.Stub(); @@ -147,7 +147,7 @@ // Assert var exception = Assert.Throws(Call); - Assert.AreEqual("getNormFunc", exception.ParamName); + Assert.AreEqual("getTargetProbabilityFunc", exception.ParamName); } [Test] @@ -619,7 +619,7 @@ public void CalculateForSelectedButton_HydraulicBoundaryDatabaseWithCanUsePreprocessorFalse_CreateDunesBoundaryConditionsCalculatorCalledAsExpected() { // Setup - const double norm = 0.01; + const double targetProbability = 0.01; var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = hydraulicBoundaryDatabaseFilePath @@ -650,7 +650,7 @@ using (var view = new DuneLocationCalculationsView(GenerateDuneLocationCalculations(), failureMechanism, assessmentSection, - () => norm, + () => targetProbability, () => "1/100")) { testForm.Controls.Add(view); @@ -674,7 +674,7 @@ DunesBoundaryConditionsCalculationInput dunesBoundaryConditionsCalculationInput = dunesBoundaryConditionsCalculator.ReceivedInputs.First(); Assert.AreEqual(1, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), dunesBoundaryConditionsCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(targetProbability), dunesBoundaryConditionsCalculationInput.Beta); } } } @@ -683,7 +683,7 @@ public void CalculateForSelectedButton_HydraulicBoundaryDatabaseWithUsePreprocessorTrue_CreateDunesBoundaryConditionsCalculatorCalledAsExpected() { // Setup - const double norm = 0.01; + const double targetProbability = 0.01; var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = hydraulicBoundaryDatabaseFilePath, @@ -720,7 +720,7 @@ using (var view = new DuneLocationCalculationsView(GenerateDuneLocationCalculations(), failureMechanism, assessmentSection, - () => norm, + () => targetProbability, () => "1/100")) { testForm.Controls.Add(view); @@ -744,7 +744,7 @@ DunesBoundaryConditionsCalculationInput dunesBoundaryConditionsCalculationInput = dunesBoundaryConditionsCalculator.ReceivedInputs.First(); Assert.AreEqual(1, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), dunesBoundaryConditionsCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(targetProbability), dunesBoundaryConditionsCalculationInput.Beta); } } } @@ -753,7 +753,7 @@ public void CalculateForSelectedButton_HydraulicBoundaryDatabaseWithUsePreprocessorFalse_CreateDunesBoundaryConditionsCalculatorCalledAsExpected() { // Setup - const double norm = 0.01; + const double targetProbability = 0.01; var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = hydraulicBoundaryDatabaseFilePath, @@ -791,7 +791,7 @@ using (var view = new DuneLocationCalculationsView(GenerateDuneLocationCalculations(), failureMechanism, assessmentSection, - () => norm, + () => targetProbability, () => "1/100")) { testForm.Controls.Add(view); @@ -814,7 +814,7 @@ DunesBoundaryConditionsCalculationInput dunesBoundaryConditionsCalculationInput = dunesBoundaryConditionsCalculator.ReceivedInputs.First(); Assert.AreEqual(1, dunesBoundaryConditionsCalculationInput.HydraulicBoundaryLocationId); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), dunesBoundaryConditionsCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(targetProbability), dunesBoundaryConditionsCalculationInput.Beta); } } } Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs =================================================================== diff -u -re3c8135a137a664bc323012ca829d606ebee6bff -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs (.../DuneLocationCalculationServiceTest.cs) (revision e3c8135a137a664bc323012ca829d606ebee6bff) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs (.../DuneLocationCalculationServiceTest.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -122,7 +122,7 @@ public void Calculate_ValidData_CalculationStartedWithRightParameters(bool usePreprocessor) { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; string preprocessorDirectory = usePreprocessor ? validPreprocessorDirectory : string.Empty; @@ -161,12 +161,12 @@ { // Call new DuneLocationCalculationService().Calculate(new DuneLocationCalculation(duneLocation), - norm, + targetProbability, calculationSettings, calculationMessageProvider); // Assert - DunesBoundaryConditionsCalculationInput expectedInput = CreateInput(duneLocation, norm); + DunesBoundaryConditionsCalculationInput expectedInput = CreateInput(duneLocation, targetProbability); DunesBoundaryConditionsCalculationInput actualInput = calculator.ReceivedInputs.Single(); AssertInput(expectedInput, actualInput); Assert.AreEqual(usePreprocessor, actualInput.PreprocessorSetting.RunPreprocessor); @@ -179,7 +179,7 @@ public void Calculate_CalculationRan_SetOutput() { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; var calculator = new TestDunesBoundaryConditionsCalculator { ReliabilityIndex = 3.27052, @@ -206,7 +206,7 @@ { // Call Action test = () => new DuneLocationCalculationService().Calculate(duneLocationCalculation, - norm, + targetProbability, CreateCalculationSettings(), calculationMessageProvider); @@ -222,14 +222,14 @@ StringAssert.StartsWith("Hydraulische belastingenberekening is uitgevoerd op de tijdelijke locatie", msgs[1]); CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[2]); }); - double targetReliability = StatisticsConverter.ProbabilityToReliability(norm); + double targetReliability = StatisticsConverter.ProbabilityToReliability(targetProbability); double calculatedProbability = StatisticsConverter.ReliabilityToProbability(calculator.ReliabilityIndex); DuneLocationCalculationOutput actualCalculationOutput = duneLocationCalculation.Output; Assert.IsNotNull(actualCalculationOutput); Assert.AreEqual(calculator.ReliabilityIndex, actualCalculationOutput.CalculatedReliability.Value); Assert.AreEqual(calculatedProbability, actualCalculationOutput.CalculatedProbability); - Assert.AreEqual(norm, actualCalculationOutput.TargetProbability); + Assert.AreEqual(targetProbability, actualCalculationOutput.TargetProbability); Assert.AreEqual(targetReliability, actualCalculationOutput.TargetReliability, actualCalculationOutput.TargetReliability.GetAccuracy()); Assert.AreEqual(calculator.WaterLevel, actualCalculationOutput.WaterLevel, actualCalculationOutput.WaterLevel.GetAccuracy()); Assert.AreEqual(calculator.WaveHeight, actualCalculationOutput.WaveHeight, actualCalculationOutput.WaveHeight.GetAccuracy()); @@ -243,7 +243,7 @@ public void Calculate_CalculationRanNotConverged_LogMessage() { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; const string locationName = "locationName"; const string failedConvergenceMessage = "failedConvergenceMessage"; @@ -268,7 +268,7 @@ { // Call Action test = () => new DuneLocationCalculationService().Calculate(duneLocationCalculation, - norm, + targetProbability, CreateCalculationSettings(), calculationMessageProvider); @@ -294,7 +294,7 @@ public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; var calculator = new TestDunesBoundaryConditionsCalculator { Converged = true @@ -317,7 +317,7 @@ // Call service.Calculate(duneLocationCalculation, - norm, + targetProbability, CreateCalculationSettings(), calculationMessageProvider); @@ -332,7 +332,7 @@ public void Calculate_CalculationFailedWithExceptionAndLastErrorPresent_LogErrorAndThrowException() { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; const string locationName = "locationName"; const string errorReport = "errorReport"; const string errorMessage = "errorMessage"; @@ -365,7 +365,7 @@ try { new DuneLocationCalculationService().Calculate(duneLocationCalculation, - norm, + targetProbability, CreateCalculationSettings(), calculationMessageProvider); } @@ -399,7 +399,7 @@ public void Calculate_CalculationFailedWithExceptionAndNoLastErrorPresent_LogErrorAndThrowException() { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; const string locationName = "locationName"; const string errorMessage = "errorMessage"; @@ -430,7 +430,7 @@ try { new DuneLocationCalculationService().Calculate(duneLocationCalculation, - norm, + targetProbability, CreateCalculationSettings(), calculationMessageProvider); } @@ -464,7 +464,7 @@ public void Calculate_CalculationFailedWithoutExceptionAndWithLastErrorPresent_LogErrorAndThrowException() { // Setup - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; const string locationName = "locationName"; const string errorMessage = "errorMessage"; const string lastErrorFileContent = "lastErrorFileContent"; @@ -498,7 +498,7 @@ try { new DuneLocationCalculationService().Calculate(duneLocationCalculation, - norm, + targetProbability, CreateCalculationSettings(), calculationMessageProvider); } @@ -546,9 +546,9 @@ Assert.AreEqual(expectedInput.Beta, actualInput.Beta); } - private static DunesBoundaryConditionsCalculationInput CreateInput(DuneLocation duneLocation, double norm) + private static DunesBoundaryConditionsCalculationInput CreateInput(DuneLocation duneLocation, double targetProbability) { - return new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, norm); + return new DunesBoundaryConditionsCalculationInput(1, duneLocation.Id, targetProbability); } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/DikeHeightOutput.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/DikeHeightOutput.cs (.../DikeHeightOutput.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/DikeHeightOutput.cs (.../DikeHeightOutput.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -35,7 +35,7 @@ /// Creates a new instance of . /// /// The calculated dike height. - /// The norm used during the calculation. + /// The target probability used during the calculation. /// The reliability index used during the calculation. /// The calculated probability. /// The calculated reliability index. Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs (.../HydraulicLoadsOutput.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs (.../HydraulicLoadsOutput.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -35,7 +35,7 @@ /// /// Creates a new instance of . /// - /// The norm used during the calculation. + /// The target probability used during the calculation. /// The reliability index used during the calculation. /// The calculated probability. /// The calculated reliability index. @@ -60,7 +60,7 @@ } /// - /// Gets the norm used during the calculation. + /// Gets the target probability used during the calculation. /// [1/year] /// public double TargetProbability { get; } Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/OvertoppingRateOutput.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/OvertoppingRateOutput.cs (.../OvertoppingRateOutput.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Data/OvertoppingRateOutput.cs (.../OvertoppingRateOutput.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -35,7 +35,7 @@ /// Creates a new instance of . /// /// The calculated overtopping rate. - /// The norm used during the calculation. + /// The target probability used during the calculation. /// The reliability index used during the calculation. /// The calculated probability. /// The calculated reliability index. Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs =================================================================== diff -u -r1fda102d01d36587865ef1ac1bb3a01b04a467ff -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs (.../GrassCoverErosionInwardsCalculationConfigurationHelper.cs) (revision 1fda102d01d36587865ef1ac1bb3a01b04a467ff) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/GrassCoverErosionInwardsCalculationConfigurationHelper.cs (.../GrassCoverErosionInwardsCalculationConfigurationHelper.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -40,7 +40,7 @@ /// The calculation group. /// The collection of dike profiles. /// The - /// used to get the default norm. + /// used to get the default target probability. /// Thrown when any parameter is null. public static void GenerateCalculations(CalculationGroup calculationGroup, IEnumerable dikeProfiles, FailureMechanismContribution failureMechanismContribution) Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r1fda102d01d36587865ef1ac1bb3a01b04a467ff -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 1fda102d01d36587865ef1ac1bb3a01b04a467ff) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -49,7 +49,7 @@ /// The path to the XML file to import from. /// The calculation group to update. /// The - /// used to get the default norm. + /// used to get the default target probability. /// The hydraulic boundary locations /// used to check if the imported objects contain the right location. /// The dike profiles used to check if Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r52ea2c5dba806b8ff57b8124428c162cb4cd87cf -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 52ea2c5dba806b8ff57b8124428c162cb4cd87cf) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -814,15 +814,15 @@ private static void AddCalculation(GrassCoverErosionInwardsCalculationGroupContext context) { - double norm = context.AssessmentSection.FailureMechanismContribution.Norm; + double targetProbability = context.AssessmentSection.FailureMechanismContribution.Norm; var calculation = new GrassCoverErosionInwardsCalculationScenario { Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RiskeerCommonDataResources.Calculation_DefaultName, c => c.Name), InputParameters = { - DikeHeightTargetProbability = norm, - OvertoppingRateTargetProbability = norm + DikeHeightTargetProbability = targetProbability, + OvertoppingRateTargetProbability = targetProbability } }; context.WrappedData.Children.Add(calculation); Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -ra404640996ba486bfca99124475d3807fec13077 -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision a404640996ba486bfca99124475d3807fec13077) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -110,7 +110,7 @@ /// information is logged during the execution of the operation. /// /// The that holds all the information required to perform the calculation. - /// The that holds information about the norm used in the calculation. + /// The that holds information about the target probability used in the calculation. /// Calculation input parameters that apply to all instances. /// Thrown when one of the following parameters is null: /// Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.TestUtil/TestHydraulicLoadsOutput.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r04baa9e821738407ab5b6754ffa55acf22229a9f --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.TestUtil/TestHydraulicLoadsOutput.cs (.../TestHydraulicLoadsOutput.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Data.TestUtil/TestHydraulicLoadsOutput.cs (.../TestHydraulicLoadsOutput.cs) (revision 04baa9e821738407ab5b6754ffa55acf22229a9f) @@ -33,7 +33,7 @@ /// /// Creates a new instance of . /// - /// The norm used during the calculation. + /// The target probability used during the calculation. /// The reliability index used during the calculation. /// The calculated probability. /// The calculated reliability index.