Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -r540cb5503a23ea9ea7b1e633888df92fa0531151 -reebbc3b7f6370ec49ab77281034fab75b676c66f --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -74,11 +74,11 @@ RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, - HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(hydraulicBoundaryDatabaseFilePath, - preprocessorDirectory, - calculations, - norm, - messageProvider)); + HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + calculations, + norm, + messageProvider)); } public void CalculateWaveHeights(string hydraulicBoundaryDatabaseFilePath, @@ -99,23 +99,18 @@ RunActivities(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, - HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(hydraulicBoundaryDatabaseFilePath, - preprocessorDirectory, - calculations, - norm, - messageProvider)); + HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + calculations, + norm, + messageProvider)); } private void RunActivities(string hydraulicBoundaryDatabaseFilePath, string preprocessorDirectory, IEnumerable activities) where TActivity : Activity { - if (activities == null) - { - throw new ArgumentNullException(nameof(activities)); - } - string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, preprocessorDirectory); if (string.IsNullOrEmpty(validationProblem)) Fisheye: Tag eebbc3b7f6370ec49ab77281034fab75b676c66f refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/HydraulicBoundaryCalculationActivityHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/HydraulicBoundaryLocationCalculationActivityFactory.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/HydraulicBoundaryLocationCalculationActivityFactory.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/HydraulicBoundaryLocationCalculationActivityFactory.cs (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -0,0 +1,110 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Linq; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Service; +using Ringtoets.Common.Service.MessageProviders; + +namespace Ringtoets.Common.Forms.Helpers +{ + /// + /// Factory for creating hydraulic boundary location calculation activities. + /// + public static class HydraulicBoundaryLocationCalculationActivityFactory + { + /// + /// Creates a collection of based on the + /// given parameters. + /// + /// The path of the hydraulic boundary database file. + /// The preprocessor directory. + /// The collection of to create + /// the activities for. + /// The norm to use during the calculations. + /// The message provider for the activities. + /// A collection of . + /// Thrown when + /// or is null. + public static IEnumerable CreateWaveHeightCalculationActivities( + string hydraulicBoundaryDatabaseFilePath, + string preprocessorDirectory, + IEnumerable calculations, + double norm, + ICalculationMessageProvider messageProvider) + { + if (calculations == null) + { + throw new ArgumentNullException(nameof(calculations)); + } + + if (messageProvider == null) + { + throw new ArgumentNullException(nameof(messageProvider)); + } + + return calculations.Select(calculation => new WaveHeightCalculationActivity(calculation, + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + norm, + messageProvider)).ToArray(); + } + + /// + /// Creates a collection of based on the + /// given parameters. + /// + /// The path of the hydraulic boundary database file. + /// The preprocessor directory. + /// The collection of to create + /// the activities for. + /// The norm to use during the calculations. + /// The message provider for the activities. + /// A collection of . + /// Thrown when + /// or is null. + public static IEnumerable CreateDesignWaterLevelCalculationActivities( + string hydraulicBoundaryDatabaseFilePath, + string preprocessorDirectory, + IEnumerable calculations, + double norm, + ICalculationMessageProvider messageProvider) + { + if (calculations == null) + { + throw new ArgumentNullException(nameof(calculations)); + } + + if (messageProvider == null) + { + throw new ArgumentNullException(nameof(messageProvider)); + } + + return calculations.Select(calculation => new DesignWaterLevelCalculationActivity(calculation, + hydraulicBoundaryDatabaseFilePath, + preprocessorDirectory, + norm, + messageProvider)).ToArray(); + } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -r4c288b5894b926ba5fdd7f6222c813c19b9701b8 -reebbc3b7f6370ec49ab77281034fab75b676c66f --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 4c288b5894b926ba5fdd7f6222c813c19b9701b8) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -51,7 +51,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r540cb5503a23ea9ea7b1e633888df92fa0531151 -reebbc3b7f6370ec49ab77281034fab75b676c66f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 540cb5503a23ea9ea7b1e633888df92fa0531151) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -72,63 +72,6 @@ } [Test] - public void CalculateDesignWaterLevels_CalculationsNull_ThrowsArgumentNullException() - { - // Setup - var calculatorFactory = mockRepository.StrictMock(); - var calculationMessageProvider = mockRepository.StrictMock(); - mockRepository.ReplayAll(); - - using (var viewParent = new Form()) - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); - - // Call - TestDelegate test = () => guiService.CalculateDesignWaterLevels(validFilePath, - validPreprocessorDirectory, - null, - 0.01, - calculationMessageProvider); - - // Assert - string paramName = Assert.Throws(test).ParamName; - const string expectedParamName = "calculations"; - Assert.AreEqual(expectedParamName, paramName); - } - - mockRepository.VerifyAll(); - } - - [Test] - public void CalculateDesignWaterLevels_CalculationServiceMessageProviderNull_ThrowsArgumentNullException() - { - // Setup - var calculatorFactory = mockRepository.StrictMock(); - mockRepository.ReplayAll(); - - using (var viewParent = new Form()) - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); - - // Call - TestDelegate test = () => guiService.CalculateDesignWaterLevels(validFilePath, - validPreprocessorDirectory, - Enumerable.Empty(), - 0.01, - null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - const string expectedParamName = "messageProvider"; - Assert.AreEqual(expectedParamName, paramName); - } - - mockRepository.VerifyAll(); - } - - [Test] public void CalculateDesignWaterLevels_HydraulicDatabaseDoesNotExist_LogsError() { // Setup Fisheye: Tag eebbc3b7f6370ec49ab77281034fab75b676c66f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryCalculationActivityHelperTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -0,0 +1,256 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Core.Common.Base.Service; +using Core.Common.TestUtil; +using Core.Common.Util; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Forms.Helpers; +using Ringtoets.Common.Service; +using Ringtoets.Common.Service.MessageProviders; +using Ringtoets.Common.Service.TestUtil; +using Ringtoets.HydraRing.Calculation.Calculator.Factory; +using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; +using Ringtoets.HydraRing.Calculation.TestUtil.Calculator; + +namespace Ringtoets.Common.Forms.Test.Helpers +{ + [TestFixture] + public class HydraulicBoundaryLocationCalculationActivityFactoryTest + { + private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath(); + + [Test] + public void CreateWaveHeightCalculationActivities_CalculationsNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var messageProvider = mocks.Stub(); + mocks.ReplayAll(); + + // Call + TestDelegate test = () => HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( + string.Empty, + string.Empty, + null, + new Random(12).NextDouble(), + messageProvider); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("calculations", paramName); + mocks.VerifyAll(); + } + + [Test] + public void CreateWaveHeightCalculationActivities_MessageProviderNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( + string.Empty, + string.Empty, + Enumerable.Empty(), + new Random(12).NextDouble(), + null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("messageProvider", paramName); + } + + [Test] + public void CreateWaveHeightCalculationActivities_WithValidData_ReturnsExpectedActivity() + { + // Setup + const string locationName = "locationName"; + const string activityDescription = "activityDescription"; + const double norm = 1.0 / 30; + + var calculator = new TestWaveHeightCalculator + { + Converged = true + }; + + var mocks = new MockRepository(); + var calculatorFactory = mocks.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator); + + var calculationMessageProvider = mocks.Stub(); + calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); + + var messageProvider = mocks.Stub(); + messageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); + + mocks.ReplayAll(); + + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName); + + // Call + IEnumerable activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( + validFilePath, + validPreprocessorDirectory, + new[] + { + new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) + }, + norm, + messageProvider); + + // Assert + WaveHeightCalculationActivity activity = activities.Single(); + using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) + { + Action call = () => activity.Run(); + + TestHelper.AssertLogMessages(call, m => + { + string[] messages = m.ToArray(); + Assert.AreEqual(6, messages.Length); + Assert.AreEqual($"{activityDescription} is gestart.", messages[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(messages[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]); + StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", messages[4]); + CalculationServiceTestHelper.AssertCalculationEndMessage(messages[5]); + }); + WaveHeightCalculationInput waveHeightCalculationInput = calculator.ReceivedInputs.Single(); + + Assert.AreEqual(hydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), waveHeightCalculationInput.Beta); + } + + Assert.AreEqual(ActivityState.Executed, activity.State); + mocks.VerifyAll(); + } + + [Test] + public void CreateDesignWaterLevelCalculationActivities_CalculationsNull_ThrowsArgumentNullException() + { + // Setup + var mocks = new MockRepository(); + var messageProvider = mocks.Stub(); + mocks.ReplayAll(); + + // Call + TestDelegate test = () => HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( + string.Empty, + string.Empty, + null, + new Random(12).NextDouble(), + messageProvider); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("calculations", paramName); + mocks.VerifyAll(); + } + + [Test] + public void CreateDesignWaterLevelCalculationActivities_MessageProviderNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( + string.Empty, + string.Empty, + Enumerable.Empty(), + new Random(12).NextDouble(), + null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("messageProvider", paramName); + } + + [Test] + public void CreateDesignWaterLevelCalculationActivities_WithValidData_ReturnsExpectedActivity() + { + // Setup + const string locationName = "locationName"; + const string activityDescription = "activityDescription"; + const double norm = 1.0 / 30; + + var calculator = new TestDesignWaterLevelCalculator + { + Converged = true + }; + + var mocks = new MockRepository(); + var calculatorFactory = mocks.StrictMock(); + calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator); + + var calculationMessageProvider = mocks.Stub(); + calculationMessageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); + + var messageProvider = mocks.Stub(); + messageProvider.Stub(calc => calc.GetActivityDescription(locationName)).Return(activityDescription); + + mocks.ReplayAll(); + + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName); + + // Call + IEnumerable activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( + validFilePath, + validPreprocessorDirectory, + new[] + { + new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) + }, + norm, + messageProvider); + + // Assert + DesignWaterLevelCalculationActivity activity = activities.Single(); + using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) + { + Action call = () => activity.Run(); + + TestHelper.AssertLogMessages(call, m => + { + string[] messages = m.ToArray(); + Assert.AreEqual(6, messages.Length); + Assert.AreEqual($"{activityDescription} is gestart.", messages[0]); + CalculationServiceTestHelper.AssertValidationStartMessage(messages[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]); + CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]); + StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", messages[4]); + CalculationServiceTestHelper.AssertCalculationEndMessage(messages[5]); + }); + AssessmentLevelCalculationInput assessmentLevelCalculationInput = calculator.ReceivedInputs.Single(); + + Assert.AreEqual(hydraulicBoundaryLocation.Id, assessmentLevelCalculationInput.HydraulicBoundaryLocationId); + Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), assessmentLevelCalculationInput.Beta); + } + + Assert.AreEqual(ActivityState.Executed, activity.State); + mocks.VerifyAll(); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -r4c288b5894b926ba5fdd7f6222c813c19b9701b8 -reebbc3b7f6370ec49ab77281034fab75b676c66f --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 4c288b5894b926ba5fdd7f6222c813c19b9701b8) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -60,7 +60,7 @@ - + Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r2d6c1054fcb2dd33ebcbd068569ed163631c3232 -reebbc3b7f6370ec49ab77281034fab75b676c66f --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 2d6c1054fcb2dd33ebcbd068569ed163631c3232) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -57,7 +57,6 @@ using Ringtoets.GrassCoverErosionOutwards.Service; using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Forms.Views; -using Ringtoets.Revetment.IO.Configurations; using RingtoetsGrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -1005,35 +1004,35 @@ string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); var calculations = new List(); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, @@ -1114,35 +1113,35 @@ string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); var calculations = new List(); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaveHeightCalculationsForLowerLimitNorm, failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f -reebbc3b7f6370ec49ab77281034fab75b676c66f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f) @@ -1963,28 +1963,28 @@ string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); var calculations = new List(); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaterLevelCalculationsForSignalingNorm, assessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, assessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm), new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, @@ -2022,28 +2022,28 @@ string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath; string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); var calculations = new List(); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaveHeightCalculationsForSignalingNorm, assessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaveHeightCalculationsForLowerLimitNorm, assessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm), new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName))); - calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities( + calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities( hydraulicBoundaryDatabaseFilePath, preprocessorDirectory, assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,