Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs =================================================================== diff -u -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs (.../ClosingStructuresCalculationActivity.cs) (revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationActivity.cs (.../ClosingStructuresCalculationActivity.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -37,27 +37,27 @@ private readonly ClosingStructuresCalculationService calculationService; private readonly ClosingStructuresFailureMechanism failureMechanism; private readonly IAssessmentSection assessmentSection; - private readonly string hlcdFilepath; + private readonly string hydraulicBoundaryDatabaseFilePath; /// /// Creates a new instance of . /// /// The closing structures data used for the calculation. - /// The filepath of the HLCD file that should be used for performing the calculation. + /// The path which points to the hydraulic boundary database file. /// The failure mechanism the calculation belongs to. /// The assessment section the calculation belongs to. /// Thrown when any input argument is null. - public ClosingStructuresCalculationActivity(StructuresCalculation calculation, string hlcdFilepath, + public ClosingStructuresCalculationActivity(StructuresCalculation calculation, string hydraulicBoundaryDatabaseFilePath, ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { if (calculation == null) { throw new ArgumentNullException("calculation"); } - if (hlcdFilepath == null) + if (hydraulicBoundaryDatabaseFilePath == null) { - throw new ArgumentNullException("hlcdFilepath"); + throw new ArgumentNullException("hydraulicBoundaryDatabaseFilePath"); } if (failureMechanism == null) @@ -73,7 +73,7 @@ this.calculation = calculation; this.failureMechanism = failureMechanism; this.assessmentSection = assessmentSection; - this.hlcdFilepath = hlcdFilepath; + this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; Name = calculation.Name; calculationService = new ClosingStructuresCalculationService(); @@ -91,7 +91,7 @@ calculationService.Calculate(calculation, assessmentSection, failureMechanism, - hlcdFilepath); + hydraulicBoundaryDatabaseFilePath); } protected override void OnCancel() Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -r02d0e67121f748ae6d69ab9f68643d2f5e62f800 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -63,13 +63,13 @@ /// The that holds information about the norm used in the calculation. /// The that holds the information about the contribution /// and the general inputs used in the calculation. - /// The filepath of the HLCD file that should be used for performing the calculation. + /// The path which points to the hydraulic boundary database file. /// Thrown when is an invalid /// . public void Calculate(StructuresCalculation calculation, IAssessmentSection assessmentSection, ClosingStructuresFailureMechanism failureMechanism, - string hlcdFilePath) + string hydraulicBoundaryDatabaseFilePath) { var calculationName = calculation.Name; @@ -78,9 +78,10 @@ StructuresClosureCalculationInput input = CreateStructuresClosureCalculationInput(calculation, failureMechanism, - failureMechanismSection); + failureMechanismSection, + hydraulicBoundaryDatabaseFilePath); - string hlcdDirectory = Path.GetDirectoryName(hlcdFilePath); + string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); calculator = HydraRingCalculatorFactory.Instance.CreateStructuresClosureCalculator(hlcdDirectory, assessmentSection.Id); CalculationServiceHelper.LogCalculationBeginTime(calculationName); @@ -171,21 +172,23 @@ return !messages.Any(); } - private static StructuresClosureCalculationInput CreateStructuresClosureCalculationInput(StructuresCalculation calculation, - ClosingStructuresFailureMechanism failureMechanism, - FailureMechanismSection failureMechanismSection) + private static StructuresClosureCalculationInput CreateStructuresClosureCalculationInput( + StructuresCalculation calculation, + ClosingStructuresFailureMechanism failureMechanism, + FailureMechanismSection failureMechanismSection, + string hydraulicBoundaryDatabaseFilePath) { StructuresClosureCalculationInput input; switch (calculation.InputParameters.InflowModelType) { case ClosingStructureInflowModelType.VerticalWall: - input = CreateClosureVerticalWallCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + input = CreateClosureVerticalWallCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath); break; case ClosingStructureInflowModelType.LowSill: - input = CreateLowSillCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + input = CreateLowSillCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath); break; case ClosingStructureInflowModelType.FloodedCulvert: - input = CreateFloodedCulvertCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + input = CreateFloodedCulvertCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath); break; default: throw new InvalidEnumArgumentException("calculation", @@ -195,11 +198,13 @@ return input; } - private static StructuresClosureVerticalWallCalculationInput CreateClosureVerticalWallCalculationInput(StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, - GeneralClosingStructuresInput generalInput) + private static StructuresClosureVerticalWallCalculationInput CreateClosureVerticalWallCalculationInput( + StructuresCalculation calculation, + FailureMechanismSection failureMechanismSection, + GeneralClosingStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresClosureVerticalWallCalculationInput( + var structuresClosureVerticalWallCalculationInput = new StructuresClosureVerticalWallCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), HydraRingInputParser.ParseForeshore(calculation.InputParameters), @@ -224,13 +229,19 @@ calculation.InputParameters.LevelCrestStructureNotClosing.Mean, calculation.InputParameters.LevelCrestStructureNotClosing.StandardDeviation, calculation.InputParameters.WidthFlowApertures.Mean, calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation, calculation.InputParameters.DeviationWaveDirection); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresClosureVerticalWallCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresClosureVerticalWallCalculationInput; } - private static StructuresClosureLowSillCalculationInput CreateLowSillCalculationInput(StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, - GeneralClosingStructuresInput generalInput) + private static StructuresClosureLowSillCalculationInput CreateLowSillCalculationInput( + StructuresCalculation calculation, + FailureMechanismSection failureMechanismSection, + GeneralClosingStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresClosureLowSillCalculationInput( + var structuresClosureLowSillCalculationInput = new StructuresClosureLowSillCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), HydraRingInputParser.ParseForeshore(calculation.InputParameters), @@ -254,13 +265,19 @@ calculation.InputParameters.ThresholdHeightOpenWeir.Mean, calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, calculation.InputParameters.InsideWaterLevel.Mean, calculation.InputParameters.InsideWaterLevel.StandardDeviation, calculation.InputParameters.WidthFlowApertures.Mean, calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresClosureLowSillCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresClosureLowSillCalculationInput; } - private static StructuresClosureFloodedCulvertCalculationInput CreateFloodedCulvertCalculationInput(StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, - GeneralClosingStructuresInput generalInput) + private static StructuresClosureFloodedCulvertCalculationInput CreateFloodedCulvertCalculationInput( + StructuresCalculation calculation, + FailureMechanismSection failureMechanismSection, + GeneralClosingStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresClosureFloodedCulvertCalculationInput( + var structuresClosureFloodedCulvertCalculationInput = new StructuresClosureFloodedCulvertCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), HydraRingInputParser.ParseForeshore(calculation.InputParameters), @@ -282,6 +299,10 @@ calculation.InputParameters.DrainCoefficient.Mean, calculation.InputParameters.DrainCoefficient.StandardDeviation, calculation.InputParameters.AreaFlowApertures.Mean, calculation.InputParameters.AreaFlowApertures.StandardDeviation, calculation.InputParameters.InsideWaterLevel.Mean, calculation.InputParameters.InsideWaterLevel.StandardDeviation); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresClosureFloodedCulvertCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresClosureFloodedCulvertCalculationInput; } private static string[] ValidateInput(ClosingStructuresInput inputParameters, IAssessmentSection assessmentSection) Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r7ad50171865839ec26c5356aaacc24606faf75a7 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 7ad50171865839ec26c5356aaacc24606faf75a7) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Integration.Test/ClosingStructuresCalculationActivityIntegrationTest.cs (.../ClosingStructuresCalculationActivityIntegrationTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -45,7 +45,8 @@ [TestFixture] public class ClosingStructuresCalculationActivityIntegrationTest { - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + 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"); [Test] public void Run_CalculationInvalidInput_LogValidationStartAndEndWithError() @@ -91,8 +92,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -113,7 +112,7 @@ } }; - var activity = new ClosingStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { // Call @@ -140,8 +139,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -162,7 +159,7 @@ } }; - var activity = new ClosingStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { @@ -196,8 +193,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -218,7 +213,7 @@ } }; - var activity = new ClosingStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator; @@ -250,8 +245,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -272,7 +265,7 @@ } }; - var activity = new ClosingStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new ClosingStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator; @@ -309,8 +302,7 @@ mocks.ReplayAll(); var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -359,7 +351,6 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityTest.cs =================================================================== diff -u -r3f40e34c76b06d66a6426c7e07fb3a101b4952cb -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityTest.cs (.../ClosingStructuresCalculationActivityTest.cs) (revision 3f40e34c76b06d66a6426c7e07fb3a101b4952cb) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationActivityTest.cs (.../ClosingStructuresCalculationActivityTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -91,7 +91,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("hlcdFilepath", exception.ParamName); + Assert.AreEqual("hydraulicBoundaryDatabaseFilePath", exception.ParamName); mocks.VerifyAll(); } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -r13898fd5c275bf31e77a47d31e95cb45ab5752be -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 13898fd5c275bf31e77a47d31e95cb45ab5752be) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -50,7 +50,7 @@ public class ClosingStructuresCalculationServiceTest { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - private static readonly string validDataFilepath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] public void Validate_ValidCalculationInvalidHydraulicBoundaryDatabase_ReturnsFalse() @@ -428,7 +428,7 @@ TestDelegate call = () => service.Calculate(calculation, assessmentSectionStub, closingStructuresFailureMechanism, - testDataPath); + validFilePath); StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -531,7 +531,7 @@ new ClosingStructuresCalculationService().Calculate(calculation, assessmentSectionStub, closingStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -618,7 +618,7 @@ new ClosingStructuresCalculationService().Calculate(calculation, assessmentSectionStub, closingStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -704,7 +704,7 @@ new ClosingStructuresCalculationService().Calculate(calculation, assessmentSectionStub, closingStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -797,7 +797,7 @@ Action call = () => new ClosingStructuresCalculationService().Calculate(calculation, assessmentSectionStub, closingStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert TestHelper.AssertLogMessages(call, messages => @@ -849,7 +849,7 @@ service.Calculate(calculation, assessmentSectionStub, closingStructuresFailureMechanism, - testDataPath); + validFilePath); // Assert Assert.IsNull(calculation.Output); @@ -898,7 +898,7 @@ new ClosingStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -960,7 +960,7 @@ new ClosingStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -1024,7 +1024,7 @@ new ClosingStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException e) { Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r02d0e67121f748ae6d69ab9f68643d2f5e62f800 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -94,7 +94,7 @@ try { - calculator.Calculate(CreateInput(hydraulicBoundaryLocation, norm)); + calculator.Calculate(CreateInput(hydraulicBoundaryLocation, norm, hydraulicBoundaryDatabaseFilePath)); hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) calculator.WaveHeight; hydraulicBoundaryLocation.WaveHeightCalculationConvergence = @@ -149,9 +149,13 @@ } } - private WaveHeightCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double norm) + private WaveHeightCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation, double norm, string hydraulicBoundaryDatabaseFilePath) { - return new WaveHeightCalculationInput(1, hydraulicBoundaryLocation.Id, norm); + var waveHeightCalculationInput = new WaveHeightCalculationInput(1, hydraulicBoundaryLocation.Id, norm); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(waveHeightCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return waveHeightCalculationInput; } private static string[] ValidateInput(string hydraulicBoundaryDatabaseFilePath) Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs =================================================================== diff -u -r183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs (.../HeightStructuresCalculationActivity.cs) (revision 183d1e7ed095ea4e8024068bc4ddfcf3ac6997d3) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationActivity.cs (.../HeightStructuresCalculationActivity.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -34,7 +34,7 @@ public class HeightStructuresCalculationActivity : HydraRingActivityBase { private readonly StructuresCalculation calculation; - private readonly string hlcdFilepath; + private readonly string hydraulicBoundaryDatabaseFilePath; private readonly HeightStructuresFailureMechanism failureMechanism; private readonly IAssessmentSection assessmentSection; private readonly HeightStructuresCalculationService calculationService; @@ -43,20 +43,20 @@ /// Creates a new instance of . /// /// The height structures data used for the calculation. - /// The filepath of the HLCD file that should be used for performing the calculation. + /// The path which points to the hydraulic boundary database file. /// The failure mechanism the calculation belongs to. /// The assessment section the calculation belongs to. /// Thrown when any input argument is null. - public HeightStructuresCalculationActivity(StructuresCalculation calculation, string hlcdFilepath, + public HeightStructuresCalculationActivity(StructuresCalculation calculation, string hydraulicBoundaryDatabaseFilePath, HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { if (calculation == null) { throw new ArgumentNullException("calculation"); } - if (hlcdFilepath == null) + if (hydraulicBoundaryDatabaseFilePath == null) { - throw new ArgumentNullException("hlcdFilepath"); + throw new ArgumentNullException("hydraulicBoundaryDatabaseFilePath"); } if (failureMechanism == null) { @@ -68,7 +68,7 @@ } this.calculation = calculation; - this.hlcdFilepath = hlcdFilepath; + this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; this.failureMechanism = failureMechanism; this.assessmentSection = assessmentSection; @@ -89,7 +89,7 @@ calculationService.Calculate(calculation, assessmentSection, failureMechanism, - hlcdFilepath); + hydraulicBoundaryDatabaseFilePath); } protected override void OnCancel() Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs =================================================================== diff -u -r02d0e67121f748ae6d69ab9f68643d2f5e62f800 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -92,20 +92,20 @@ /// The that holds information about the norm used in the calculation. /// The that holds the information about the contribution /// and the general inputs used in the calculation. - /// The file path of the HLCD file that should be used for performing the calculation. + /// The path which points to the hydraulic boundary database file. internal void Calculate(StructuresCalculation calculation, IAssessmentSection assessmentSection, HeightStructuresFailureMechanism failureMechanism, - string hlcdFilePath) + string hydraulicBoundaryDatabaseFilePath) { var calculationName = calculation.Name; FailureMechanismSection failureMechanismSection = StructuresHelper.FailureMechanismSectionForCalculation(failureMechanism.Sections, calculation); - StructuresOvertoppingCalculationInput input = CreateInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + StructuresOvertoppingCalculationInput input = CreateInput(calculation, failureMechanismSection, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath); - string hlcdDirectory = Path.GetDirectoryName(hlcdFilePath); + string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); calculator = HydraRingCalculatorFactory.Instance.CreateStructuresOvertoppingCalculator(hlcdDirectory, assessmentSection.Id); CalculationServiceHelper.LogCalculationBeginTime(calculationName); @@ -165,9 +165,13 @@ } } - private static StructuresOvertoppingCalculationInput CreateInput(StructuresCalculation calculation, FailureMechanismSection failureMechanismSection, GeneralHeightStructuresInput generalInput) + private static StructuresOvertoppingCalculationInput CreateInput( + StructuresCalculation calculation, + FailureMechanismSection failureMechanismSection, + GeneralHeightStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresOvertoppingCalculationInput( + var structuresOvertoppingCalculationInput = new StructuresOvertoppingCalculationInput( calculation.InputParameters.HydraulicBoundaryLocation.Id, new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), HydraRingInputParser.ParseForeshore(calculation.InputParameters), @@ -187,6 +191,10 @@ calculation.InputParameters.WidthFlowApertures.Mean, calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation, calculation.InputParameters.DeviationWaveDirection, calculation.InputParameters.StormDuration.Mean, calculation.InputParameters.StormDuration.CoefficientOfVariation); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresOvertoppingCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresOvertoppingCalculationInput; } private static string[] ValidateInput(HeightStructuresInput inputParameters, IAssessmentSection assessmentSection) Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r7ad50171865839ec26c5356aaacc24606faf75a7 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 7ad50171865839ec26c5356aaacc24606faf75a7) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Integration.Test/HeightStructuresCalculationActivityIntegrationTest.cs (.../HeightStructuresCalculationActivityIntegrationTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -45,7 +45,8 @@ [TestFixture] public class HeightStructuresCalculationActivityIntegrationTest { - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] public void Run_CalculationInvalidInput_LogValidationStartAndEndWithError() @@ -91,8 +92,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -114,7 +113,7 @@ } }; - var activity = new HeightStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new HeightStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { // Call @@ -141,8 +140,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -164,7 +161,7 @@ } }; - var activity = new HeightStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new HeightStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { @@ -197,8 +194,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -219,7 +214,7 @@ } }; - var activity = new HeightStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new HeightStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator; @@ -251,8 +246,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -273,7 +266,7 @@ } }; - var activity = new HeightStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new HeightStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator; @@ -311,7 +304,6 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); using (var importer = new HydraulicBoundaryDatabaseImporter()) { @@ -361,8 +353,6 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -386,7 +376,7 @@ calculation.Attach(observerMock); - var activity = new HeightStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new HeightStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); activity.Run(); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityTest.cs =================================================================== diff -u -rfc4f8f86955f675f94208db783c8d0624d2b2250 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityTest.cs (.../HeightStructuresCalculationActivityTest.cs) (revision fc4f8f86955f675f94208db783c8d0624d2b2250) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationActivityTest.cs (.../HeightStructuresCalculationActivityTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -90,7 +90,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("hlcdFilepath", exception.ParamName); + Assert.AreEqual("hydraulicBoundaryDatabaseFilePath", exception.ParamName); mocks.VerifyAll(); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -r13898fd5c275bf31e77a47d31e95cb45ab5752be -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 13898fd5c275bf31e77a47d31e95cb45ab5752be) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -49,7 +49,8 @@ [TestFixture] public class HeightStructuresCalculationServiceTest { - private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] public void Validate_ValidCalculationInvalidHydraulicBoundaryDatabase_ReturnsFalse() @@ -99,7 +100,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -138,7 +139,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -178,7 +179,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; const string parameterName = "afwijking golfrichting"; @@ -222,7 +223,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = "Validatie mislukt: Er is geen concreet getal ingevoerd voor 'oriëntatie'."; @@ -267,7 +268,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een concreet getal zijn.", parameterName); @@ -314,7 +315,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een positief getal zijn.", parameterName); @@ -363,7 +364,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De standaard afwijking voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", parameterName); @@ -411,7 +412,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De variatiecoëfficient voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", parameterName); @@ -460,7 +461,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -502,7 +503,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -579,8 +580,6 @@ break; } - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - // Call using (new HydraRingCalculatorFactoryConfig()) { @@ -634,8 +633,6 @@ } }; - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - // Call using (new HydraRingCalculatorFactoryConfig()) { @@ -665,7 +662,6 @@ public void Calculate_VariousCalculations_InputPropertiesCorrectlySentToCalculator(bool useForeshore, bool useBreakWater) { // Setup - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); var heightStructuresFailureMechanism = new HeightStructuresFailureMechanism(); var mockRepository = new MockRepository(); @@ -775,7 +771,7 @@ service.Calculate(calculation, assessmentSectionStub, heightStructuresFailureMechanism, - testDataPath); + validFilePath); // Assert Assert.IsNull(calculation.Output); @@ -824,7 +820,7 @@ new HeightStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -886,7 +882,7 @@ new HeightStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -950,7 +946,7 @@ new HeightStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException e) { Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs =================================================================== diff -u -ra38c4e8a74a2110b70335a61abe451051f70528a -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs (.../StabilityPointStructuresCalculationActivity.cs) (revision a38c4e8a74a2110b70335a61abe451051f70528a) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationActivity.cs (.../StabilityPointStructuresCalculationActivity.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -37,27 +37,27 @@ private readonly StabilityPointStructuresCalculationService calculationService; private readonly StabilityPointStructuresFailureMechanism failureMechanism; private readonly IAssessmentSection assessmentSection; - private readonly string hlcdFilepath; + private readonly string hydraulicBoundaryDatabaseFilePath; /// /// Creates a new instance of . /// /// The stability point structures data used for the calculation. - /// The filepath of the HLCD file that should be used for performing the calculation. + /// The path which points to the hydraulic boundary database file. /// The failure mechanism the calculation belongs to. /// The assessment section the calculation belongs to. /// Thrown when any input argument is null. - public StabilityPointStructuresCalculationActivity(StructuresCalculation calculation, string hlcdFilepath, + public StabilityPointStructuresCalculationActivity(StructuresCalculation calculation, string hydraulicBoundaryDatabaseFilePath, StabilityPointStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) { if (calculation == null) { throw new ArgumentNullException("calculation"); } - if (hlcdFilepath == null) + if (hydraulicBoundaryDatabaseFilePath == null) { - throw new ArgumentNullException("hlcdFilepath"); + throw new ArgumentNullException("hydraulicBoundaryDatabaseFilePath"); } if (failureMechanism == null) @@ -73,7 +73,7 @@ this.calculation = calculation; this.failureMechanism = failureMechanism; this.assessmentSection = assessmentSection; - this.hlcdFilepath = hlcdFilepath; + this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; Name = calculation.Name; calculationService = new StabilityPointStructuresCalculationService(); @@ -91,7 +91,7 @@ calculationService.Calculate(calculation, assessmentSection, failureMechanism, - hlcdFilepath); + hydraulicBoundaryDatabaseFilePath); } protected override void OnCancel() Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r02d0e67121f748ae6d69ab9f68643d2f5e62f800 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 02d0e67121f748ae6d69ab9f68643d2f5e62f800) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -80,7 +80,7 @@ /// The that holds information about the norm used in the calculation. /// The that holds the information about the contribution /// and the general inputs used in the calculation. - /// The filepath of the HLCD file that should be used for performing the calculation. + /// The path which points to the hydraulic boundary database file. /// Thrown when: /// /// is an invalid . @@ -90,7 +90,7 @@ public void Calculate(StructuresCalculation calculation, IAssessmentSection assessmentSection, StabilityPointStructuresFailureMechanism failureMechanism, - string hlcdFilePath) + string hydraulicBoundaryDatabaseFilePath) { var calculationName = calculation.Name; @@ -99,9 +99,10 @@ StructuresStabilityPointCalculationInput input = CreateStructuresStabilityPointCalculationInput(calculation, failureMechanism, - failureMechanismSection); + failureMechanismSection, + hydraulicBoundaryDatabaseFilePath); - string hlcdDirectory = Path.GetDirectoryName(hlcdFilePath); + string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); calculator = HydraRingCalculatorFactory.Instance.CreateStructuresStabilityPointCalculator(hlcdDirectory, assessmentSection.Id); CalculationServiceHelper.LogCalculationBeginTime(calculationName); @@ -173,9 +174,11 @@ canceled = true; } - private StructuresStabilityPointCalculationInput CreateStructuresStabilityPointCalculationInput(StructuresCalculation calculation, - StabilityPointStructuresFailureMechanism failureMechanism, - FailureMechanismSection failureMechanismSection) + private StructuresStabilityPointCalculationInput CreateStructuresStabilityPointCalculationInput( + StructuresCalculation calculation, + StabilityPointStructuresFailureMechanism failureMechanism, + FailureMechanismSection failureMechanismSection, + string hydraulicBoundaryDatabaseFilePath) { StructuresStabilityPointCalculationInput input; switch (calculation.InputParameters.InflowModelType) @@ -184,10 +187,18 @@ switch (calculation.InputParameters.LoadSchematizationType) { case LoadSchematizationType.Linear: - input = CreateLowSillLinearCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + input = CreateLowSillLinearCalculationInput( + calculation, + failureMechanismSection, + failureMechanism.GeneralInput, + hydraulicBoundaryDatabaseFilePath); break; case LoadSchematizationType.Quadratic: - input = CreateLowSillQuadraticCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + input = CreateLowSillQuadraticCalculationInput( + calculation, + failureMechanismSection, + failureMechanism.GeneralInput, + hydraulicBoundaryDatabaseFilePath); break; default: throw new InvalidEnumArgumentException("calculation", @@ -199,10 +210,18 @@ switch (calculation.InputParameters.LoadSchematizationType) { case LoadSchematizationType.Linear: - input = CreateFloodedCulvertLinearCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + input = CreateFloodedCulvertLinearCalculationInput( + calculation, + failureMechanismSection, + failureMechanism.GeneralInput, + hydraulicBoundaryDatabaseFilePath); break; case LoadSchematizationType.Quadratic: - input = CreateFloodedCulvertQuadraticCalculationInput(calculation, failureMechanismSection, failureMechanism.GeneralInput); + input = CreateFloodedCulvertQuadraticCalculationInput( + calculation, + failureMechanismSection, + failureMechanism.GeneralInput, + hydraulicBoundaryDatabaseFilePath); break; default: throw new InvalidEnumArgumentException("calculation", @@ -221,278 +240,305 @@ private StructuresStabilityPointLowSillLinearCalculationInput CreateLowSillLinearCalculationInput(StructuresCalculation calculation, FailureMechanismSection failureMechanismSection, - GeneralStabilityPointStructuresInput generalInput) + GeneralStabilityPointStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresStabilityPointLowSillLinearCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), - HydraRingInputParser.ParseForeshore(calculation.InputParameters), - HydraRingInputParser.ParseBreakWater(calculation.InputParameters), - calculation.InputParameters.VolumicWeightWater, - generalInput.GravitationalAcceleration, - calculation.InputParameters.LevelCrestStructure.Mean, - calculation.InputParameters.LevelCrestStructure.StandardDeviation, - calculation.InputParameters.StructureNormalOrientation, - calculation.InputParameters.FactorStormDurationOpenStructure, - generalInput.ModelFactorSubCriticalFlow.Mean, - generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, - calculation.InputParameters.ThresholdHeightOpenWeir.Mean, - calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, - calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, - calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, - calculation.InputParameters.FailureProbabilityRepairClosure, - calculation.InputParameters.FailureCollisionEnergy.Mean, - calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, - generalInput.ModelFactorCollisionLoad.Mean, - generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, - calculation.InputParameters.ShipMass.Mean, - calculation.InputParameters.ShipMass.CoefficientOfVariation, - calculation.InputParameters.ShipVelocity.Mean, - calculation.InputParameters.ShipVelocity.CoefficientOfVariation, - calculation.InputParameters.LevellingCount, - calculation.InputParameters.ProbabilityCollisionSecondaryStructure, - calculation.InputParameters.FlowVelocityStructureClosable.Mean, - calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, - calculation.InputParameters.InsideWaterLevel.Mean, - calculation.InputParameters.InsideWaterLevel.StandardDeviation, - calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, - calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, - generalInput.ModelFactorStorageVolume.Mean, - generalInput.ModelFactorStorageVolume.StandardDeviation, - calculation.InputParameters.StorageStructureArea.Mean, - calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, - generalInput.ModelFactorInflowVolume, - calculation.InputParameters.FlowWidthAtBottomProtection.Mean, - calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, - calculation.InputParameters.CriticalOvertoppingDischarge.Mean, - calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, - calculation.InputParameters.FailureProbabilityStructureWithErosion, - calculation.InputParameters.StormDuration.Mean, - calculation.InputParameters.StormDuration.CoefficientOfVariation, - calculation.InputParameters.BankWidth.Mean, - calculation.InputParameters.BankWidth.StandardDeviation, - calculation.InputParameters.EvaluationLevel, - generalInput.ModelFactorLoadEffect.Mean, - generalInput.ModelFactorLoadEffect.StandardDeviation, - generalInput.WaveRatioMaxHN, - generalInput.WaveRatioMaxHStandardDeviation, - calculation.InputParameters.VerticalDistance, - generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, - generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, - calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean, - calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation, - calculation.InputParameters.ConstructiveStrengthLinearLoadModel.Mean, - calculation.InputParameters.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, - calculation.InputParameters.StabilityLinearLoadModel.Mean, - calculation.InputParameters.StabilityLinearLoadModel.CoefficientOfVariation, - calculation.InputParameters.WidthFlowApertures.Mean, - calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation); + var structuresStabilityPointLowSillLinearCalculationInput = new StructuresStabilityPointLowSillLinearCalculationInput( + calculation.InputParameters.HydraulicBoundaryLocation.Id, + new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + HydraRingInputParser.ParseForeshore(calculation.InputParameters), + HydraRingInputParser.ParseBreakWater(calculation.InputParameters), + calculation.InputParameters.VolumicWeightWater, + generalInput.GravitationalAcceleration, + calculation.InputParameters.LevelCrestStructure.Mean, + calculation.InputParameters.LevelCrestStructure.StandardDeviation, + calculation.InputParameters.StructureNormalOrientation, + calculation.InputParameters.FactorStormDurationOpenStructure, + generalInput.ModelFactorSubCriticalFlow.Mean, + generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, + calculation.InputParameters.ThresholdHeightOpenWeir.Mean, + calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, + calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, + calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, + calculation.InputParameters.FailureProbabilityRepairClosure, + calculation.InputParameters.FailureCollisionEnergy.Mean, + calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, + generalInput.ModelFactorCollisionLoad.Mean, + generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, + calculation.InputParameters.ShipMass.Mean, + calculation.InputParameters.ShipMass.CoefficientOfVariation, + calculation.InputParameters.ShipVelocity.Mean, + calculation.InputParameters.ShipVelocity.CoefficientOfVariation, + calculation.InputParameters.LevellingCount, + calculation.InputParameters.ProbabilityCollisionSecondaryStructure, + calculation.InputParameters.FlowVelocityStructureClosable.Mean, + calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, + calculation.InputParameters.InsideWaterLevel.Mean, + calculation.InputParameters.InsideWaterLevel.StandardDeviation, + calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, + calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, + generalInput.ModelFactorStorageVolume.Mean, + generalInput.ModelFactorStorageVolume.StandardDeviation, + calculation.InputParameters.StorageStructureArea.Mean, + calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, + generalInput.ModelFactorInflowVolume, + calculation.InputParameters.FlowWidthAtBottomProtection.Mean, + calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, + calculation.InputParameters.CriticalOvertoppingDischarge.Mean, + calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, + calculation.InputParameters.FailureProbabilityStructureWithErosion, + calculation.InputParameters.StormDuration.Mean, + calculation.InputParameters.StormDuration.CoefficientOfVariation, + calculation.InputParameters.BankWidth.Mean, + calculation.InputParameters.BankWidth.StandardDeviation, + calculation.InputParameters.EvaluationLevel, + generalInput.ModelFactorLoadEffect.Mean, + generalInput.ModelFactorLoadEffect.StandardDeviation, + generalInput.WaveRatioMaxHN, + generalInput.WaveRatioMaxHStandardDeviation, + calculation.InputParameters.VerticalDistance, + generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, + generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, + calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean, + calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation, + calculation.InputParameters.ConstructiveStrengthLinearLoadModel.Mean, + calculation.InputParameters.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, + calculation.InputParameters.StabilityLinearLoadModel.Mean, + calculation.InputParameters.StabilityLinearLoadModel.CoefficientOfVariation, + calculation.InputParameters.WidthFlowApertures.Mean, + calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresStabilityPointLowSillLinearCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresStabilityPointLowSillLinearCalculationInput; } - private StructuresStabilityPointLowSillQuadraticCalculationInput CreateLowSillQuadraticCalculationInput(StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, - GeneralStabilityPointStructuresInput generalInput) + private StructuresStabilityPointLowSillQuadraticCalculationInput CreateLowSillQuadraticCalculationInput( + StructuresCalculation calculation, + FailureMechanismSection failureMechanismSection, + GeneralStabilityPointStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresStabilityPointLowSillQuadraticCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), - HydraRingInputParser.ParseForeshore(calculation.InputParameters), - HydraRingInputParser.ParseBreakWater(calculation.InputParameters), - calculation.InputParameters.VolumicWeightWater, - generalInput.GravitationalAcceleration, - calculation.InputParameters.LevelCrestStructure.Mean, - calculation.InputParameters.LevelCrestStructure.StandardDeviation, - calculation.InputParameters.StructureNormalOrientation, - calculation.InputParameters.FactorStormDurationOpenStructure, - generalInput.ModelFactorSubCriticalFlow.Mean, - generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, - calculation.InputParameters.ThresholdHeightOpenWeir.Mean, - calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, - calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, - calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, - calculation.InputParameters.FailureProbabilityRepairClosure, - calculation.InputParameters.FailureCollisionEnergy.Mean, - calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, - generalInput.ModelFactorCollisionLoad.Mean, - generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, - calculation.InputParameters.ShipMass.Mean, - calculation.InputParameters.ShipMass.CoefficientOfVariation, - calculation.InputParameters.ShipVelocity.Mean, - calculation.InputParameters.ShipVelocity.CoefficientOfVariation, - calculation.InputParameters.LevellingCount, - calculation.InputParameters.ProbabilityCollisionSecondaryStructure, - calculation.InputParameters.FlowVelocityStructureClosable.Mean, - calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, - calculation.InputParameters.InsideWaterLevel.Mean, - calculation.InputParameters.InsideWaterLevel.StandardDeviation, - calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, - calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, - generalInput.ModelFactorStorageVolume.Mean, - generalInput.ModelFactorStorageVolume.StandardDeviation, - calculation.InputParameters.StorageStructureArea.Mean, - calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, - generalInput.ModelFactorInflowVolume, - calculation.InputParameters.FlowWidthAtBottomProtection.Mean, - calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, - calculation.InputParameters.CriticalOvertoppingDischarge.Mean, - calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, - calculation.InputParameters.FailureProbabilityStructureWithErosion, - calculation.InputParameters.StormDuration.Mean, - calculation.InputParameters.StormDuration.CoefficientOfVariation, - calculation.InputParameters.BankWidth.Mean, - calculation.InputParameters.BankWidth.StandardDeviation, - calculation.InputParameters.EvaluationLevel, - generalInput.ModelFactorLoadEffect.Mean, - generalInput.ModelFactorLoadEffect.StandardDeviation, - generalInput.WaveRatioMaxHN, - generalInput.WaveRatioMaxHStandardDeviation, - calculation.InputParameters.VerticalDistance, - generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, - generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, - calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean, - calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation, - calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.Mean, - calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation, - calculation.InputParameters.StabilityQuadraticLoadModel.Mean, - calculation.InputParameters.StabilityQuadraticLoadModel.CoefficientOfVariation, - calculation.InputParameters.WidthFlowApertures.Mean, - calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation); + var structuresStabilityPointLowSillQuadraticCalculationInput = new StructuresStabilityPointLowSillQuadraticCalculationInput( + calculation.InputParameters.HydraulicBoundaryLocation.Id, + new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + HydraRingInputParser.ParseForeshore(calculation.InputParameters), + HydraRingInputParser.ParseBreakWater(calculation.InputParameters), + calculation.InputParameters.VolumicWeightWater, + generalInput.GravitationalAcceleration, + calculation.InputParameters.LevelCrestStructure.Mean, + calculation.InputParameters.LevelCrestStructure.StandardDeviation, + calculation.InputParameters.StructureNormalOrientation, + calculation.InputParameters.FactorStormDurationOpenStructure, + generalInput.ModelFactorSubCriticalFlow.Mean, + generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, + calculation.InputParameters.ThresholdHeightOpenWeir.Mean, + calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, + calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, + calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, + calculation.InputParameters.FailureProbabilityRepairClosure, + calculation.InputParameters.FailureCollisionEnergy.Mean, + calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, + generalInput.ModelFactorCollisionLoad.Mean, + generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, + calculation.InputParameters.ShipMass.Mean, + calculation.InputParameters.ShipMass.CoefficientOfVariation, + calculation.InputParameters.ShipVelocity.Mean, + calculation.InputParameters.ShipVelocity.CoefficientOfVariation, + calculation.InputParameters.LevellingCount, + calculation.InputParameters.ProbabilityCollisionSecondaryStructure, + calculation.InputParameters.FlowVelocityStructureClosable.Mean, + calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, + calculation.InputParameters.InsideWaterLevel.Mean, + calculation.InputParameters.InsideWaterLevel.StandardDeviation, + calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, + calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, + generalInput.ModelFactorStorageVolume.Mean, + generalInput.ModelFactorStorageVolume.StandardDeviation, + calculation.InputParameters.StorageStructureArea.Mean, + calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, + generalInput.ModelFactorInflowVolume, + calculation.InputParameters.FlowWidthAtBottomProtection.Mean, + calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, + calculation.InputParameters.CriticalOvertoppingDischarge.Mean, + calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, + calculation.InputParameters.FailureProbabilityStructureWithErosion, + calculation.InputParameters.StormDuration.Mean, + calculation.InputParameters.StormDuration.CoefficientOfVariation, + calculation.InputParameters.BankWidth.Mean, + calculation.InputParameters.BankWidth.StandardDeviation, + calculation.InputParameters.EvaluationLevel, + generalInput.ModelFactorLoadEffect.Mean, + generalInput.ModelFactorLoadEffect.StandardDeviation, + generalInput.WaveRatioMaxHN, + generalInput.WaveRatioMaxHStandardDeviation, + calculation.InputParameters.VerticalDistance, + generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, + generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, + calculation.InputParameters.ModelFactorSuperCriticalFlow.Mean, + calculation.InputParameters.ModelFactorSuperCriticalFlow.StandardDeviation, + calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.Mean, + calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation, + calculation.InputParameters.StabilityQuadraticLoadModel.Mean, + calculation.InputParameters.StabilityQuadraticLoadModel.CoefficientOfVariation, + calculation.InputParameters.WidthFlowApertures.Mean, + calculation.InputParameters.WidthFlowApertures.CoefficientOfVariation); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresStabilityPointLowSillQuadraticCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresStabilityPointLowSillQuadraticCalculationInput; } - private StructuresStabilityPointFloodedCulvertLinearCalculationInput CreateFloodedCulvertLinearCalculationInput(StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, - GeneralStabilityPointStructuresInput generalInput) + private StructuresStabilityPointFloodedCulvertLinearCalculationInput CreateFloodedCulvertLinearCalculationInput( + StructuresCalculation calculation, + FailureMechanismSection failureMechanismSection, + GeneralStabilityPointStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresStabilityPointFloodedCulvertLinearCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), - HydraRingInputParser.ParseForeshore(calculation.InputParameters), - HydraRingInputParser.ParseBreakWater(calculation.InputParameters), - calculation.InputParameters.VolumicWeightWater, - generalInput.GravitationalAcceleration, - calculation.InputParameters.LevelCrestStructure.Mean, - calculation.InputParameters.LevelCrestStructure.StandardDeviation, - calculation.InputParameters.StructureNormalOrientation, - calculation.InputParameters.FactorStormDurationOpenStructure, - generalInput.ModelFactorSubCriticalFlow.Mean, - generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, - calculation.InputParameters.ThresholdHeightOpenWeir.Mean, - calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, - calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, - calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, - calculation.InputParameters.FailureProbabilityRepairClosure, - calculation.InputParameters.FailureCollisionEnergy.Mean, - calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, - generalInput.ModelFactorCollisionLoad.Mean, - generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, - calculation.InputParameters.ShipMass.Mean, - calculation.InputParameters.ShipMass.CoefficientOfVariation, - calculation.InputParameters.ShipVelocity.Mean, - calculation.InputParameters.ShipVelocity.CoefficientOfVariation, - calculation.InputParameters.LevellingCount, - calculation.InputParameters.ProbabilityCollisionSecondaryStructure, - calculation.InputParameters.FlowVelocityStructureClosable.Mean, - calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, - calculation.InputParameters.InsideWaterLevel.Mean, - calculation.InputParameters.InsideWaterLevel.StandardDeviation, - calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, - calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, - generalInput.ModelFactorStorageVolume.Mean, - generalInput.ModelFactorStorageVolume.StandardDeviation, - calculation.InputParameters.StorageStructureArea.Mean, - calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, - generalInput.ModelFactorInflowVolume, - calculation.InputParameters.FlowWidthAtBottomProtection.Mean, - calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, - calculation.InputParameters.CriticalOvertoppingDischarge.Mean, - calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, - calculation.InputParameters.FailureProbabilityStructureWithErosion, - calculation.InputParameters.StormDuration.Mean, - calculation.InputParameters.StormDuration.CoefficientOfVariation, - calculation.InputParameters.BankWidth.Mean, - calculation.InputParameters.BankWidth.StandardDeviation, - calculation.InputParameters.EvaluationLevel, - generalInput.ModelFactorLoadEffect.Mean, - generalInput.ModelFactorLoadEffect.StandardDeviation, - generalInput.WaveRatioMaxHN, - generalInput.WaveRatioMaxHStandardDeviation, - calculation.InputParameters.VerticalDistance, - generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, - generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, - calculation.InputParameters.DrainCoefficient.Mean, - calculation.InputParameters.DrainCoefficient.StandardDeviation, - calculation.InputParameters.AreaFlowApertures.Mean, - calculation.InputParameters.AreaFlowApertures.StandardDeviation, - calculation.InputParameters.ConstructiveStrengthLinearLoadModel.Mean, - calculation.InputParameters.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, - calculation.InputParameters.StabilityLinearLoadModel.Mean, - calculation.InputParameters.StabilityLinearLoadModel.CoefficientOfVariation); + var structuresStabilityPointFloodedCulvertLinearCalculationInput = new StructuresStabilityPointFloodedCulvertLinearCalculationInput( + calculation.InputParameters.HydraulicBoundaryLocation.Id, + new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + HydraRingInputParser.ParseForeshore(calculation.InputParameters), + HydraRingInputParser.ParseBreakWater(calculation.InputParameters), + calculation.InputParameters.VolumicWeightWater, + generalInput.GravitationalAcceleration, + calculation.InputParameters.LevelCrestStructure.Mean, + calculation.InputParameters.LevelCrestStructure.StandardDeviation, + calculation.InputParameters.StructureNormalOrientation, + calculation.InputParameters.FactorStormDurationOpenStructure, + generalInput.ModelFactorSubCriticalFlow.Mean, + generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, + calculation.InputParameters.ThresholdHeightOpenWeir.Mean, + calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, + calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, + calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, + calculation.InputParameters.FailureProbabilityRepairClosure, + calculation.InputParameters.FailureCollisionEnergy.Mean, + calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, + generalInput.ModelFactorCollisionLoad.Mean, + generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, + calculation.InputParameters.ShipMass.Mean, + calculation.InputParameters.ShipMass.CoefficientOfVariation, + calculation.InputParameters.ShipVelocity.Mean, + calculation.InputParameters.ShipVelocity.CoefficientOfVariation, + calculation.InputParameters.LevellingCount, + calculation.InputParameters.ProbabilityCollisionSecondaryStructure, + calculation.InputParameters.FlowVelocityStructureClosable.Mean, + calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, + calculation.InputParameters.InsideWaterLevel.Mean, + calculation.InputParameters.InsideWaterLevel.StandardDeviation, + calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, + calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, + generalInput.ModelFactorStorageVolume.Mean, + generalInput.ModelFactorStorageVolume.StandardDeviation, + calculation.InputParameters.StorageStructureArea.Mean, + calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, + generalInput.ModelFactorInflowVolume, + calculation.InputParameters.FlowWidthAtBottomProtection.Mean, + calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, + calculation.InputParameters.CriticalOvertoppingDischarge.Mean, + calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, + calculation.InputParameters.FailureProbabilityStructureWithErosion, + calculation.InputParameters.StormDuration.Mean, + calculation.InputParameters.StormDuration.CoefficientOfVariation, + calculation.InputParameters.BankWidth.Mean, + calculation.InputParameters.BankWidth.StandardDeviation, + calculation.InputParameters.EvaluationLevel, + generalInput.ModelFactorLoadEffect.Mean, + generalInput.ModelFactorLoadEffect.StandardDeviation, + generalInput.WaveRatioMaxHN, + generalInput.WaveRatioMaxHStandardDeviation, + calculation.InputParameters.VerticalDistance, + generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, + generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, + calculation.InputParameters.DrainCoefficient.Mean, + calculation.InputParameters.DrainCoefficient.StandardDeviation, + calculation.InputParameters.AreaFlowApertures.Mean, + calculation.InputParameters.AreaFlowApertures.StandardDeviation, + calculation.InputParameters.ConstructiveStrengthLinearLoadModel.Mean, + calculation.InputParameters.ConstructiveStrengthLinearLoadModel.CoefficientOfVariation, + calculation.InputParameters.StabilityLinearLoadModel.Mean, + calculation.InputParameters.StabilityLinearLoadModel.CoefficientOfVariation); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresStabilityPointFloodedCulvertLinearCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresStabilityPointFloodedCulvertLinearCalculationInput; } - private StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput(StructuresCalculation calculation, - FailureMechanismSection failureMechanismSection, - GeneralStabilityPointStructuresInput generalInput) + private StructuresStabilityPointFloodedCulvertQuadraticCalculationInput CreateFloodedCulvertQuadraticCalculationInput( + StructuresCalculation calculation, + FailureMechanismSection failureMechanismSection, + GeneralStabilityPointStructuresInput generalInput, + string hydraulicBoundaryDatabaseFilePath) { - return new StructuresStabilityPointFloodedCulvertQuadraticCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id, - new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), - HydraRingInputParser.ParseForeshore(calculation.InputParameters), - HydraRingInputParser.ParseBreakWater(calculation.InputParameters), - calculation.InputParameters.VolumicWeightWater, - generalInput.GravitationalAcceleration, - calculation.InputParameters.LevelCrestStructure.Mean, - calculation.InputParameters.LevelCrestStructure.StandardDeviation, - calculation.InputParameters.StructureNormalOrientation, - calculation.InputParameters.FactorStormDurationOpenStructure, - generalInput.ModelFactorSubCriticalFlow.Mean, - generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, - calculation.InputParameters.ThresholdHeightOpenWeir.Mean, - calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, - calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, - calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, - calculation.InputParameters.FailureProbabilityRepairClosure, - calculation.InputParameters.FailureCollisionEnergy.Mean, - calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, - generalInput.ModelFactorCollisionLoad.Mean, - generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, - calculation.InputParameters.ShipMass.Mean, - calculation.InputParameters.ShipMass.CoefficientOfVariation, - calculation.InputParameters.ShipVelocity.Mean, - calculation.InputParameters.ShipVelocity.CoefficientOfVariation, - calculation.InputParameters.LevellingCount, - calculation.InputParameters.ProbabilityCollisionSecondaryStructure, - calculation.InputParameters.FlowVelocityStructureClosable.Mean, - calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, - calculation.InputParameters.InsideWaterLevel.Mean, - calculation.InputParameters.InsideWaterLevel.StandardDeviation, - calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, - calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, - generalInput.ModelFactorStorageVolume.Mean, - generalInput.ModelFactorStorageVolume.StandardDeviation, - calculation.InputParameters.StorageStructureArea.Mean, - calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, - generalInput.ModelFactorInflowVolume, - calculation.InputParameters.FlowWidthAtBottomProtection.Mean, - calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, - calculation.InputParameters.CriticalOvertoppingDischarge.Mean, - calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, - calculation.InputParameters.FailureProbabilityStructureWithErosion, - calculation.InputParameters.StormDuration.Mean, - calculation.InputParameters.StormDuration.CoefficientOfVariation, - calculation.InputParameters.BankWidth.Mean, - calculation.InputParameters.BankWidth.StandardDeviation, - calculation.InputParameters.EvaluationLevel, - generalInput.ModelFactorLoadEffect.Mean, - generalInput.ModelFactorLoadEffect.StandardDeviation, - generalInput.WaveRatioMaxHN, - generalInput.WaveRatioMaxHStandardDeviation, - calculation.InputParameters.VerticalDistance, - generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, - generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, - calculation.InputParameters.DrainCoefficient.Mean, - calculation.InputParameters.DrainCoefficient.StandardDeviation, - calculation.InputParameters.AreaFlowApertures.Mean, - calculation.InputParameters.AreaFlowApertures.StandardDeviation, - calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.Mean, - calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation, - calculation.InputParameters.StabilityQuadraticLoadModel.Mean, - calculation.InputParameters.StabilityQuadraticLoadModel.CoefficientOfVariation); + var structuresStabilityPointFloodedCulvertQuadraticCalculationInput = new StructuresStabilityPointFloodedCulvertQuadraticCalculationInput( + calculation.InputParameters.HydraulicBoundaryLocation.Id, + new HydraRingSection(1, failureMechanismSection.GetSectionLength(), calculation.InputParameters.StructureNormalOrientation), + HydraRingInputParser.ParseForeshore(calculation.InputParameters), + HydraRingInputParser.ParseBreakWater(calculation.InputParameters), + calculation.InputParameters.VolumicWeightWater, + generalInput.GravitationalAcceleration, + calculation.InputParameters.LevelCrestStructure.Mean, + calculation.InputParameters.LevelCrestStructure.StandardDeviation, + calculation.InputParameters.StructureNormalOrientation, + calculation.InputParameters.FactorStormDurationOpenStructure, + generalInput.ModelFactorSubCriticalFlow.Mean, + generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation, + calculation.InputParameters.ThresholdHeightOpenWeir.Mean, + calculation.InputParameters.ThresholdHeightOpenWeir.StandardDeviation, + calculation.InputParameters.InsideWaterLevelFailureConstruction.Mean, + calculation.InputParameters.InsideWaterLevelFailureConstruction.StandardDeviation, + calculation.InputParameters.FailureProbabilityRepairClosure, + calculation.InputParameters.FailureCollisionEnergy.Mean, + calculation.InputParameters.FailureCollisionEnergy.CoefficientOfVariation, + generalInput.ModelFactorCollisionLoad.Mean, + generalInput.ModelFactorCollisionLoad.CoefficientOfVariation, + calculation.InputParameters.ShipMass.Mean, + calculation.InputParameters.ShipMass.CoefficientOfVariation, + calculation.InputParameters.ShipVelocity.Mean, + calculation.InputParameters.ShipVelocity.CoefficientOfVariation, + calculation.InputParameters.LevellingCount, + calculation.InputParameters.ProbabilityCollisionSecondaryStructure, + calculation.InputParameters.FlowVelocityStructureClosable.Mean, + calculation.InputParameters.FlowVelocityStructureClosable.StandardDeviation, + calculation.InputParameters.InsideWaterLevel.Mean, + calculation.InputParameters.InsideWaterLevel.StandardDeviation, + calculation.InputParameters.AllowedLevelIncreaseStorage.Mean, + calculation.InputParameters.AllowedLevelIncreaseStorage.StandardDeviation, + generalInput.ModelFactorStorageVolume.Mean, + generalInput.ModelFactorStorageVolume.StandardDeviation, + calculation.InputParameters.StorageStructureArea.Mean, + calculation.InputParameters.StorageStructureArea.CoefficientOfVariation, + generalInput.ModelFactorInflowVolume, + calculation.InputParameters.FlowWidthAtBottomProtection.Mean, + calculation.InputParameters.FlowWidthAtBottomProtection.StandardDeviation, + calculation.InputParameters.CriticalOvertoppingDischarge.Mean, + calculation.InputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation, + calculation.InputParameters.FailureProbabilityStructureWithErosion, + calculation.InputParameters.StormDuration.Mean, + calculation.InputParameters.StormDuration.CoefficientOfVariation, + calculation.InputParameters.BankWidth.Mean, + calculation.InputParameters.BankWidth.StandardDeviation, + calculation.InputParameters.EvaluationLevel, + generalInput.ModelFactorLoadEffect.Mean, + generalInput.ModelFactorLoadEffect.StandardDeviation, + generalInput.WaveRatioMaxHN, + generalInput.WaveRatioMaxHStandardDeviation, + calculation.InputParameters.VerticalDistance, + generalInput.ModificationFactorWavesSlowlyVaryingPressureComponent, + generalInput.ModificationFactorDynamicOrImpulsivePressureComponent, + calculation.InputParameters.DrainCoefficient.Mean, + calculation.InputParameters.DrainCoefficient.StandardDeviation, + calculation.InputParameters.AreaFlowApertures.Mean, + calculation.InputParameters.AreaFlowApertures.StandardDeviation, + calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.Mean, + calculation.InputParameters.ConstructiveStrengthQuadraticLoadModel.CoefficientOfVariation, + calculation.InputParameters.StabilityQuadraticLoadModel.Mean, + calculation.InputParameters.StabilityQuadraticLoadModel.CoefficientOfVariation); + + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(structuresStabilityPointFloodedCulvertQuadraticCalculationInput, hydraulicBoundaryDatabaseFilePath); + + return structuresStabilityPointFloodedCulvertQuadraticCalculationInput; } private static string[] ValidateInput(StabilityPointStructuresInput inputParameters, IAssessmentSection assessmentSection) Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs =================================================================== diff -u -r7ad50171865839ec26c5356aaacc24606faf75a7 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 7ad50171865839ec26c5356aaacc24606faf75a7) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Integration.Test/StabilityPointStructuresCalculationActivityIntegrationTest.cs (.../StabilityPointStructuresCalculationActivityIntegrationTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -45,7 +45,8 @@ [TestFixture] public class StabilityPointStructuresCalculationActivityIntegrationTest { - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] public void Run_CalculationInvalidInput_LogValidationStartAndEndWithError() @@ -91,8 +92,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -115,7 +114,7 @@ } }; - var activity = new StabilityPointStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { // Call @@ -142,8 +141,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -166,7 +163,7 @@ } }; - var activity = new StabilityPointStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { @@ -199,8 +196,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -222,7 +217,7 @@ } }; - var activity = new StabilityPointStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresStabilityPointCalculator; @@ -254,8 +249,6 @@ // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -277,7 +270,7 @@ } }; - var activity = new StabilityPointStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); using (new HydraRingCalculatorFactoryConfig()) { var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresStabilityPointCalculator; @@ -315,7 +308,6 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -366,7 +358,6 @@ var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); using (var importer = new HydraulicBoundaryDatabaseImporter()) { importer.Import(assessmentSection, validFilePath); @@ -389,7 +380,7 @@ calculation.Attach(observerMock); - var activity = new StabilityPointStructuresCalculationActivity(calculation, testDataPath, failureMechanism, assessmentSection); + var activity = new StabilityPointStructuresCalculationActivity(calculation, validFilePath, failureMechanism, assessmentSection); activity.Run(); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityTest.cs =================================================================== diff -u -r6ac5917aa7fd76c41f389c1f649b2449229925d8 -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityTest.cs (.../StabilityPointStructuresCalculationActivityTest.cs) (revision 6ac5917aa7fd76c41f389c1f649b2449229925d8) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationActivityTest.cs (.../StabilityPointStructuresCalculationActivityTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -91,7 +91,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual("hlcdFilepath", exception.ParamName); + Assert.AreEqual("hydraulicBoundaryDatabaseFilePath", exception.ParamName); mocks.VerifyAll(); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r13898fd5c275bf31e77a47d31e95cb45ab5752be -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 13898fd5c275bf31e77a47d31e95cb45ab5752be) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -50,7 +50,7 @@ public class StabilityPointStructuresCalculationServiceTest { private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); - private static readonly string validDataFilepath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] public void Validate_ValidCalculationInvalidHydraulicBoundaryDatabase_ReturnsFalse() @@ -100,7 +100,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new StabilityPointStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -142,7 +142,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; mockRepository.ReplayAll(); failureMechanism.AddSection(new FailureMechanismSection("test section", new[] @@ -194,7 +194,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; mockRepository.ReplayAll(); failureMechanism.AddSection(new FailureMechanismSection("test section", new[] @@ -248,7 +248,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -333,7 +333,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -418,7 +418,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -503,7 +503,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -584,7 +584,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; mockRepository.ReplayAll(); failureMechanism.AddSection(new FailureMechanismSection("test section", new[] @@ -624,7 +624,7 @@ var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mockRepository); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; mockRepository.ReplayAll(); failureMechanism.AddSection(new FailureMechanismSection("test section", new[] @@ -805,7 +805,7 @@ new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, stabilityPointStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -931,7 +931,7 @@ new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, stabilityPointStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1057,7 +1057,7 @@ new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, stabilityPointStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1183,7 +1183,7 @@ new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, stabilityPointStructuresFailureMechanism, - validDataFilepath); + validFilePath); // Assert StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); @@ -1319,7 +1319,7 @@ Action call = () => new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - validDataFilepath); + validFilePath); // Assert TestHelper.AssertLogMessages(call, messages => @@ -1372,7 +1372,7 @@ service.Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); // Assert Assert.IsNull(calculation.Output); @@ -1422,7 +1422,7 @@ new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -1484,7 +1484,7 @@ new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -1548,7 +1548,7 @@ new StabilityPointStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException e) {