Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporter.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporter.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporter.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporter.cs) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -27,7 +27,6 @@ using Riskeer.Common.IO.Configurations.Export; using Riskeer.Common.IO.Configurations.Helpers; using Riskeer.GrassCoverErosionInwards.Data; -using Riskeer.GrassCoverErosionInwards.IO.Configurations.Helpers; namespace Riskeer.GrassCoverErosionInwards.IO.Configurations { @@ -56,11 +55,15 @@ var configuration = new GrassCoverErosionInwardsCalculationConfiguration(calculation.Name) { HydraulicBoundaryLocationName = input.HydraulicBoundaryLocation?.Name, + CriticalFlowRate = input.CriticalFlowRate.ToStochastConfiguration(), + Scenario = calculation.ToScenarioConfiguration(), ShouldOvertoppingOutputIllustrationPointsBeCalculated = input.ShouldOvertoppingOutputIllustrationPointsBeCalculated, + ShouldDikeHeightBeCalculated = input.ShouldDikeHeightBeCalculated, + DikeHeightTargetProbability = input.DikeHeightTargetProbability, ShouldDikeHeightIllustrationPointsBeCalculated = input.ShouldDikeHeightIllustrationPointsBeCalculated, - ShouldOvertoppingRateIllustrationPointsBeCalculated = input.ShouldOvertoppingRateIllustrationPointsBeCalculated, - CriticalFlowRate = input.CriticalFlowRate.ToStochastConfiguration(), - Scenario = calculation.ToScenarioConfiguration() + ShouldOvertoppingRateBeCalculated = input.ShouldOvertoppingRateBeCalculated, + OvertoppingRateTargetProbability = input.OvertoppingRateTargetProbability, + ShouldOvertoppingRateIllustrationPointsBeCalculated = input.ShouldOvertoppingRateIllustrationPointsBeCalculated }; if (input.DikeProfile != null) @@ -83,18 +86,6 @@ } } - if (Enum.IsDefined(typeof(DikeHeightCalculationType), input.DikeHeightCalculationType)) - { - configuration.DikeHeightCalculationType = (ConfigurationHydraulicLoadsCalculationType?) - new ConfigurationHydraulicLoadsCalculationTypeConverter().ConvertFrom(input.DikeHeightCalculationType); - } - - if (Enum.IsDefined(typeof(OvertoppingRateCalculationType), input.OvertoppingRateCalculationType)) - { - configuration.OvertoppingRateCalculationType = (ConfigurationHydraulicLoadsCalculationType?) - new ConfigurationHydraulicLoadsCalculationTypeConverter().ConvertFrom(input.OvertoppingRateCalculationType); - } - return configuration; } } Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationReader.cs (.../GrassCoverErosionInwardsCalculationConfigurationReader.cs) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -121,13 +121,13 @@ Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation), DikeHeight = calculationElement.GetDoubleValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightElement), DikeHeightCalculationType = (ConfigurationHydraulicLoadsCalculationType?) calculationElement.GetConvertedValueFromDescendantStringElement( - GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightCalculationTypeElement), + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightBeCalculatedElement), OvertoppingRateCalculationType = (ConfigurationHydraulicLoadsCalculationType?) calculationElement.GetConvertedValueFromDescendantStringElement( - GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.OvertoppingRateCalculationTypeElement), + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateBeCalculatedElement), WaveReduction = calculationElement.GetWaveReductionParameters(), CriticalFlowRate = calculationElement.GetStochastConfiguration(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.CriticalFlowRateStochastName), ShouldOvertoppingOutputIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement), - ShouldDikeHeightIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElementElement), + ShouldDikeHeightIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElement), ShouldOvertoppingRateIllustrationPointsBeCalculated = calculationElement.GetBoolValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateIllustrationPointsBeCalculatedElement), Scenario = calculationElement.GetScenarioConfiguration() }; Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.cs) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -42,26 +42,36 @@ public const string DikeHeightElement = "dijkhoogte"; /// - /// The identifier for the dike height calculation type elements. + /// The tag of the element containing the value whether illustration points should be read for the overtopping calculation. /// - public const string DikeHeightCalculationTypeElement = "hbnberekenen"; + public const string ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement = "illustratiepunteninlezen"; /// - /// The identifier for the overtopping rate calculation type elements. + /// The tag of the element containing the value whether dike height should be calculated. /// - public const string OvertoppingRateCalculationTypeElement = "overslagdebietberekenen"; + public const string ShouldDikeHeightBeCalculatedElement = "hbnberekenen"; /// - /// The tag of the element containing the value whether illustration points should be read for the overtopping calculation. + /// The tag of the element containing the value of the dike height target probability. /// - public const string ShouldOvertoppingOutputIllustrationPointsBeCalculatedElement = "illustratiepunteninlezen"; + public const string DikeHeightTargetProbability = "hbndoelkans"; /// /// The tag of the element containing the value whether illustration points should be read for the dike height calculation. /// - public const string ShouldDikeHeightIllustrationPointsBeCalculatedElementElement = "hbnillustratiepunteninlezen"; + public const string ShouldDikeHeightIllustrationPointsBeCalculatedElement = "hbnillustratiepunteninlezen"; /// + /// The tag of the element containing the value whether overtopping rate should be calculated. + /// + public const string ShouldOvertoppingRateBeCalculatedElement = "overslagdebietberekenen"; + + /// + /// The tag of the element containing the value of the overtopping rate target probability. + /// + public const string OvertoppingRateTargetProbability = "overslagdebietdoelkans"; + + /// /// The tag of the element containing the value whether illustration points should be read for the overtopping rate calculation. /// public const string ShouldOvertoppingRateIllustrationPointsBeCalculatedElement = "overslagdebietillustratiepunteninlezen"; Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriter.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.IO/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriter.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriter.cs) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -23,7 +23,6 @@ using System.Xml; using Riskeer.Common.IO.Configurations; using Riskeer.Common.IO.Configurations.Export; -using Riskeer.GrassCoverErosionInwards.IO.Configurations.Helpers; namespace Riskeer.GrassCoverErosionInwards.IO.Configurations { @@ -89,14 +88,46 @@ XmlConvert.ToString(configuration.ShouldOvertoppingOutputIllustrationPointsBeCalculated.Value)); } + if (configuration.ShouldDikeHeightBeCalculated.HasValue) + { + WriteElementWhenContentAvailable( + writer, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightBeCalculatedElement, + XmlConvert.ToString(configuration.ShouldDikeHeightBeCalculated.Value)); + } + + if (configuration.DikeHeightTargetProbability.HasValue) + { + WriteElementWhenContentAvailable( + writer, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightTargetProbability, + XmlConvert.ToString(configuration.DikeHeightTargetProbability.Value)); + } + if (configuration.ShouldDikeHeightIllustrationPointsBeCalculated.HasValue) { WriteElementWhenContentAvailable( writer, - GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElementElement, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElement, XmlConvert.ToString(configuration.ShouldDikeHeightIllustrationPointsBeCalculated.Value)); } + if (configuration.ShouldOvertoppingRateBeCalculated.HasValue) + { + WriteElementWhenContentAvailable( + writer, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateBeCalculatedElement, + XmlConvert.ToString(configuration.ShouldOvertoppingRateBeCalculated.Value)); + } + + if (configuration.OvertoppingRateTargetProbability.HasValue) + { + WriteElementWhenContentAvailable( + writer, + GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.OvertoppingRateTargetProbability, + XmlConvert.ToString(configuration.OvertoppingRateTargetProbability.Value)); + } + if (configuration.ShouldOvertoppingRateIllustrationPointsBeCalculated.HasValue) { WriteElementWhenContentAvailable( @@ -105,16 +136,6 @@ XmlConvert.ToString(configuration.ShouldOvertoppingRateIllustrationPointsBeCalculated.Value)); } - WriteConfigurationLoadSchematizationTypeWhenAvailable( - writer, - GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightCalculationTypeElement, - configuration.DikeHeightCalculationType); - - WriteConfigurationLoadSchematizationTypeWhenAvailable( - writer, - GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.OvertoppingRateCalculationTypeElement, - configuration.OvertoppingRateCalculationType); - WriteWaveReductionWhenAvailable(writer, configuration.WaveReduction); writer.WriteStartElement(ConfigurationSchemaIdentifiers.StochastsElement); @@ -128,30 +149,5 @@ WriteScenarioWhenAvailable(writer, configuration.Scenario); } - - /// - /// Writes the in XML format to file. - /// - /// The writer to use for writing. - /// The XML element name. - /// The calculation type to write. - /// Thrown when the - /// is closed. - /// Thrown when the conversion of - /// cannot be performed. - private static void WriteConfigurationLoadSchematizationTypeWhenAvailable( - XmlWriter writer, - string elementName, - ConfigurationHydraulicLoadsCalculationType? calculationType) - { - if (!calculationType.HasValue) - { - return; - } - - var converter = new ConfigurationHydraulicLoadsCalculationTypeConverter(); - writer.WriteElementString(elementName, - converter.ConvertToInvariantString(calculationType.Value)); - } } } \ No newline at end of file Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r5a7d12426493f37ca9a8f5be5899ea7ab281ce2a -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs) (revision 5a7d12426493f37ca9a8f5be5899ea7ab281ce2a) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationExporterTest.cs) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -109,7 +109,10 @@ Id = "Dijkprofiel ID", Name = "Dijkprofiel", DikeHeight = 3.45 - }) + }), + ShouldDikeHeightBeCalculated = true, + DikeHeightTargetProbability = 0.01, + OvertoppingRateTargetProbability = 0.02 } }; } Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiersTest.cs) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -34,10 +34,12 @@ Assert.AreEqual("dijkprofiel", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeProfileElement); Assert.AreEqual("overslagdebiet", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.CriticalFlowRateStochastName); 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("hbnberekenen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightBeCalculatedElement); + Assert.AreEqual("hbndoelkans", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeHeightTargetProbability); + Assert.AreEqual("hbnillustratiepunteninlezen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldDikeHeightIllustrationPointsBeCalculatedElement); + Assert.AreEqual("overslagdebietberekenen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateBeCalculatedElement); + Assert.AreEqual("overslagdebietdoelkans", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.OvertoppingRateTargetProbability); Assert.AreEqual("overslagdebietillustratiepunteninlezen", GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.ShouldOvertoppingRateIllustrationPointsBeCalculatedElement); } } Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/Configurations/GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs (.../GrassCoverErosionInwardsCalculationConfigurationWriterTest.cs) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -19,9 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.ComponentModel; using System.IO; -using Core.Common.IO.Exceptions; using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.IO.Configurations; @@ -152,65 +150,21 @@ } } - [Test] - public void Write_InvalidDikeHeightCalculationType_ThrowsCriticalFileWriteException() - { - // Setup - var configuration = new GrassCoverErosionInwardsCalculationConfiguration("fail") - { - DikeHeightCalculationType = (ConfigurationHydraulicLoadsCalculationType?) 9000 - }; - - var writer = new GrassCoverErosionInwardsCalculationConfigurationWriter("valid"); - - // Call - void Call() => - writer.Write(new[] - { - configuration - }); - - // Assert - var exception = Assert.Throws(Call); - Assert.IsInstanceOf(exception.InnerException); - } - - [Test] - public void Write_InvalidOvertoppingRateCalculationType_ThrowsCriticalFileWriteException() - { - // Setup - var configuration = new GrassCoverErosionInwardsCalculationConfiguration("fail") - { - OvertoppingRateCalculationType = (ConfigurationHydraulicLoadsCalculationType?) 9000 - }; - - var writer = new GrassCoverErosionInwardsCalculationConfigurationWriter("valid"); - - // Call - void Call() => - writer.Write(new[] - { - configuration - }); - - // Assert - var exception = Assert.Throws(Call); - Assert.IsInstanceOf(exception.InnerException); - } - private static GrassCoverErosionInwardsCalculationConfiguration CreateCompleteCalculation() { return new GrassCoverErosionInwardsCalculationConfiguration("Berekening 1") { HydraulicBoundaryLocationName = "Locatie1", DikeProfileId = "id", Orientation = 67.1, - DikeHeightCalculationType = ConfigurationHydraulicLoadsCalculationType.NoCalculation, - OvertoppingRateCalculationType = ConfigurationHydraulicLoadsCalculationType.CalculateByAssessmentSectionNorm, DikeHeight = 0, - ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, - ShouldDikeHeightIllustrationPointsBeCalculated = false, ShouldOvertoppingRateIllustrationPointsBeCalculated = true, + ShouldDikeHeightBeCalculated = false, + DikeHeightTargetProbability = 0.001, + ShouldDikeHeightIllustrationPointsBeCalculated = false, + ShouldOvertoppingRateBeCalculated = true, + OvertoppingRateTargetProbability = 0.02, + ShouldOvertoppingOutputIllustrationPointsBeCalculated = true, WaveReduction = new WaveReductionConfiguration { UseForeshoreProfile = true, Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/calculationScenarioIrrelevant.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/calculationScenarioIrrelevant.xml (.../calculationScenarioIrrelevant.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/calculationScenarioIrrelevant.xml (.../calculationScenarioIrrelevant.xml) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -2,10 +2,12 @@ false + false + 0 false + false + 0 false - niet - niet 0.004 Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/completeConfiguration.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -6,10 +6,12 @@ 0 3.45 false + true + 0.01 false + false + 0.02 false - niet - niet true caisson Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -4,10 +4,12 @@ Location1 false + false + 0 false + false + 0 false - niet - niet 0.004 @@ -22,10 +24,12 @@ false + false + 0 false + false + 0 false - niet - niet 0.004 Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/sparseConfiguration.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/sparseConfiguration.xml (.../sparseConfiguration.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationExporter/sparseConfiguration.xml (.../sparseConfiguration.xml) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -2,10 +2,12 @@ false + false + 0 false + false + 0 false - niet - niet 0.004 Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/completeConfiguration.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/completeConfiguration.xml (.../completeConfiguration.xml) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -6,10 +6,12 @@ 67.1 0 true + false + 0.001 false + true + 0.02 true - niet - norm true caisson Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml =================================================================== diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -r056f34843af6c742d4a74e9a6941dda820c94951 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision 056f34843af6c742d4a74e9a6941dda820c94951) @@ -7,10 +7,12 @@ 67.1 0 true + false + 0.001 false + true + 0.02 true - niet - norm true caisson