Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs =================================================================== diff -u -r320fc1268c48766797d895a8f4ace546f35bf64c -r3307edf9e893dd67926dffaac019185b32bbbe86 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 320fc1268c48766797d895a8f4ace546f35bf64c) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -268,7 +268,7 @@ } set { - ProbabilityHelper.ValidateProbability(value, nameof(value), RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_); + ProbabilityHelper.ValidateProbability(value, null, RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_); failureProbabilityOpenStructure = value; } } @@ -287,7 +287,7 @@ } set { - ProbabilityHelper.ValidateProbability(value, nameof(value), RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_); + ProbabilityHelper.ValidateProbability(value, null, RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_); failureProbabilityReparation = value; } } @@ -327,7 +327,7 @@ } set { - ProbabilityHelper.ValidateProbability(value, nameof(value), RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_); + ProbabilityHelper.ValidateProbability(value, null, RingtoetsCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_); probabilityOrFrequencyOpenStructureBeforeFlooding = value; } } Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r335523a40d190e19b1061804de21c28f74140f52 -r3307edf9e893dd67926dffaac019185b32bbbe86 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 335523a40d190e19b1061804de21c28f74140f52) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -23,6 +23,7 @@ using System.Collections.Generic; using Core.Common.Base.Data; using Ringtoets.ClosingStructures.Data; +using Ringtoets.ClosingStructures.IO.Configurations.Helpers; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.Hydraulics; @@ -101,6 +102,11 @@ && TryReadStochasts(readCalculation, calculation) && TryReadOrientation(readCalculation, calculation) && TryReadFailureProbabilityStructureWithErosion(readCalculation, calculation) + && TryReadFailureProbabilityOpenStructure(readCalculation, calculation) + && TryReadFailureProbabilityReparation(readCalculation, calculation) + && TryReadProbabilityOrFrequencyOpenStructureBeforeFlooding(readCalculation, calculation) + && TryReadInflowModelType(readCalculation, calculation) + && TryReadIdenticalApertures(readCalculation, calculation) && readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile, calculation.Name, Log)) { ReadWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters); @@ -244,27 +250,60 @@ { if (readCalculation.FailureProbabilityStructureWithErosion.HasValue) { + double failureProbability = readCalculation.FailureProbabilityStructureWithErosion.Value; + + try + { + calculation.InputParameters.FailureProbabilityStructureWithErosion = (RoundedDouble) failureProbability; + } + catch (ArgumentOutOfRangeException e) + { + Log.LogOutOfRangeException(string.Format( + RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid, + failureProbability, + RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName), + calculation.Name, + e); + + return false; + } + } + + return true; + } + + /// + /// Reads the failure probability open structure. + /// + /// The calculation read from the imported file. + /// The calculation to configure. + /// false when the failure probability open structure is invalid or when there is a failure probability + /// open structure but no structure defined, true otherwise. + private bool TryReadFailureProbabilityOpenStructure(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation) + { + if (readCalculation.FailureProbabilityOpenStructure.HasValue) + { if (calculation.InputParameters.Structure == null) { Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_, - RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName), + RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName), calculation.Name); return false; } - double failureProbability = readCalculation.FailureProbabilityStructureWithErosion.Value; + double failureProbability = readCalculation.FailureProbabilityOpenStructure.Value; try { - calculation.InputParameters.FailureProbabilityStructureWithErosion = (RoundedDouble) failureProbability; + calculation.InputParameters.FailureProbabilityOpenStructure = (RoundedDouble) failureProbability; } catch (ArgumentOutOfRangeException e) { Log.LogOutOfRangeException(string.Format( RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid, failureProbability, - RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName), + RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName), calculation.Name, e); @@ -275,6 +314,144 @@ return true; } + /// + /// Reads the failure probability reparation. + /// + /// The calculation read from the imported file. + /// The calculation to configure. + /// false when the failure probability reparation is invalid or when there is a failure probability + /// reparation but no structure defined, true otherwise. + private bool TryReadFailureProbabilityReparation(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation) + { + if (readCalculation.FailureProbabilityReparation.HasValue) + { + if (calculation.InputParameters.Structure == null) + { + Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_, + RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName), + calculation.Name); + + return false; + } + + double failureProbability = readCalculation.FailureProbabilityReparation.Value; + + try + { + calculation.InputParameters.FailureProbabilityReparation = (RoundedDouble) failureProbability; + } + catch (ArgumentOutOfRangeException e) + { + Log.LogOutOfRangeException(string.Format( + RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid, + failureProbability, + RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName), + calculation.Name, + e); + + return false; + } + } + + return true; + } + + /// + /// Reads the probability or frequency open structure before flooding. + /// + /// The calculation read from the imported file. + /// The calculation to configure. + /// false when the probability or frequency open structure before flooding is invalid or when there is a + /// probability or frequency open structure before flooding but no structure defined, true otherwise. + private bool TryReadProbabilityOrFrequencyOpenStructureBeforeFlooding(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation) + { + if (readCalculation.ProbabilityOrFrequencyOpenStructureBeforeFlooding.HasValue) + { + if (calculation.InputParameters.Structure == null) + { + Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_, + RingtoetsCommonIOResources.CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName), + calculation.Name); + + return false; + } + + double failureProbability = readCalculation.ProbabilityOrFrequencyOpenStructureBeforeFlooding.Value; + + try + { + calculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding = (RoundedDouble) failureProbability; + } + catch (ArgumentOutOfRangeException e) + { + Log.LogOutOfRangeException(string.Format( + RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid, + failureProbability, + RingtoetsCommonIOResources.CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName), + calculation.Name, + e); + + return false; + } + } + + return true; + } + + /// + /// Reads the inflow model type. + /// + /// The calculation read from the imported file. + /// The calculation to configure. + /// false when the inflow model type is invalid or when there is a + /// inflow model type but no structure defined, true otherwise. + private bool TryReadInflowModelType(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation) + { + if (readCalculation.InflowModelType.HasValue) + { + if (calculation.InputParameters.Structure == null) + { + Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_, + RingtoetsCommonIOResources.CalculationConfigurationImporter_InflowModelType_DisplayName), + calculation.Name); + + return false; + } + + calculation.InputParameters.InflowModelType = + (ClosingStructureInflowModelType) new ConfigurationClosingStructureInflowModelTypeConverter() + .ConvertTo(readCalculation.InflowModelType.Value, typeof(ClosingStructureInflowModelType)); + } + + return true; + } + + /// + /// Reads the number of identical apertures. + /// + /// The calculation read from the imported file. + /// The calculation to configure. + /// false when the number of identical apertures is invalid or when there is a + /// number of identical apertures but no structure defined, true otherwise. + private bool TryReadIdenticalApertures(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation) + { + if (readCalculation.IdenticalApertures.HasValue) + { + if (calculation.InputParameters.Structure == null) + { + Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_, + RingtoetsCommonIOResources.CalculationConfigurationImporter_IdenticalApertures_DisplayName), + calculation.Name); + + return false; + } + + calculation.InputParameters.IdenticalApertures = readCalculation.IdenticalApertures.Value; + } + + return true; + } + private bool TryReadHydraulicBoundaryLocation(string locationName, StructuresCalculation calculation) { HydraulicBoundaryLocation location; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,589 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Core.Common.Base.Data; +using Core.Common.Base.Geometry; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.DikeProfiles; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.Structures; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.IO.FileImporters; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.ClosingStructures.Data.TestUtil; +using Ringtoets.ClosingStructures.IO.Configurations; + +namespace Ringtoets.ClosingStructures.IO.Test.Configurations +{ + [TestFixture] + public class ClosingStructuresCalculationConfigurationImporterTest + { + private readonly string importerPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.ClosingStructures.IO, nameof(ClosingStructuresCalculationConfigurationImporter)); + + [Test] + public void Constructor_ExpectedValues() + { + // Call + var importer = new ClosingStructuresCalculationConfigurationImporter("", + new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + Enumerable.Empty()); + + // Assert + Assert.IsInstanceOf>(importer); + } + + [Test] + public void Constructor_HydraulicBoundaryLocationsNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => new ClosingStructuresCalculationConfigurationImporter("", + new CalculationGroup(), + null, + Enumerable.Empty(), + Enumerable.Empty()); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("hydraulicBoundaryLocations", exception.ParamName); + } + + [Test] + public void Constructor_ForeshoreProfilesNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => new ClosingStructuresCalculationConfigurationImporter("", + new CalculationGroup(), + Enumerable.Empty(), + null, + Enumerable.Empty()); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("foreshoreProfiles", exception.ParamName); + } + + [Test] + public void Constructor_StructuresNull_ThrowArgumentNullException() + { + // Call + TestDelegate test = () => new ClosingStructuresCalculationConfigurationImporter("", + new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + null); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("structures", exception.ParamName); + } + + [Test] + [SetCulture("nl-NL")] + [TestCase("validConfigurationModelFactorSuperCriticalFlowStandardDeviation.xml", + "Er kan geen standaardafwijking voor stochast 'modelfactoroverloopdebiet' opgegeven worden.")] + [TestCase("validConfigurationStormDurationVariationCoefficient.xml", + "Er kan geen variatiecoëfficiënt voor stochast 'stormduur' opgegeven worden.")] + [TestCase("validConfigurationFailureProbabilityOpenStructureWithoutStructure.xml", + "Er is geen kunstwerk opgegeven om kans mislukken sluiting aan toe te voegen.")] + [TestCase("validConfigurationFailureProbabilityReparationWithoutStructure.xml", + "Er is geen kunstwerk opgegeven om faalkans herstel van gefaalde situatie aan toe te voegen.")] + [TestCase("validConfigurationIdenticalAperturesWithoutStructure.xml", + "Er is geen kunstwerk opgegeven om aantal identieke doorstroomopeningen aan toe te voegen.")] + [TestCase("validConfigurationInflowModelTypeWithoutStructure.xml", + "Er is geen kunstwerk opgegeven om instroommodel aan toe te voegen.")] + [TestCase("validConfigurationProbabilityOrFrequencyOpenStructureWithoutStructure.xml", + "Er is geen kunstwerk opgegeven om kans op open staan bij naderend hoogwater aan toe te voegen.")] + [TestCase("validConfigurationOrientationWithoutStructure.xml", + "Er is geen kunstwerk opgegeven om oriëntatie aan toe te voegen.")] + [TestCase("validConfigurationInvalidFailureProbabilityStructureErosion.xml", + "Een waarde van '1,1' als faalkans gegeven erosie bodem is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.")] + [TestCase("validConfigurationInvalidProbabilityOrFrequencyOpenStructureBeforeFlooding.xml", + "Een waarde van '-1,2' als kans op open staan bij naderend hoogwater is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.")] + [TestCase("validConfigurationInvalidFailureProbabilityOpenStructure.xml", + "Een waarde van '1,5' als kans mislukken sluiting is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.")] + [TestCase("validConfigurationInvalidFailureProbabilityReparation.xml", + "Een waarde van '-0,9' als faalkans herstel van gefaalde situatie is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.")] + [TestCase("validConfigurationInvalidOrientation.xml", + "Een waarde van '-12' als oriëntatie is ongeldig. De waarde voor de oriëntatie moet in het bereik [0,00, 360,00] liggen.")] + [TestCase("validConfigurationWaveReductionWithoutForeshoreProfile.xml", + "Er is geen voorlandprofiel opgegeven om golfreductie parameters aan toe te voegen.")] + [TestCase("validConfigurationInvalidAllowedLevelIncreaseStorageMean.xml", + "Een gemiddelde van '-0,2' is ongeldig voor stochast 'peilverhogingkomberging'. Gemiddelde moet groter zijn dan 0.")] + [TestCase("validConfigurationInvalidAllowedLevelIncreaseStorageStandardDeviation.xml", + "Een standaardafwijking van '-0,01' is ongeldig voor stochast 'peilverhogingkomberging'. Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0.")] + [TestCase("validConfigurationInvalidCriticalOvertoppingDischargeMean.xml", + "Een gemiddelde van '-2' is ongeldig voor stochast 'kritiekinstromenddebiet'. Gemiddelde moet groter zijn dan 0.")] + [TestCase("validConfigurationInvalidCriticalOvertoppingDischargeVariationCoefficient.xml", + "Een variatiecoëfficiënt van '-0,1' is ongeldig voor stochast 'kritiekinstromenddebiet'. Variatiecoëfficiënt (CV) moet groter zijn dan of gelijk zijn aan 0.")] + [TestCase("validConfigurationInvalidFlowWidthAtBottomProtectionMean.xml", + "Een gemiddelde van '-15,2' is ongeldig voor stochast 'breedtebodembescherming'. Gemiddelde moet groter zijn dan 0.")] + [TestCase("validConfigurationInvalidFlowWidthAtBottomProtectionStandardDeviation.xml", + "Een standaardafwijking van '-0,1' is ongeldig voor stochast 'breedtebodembescherming'. Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0.")] + [TestCase("validConfigurationInvalidLevelCrestStructureNotClosingStandardDeviation.xml", + "Een standaardafwijking van '-0,1' is ongeldig voor stochast 'kruinhoogte'. Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0.")] + [TestCase("validConfigurationInvalidStorageStructureAreaMean.xml", + "Een gemiddelde van '-15000' is ongeldig voor stochast 'kombergendoppervlak'. Gemiddelde moet groter zijn dan 0.")] + [TestCase("validConfigurationInvalidStorageStructureAreaVariationCoefficient.xml", + "Een variatiecoëfficiënt van '-0,01' is ongeldig voor stochast 'kombergendoppervlak'. Variatiecoëfficiënt (CV) moet groter zijn dan of gelijk zijn aan 0.")] + [TestCase("validConfigurationInvalidStormDurationMean.xml", + "Een gemiddelde van '-6' is ongeldig voor stochast 'stormduur'. Gemiddelde moet groter zijn dan 0.")] + [TestCase("validConfigurationInvalidWidthFlowAperturesStandardDeviation.xml", + "Een standaardafwijking van '-0,1' is ongeldig voor stochast 'breedtedoorstroomopening'. Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0.")] + public void Import_ValidConfigurationInvalidData_LogMessageAndContinueImport(string file, string expectedErrorMessage) + { + // Setup + string filePath = Path.Combine(importerPath, file); + + var calculationGroup = new CalculationGroup(); + var structure = new TestClosingStructure("kunstwerk1"); + var foreshoreProfile = new TestForeshoreProfile("profiel 1"); + + var importer = new ClosingStructuresCalculationConfigurationImporter(filePath, + calculationGroup, + Enumerable.Empty(), + new ForeshoreProfile[] + { + foreshoreProfile + }, + new ClosingStructure[] + { + structure + }); + var successful = false; + + // Call + Action call = () => successful = importer.Import(); + + // Assert + string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + Assert.IsTrue(successful); + CollectionAssert.IsEmpty(calculationGroup.Children); + } + + [TestCase("validConfigurationUnknownForeshoreProfile.xml", + "Het voorlandprofiel 'unknown' bestaat niet.")] + [TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml", + "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")] + [TestCase("validConfigurationUnknownStructure.xml", + "Het kunstwerk 'unknown' bestaat niet.")] + public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage) + { + // Setup + string filePath = Path.Combine(importerPath, file); + + var calculationGroup = new CalculationGroup(); + + var importer = new ClosingStructuresCalculationConfigurationImporter(filePath, + calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + Enumerable.Empty()); + var successful = false; + + // Call + Action call = () => successful = importer.Import(); + + // Assert + string expectedMessage = $"{expectedErrorMessage} Berekening 'Berekening 1' is overgeslagen."; + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + Assert.IsTrue(successful); + CollectionAssert.IsEmpty(calculationGroup.Children); + } + + [Test] + public void Import_UseForeshoreButForshoreProfileWithoutGeometry_LogMessageAndContinueImport() + { + // Setup + string filePath = Path.Combine(importerPath, "validConfigurationCalculationUseForeshoreWithoutGeometry.xml"); + + var calculationGroup = new CalculationGroup(); + var foreshoreProfile = new TestForeshoreProfile("Voorlandprofiel"); + var importer = new ClosingStructuresCalculationConfigurationImporter( + filePath, + calculationGroup, + Enumerable.Empty(), + new[] + { + foreshoreProfile + }, + Enumerable.Empty()); + + var successful = false; + + // Call + Action call = () => successful = importer.Import(); + + // Assert + const string expectedMessage = "Het opgegeven voorlandprofiel 'Voorlandprofiel' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. Berekening 'Berekening 1' is overgeslagen."; + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + Assert.IsTrue(successful); + CollectionAssert.IsEmpty(calculationGroup.Children); + } + + [Test] + public void Import_FullCalculationConfiguration_DataAddedToModel() + { + // Setup + string filePath = Path.Combine(importerPath, "validFullConfiguration.xml"); + + var calculationGroup = new CalculationGroup(); + var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("Locatie1"); + var foreshoreProfile = new TestForeshoreProfile("profiel1", new List + { + new Point2D(0,3) + }); + var structure = new TestClosingStructure("kunstwerk1"); + var importer = new ClosingStructuresCalculationConfigurationImporter( + filePath, + calculationGroup, + new[] + { + hydraulicBoundaryLocation + }, + new[] + { + foreshoreProfile + }, + new[] + { + structure + }); + + // Call + var successful = importer.Import(); + + // Assert + Assert.IsTrue(successful); + var expectedCalculation = new StructuresCalculation + { + Name = "Berekening 1", + InputParameters = + { + HydraulicBoundaryLocation = hydraulicBoundaryLocation, + Structure = structure, + ForeshoreProfile = foreshoreProfile, + StructureNormalOrientation = (RoundedDouble) 67.1, + IdenticalApertures = 4, + InflowModelType = ClosingStructureInflowModelType.VerticalWall, + FailureProbabilityStructureWithErosion = 0.001, + FactorStormDurationOpenStructure = (RoundedDouble) 0.002, + ProbabilityOrFrequencyOpenStructureBeforeFlooding = 0.03, + FailureProbabilityOpenStructure = 0.22, + FailureProbabilityReparation = 0.0006, + UseBreakWater = true, + UseForeshore = true, + BreakWater = + { + Height = (RoundedDouble) 1.23, + Type = BreakWaterType.Dam + }, + StormDuration = + { + Mean = (RoundedDouble) 6.0 + }, + ModelFactorSuperCriticalFlow = + { + Mean = (RoundedDouble) 1.10 + }, + FlowWidthAtBottomProtection = + { + Mean = (RoundedDouble) 15.2, + StandardDeviation = (RoundedDouble) 0.1 + }, + WidthFlowApertures = + { + Mean = (RoundedDouble) 15.2, + StandardDeviation = (RoundedDouble) 0.1 + }, + StorageStructureArea = + { + Mean = (RoundedDouble) 15000, + CoefficientOfVariation = (RoundedDouble) 0.01 + }, + AllowedLevelIncreaseStorage = + { + Mean = (RoundedDouble) 0.2, + StandardDeviation = (RoundedDouble) 0.01 + }, + CriticalOvertoppingDischarge = + { + Mean = (RoundedDouble) 2, + CoefficientOfVariation = (RoundedDouble) 0.1 + }, + LevelCrestStructureNotClosing = + { + Mean = (RoundedDouble) 4.3, + StandardDeviation = (RoundedDouble) 0.2 + }, + AreaFlowApertures = + { + Mean = (RoundedDouble) 80.5, + StandardDeviation = (RoundedDouble) 1 + }, + DrainCoefficient = + { + Mean = (RoundedDouble) 1.1, + StandardDeviation = (RoundedDouble) 0.1 + }, + InsideWaterLevel = + { + Mean = (RoundedDouble) 0.5, + StandardDeviation = (RoundedDouble) 0.1 + }, + ThresholdHeightOpenWeir = + { + Mean = (RoundedDouble) 1.2, + StandardDeviation = (RoundedDouble) 0.1 + } + } + }; + + Assert.AreEqual(1, calculationGroup.Children.Count); + AssertCalculation(expectedCalculation, (StructuresCalculation)calculationGroup.Children[0]); + } + + [Test] + public void Import_StochastWithMeanOnly_DataAddedToModel() + { + // Setup + string filePath = Path.Combine(importerPath, "validConfigurationStochastMeansOnly.xml"); + + var calculationGroup = new CalculationGroup(); + var structure = new TestClosingStructure("kunstwerk1"); + var importer = new ClosingStructuresCalculationConfigurationImporter( + filePath, + calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + new[] + { + structure + }); + + var expectedCalculation = new StructuresCalculation + { + Name = "Berekening 1", + InputParameters = + { + Structure = structure, + StormDuration = + { + Mean = (RoundedDouble) 6.0 + }, + ModelFactorSuperCriticalFlow = + { + Mean = (RoundedDouble) 1.10 + }, + FlowWidthAtBottomProtection = + { + Mean = (RoundedDouble) 15.2, + }, + WidthFlowApertures = + { + Mean = (RoundedDouble) 15.2, + }, + StorageStructureArea = + { + Mean = (RoundedDouble) 15000, + }, + AllowedLevelIncreaseStorage = + { + Mean = (RoundedDouble) 0.2, + }, + CriticalOvertoppingDischarge = + { + Mean = (RoundedDouble) 2, + }, + LevelCrestStructureNotClosing = + { + Mean = (RoundedDouble) 4.3, + }, + AreaFlowApertures = + { + Mean = (RoundedDouble) 80.5, + }, + DrainCoefficient = + { + Mean = (RoundedDouble) 1.1, + }, + InsideWaterLevel = + { + Mean = (RoundedDouble) 0.5, + }, + ThresholdHeightOpenWeir = + { + Mean = (RoundedDouble) 1.2, + } + } + }; + + // Call + var successful = importer.Import(); + + // Assert + Assert.IsTrue(successful); + Assert.AreEqual(1, calculationGroup.Children.Count); + AssertCalculation(expectedCalculation, (StructuresCalculation)calculationGroup.Children[0]); + } + + [Test] + public void Import_StochastWithStandardDeviationOrVariationCoefficientOnly_DataAddedToModel() + { + // Setup + string filePath = Path.Combine(importerPath, "validConfigurationStochastStandardDeviationVariationCoefficientOnly.xml"); + + var calculationGroup = new CalculationGroup(); + var structure = new TestClosingStructure("kunstwerk1"); + var importer = new ClosingStructuresCalculationConfigurationImporter( + filePath, + calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + new[] + { + structure + }); + + var expectedCalculation = new StructuresCalculation + { + Name = "Berekening 1", + InputParameters = + { + Structure = structure, + FlowWidthAtBottomProtection = + { + StandardDeviation = (RoundedDouble) 0.1 + }, + WidthFlowApertures = + { + StandardDeviation = (RoundedDouble) 0.1 + }, + StorageStructureArea = + { + CoefficientOfVariation = (RoundedDouble) 0.01 + }, + AllowedLevelIncreaseStorage = + { + StandardDeviation = (RoundedDouble) 0.01 + }, + CriticalOvertoppingDischarge = + { + CoefficientOfVariation = (RoundedDouble) 0.1 + }, + LevelCrestStructureNotClosing = + { + StandardDeviation = (RoundedDouble) 0.2 + }, + AreaFlowApertures = + { + StandardDeviation = (RoundedDouble) 1 + }, + DrainCoefficient = + { + StandardDeviation = (RoundedDouble) 0.1 + }, + InsideWaterLevel = + { + StandardDeviation = (RoundedDouble) 0.1 + }, + ThresholdHeightOpenWeir = + { + StandardDeviation = (RoundedDouble) 0.1 + } + } + }; + + // Call + var successful = importer.Import(); + + // Assert + Assert.IsTrue(successful); + Assert.AreEqual(1, calculationGroup.Children.Count); + AssertCalculation(expectedCalculation, (StructuresCalculation)calculationGroup.Children[0]); + } + + [Test] + [TestCase("validConfigurationEmptyCalculation.xml")] + [TestCase("validConfigurationEmptyStochasts.xml")] + [TestCase("validConfigurationEmptyStochastsElement.xml")] + [TestCase("validConfigurationEmptyWaveReduction.xml")] + public void Import_EmptyConfigurations_DataAddedToModel(string file) + { + // Setup + string filePath = Path.Combine(importerPath, file); + + var calculationGroup = new CalculationGroup(); + var structure = new TestClosingStructure("kunstwerk1"); + var importer = new ClosingStructuresCalculationConfigurationImporter( + filePath, + calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + new[] + { + structure + }); + + var expectedCalculation = new StructuresCalculation + { + Name = "Berekening 1" + }; + + // Call + var successful = importer.Import(); + + // Assert + Assert.IsTrue(successful); + Assert.AreEqual(1, calculationGroup.Children.Count); + AssertCalculation(expectedCalculation, (StructuresCalculation)calculationGroup.Children[0]); + } + + private static void AssertCalculation(StructuresCalculation expectedCalculation, StructuresCalculation actualCalculation) + { + Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); + Assert.AreSame(expectedCalculation.InputParameters.HydraulicBoundaryLocation, actualCalculation.InputParameters.HydraulicBoundaryLocation); + Assert.AreEqual(expectedCalculation.InputParameters.StructureNormalOrientation, actualCalculation.InputParameters.StructureNormalOrientation); + Assert.AreSame(expectedCalculation.InputParameters.ForeshoreProfile, actualCalculation.InputParameters.ForeshoreProfile); + Assert.AreSame(expectedCalculation.InputParameters.Structure, actualCalculation.InputParameters.Structure); + Assert.AreEqual(expectedCalculation.InputParameters.UseForeshore, actualCalculation.InputParameters.UseForeshore); + Assert.AreEqual(expectedCalculation.InputParameters.UseBreakWater, actualCalculation.InputParameters.UseBreakWater); + Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Height, actualCalculation.InputParameters.BreakWater.Height); + Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Type, actualCalculation.InputParameters.BreakWater.Type); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.LevelCrestStructureNotClosing, actualCalculation.InputParameters.LevelCrestStructureNotClosing); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.AllowedLevelIncreaseStorage, actualCalculation.InputParameters.AllowedLevelIncreaseStorage); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.FlowWidthAtBottomProtection, actualCalculation.InputParameters.FlowWidthAtBottomProtection); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.ModelFactorSuperCriticalFlow, actualCalculation.InputParameters.ModelFactorSuperCriticalFlow); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.CriticalOvertoppingDischarge, actualCalculation.InputParameters.CriticalOvertoppingDischarge); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.StorageStructureArea, actualCalculation.InputParameters.StorageStructureArea); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.StormDuration, actualCalculation.InputParameters.StormDuration); + DistributionAssert.AreEqual(expectedCalculation.InputParameters.WidthFlowApertures, actualCalculation.InputParameters.WidthFlowApertures); + } + } +} \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Ringtoets.ClosingStructures.IO.Test.csproj =================================================================== diff -u -r16c94d05c67237dec9fcab0f3f03c6b48d3c335b -r3307edf9e893dd67926dffaac019185b32bbbe86 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Ringtoets.ClosingStructures.IO.Test.csproj (.../Ringtoets.ClosingStructures.IO.Test.csproj) (revision 16c94d05c67237dec9fcab0f3f03c6b48d3c335b) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Ringtoets.ClosingStructures.IO.Test.csproj (.../Ringtoets.ClosingStructures.IO.Test.csproj) (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -54,6 +54,7 @@ + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreWithoutGeometry.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreWithoutGeometry.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationCalculationUseForeshoreWithoutGeometry.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,9 @@ + + + + Voorlandprofiel + + true + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyCalculation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyCalculation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyCalculation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,4 @@ + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyStochasts.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyStochasts.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyStochasts.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyStochastsElement.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyStochastsElement.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyStochastsElement.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyWaveReduction.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyWaveReduction.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationEmptyWaveReduction.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityOpenStructureWithoutStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityOpenStructureWithoutStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityOpenStructureWithoutStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + 0.091 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityReparationWithoutStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityReparationWithoutStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationFailureProbabilityReparationWithoutStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + 0.001 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationIdenticalAperturesWithoutStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationIdenticalAperturesWithoutStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationIdenticalAperturesWithoutStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + 3 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInflowModelTypeWithoutStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInflowModelTypeWithoutStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInflowModelTypeWithoutStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + verdronkenkoker + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidAllowedLevelIncreaseStorageMean.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidAllowedLevelIncreaseStorageMean.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidAllowedLevelIncreaseStorageMean.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + -0.2 + 0.01 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidAllowedLevelIncreaseStorageStandardDeviation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidAllowedLevelIncreaseStorageStandardDeviation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidAllowedLevelIncreaseStorageStandardDeviation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + 0.2 + -0.01 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidCriticalOvertoppingDischargeMean.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidCriticalOvertoppingDischargeMean.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidCriticalOvertoppingDischargeMean.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + -2 + 0.1 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidCriticalOvertoppingDischargeVariationCoefficient.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidCriticalOvertoppingDischargeVariationCoefficient.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidCriticalOvertoppingDischargeVariationCoefficient.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + 2 + -0.1 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityOpenStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityOpenStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityOpenStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,7 @@ + + + + kunstwerk1 + 1.5 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityReparation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityReparation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityReparation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,7 @@ + + + + kunstwerk1 + -0.9 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityStructureErosion.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityStructureErosion.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityStructureErosion.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,7 @@ + + + + kunstwerk1 + 1.1 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFlowWidthAtBottomProtectionMean.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFlowWidthAtBottomProtectionMean.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFlowWidthAtBottomProtectionMean.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + -15.2 + 0.1 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFlowWidthAtBottomProtectionStandardDeviation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFlowWidthAtBottomProtectionStandardDeviation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidFlowWidthAtBottomProtectionStandardDeviation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + 15.2 + -0.1 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidLevelCrestStructureNotClosingStandardDeviation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidLevelCrestStructureNotClosingStandardDeviation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidLevelCrestStructureNotClosingStandardDeviation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + 4.3 + -0.1 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidOrientation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidOrientation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidOrientation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,7 @@ + + + + kunstwerk1 + -12 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidProbabilityOrFrequencyOpenStructureBeforeFlooding.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidProbabilityOrFrequencyOpenStructureBeforeFlooding.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidProbabilityOrFrequencyOpenStructureBeforeFlooding.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,7 @@ + + + + kunstwerk1 + -1.2 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStorageStructureAreaMean.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStorageStructureAreaMean.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStorageStructureAreaMean.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + -15000 + 0.01 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStorageStructureAreaVariationCoefficient.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStorageStructureAreaVariationCoefficient.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStorageStructureAreaVariationCoefficient.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + 15000 + -0.01 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStormDurationMean.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStormDurationMean.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidStormDurationMean.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,11 @@ + + + + kunstwerk1 + + + -6.0 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidWidthFlowAperturesStandardDeviation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidWidthFlowAperturesStandardDeviation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationInvalidWidthFlowAperturesStandardDeviation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,12 @@ + + + + kunstwerk1 + + + 15.2 + -0.1 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationModelFactorSuperCriticalFlowStandardDeviation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationModelFactorSuperCriticalFlowStandardDeviation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationModelFactorSuperCriticalFlowStandardDeviation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,11 @@ + + + + kunstwerk1 + + + 0.1 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationOrientationWithoutStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationOrientationWithoutStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationOrientationWithoutStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + 67.1 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationProbabilityOrFrequencyOpenStructureWithoutStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationProbabilityOrFrequencyOpenStructureWithoutStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationProbabilityOrFrequencyOpenStructureWithoutStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + 0.5 + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastMeansOnly.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastMeansOnly.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastMeansOnly.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,44 @@ + + + + kunstwerk1 + + + 6.0 + + + 1.10 + + + 15.2 + + + 15.2 + + + 15000 + + + 0.2 + + + 2 + + + 1.1 + + + 0.5 + + + 80.5 + + + 1.2 + + + 4.3 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastStandardDeviationVariationCoefficientOnly.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastStandardDeviationVariationCoefficientOnly.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastStandardDeviationVariationCoefficientOnly.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,42 @@ + + + + kunstwerk1 + + + + + + + 0.1 + + + 0.1 + + + 0.01 + + + 0.01 + + + 0.1 + + + 0.1 + + + 0.1 + + + 1 + + + 0.1 + + + 0.2 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastsWithoutStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastsWithoutStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStochastsWithoutStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,32 @@ + + + + kunstwerk1 + + + 6.0 + + + 1.10 + + + 15.2 + + + 15.2 + + + 15000 + + + 0.2 + + + 4.3 + + + 2 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStormDurationVariationCoefficient.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStormDurationVariationCoefficient.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationStormDurationVariationCoefficient.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,11 @@ + + + + kunstwerk1 + + + 0.01 + + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownForeshoreProfile.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownForeshoreProfile.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownForeshoreProfile.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + unknown + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownHydraulicBoundaryLocation.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownHydraulicBoundaryLocation.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownHydraulicBoundaryLocation.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + unknown + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownStructure.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownStructure.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationUnknownStructure.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,6 @@ + + + + unknown + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationWaveReductionWithoutForeshoreProfile.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationWaveReductionWithoutForeshoreProfile.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validConfigurationWaveReductionWithoutForeshoreProfile.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,8 @@ + + + + + false + + + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validFullConfiguration.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validFullConfiguration.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validFullConfiguration.xml (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -0,0 +1,70 @@ + + + + Locatie1 + kunstwerk1 + 67.1 + 0.001 + 0.002 + 0.03 + 0.22 + 0.0006 + 4 + verticalewand + profiel1 + + true + havendam + 1.234 + true + + + + 6.0 + + + 1.10 + + + 15.2 + 0.1 + + + 15.2 + 0.1 + + + 15000 + 0.01 + + + 0.2 + 0.01 + + + 2 + 0.1 + + + 1.1 + 0.1 + + + 0.5 + 0.1 + + + 80.5 + 1 + + + 1.2 + 0.1 + + + 4.3 + 0.2 + + + + Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r335523a40d190e19b1061804de21c28f74140f52 -r3307edf9e893dd67926dffaac019185b32bbbe86 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 335523a40d190e19b1061804de21c28f74140f52) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -1,4 +1,25 @@ -//------------------------------------------------------------------------------ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -71,6 +92,24 @@ } /// + /// Looks up a localized string similar to kans mislukken sluiting. + /// + public static string CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName { + get { + return ResourceManager.GetString("CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to faalkans herstel van gefaalde situatie. + /// + public static string CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName { + get { + return ResourceManager.GetString("CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to faalkans gegeven erosie bodem. /// public static string CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName { @@ -92,6 +131,24 @@ } /// + /// Looks up a localized string similar to aantal identieke doorstroomopeningen. + /// + public static string CalculationConfigurationImporter_IdenticalApertures_DisplayName { + get { + return ResourceManager.GetString("CalculationConfigurationImporter_IdenticalApertures_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to instroommodel. + /// + public static string CalculationConfigurationImporter_InflowModelType_DisplayName { + get { + return ResourceManager.GetString("CalculationConfigurationImporter_InflowModelType_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Berekeningenconfiguratie importeren afgebroken. Geen data ingelezen.. /// public static string CalculationConfigurationImporter_LogImportCanceledMessage_Import_canceled_no_data_read { @@ -111,6 +168,16 @@ } /// + /// Looks up a localized string similar to kans op open staan bij naderend hoogwater. + /// + public static string CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName { + get { + return ResourceManager.GetString("CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFloodin" + + "g_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Inlezen berekeningenconfiguratie.. /// public static string CalculationConfigurationImporter_ProgressText_Reading_configuration { @@ -158,7 +225,7 @@ } /// - /// Looks up a localized string similar to Er is geen kunstwerk opgegeven om de {0} aan toe te voegen.. + /// Looks up a localized string similar to Er is geen kunstwerk opgegeven om {0} aan toe te voegen.. /// public static string CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_ { get { Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -r335523a40d190e19b1061804de21c28f74140f52 -r3307edf9e893dd67926dffaac019185b32bbbe86 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 335523a40d190e19b1061804de21c28f74140f52) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -608,7 +608,7 @@ faalkans gegeven erosie bodem - Er is geen kunstwerk opgegeven om de {0} aan toe te voegen. + Er is geen kunstwerk opgegeven om {0} aan toe te voegen. Het opgegeven voorlandprofiel '{0}' heeft geen voorlandgeometrie en kan daarom niet gebruikt worden. @@ -619,4 +619,19 @@ Er kan geen standaardafwijking voor stochast 'modelfactoroverloopdebiet' opgegeven worden. + + kans mislukken sluiting + + + faalkans herstel van gefaalde situatie + + + kans op open staan bij naderend hoogwater + + + aantal identieke doorstroomopeningen + + + instroommodel + \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r335523a40d190e19b1061804de21c28f74140f52 -r3307edf9e893dd67926dffaac019185b32bbbe86 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 335523a40d190e19b1061804de21c28f74140f52) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -217,8 +217,8 @@ /// /// The calculation read from the imported file. /// The calculation to configure. - /// false when the orientation is invalid or when there is a failure probability - /// structure with erosion but no structure defined, true otherwise. + /// false when the failure probability structure with erosion is invalid or when there is + /// a failure probability structure with erosion but no structure defined, true otherwise. private bool TryReadFailureProbabilityStructureWithErosion(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation) { if (readCalculation.FailureProbabilityStructureWithErosion.HasValue) Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -r9a0e768e9ddbc5e4917201fdb864bb2247e5cd90 -r3307edf9e893dd67926dffaac019185b32bbbe86 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 9a0e768e9ddbc5e4917201fdb864bb2247e5cd90) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 3307edf9e893dd67926dffaac019185b32bbbe86) @@ -110,9 +110,9 @@ [TestCase("validConfigurationStormDurationVariationCoefficient.xml", "Er kan geen variatiecoëfficiënt voor stochast 'stormduur' opgegeven worden.")] [TestCase("validConfigurationFailureProbabilityStructureErosionWithoutStructure.xml", - "Er is geen kunstwerk opgegeven om de faalkans gegeven erosie bodem aan toe te voegen.")] + "Er is geen kunstwerk opgegeven om faalkans gegeven erosie bodem aan toe te voegen.")] [TestCase("validConfigurationOrientationWithoutStructure.xml", - "Er is geen kunstwerk opgegeven om de oriëntatie aan toe te voegen.")] + "Er is geen kunstwerk opgegeven om oriëntatie aan toe te voegen.")] [TestCase("validConfigurationInvalidFailureProbabilityStructureErosion.xml", "Een waarde van '1,1' als faalkans gegeven erosie bodem is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.")] [TestCase("validConfigurationInvalidOrientation.xml", @@ -234,7 +234,7 @@ } [Test] - public void Import_FullCalculationConfigruation_DataAddedToModel() + public void Import_FullCalculationConfiguration_DataAddedToModel() { // Setup string filePath = Path.Combine(importerPath, "validFullConfiguration.xml");