Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs (.../ClosingStructuresCalculationConfigurationExporter.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs (.../ClosingStructuresCalculationConfigurationExporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -46,7 +46,7 @@ /// The path of the XML file to export to. /// Thrown when is null. /// Thrown when is invalid. - public ClosingStructuresCalculationConfigurationExporter(IEnumerable calculations, string filePath) + public ClosingStructuresCalculationConfigurationExporter(IEnumerable calculations, string filePath) : base(calculations, filePath) {} protected override ClosingStructuresCalculationConfiguration ToConfiguration(StructuresCalculation calculation) @@ -57,6 +57,11 @@ HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name }; + if (input.ShouldIllustrationPointsBeCalculated) + { + calculationConfiguration.ShouldIllustrationPointsBeCalculated = input.ShouldIllustrationPointsBeCalculated; + } + if (input.Structure != null) { calculationConfiguration.StructureId = input.Structure.Id; Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -114,6 +114,8 @@ Name = readCalculation.Name }; + SetShouldIllustrationPointsBeCalculated(readCalculation, calculation); + if (TrySetStructure(readCalculation.StructureId, calculation) && TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation) && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation) @@ -469,5 +471,14 @@ return false; } + + private static void SetShouldIllustrationPointsBeCalculated(ClosingStructuresCalculationConfiguration calculationConfiguration, + StructuresCalculation calculation) + { + if (calculationConfiguration.ShouldIllustrationPointsBeCalculated.HasValue) + { + calculation.InputParameters.ShouldIllustrationPointsBeCalculated = calculationConfiguration.ShouldIllustrationPointsBeCalculated.Value; + } + } } } \ No newline at end of file Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs =================================================================== diff -u -rb1fd20384e0835b604bb68d94e16e8ead46ed93e -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision b1fd20384e0835b604bb68d94e16e8ead46ed93e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -120,7 +120,8 @@ WidthFlowApertures = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName), CriticalOvertoppingDischarge = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName), StorageStructureArea = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName), - StormDuration = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StormDurationStochastName) + StormDuration = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StormDurationStochastName), + ShouldIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(ConfigurationSchemaIdentifiers.ShouldIllustrationPointsBeCalculatedElement) }; return configuration; Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd =================================================================== diff -u -rf88343c0590cb04c7135ce141872940e59325927 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd (.../KunstwerkenBetrouwbaarheidSluitenSchema.xsd) (revision f88343c0590cb04c7135ce141872940e59325927) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Resources/KunstwerkenBetrouwbaarheidSluitenSchema.xsd (.../KunstwerkenBetrouwbaarheidSluitenSchema.xsd) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -46,6 +46,7 @@ + Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -re507c88f2863ff7bc93505caf71c5f8025fb48c0 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision e507c88f2863ff7bc93505caf71c5f8025fb48c0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -137,6 +137,7 @@ InflowModelType = ClosingStructureInflowModelType.LowSill, UseBreakWater = true, UseForeshore = true, + ShouldIllustrationPointsBeCalculated = true, BreakWater = { Type = BreakWaterType.Dam, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -r022a409926423d8107a307e28e3a13a8f2a83188 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision 022a409926423d8107a307e28e3a13a8f2a83188) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -405,6 +405,7 @@ ProbabilityOrFrequencyOpenStructureBeforeFlooding = 0.03, FailureProbabilityOpenStructure = 0.22, FailureProbabilityReparation = 0.0006, + ShouldIllustrationPointsBeCalculated = true, UseBreakWater = true, UseForeshore = true, BreakWater = @@ -671,37 +672,6 @@ AssertCalculation(expectedCalculation, (StructuresCalculation) calculationGroup.Children[0]); } - [TestCase("validConfigurationUnknownForeshoreProfile.xml", - "Het voorlandprofiel met ID 'unknown' bestaat niet.")] - [TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml", - "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")] - [TestCase("validConfigurationUnknownStructure.xml", - "Het kunstwerk met ID '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(), - new ClosingStructuresFailureMechanism()); - 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 DoPostImport_CalculationWithStructureInSection_AssignsCalculationToSectionResult() { @@ -746,6 +716,37 @@ Assert.AreSame(calculation, failureMechanism.SectionResults.ElementAt(0).Calculation); } + [TestCase("validConfigurationUnknownForeshoreProfile.xml", + "Het voorlandprofiel met ID 'unknown' bestaat niet.")] + [TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml", + "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")] + [TestCase("validConfigurationUnknownStructure.xml", + "Het kunstwerk met ID '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(), + new ClosingStructuresFailureMechanism()); + 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); + } + private static void AssertCalculation(StructuresCalculation expectedCalculation, StructuresCalculation actualCalculation) { Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); @@ -758,6 +759,7 @@ Assert.AreEqual(expectedCalculation.InputParameters.InflowModelType, actualCalculation.InputParameters.InflowModelType); Assert.AreEqual(expectedCalculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding, actualCalculation.InputParameters.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreSame(expectedCalculation.InputParameters.ForeshoreProfile, actualCalculation.InputParameters.ForeshoreProfile); + Assert.AreEqual(expectedCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, actualCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); Assert.AreSame(expectedCalculation.InputParameters.Structure, actualCalculation.InputParameters.Structure); Assert.AreEqual(expectedCalculation.InputParameters.UseForeshore, actualCalculation.InputParameters.UseForeshore); Assert.AreEqual(expectedCalculation.InputParameters.UseBreakWater, actualCalculation.InputParameters.UseBreakWater); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -256,6 +256,13 @@ yield return new TestCaseData("invalidMultipleUseForeshore.xml", "Element 'voorlandgebruiken' cannot appear more than once if content model type is \"all\".") .SetName("invalidMultipleUseForeshores"); + + yield return new TestCaseData("invalidShouldIllustrationPointsBeCalculatedEmpty.xml", + "The 'illustratiepunteninlezen' element is invalid - The value '' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldIllustrationPointsBeCalculatedEmpty"); + yield return new TestCaseData("invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml", + "The 'illustratiepunteninlezen' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldIllustrationPointsBeCalculatedNoBoolean"); } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs =================================================================== diff -u -r3a60f4df420a7669a047880a924bf4a0ff67c265 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs (.../ClosingStructuresCalculationConfigurationWriterTest.cs) (revision 3a60f4df420a7669a047880a924bf4a0ff67c265) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs (.../ClosingStructuresCalculationConfigurationWriterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -142,6 +142,7 @@ FailureProbabilityOpenStructure = 1e-3, FailureProbabilityReparation = 1e-2, InflowModelType = ConfigurationClosingStructureInflowModelType.LowSill, + ShouldIllustrationPointsBeCalculated = true, WaveReduction = new WaveReductionConfiguration { UseBreakWater = true, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationExporter/completeConfiguration.xml =================================================================== diff -u -r727e2faf5e0db1b34e1506d1e5efaf8434bbf6ca -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 727e2faf5e0db1b34e1506d1e5efaf8434bbf6ca) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -65,5 +65,6 @@ 0.2 + true \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r727e2faf5e0db1b34e1506d1e5efaf8434bbf6ca -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 727e2faf5e0db1b34e1506d1e5efaf8434bbf6ca) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -66,6 +66,7 @@ 0.2 + true Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validFullConfiguration.xml =================================================================== diff -u -r5f489223b4d730eec42acd55533dd012d10dd1ca -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision 5f489223b4d730eec42acd55533dd012d10dd1ca) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationImporter/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -10,6 +10,7 @@ 0.22 0.0006 4 + true verticalewand profiel1 Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml =================================================================== diff -u --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml (revision 0) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + string + + \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -rc0c4d914f97d3471b73898030db0066dced39331 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision c0c4d914f97d3471b73898030db0066dced39331) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -68,5 +68,6 @@ 0.2 + true \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rc0c4d914f97d3471b73898030db0066dced39331 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision c0c4d914f97d3471b73898030db0066dced39331) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/test-data/ClosingStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -69,6 +69,7 @@ 0.2 + true Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs =================================================================== diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs (.../ConfigurationSchemaIdentifiers.cs) (revision 01bd90d4fab9699280c5619754fc55b4f03be08a) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/ConfigurationSchemaIdentifiers.cs (.../ConfigurationSchemaIdentifiers.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -56,6 +56,11 @@ /// public const string Orientation = "orientatie"; + /// + /// The identifier for the illustration point attributes. + /// + public const string ShouldIllustrationPointsBeCalculatedElement = "illustratiepunteninlezen"; + #region Stochasts /// Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs =================================================================== diff -u -r3a60f4df420a7669a047880a924bf4a0ff67c265 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs (.../StructureCalculationConfigurationWriter.cs) (revision 3a60f4df420a7669a047880a924bf4a0ff67c265) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs (.../StructureCalculationConfigurationWriter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -55,6 +55,14 @@ WriteStochasts(configuration, writer); + if (configuration.ShouldIllustrationPointsBeCalculated.HasValue) + { + WriteElementWhenContentAvailable( + writer, + ConfigurationSchemaIdentifiers.ShouldIllustrationPointsBeCalculatedElement, + XmlConvert.ToString(configuration.ShouldIllustrationPointsBeCalculated.Value)); + } + writer.WriteEndElement(); } Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs (.../StructuresCalculationConfiguration.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs (.../StructuresCalculationConfiguration.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -106,6 +106,11 @@ public string ForeshoreProfileId { get; set; } /// + /// Gets or sets if the illustration points should be calculated. + /// + public bool? ShouldIllustrationPointsBeCalculated { get; set; } + + /// /// Gets or sets the name of the calculation. /// /// Thrown when is null. Index: Ringtoets/Common/src/Ringtoets.Common.IO/Resources/KunstwerkenBasisSchema.xsd =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/src/Ringtoets.Common.IO/Resources/KunstwerkenBasisSchema.xsd (.../KunstwerkenBasisSchema.xsd) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Resources/KunstwerkenBasisSchema.xsd (.../KunstwerkenBasisSchema.xsd) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -62,4 +62,10 @@ + + + + + + \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/ConfigurationSchemaIdentifiersTest.cs =================================================================== diff -u -r8ebf5b222f3b052df95f6164ac488a5e7760cf68 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/ConfigurationSchemaIdentifiersTest.cs (.../ConfigurationSchemaIdentifiersTest.cs) (revision 8ebf5b222f3b052df95f6164ac488a5e7760cf68) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/ConfigurationSchemaIdentifiersTest.cs (.../ConfigurationSchemaIdentifiersTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -36,6 +36,7 @@ Assert.AreEqual("naam", ConfigurationSchemaIdentifiers.NameAttribute); Assert.AreEqual("hrlocatie", ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement); Assert.AreEqual("orientatie", ConfigurationSchemaIdentifiers.Orientation); + Assert.AreEqual("illustratiepunteninlezen", ConfigurationSchemaIdentifiers.ShouldIllustrationPointsBeCalculatedElement); Assert.AreEqual("stochasten", ConfigurationSchemaIdentifiers.StochastsElement); Assert.AreEqual("stochast", ConfigurationSchemaIdentifiers.StochastElement); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs =================================================================== diff -u -r3a60f4df420a7669a047880a924bf4a0ff67c265 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs (.../StructureCalculationConfigurationWriterTest.cs) (revision 3a60f4df420a7669a047880a924bf4a0ff67c265) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs (.../StructureCalculationConfigurationWriterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -156,7 +156,8 @@ { Mean = 121.3, StandardDeviation = 222.1 - } + }, + ShouldIllustrationPointsBeCalculated = true }; } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs (.../StructureCalculationConfigurationTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs (.../StructureCalculationConfigurationTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.IO.Configurations; @@ -63,6 +64,7 @@ Assert.IsNull(configuration.WidthFlowApertures); Assert.IsNull(configuration.ForeshoreProfileId); Assert.IsNull(configuration.WaveReduction); + Assert.IsNull(configuration.ShouldIllustrationPointsBeCalculated); } [Test] @@ -79,6 +81,7 @@ var random = new Random(22); double structureNormalOrientation = random.NextDouble(); double failureProbabilityStructureWithErosion = random.NextDouble(); + bool shouldIllustrationPointsBeCalculated = random.NextBoolean(); var modelFactorSuperCriticalFlow = new StochastConfiguration(); var stormDuration = new StochastConfiguration(); @@ -104,6 +107,7 @@ configuration.WidthFlowApertures = widthFlowApertures; configuration.ForeshoreProfileId = foreshoreProfileName; configuration.WaveReduction = waveReduction; + configuration.ShouldIllustrationPointsBeCalculated = shouldIllustrationPointsBeCalculated; // Assert Assert.AreEqual(configurationName, configuration.Name); @@ -120,6 +124,7 @@ Assert.AreSame(widthFlowApertures, configuration.WidthFlowApertures); Assert.AreEqual(foreshoreProfileName, configuration.ForeshoreProfileId); Assert.AreSame(waveReduction, configuration.WaveReduction); + Assert.AreEqual(shouldIllustrationPointsBeCalculated, configuration.ShouldIllustrationPointsBeCalculated); } private class SimpleStructuresCalculationConfiguration : StructuresCalculationConfiguration Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StructureCalculationConfigurationWriter/structureCalculationWithAllParametersSet.xml =================================================================== diff -u -r43b7d2fe7b1c4209fd2afcd985a5c1f4b7bf14e9 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StructureCalculationConfigurationWriter/structureCalculationWithAllParametersSet.xml (.../structureCalculationWithAllParametersSet.xml) (revision 43b7d2fe7b1c4209fd2afcd985a5c1f4b7bf14e9) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StructureCalculationConfigurationWriter/structureCalculationWithAllParametersSet.xml (.../structureCalculationWithAllParametersSet.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -44,5 +44,6 @@ + true \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfiguration.cs =================================================================== diff -u -rfeb209a2803f325821e680336e0726d509c5abde -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfiguration.cs (.../GrassCoverErosionInwardsCalculationConfiguration.cs) (revision feb209a2803f325821e680336e0726d509c5abde) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfiguration.cs (.../GrassCoverErosionInwardsCalculationConfiguration.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -75,8 +75,23 @@ /// cover erosion inwards calculation. /// public ConfigurationHydraulicLoadsCalculationType? OvertoppingRateCalculationType { get; set; } - + /// + /// Gets or sets if the illustration points should be calculated for Overtopping Output. + /// + public bool? ShouldOvertoppingOutputIllustrationPointsBeCalculated { get; set; } + + /// + /// Gets or sets if the illustration points should be calculated for Dike Height. + /// + public bool? ShouldDikeHeightIllustrationPointsBeCalculated { get; set; } + + /// + /// Gets or sets if the illustration points should be calculated for Overtopping Flow. + /// + public bool? ShouldOvertoppingRateIllustrationPointsBeCalculated { get; set; } + + /// /// Gets or sets the wave reduction configuration. /// public WaveReductionConfiguration WaveReduction { get; set; } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporter.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporter.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -62,6 +62,19 @@ configuration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name; + if (input.ShouldOvertoppingOutputIllustrationPointsBeCalculated) + { + configuration.ShouldOvertoppingOutputIllustrationPointsBeCalculated = input.ShouldOvertoppingOutputIllustrationPointsBeCalculated; + } + if (input.ShouldDikeHeightIllustrationPointsBeCalculated) + { + configuration.ShouldDikeHeightIllustrationPointsBeCalculated = input.ShouldDikeHeightIllustrationPointsBeCalculated; + } + if (input.ShouldOvertoppingRateIllustrationPointsBeCalculated) + { + configuration.ShouldOvertoppingRateIllustrationPointsBeCalculated = input.ShouldOvertoppingRateIllustrationPointsBeCalculated; + } + if (input.DikeProfile != null) { configuration.DikeProfileId = input.DikeProfile.Id; Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -r8ebf5b222f3b052df95f6164ac488a5e7760cf68 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision 8ebf5b222f3b052df95f6164ac488a5e7760cf68) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -102,7 +102,7 @@ }; SetDikeHeightCalculationType(calculationConfiguration, calculation); SetOvertoppingRateCalculationType(calculationConfiguration, calculation); - + SetShouldIllustrationPointsBeCalculated(calculationConfiguration, calculation); if (TrySetCriticalFlowRate(calculationConfiguration, calculation) && TrySetHydraulicBoundaryLocation(calculationConfiguration.HydraulicBoundaryLocationName, calculation) && TrySetDikeProfile(calculationConfiguration.DikeProfileId, calculation) @@ -242,6 +242,28 @@ } /// + /// Assigns the properties defining whether the illustration points need to be read for various calculations. + /// + /// The calculation read from the imported file. + /// The calculation to configure. + private static void SetShouldIllustrationPointsBeCalculated(GrassCoverErosionInwardsCalculationConfiguration calculationConfiguration, + GrassCoverErosionInwardsCalculation calculation) + { + if (calculationConfiguration.ShouldOvertoppingOutputIllustrationPointsBeCalculated.HasValue) + { + calculation.InputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated = calculationConfiguration.ShouldOvertoppingOutputIllustrationPointsBeCalculated.Value; + } + if (calculationConfiguration.ShouldDikeHeightIllustrationPointsBeCalculated.HasValue) + { + calculation.InputParameters.ShouldDikeHeightIllustrationPointsBeCalculated = calculationConfiguration.ShouldDikeHeightIllustrationPointsBeCalculated.Value; + } + if (calculationConfiguration.ShouldOvertoppingRateIllustrationPointsBeCalculated.HasValue) + { + calculation.InputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated = calculationConfiguration.ShouldOvertoppingRateIllustrationPointsBeCalculated.Value; + } + } + + /// /// Assigns the critical flow rate. /// /// The calculation read from the imported file. Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -93,7 +93,10 @@ OvertoppingRateCalculationType = (ConfigurationHydraulicLoadsCalculationType?) calculationElement.GetConvertedValueFromDescendantStringElement( GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.OvertoppingRateCalculationTypeElement), WaveReduction = calculationElement.GetWaveReductionParameters(), - CriticalFlowRate = calculationElement.GetStochastConfiguration(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.CriticalFlowRateStochastName) + CriticalFlowRate = calculationElement.GetStochastConfiguration(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.CriticalFlowRateStochastName), + ShouldOvertoppingOutputIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement), + ShouldDikeHeightIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElementElement), + ShouldOvertoppingRateIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateIllustrationPointsBeCalculatedElement) }; return configuration; Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs =================================================================== diff -u -r12ccd3dc7621c2cfc790f71e2b49f7acfdce04e1 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 12ccd3dc7621c2cfc790f71e2b49f7acfdce04e1) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -50,5 +50,20 @@ /// The identifier for the overtopping rate calculation type elements. /// public const string OvertoppingRateCalculationTypeElement = "overslagdebietberekenen"; + + /// + /// The identifier for the overtopping output illustration point elements. + /// + public const string ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement = "illustratiepunteninlezen"; + + /// + /// The identifier for the dike height illustration point elements. + /// + public const string ShouldDikeHeightIllustrationPointsBeCalculatedElementElement = "hbnillustratiepunteninlezen"; + + /// + /// The identifier for the overtopping flow illustration point elements. + /// + public const string ShouldOvertoppingRateIllustrationPointsBeCalculatedElement = "overslagdebietillustratiepunteninlezen"; } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs =================================================================== diff -u -r3a60f4df420a7669a047880a924bf4a0ff67c265 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriter.cs) (revision 3a60f4df420a7669a047880a924bf4a0ff67c265) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -69,6 +69,29 @@ GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightElement, configuration.DikeHeight); + if (configuration.ShouldOvertoppingOutputIllustrationPointsBeCalculated.HasValue) + { + WriteElementWhenContentAvailable( + writer, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement, + XmlConvert.ToString(configuration.ShouldOvertoppingOutputIllustrationPointsBeCalculated.Value)); + } + + if (configuration.ShouldDikeHeightIllustrationPointsBeCalculated.HasValue) + { + WriteElementWhenContentAvailable( + writer, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElementElement, + XmlConvert.ToString(configuration.ShouldDikeHeightIllustrationPointsBeCalculated.Value)); + } + + if (configuration.ShouldOvertoppingRateIllustrationPointsBeCalculated.HasValue) + { + WriteElementWhenContentAvailable( + writer, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateIllustrationPointsBeCalculatedElement, + XmlConvert.ToString(configuration.ShouldOvertoppingRateIllustrationPointsBeCalculated.Value)); + } WriteConfigurationLoadSchematizationTypeWhenAvailable( writer, GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightCalculationTypeElement, Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd =================================================================== diff -u -raeb6e1a439617630e7613b9ed5af152c345fa2c6 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd (.../GEKBConfiguratieSchema.xsd) (revision aeb6e1a439617630e7613b9ed5af152c345fa2c6) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Resources/GEKBConfiguratieSchema.xsd (.../GEKBConfiguratieSchema.xsd) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -36,6 +36,9 @@ + + + @@ -113,4 +116,24 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -rb1fd20384e0835b604bb68d94e16e8ead46ed93e -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision b1fd20384e0835b604bb68d94e16e8ead46ed93e) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationImporterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -561,7 +561,10 @@ { Mean = (RoundedDouble) 2.0, StandardDeviation = (RoundedDouble) 1.1 - } + }, + ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, + ShouldDikeHeightIllustrationPointsBeCalculated = false, + ShouldOvertoppingRateIllustrationPointsBeCalculated = true } }; @@ -625,6 +628,12 @@ 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); + Assert.AreEqual(expectedCalculation.InputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated, + actualCalculation.InputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + Assert.AreEqual(expectedCalculation.InputParameters.ShouldDikeHeightIllustrationPointsBeCalculated, + actualCalculation.InputParameters.ShouldDikeHeightIllustrationPointsBeCalculated); + Assert.AreEqual(expectedCalculation.InputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated, + actualCalculation.InputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated); DistributionAssert.AreEqual(expectedCalculation.InputParameters.CriticalFlowRate, actualCalculation.InputParameters.CriticalFlowRate); } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -169,6 +169,27 @@ yield return new TestCaseData("invalidMultipleStochasts.xml", "Element 'stochasten' cannot appear more than once if content model type is \"all\".") .SetName("invalidMultipleStochasts"); + + yield return new TestCaseData("invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedEmpty.xml", + "The 'illustratiepunteninlezen' element is invalid - The value '' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedEmpty"); + yield return new TestCaseData("invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedNoBoolean.xml", + "The 'illustratiepunteninlezen' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedNoBoolean"); + + yield return new TestCaseData("invalidShouldDikeHeightIllustrationPointsBeCalculatedEmpty.xml", + "The 'hbnillustratiepunteninlezen' element is invalid - The value '' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldDikeHeightIllustrationPointsBeCalculatedEmpty"); + yield return new TestCaseData("invalidShouldDikeHeightIllustrationPointsBeCalculatedNoBoolean.xml", + "The 'hbnillustratiepunteninlezen' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldDikeHeightIllustrationPointsBeCalculatedNoBoolean"); + + yield return new TestCaseData("invalidShouldOvertoppingRateIllustrationPointsBeCalculatedEmpty.xml", + "The 'overslagdebietillustratiepunteninlezen' element is invalid - The value '' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldOvertoppingRateIllustrationPointsBeCalculatedEmpty"); + yield return new TestCaseData("invalidShouldOvertoppingRateIllustrationPointsBeCalculatedNoBoolean.xml", + "The 'overslagdebietillustratiepunteninlezen' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldOvertoppingRateIllustrationPointsBeCalculatedNoBoolean"); } } @@ -328,6 +349,9 @@ Assert.AreEqual(false, calculation.WaveReduction.UseForeshoreProfile); Assert.AreEqual(0.1, calculation.CriticalFlowRate.Mean); Assert.AreEqual(0.2, calculation.CriticalFlowRate.StandardDeviation); + Assert.IsTrue(calculation.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + Assert.IsTrue(calculation.ShouldDikeHeightIllustrationPointsBeCalculated); + Assert.IsFalse(calculation.ShouldOvertoppingRateIllustrationPointsBeCalculated); } [Test] @@ -357,6 +381,9 @@ Assert.AreEqual(3.4, calculation.WaveReduction.BreakWaterHeight); Assert.IsNull(calculation.WaveReduction.UseForeshoreProfile); Assert.IsNull(calculation.CriticalFlowRate); + Assert.IsTrue(calculation.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + Assert.IsNull(calculation.ShouldDikeHeightIllustrationPointsBeCalculated); + Assert.IsNull(calculation.ShouldOvertoppingRateIllustrationPointsBeCalculated); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs =================================================================== diff -u -r237b9031d74382e26141395ff845d5e43f44981d -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 237b9031d74382e26141395ff845d5e43f44981d) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -36,6 +36,9 @@ Assert.AreEqual("dijkhoogte", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightElement); Assert.AreEqual("hbnberekenen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightCalculationTypeElement); Assert.AreEqual("overslagdebietberekenen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.OvertoppingRateCalculationTypeElement); + Assert.AreEqual("illustratiepunteninlezen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement); + Assert.AreEqual("hbnillustratiepunteninlezen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElementElement); + Assert.AreEqual("overslagdebietillustratiepunteninlezen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateIllustrationPointsBeCalculatedElement); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationTest.cs =================================================================== diff -u -r9d03e0c94adad4bcb57a0b7135f8891c255c5f52 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationTest.cs) (revision 9d03e0c94adad4bcb57a0b7135f8891c255c5f52) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -59,6 +59,9 @@ Assert.IsNull(readCalculation.OvertoppingRateCalculationType); Assert.IsNull(readCalculation.WaveReduction); Assert.IsNull(readCalculation.CriticalFlowRate); + Assert.IsNull(readCalculation.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + Assert.IsNull(readCalculation.ShouldDikeHeightIllustrationPointsBeCalculated); + Assert.IsNull(readCalculation.ShouldOvertoppingRateIllustrationPointsBeCalculated); } [Test] @@ -78,6 +81,9 @@ const bool useForeshore = true; const double criticalFlowMean = 4.4; const double critifalFlowStandardDeviation = 5.5; + const bool readOvertoppingOutputIllustrationPoints = true; + const bool readDikeHeightIllustrationPoints = true; + const bool readOvertoppingRateIllustrationPoints = true; // Call var readCalculation = new GrassCoverErosionInwardsCalculationConfiguration(calculationName) @@ -89,6 +95,9 @@ DikeHeight = dikeHeight, DikeHeightCalculationType = dikeHeightCalculationType, OvertoppingRateCalculationType = overtoppingRateCalculationType, + ShouldOvertoppingOutputIllustrationPointsBeCalculated = readOvertoppingOutputIllustrationPoints, + ShouldDikeHeightIllustrationPointsBeCalculated = readDikeHeightIllustrationPoints, + ShouldOvertoppingRateIllustrationPointsBeCalculated = readOvertoppingRateIllustrationPoints, WaveReduction = new WaveReductionConfiguration { UseBreakWater = useBreakWater, @@ -117,6 +126,9 @@ Assert.AreEqual(useForeshore, readCalculation.WaveReduction.UseForeshoreProfile); Assert.AreEqual(criticalFlowMean, readCalculation.CriticalFlowRate.Mean); Assert.AreEqual(critifalFlowStandardDeviation, readCalculation.CriticalFlowRate.StandardDeviation); + Assert.AreEqual(readOvertoppingOutputIllustrationPoints, readCalculation.ShouldOvertoppingOutputIllustrationPointsBeCalculated); + Assert.AreEqual(readDikeHeightIllustrationPoints, readCalculation.ShouldDikeHeightIllustrationPointsBeCalculated); + Assert.AreEqual(readOvertoppingRateIllustrationPoints, readCalculation.ShouldOvertoppingRateIllustrationPointsBeCalculated); } [Test] Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs =================================================================== diff -u -r3a60f4df420a7669a047880a924bf4a0ff67c265 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs) (revision 3a60f4df420a7669a047880a924bf4a0ff67c265) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -180,7 +180,7 @@ // Setup var configuration = new GrassCoverErosionInwardsCalculationConfiguration("fail") { - OvertoppingRateCalculationType= (ConfigurationHydraulicLoadsCalculationType?) 9000 + OvertoppingRateCalculationType = (ConfigurationHydraulicLoadsCalculationType?) 9000 }; var writer = new GrassCoverErosionInwardsCalculationConfigurationWriter("valid"); @@ -206,6 +206,9 @@ DikeHeightCalculationType = ConfigurationHydraulicLoadsCalculationType.NoCalculation, OvertoppingRateCalculationType = ConfigurationHydraulicLoadsCalculationType.CalculateByAssessmentSectionNorm, DikeHeight = 0, + ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, + ShouldDikeHeightIllustrationPointsBeCalculated = false, + ShouldOvertoppingRateIllustrationPointsBeCalculated = true, WaveReduction = new WaveReductionConfiguration { UseForeshoreProfile = true, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationFullCalculation.xml =================================================================== diff -u -rfbb4c794a5fa03fd6a52dc54b0d50a778f4524ae -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision fbb4c794a5fa03fd6a52dc54b0d50a778f4524ae) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationImporter/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -5,6 +5,9 @@ Dijkprofiel ID 5.5 3.45 + true + false + true norm doorsnede Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldDikeHeightIllustrationPointsBeCalculatedEmpty.xml =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldDikeHeightIllustrationPointsBeCalculatedEmpty.xml (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldDikeHeightIllustrationPointsBeCalculatedEmpty.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldDikeHeightIllustrationPointsBeCalculatedNoBoolean.xml =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldDikeHeightIllustrationPointsBeCalculatedNoBoolean.xml (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldDikeHeightIllustrationPointsBeCalculatedNoBoolean.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + string + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedEmpty.xml =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedEmpty.xml (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedEmpty.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedNoBoolean.xml =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedNoBoolean.xml (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingOutputIllustrationPointsBeCalculatedNoBoolean.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + string + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingRateIllustrationPointsBeCalculatedEmpty.xml =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingRateIllustrationPointsBeCalculatedEmpty.xml (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingRateIllustrationPointsBeCalculatedEmpty.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingRateIllustrationPointsBeCalculatedNoBoolean.xml =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingRateIllustrationPointsBeCalculatedNoBoolean.xml (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidShouldOvertoppingRateIllustrationPointsBeCalculatedNoBoolean.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + string + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation.xml =================================================================== diff -u -r58ff4568b9411ceaa7a42f96c5d7ce54f091567f -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision 58ff4568b9411ceaa7a42f96c5d7ce54f091567f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation.xml (.../validConfigurationFullCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -5,6 +5,9 @@ some_dike_profile 67.1 3.45 + true + true + false norm doorsnede Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml =================================================================== diff -u -r58ff4568b9411ceaa7a42f96c5d7ce54f091567f -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (.../validConfigurationFullCalculation_differentOrder.xml) (revision 58ff4568b9411ceaa7a42f96c5d7ce54f091567f) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationFullCalculation_differentOrder.xml (.../validConfigurationFullCalculation_differentOrder.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -8,6 +8,9 @@ 0.1 + true + true + false false 1.234 Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml =================================================================== diff -u -r29b2df4eedf6ea8e303dcccdaa75e985b15c8ad2 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision 29b2df4eedf6ea8e303dcccdaa75e985b15c8ad2) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -3,6 +3,7 @@ id_of_dikeprofile -1.2 + true false 3.4 Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -r4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -5,6 +5,9 @@ id 67.1 0 + true + false + true niet norm Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 4c5ed0f6a4b5f4bbf8a39c6dd6d9d372ee54acfb) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -6,6 +6,9 @@ id 67.1 0 + true + false + true niet norm Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs (.../HeightStructuresCalculationConfigurationExporter.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs (.../HeightStructuresCalculationConfigurationExporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -55,6 +55,11 @@ calculationConfiguration.HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name; + if (input.ShouldIllustrationPointsBeCalculated) + { + calculationConfiguration.ShouldIllustrationPointsBeCalculated = input.ShouldIllustrationPointsBeCalculated; + } + if (input.Structure != null) { calculationConfiguration.StructureId = input.Structure.Id; Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -113,6 +113,8 @@ Name = readCalculation.Name }; + SetShouldIllustrationPointsBeCalculated(readCalculation, calculation); + if (TrySetStructure(readCalculation.StructureId, calculation) && TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation) && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation) @@ -264,5 +266,14 @@ return false; } + + private static void SetShouldIllustrationPointsBeCalculated(HeightStructuresCalculationConfiguration calculationConfiguration, + StructuresCalculation calculation) + { + if (calculationConfiguration.ShouldIllustrationPointsBeCalculated.HasValue) + { + calculation.InputParameters.ShouldIllustrationPointsBeCalculated = calculationConfiguration.ShouldIllustrationPointsBeCalculated.Value; + } + } } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs =================================================================== diff -u -rb1fd20384e0835b604bb68d94e16e8ead46ed93e -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision b1fd20384e0835b604bb68d94e16e8ead46ed93e) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -107,7 +107,8 @@ WidthFlowApertures = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName), CriticalOvertoppingDischarge = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName), StorageStructureArea = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName), - StormDuration = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StormDurationStochastName) + StormDuration = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StormDurationStochastName), + ShouldIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(ConfigurationSchemaIdentifiers.ShouldIllustrationPointsBeCalculatedElement) }; return configuration; Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Resources/KunstwerkenHoogteSchema.xsd =================================================================== diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Resources/KunstwerkenHoogteSchema.xsd (.../KunstwerkenHoogteSchema.xsd) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Resources/KunstwerkenHoogteSchema.xsd (.../KunstwerkenHoogteSchema.xsd) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -38,6 +38,7 @@ + Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -re507c88f2863ff7bc93505caf71c5f8025fb48c0 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationExporterTest.cs (.../HeightStructuresCalculationConfigurationExporterTest.cs) (revision e507c88f2863ff7bc93505caf71c5f8025fb48c0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationExporterTest.cs (.../HeightStructuresCalculationConfigurationExporterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -131,6 +131,7 @@ StructureNormalOrientation = (RoundedDouble) 67.1, UseBreakWater = true, UseForeshore = true, + ShouldIllustrationPointsBeCalculated = true, BreakWater = { Type = BreakWaterType.Dam, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -r44ee3fe251adc2191beb743080ebd4433c12c0e9 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 44ee3fe251adc2191beb743080ebd4433c12c0e9) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -345,6 +345,7 @@ FailureProbabilityStructureWithErosion = 1e-6, UseBreakWater = true, UseForeshore = true, + ShouldIllustrationPointsBeCalculated = true, BreakWater = { Height = (RoundedDouble) 1.23, @@ -562,37 +563,6 @@ AssertCalculation(expectedCalculation, (StructuresCalculation) calculationGroup.Children[0]); } - [TestCase("validConfigurationUnknownForeshoreProfile.xml", - "Het voorlandprofiel met ID 'unknown' bestaat niet.")] - [TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml", - "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")] - [TestCase("validConfigurationUnknownStructure.xml", - "Het kunstwerk met ID '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 HeightStructuresCalculationConfigurationImporter(filePath, - calculationGroup, - Enumerable.Empty(), - Enumerable.Empty(), - Enumerable.Empty(), - new HeightStructuresFailureMechanism()); - 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 DoPostImport_CalculationWithStructureInSection_AssignsCalculationToSectionResult() { @@ -637,6 +607,37 @@ Assert.AreSame(calculation, failureMechanism.SectionResults.ElementAt(0).Calculation); } + [TestCase("validConfigurationUnknownForeshoreProfile.xml", + "Het voorlandprofiel met ID 'unknown' bestaat niet.")] + [TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml", + "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")] + [TestCase("validConfigurationUnknownStructure.xml", + "Het kunstwerk met ID '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 HeightStructuresCalculationConfigurationImporter(filePath, + calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + Enumerable.Empty(), + new HeightStructuresFailureMechanism()); + 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); + } + private static void AssertCalculation(StructuresCalculation expectedCalculation, StructuresCalculation actualCalculation) { Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name); @@ -648,6 +649,7 @@ 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); + Assert.AreEqual(expectedCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, actualCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); DistributionAssert.AreEqual(expectedCalculation.InputParameters.LevelCrestStructure, actualCalculation.InputParameters.LevelCrestStructure); DistributionAssert.AreEqual(expectedCalculation.InputParameters.AllowedLevelIncreaseStorage, actualCalculation.InputParameters.AllowedLevelIncreaseStorage); DistributionAssert.AreEqual(expectedCalculation.InputParameters.FlowWidthAtBottomProtection, actualCalculation.InputParameters.FlowWidthAtBottomProtection); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -182,6 +182,12 @@ yield return new TestCaseData("invalidMultipleUseForeshore.xml", "Element 'voorlandgebruiken' cannot appear more than once if content model type is \"all\".") .SetName("invalidMultipleUseForeshores"); + yield return new TestCaseData("invalidShouldIllustrationPointsBeCalculatedEmpty.xml", + "The 'illustratiepunteninlezen' element is invalid - The value '' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldIllustrationPointsBeCalculatedEmpty"); + yield return new TestCaseData("invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml", + "The 'illustratiepunteninlezen' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldIllustrationPointsBeCalculatedNoBoolean"); } } @@ -244,6 +250,7 @@ Assert.IsNull(calculation.StorageStructureArea); Assert.IsNull(calculation.StormDuration); Assert.IsNull(calculation.WidthFlowApertures); + Assert.IsNull(calculation.ShouldIllustrationPointsBeCalculated); Assert.IsNull(calculation.WaveReduction); } @@ -292,6 +299,7 @@ Assert.AreEqual(1.234, calculation.WaveReduction.BreakWaterHeight); Assert.IsTrue(calculation.WaveReduction.UseBreakWater); Assert.IsTrue(calculation.WaveReduction.UseForeshoreProfile); + Assert.IsTrue(calculation.ShouldIllustrationPointsBeCalculated); } [Test] @@ -336,6 +344,7 @@ Assert.IsTrue(double.IsNegativeInfinity(calculation.WaveReduction.BreakWaterHeight.Value)); Assert.IsNull(calculation.WaveReduction.UseBreakWater); Assert.IsNull(calculation.WaveReduction.UseForeshoreProfile); + Assert.IsNull(calculation.ShouldIllustrationPointsBeCalculated); } [Test] @@ -380,6 +389,7 @@ Assert.IsNaN(calculation.WaveReduction.BreakWaterHeight); Assert.IsNull(calculation.WaveReduction.UseBreakWater); Assert.IsNull(calculation.WaveReduction.UseForeshoreProfile); + Assert.IsNull(calculation.ShouldIllustrationPointsBeCalculated); } [Test] @@ -420,6 +430,7 @@ Assert.IsNull(calculation.WaveReduction.BreakWaterHeight); Assert.IsTrue(calculation.WaveReduction.UseBreakWater); Assert.IsTrue(calculation.WaveReduction.UseForeshoreProfile); + Assert.IsNull(calculation.ShouldIllustrationPointsBeCalculated); } [Test] @@ -461,6 +472,7 @@ Assert.IsNull(calculation.WidthFlowApertures.StandardDeviation); Assert.IsNull(calculation.WaveReduction); + Assert.IsNull(calculation.ShouldIllustrationPointsBeCalculated); } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs =================================================================== diff -u -re507c88f2863ff7bc93505caf71c5f8025fb48c0 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision e507c88f2863ff7bc93505caf71c5f8025fb48c0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -112,6 +112,7 @@ ForeshoreProfileId = "profiel1", FailureProbabilityStructureWithErosion = 1e-6, StructureNormalOrientation = 67.1, + ShouldIllustrationPointsBeCalculated = true, WaveReduction = new WaveReductionConfiguration { UseBreakWater = true, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationExporter/completeConfiguration.xml =================================================================== diff -u -r1de8babc6b4f83b087b767257bc09770e27b5119 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 1de8babc6b4f83b087b767257bc09770e27b5119) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -44,5 +44,6 @@ 0.2 + true \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r1de8babc6b4f83b087b767257bc09770e27b5119 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 1de8babc6b4f83b087b767257bc09770e27b5119) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -45,6 +45,7 @@ 0.2 + true Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationImporter/validFullConfiguration.xml =================================================================== diff -u -r5b07686bb3f89f1fa1017c4bf2cf8964ae9bd95c -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationImporter/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision 5b07686bb3f89f1fa1017c4bf2cf8964ae9bd95c) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationImporter/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -6,6 +6,7 @@ 67.1 1E-6 profiel1 + true true havendam Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml =================================================================== diff -u --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml (revision 0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml =================================================================== diff -u --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml (revision 0) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + string + + \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/validFullConfiguration.xml =================================================================== diff -u -r04a0742040ae09f8839510470014d2b273e67a78 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision 04a0742040ae09f8839510470014d2b273e67a78) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -4,6 +4,7 @@ Locatie1 kunstwerk1 67.1 + true 1E-6 profiel1 Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml =================================================================== diff -u -r04a0742040ae09f8839510470014d2b273e67a78 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml (.../validFullConfiguration_differentOrder.xml) (revision 04a0742040ae09f8839510470014d2b273e67a78) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml (.../validFullConfiguration_differentOrder.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -43,6 +43,7 @@ profiel1 1E-6 + true 67.1 kunstwerk1 Locatie1 Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -rc0c4d914f97d3471b73898030db0066dced39331 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision c0c4d914f97d3471b73898030db0066dced39331) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -46,5 +46,6 @@ 0.2 + true \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rc0c4d914f97d3471b73898030db0066dced39331 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision c0c4d914f97d3471b73898030db0066dced39331) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/test-data/HeightStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -47,6 +47,7 @@ 0.2 + true Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationExporter.cs =================================================================== diff -u -r681fe6f5c04ea2acdb99801dd749a11a174d5b42 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationExporter.cs (.../StabilityPointStructuresCalculationConfigurationExporter.cs) (revision 681fe6f5c04ea2acdb99801dd749a11a174d5b42) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationExporter.cs (.../StabilityPointStructuresCalculationConfigurationExporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -69,6 +69,11 @@ StormDuration = input.StormDuration.ToStochastConfigurationWithMean() }; + if (input.ShouldIllustrationPointsBeCalculated) + { + calculationConfiguration.ShouldIllustrationPointsBeCalculated = input.ShouldIllustrationPointsBeCalculated; + } + SetConfigurationStructureDependendParameters(calculationConfiguration, input); calculationConfiguration.SetConfigurationForeshoreProfileDependendProperties(input); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -118,6 +118,8 @@ Name = readCalculation.Name }; + SetShouldIllustrationPointsBeCalculated(readCalculation, calculation); + if (TrySetStructure(readCalculation.StructureId, calculation) && TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation) && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation) @@ -520,5 +522,14 @@ return false; } + + private static void SetShouldIllustrationPointsBeCalculated(StabilityPointStructuresCalculationConfiguration calculationConfiguration, + StructuresCalculation calculation) + { + if (calculationConfiguration.ShouldIllustrationPointsBeCalculated.HasValue) + { + calculation.InputParameters.ShouldIllustrationPointsBeCalculated = calculationConfiguration.ShouldIllustrationPointsBeCalculated.Value; + } + } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs =================================================================== diff -u -rb1fd20384e0835b604bb68d94e16e8ead46ed93e -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision b1fd20384e0835b604bb68d94e16e8ead46ed93e) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -136,7 +136,8 @@ VerticalDistance = calculationElement.GetDoubleValueFromDescendantElement(StabilityPointStructuresConfigurationSchemaIdentifiers.VerticalDistanceElement), VolumicWeightWater = calculationElement.GetDoubleValueFromDescendantElement(StabilityPointStructuresConfigurationSchemaIdentifiers.VolumicWeightWaterElement), WaveReduction = calculationElement.GetWaveReductionParameters(), - WidthFlowApertures = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName) + WidthFlowApertures = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName), + ShouldIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(ConfigurationSchemaIdentifiers.ShouldIllustrationPointsBeCalculatedElement) }; } } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema.xsd =================================================================== diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema.xsd (.../KunstwerkenConstructiefFalenSchema.xsd) (revision ff948d4633181ead2677ab35467a93b4118c6751) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema.xsd (.../KunstwerkenConstructiefFalenSchema.xsd) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -49,6 +49,7 @@ + Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs =================================================================== diff -u -re507c88f2863ff7bc93505caf71c5f8025fb48c0 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision e507c88f2863ff7bc93505caf71c5f8025fb48c0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -208,6 +208,7 @@ { ForeshoreProfile = new TestForeshoreProfile("profiel1"), Structure = new TestStabilityPointStructure("kunstwerk1", "kunstwerk1"), + ShouldIllustrationPointsBeCalculated = true, AllowedLevelIncreaseStorage = new LogNormalDistribution { Mean = (RoundedDouble) 0.2, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs =================================================================== diff -u -r5f6b3f80bb6747f12157149f7689a8fc7d3552a5 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision 5f6b3f80bb6747f12157149f7689a8fc7d3552a5) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -939,6 +939,7 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation, Structure = structure, ForeshoreProfile = foreshoreProfile, + ShouldIllustrationPointsBeCalculated = true, AllowedLevelIncreaseStorage = { Mean = (RoundedDouble) 0.2, @@ -1101,40 +1102,6 @@ Assert.AreEqual(expectedValue, calculation.InputParameters.ProbabilityCollisionSecondaryStructure); } - [TestCase("validConfigurationUnknownForeshoreProfile.xml", - "Het voorlandprofiel met ID 'unknown' bestaat niet.", - TestName = "Import_UnknownData({0:80})")] - [TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml", - "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.", - TestName = "Import_UnknownData({0:80})")] - [TestCase("validConfigurationUnknownStructure.xml", - "Het kunstwerk met ID 'unknown' bestaat niet.", - TestName = "Import_UnknownData({0:80})")] - public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage) - { - // Setup - string filePath = Path.Combine(importerPath, file); - - var calculationGroup = new CalculationGroup(); - - var importer = new StabilityPointStructuresCalculationConfigurationImporter(filePath, - calculationGroup, - Enumerable.Empty(), - Enumerable.Empty(), - Enumerable.Empty(), - new StabilityPointStructuresFailureMechanism()); - 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 DoPostImport_CalculationWithStructureInSection_AssignsCalculationToSectionResult() { @@ -1179,6 +1146,40 @@ Assert.AreSame(calculation, failureMechanism.SectionResults.ElementAt(0).Calculation); } + [TestCase("validConfigurationUnknownForeshoreProfile.xml", + "Het voorlandprofiel met ID 'unknown' bestaat niet.", + TestName = "Import_UnknownData({0:80})")] + [TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml", + "De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.", + TestName = "Import_UnknownData({0:80})")] + [TestCase("validConfigurationUnknownStructure.xml", + "Het kunstwerk met ID 'unknown' bestaat niet.", + TestName = "Import_UnknownData({0:80})")] + public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage) + { + // Setup + string filePath = Path.Combine(importerPath, file); + + var calculationGroup = new CalculationGroup(); + + var importer = new StabilityPointStructuresCalculationConfigurationImporter(filePath, + calculationGroup, + Enumerable.Empty(), + Enumerable.Empty(), + Enumerable.Empty(), + new StabilityPointStructuresFailureMechanism()); + 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); + } + private static void AssertCalculation(StructuresCalculation expectedCalculation, StructuresCalculation actualCalculation) { @@ -1201,6 +1202,7 @@ Assert.AreEqual(expectedCalculation.InputParameters.StructureNormalOrientation, actualCalculation.InputParameters.StructureNormalOrientation); Assert.AreEqual(expectedCalculation.InputParameters.UseForeshore, actualCalculation.InputParameters.UseForeshore); Assert.AreEqual(expectedCalculation.InputParameters.UseBreakWater, actualCalculation.InputParameters.UseBreakWater); + Assert.AreEqual(expectedCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, actualCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); Assert.AreEqual(expectedCalculation.InputParameters.VerticalDistance, actualCalculation.InputParameters.VerticalDistance); Assert.AreEqual(expectedCalculation.InputParameters.VolumicWeightWater, actualCalculation.InputParameters.VolumicWeightWater); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -331,6 +331,12 @@ yield return new TestCaseData("invalidStochastMultipleVariationCoefficient.xml", "Element 'variatiecoefficient' cannot appear more than once if content model type is \"all\".") .SetName("invalidStochastMultipleVariationCoefficient"); + yield return new TestCaseData("invalidShouldIllustrationPointsBeCalculatedEmpty.xml", + "The 'illustratiepunteninlezen' element is invalid - The value '' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldIllustrationPointsBeCalculatedEmpty"); + yield return new TestCaseData("invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml", + "The 'illustratiepunteninlezen' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'") + .SetName("invalidShouldIllustrationPointsBeCalculatedNoBoolean"); } } @@ -544,6 +550,7 @@ Assert.IsNull(calculation.VerticalDistance); Assert.IsNull(calculation.WidthFlowApertures); Assert.IsNull(calculation.WaveReduction.UseForeshoreProfile); + Assert.IsNull(calculation.ShouldIllustrationPointsBeCalculated); } [Test] Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs =================================================================== diff -u -r3a60f4df420a7669a047880a924bf4a0ff67c265 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs (.../StabilityPointStructuresCalculationConfigurationWriterTest.cs) (revision 3a60f4df420a7669a047880a924bf4a0ff67c265) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs (.../StabilityPointStructuresCalculationConfigurationWriterTest.cs) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -22,7 +22,6 @@ using System; using System.Collections.Generic; using System.IO; -using Core.Common.Base.IO; using Core.Common.IO.Exceptions; using Core.Common.TestUtil; using NUnit.Framework; @@ -240,6 +239,7 @@ Mean = 0.15, VariationCoefficient = 0.25 }, + ShouldIllustrationPointsBeCalculated = true, StabilityLinearLoadModel = new StochastConfiguration { Mean = 0.16, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/completeConfiguration.xml =================================================================== diff -u -r1ce041a490caba4dc2290b6b23c4170ab07b2a12 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 1ce041a490caba4dc2290b6b23c4170ab07b2a12) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -107,5 +107,6 @@ 0.1 + true \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r1ce041a490caba4dc2290b6b23c4170ab07b2a12 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 1ce041a490caba4dc2290b6b23c4170ab07b2a12) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -108,6 +108,7 @@ 0.1 + true Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validFullConfiguration.xml =================================================================== diff -u -r1ce041a490caba4dc2290b6b23c4170ab07b2a12 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision 1ce041a490caba4dc2290b6b23c4170ab07b2a12) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -14,6 +14,7 @@ 1 1E-05 0.0001 + true profiel1 true Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedEmpty.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml =================================================================== diff -u --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml (revision 0) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -0,0 +1,6 @@ + + + + string + + \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration.xml =================================================================== diff -u -r1ce041a490caba4dc2290b6b23c4170ab07b2a12 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision 1ce041a490caba4dc2290b6b23c4170ab07b2a12) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration.xml (.../validFullConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -14,6 +14,7 @@ 1 1E-05 0.0001 + true profiel1 true Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml =================================================================== diff -u -r1ce041a490caba4dc2290b6b23c4170ab07b2a12 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml (.../validFullConfiguration_differentOrder.xml) (revision 1ce041a490caba4dc2290b6b23c4170ab07b2a12) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder.xml (.../validFullConfiguration_differentOrder.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -4,6 +4,7 @@ Locatie1 kunstwerk1 7 + true 0.0001 profiel1 0.1 Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -r1ce041a490caba4dc2290b6b23c4170ab07b2a12 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 1ce041a490caba4dc2290b6b23c4170ab07b2a12) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -111,5 +111,6 @@ 0.3 + true \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -r1ce041a490caba4dc2290b6b23c4170ab07b2a12 -ref881721312166028ed88eaa21dfd1ee8a5cbba4 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 1ce041a490caba4dc2290b6b23c4170ab07b2a12) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision ef881721312166028ed88eaa21dfd1ee8a5cbba4) @@ -112,6 +112,7 @@ 0.3 + true