Index: Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryLocationCalculationActivityFactory.cs =================================================================== diff -u -reffb38a0f31145f3809b4fcfbf5d41562615e0c0 -r5fa7631ecb7a65e10947b52c40c46a5ce6e3e2a4 --- Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryLocationCalculationActivityFactory.cs (.../HydraulicBoundaryLocationCalculationActivityFactory.cs) (revision effb38a0f31145f3809b4fcfbf5d41562615e0c0) +++ Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryLocationCalculationActivityFactory.cs (.../HydraulicBoundaryLocationCalculationActivityFactory.cs) (revision 5fa7631ecb7a65e10947b52c40c46a5ce6e3e2a4) @@ -40,15 +40,15 @@ /// The collection of to create /// the activities for. /// The assessment section the belong to. - /// The norm to use during the calculations. + /// The target probability to use during the calculations. /// The calculation identifier to use in all messages. /// A collection of . /// Thrown when is null. /// Thrown when is null or empty. public static IEnumerable CreateWaveHeightCalculationActivities( IEnumerable calculations, IAssessmentSection assessmentSection, - double norm, + double targetProbability, string calculationIdentifier) { if (assessmentSection == null) @@ -64,7 +64,7 @@ HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase); return calculations.Select(calculation => new WaveHeightCalculationActivity(calculation, settings, - norm, + targetProbability, calculationIdentifier)).ToArray(); } @@ -75,15 +75,15 @@ /// The collection of to create /// the activities for. /// The assessment section the belong to. - /// The norm to use during the calculations. + /// The target probability to use during the calculations. /// The calculation identifier to use in all messages. /// A collection of . /// Thrown when is null. /// Thrown when is null or empty. public static IEnumerable CreateDesignWaterLevelCalculationActivities( IEnumerable calculations, IAssessmentSection assessmentSection, - double norm, + double targetProbability, string calculationIdentifier) { if (assessmentSection == null) @@ -99,7 +99,7 @@ HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase); return calculations.Select(calculation => new DesignWaterLevelCalculationActivity(calculation, settings, - norm, + targetProbability, calculationIdentifier)).ToArray(); } } Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -r718830d52176d7c6f455da5dde26217ec0d77b09 -r5fa7631ecb7a65e10947b52c40c46a5ce6e3e2a4 --- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision 718830d52176d7c6f455da5dde26217ec0d77b09) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision 5fa7631ecb7a65e10947b52c40c46a5ce6e3e2a4) @@ -89,7 +89,7 @@ { // Setup const string calculationIdentifier = "1/30"; - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); @@ -108,16 +108,16 @@ new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation2) }, assessmentSection, - norm, + targetProbability, calculationIdentifier); // Assert Assert.AreEqual(2, activities.Count()); CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(WaveHeightCalculationActivity)); HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; - AssertWaveHeightCalculationActivity(activities.First(), hydraulicBoundaryLocation1, calculationIdentifier, norm, hydraulicBoundaryDatabase); - AssertWaveHeightCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, calculationIdentifier, norm, hydraulicBoundaryDatabase); + AssertWaveHeightCalculationActivity(activities.First(), hydraulicBoundaryLocation1, calculationIdentifier, targetProbability, hydraulicBoundaryDatabase); + AssertWaveHeightCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, calculationIdentifier, targetProbability, hydraulicBoundaryDatabase); mocks.VerifyAll(); } @@ -165,7 +165,7 @@ { // Setup const string calculationIdentifier = "1/30"; - const double norm = 1.0 / 30; + const double targetProbability = 1.0 / 30; var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); @@ -184,24 +184,24 @@ new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation2) }, assessmentSection, - norm, + targetProbability, calculationIdentifier); // Assert Assert.AreEqual(2, activities.Count()); CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(DesignWaterLevelCalculationActivity)); HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; - AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation1, calculationIdentifier, norm, hydraulicBoundaryDatabase); - AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, calculationIdentifier, norm, hydraulicBoundaryDatabase); + AssertDesignWaterLevelCalculationActivity(activities.First(), hydraulicBoundaryLocation1, calculationIdentifier, targetProbability, hydraulicBoundaryDatabase); + AssertDesignWaterLevelCalculationActivity(activities.ElementAt(1), hydraulicBoundaryLocation2, calculationIdentifier, targetProbability, hydraulicBoundaryDatabase); mocks.VerifyAll(); } private static void AssertWaveHeightCalculationActivity(Activity activity, HydraulicBoundaryLocation hydraulicBoundaryLocation, string calculationIdentifier, - double norm, + double targetProbability, HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { var mocks = new MockRepository(); @@ -226,7 +226,7 @@ TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage); WaveHeightCalculationInput waveHeightCalculationInput = calculator.ReceivedInputs.Single(); Assert.AreEqual(hydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), waveHeightCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(targetProbability), waveHeightCalculationInput.Beta); } mocks.VerifyAll(); @@ -235,7 +235,7 @@ private static void AssertDesignWaterLevelCalculationActivity(Activity activity, HydraulicBoundaryLocation hydraulicBoundaryLocation, string calculationIdentifier, - double norm, + double targetProbability, HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { var mocks = new MockRepository(); @@ -260,7 +260,7 @@ TestHelper.AssertLogMessageIsGenerated(call, expectedLogMessage); AssessmentLevelCalculationInput designWaterLevelCalculationInput = calculator.ReceivedInputs.Single(); Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId); - Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), designWaterLevelCalculationInput.Beta); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(targetProbability), designWaterLevelCalculationInput.Beta); } mocks.VerifyAll();