Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs =================================================================== diff -u -r2539713cb27674daed011f260add32abcaddb958 -r0e7a8b96cacaabb259e60bee2bf1c2b263492991 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs (.../MacroStabilityInwardsCalculationConfigurationReader.cs) (revision 2539713cb27674daed011f260add32abcaddb958) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs (.../MacroStabilityInwardsCalculationConfigurationReader.cs) (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -82,8 +82,7 @@ var configuration = new MacroStabilityInwardsCalculationConfiguration( calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value) { - AssessmentLevel = calculationElement.GetDoubleValueFromDescendantElement( - MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement), + AssessmentLevel = GetWaterLevel(calculationElement), HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement( ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementOld), SurfaceLineName = calculationElement.GetStringValueFromDescendantElement( @@ -131,6 +130,12 @@ return configuration; } + private static double? GetWaterLevel(XElement calculationElement) + { + return calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelElement) + ?? calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement); + } + /// /// Sets the minimum level phreatic line related properties to . /// Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs =================================================================== diff -u -re39e5eb381bc6b71f5aa713a3094ae2a8def6013 -r0e7a8b96cacaabb259e60bee2bf1c2b263492991 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision e39e5eb381bc6b71f5aa713a3094ae2a8def6013) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -124,10 +124,12 @@ } [Test] - public void Read_ValidConfigurationWithCalculationContainingNaNs_ReturnExpectedReadMacroStabilityInwardsCalculation() + [TestCase("validConfigurationCalculationContainingAssessmentLevelAndNaNs")] + [TestCase("validConfigurationCalculationContainingWaterLevelAndNaNs")] + public void Read_ValidConfigurationWithCalculationContainingNaNs_ReturnExpectedReadMacroStabilityInwardsCalculation(string fileName) { // Setup - string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContainingNaNs.xml"); + string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml"); var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call @@ -176,10 +178,12 @@ } [Test] - public void Read_ValidConfigurationWithCalculationContainingInfinities_ReturnExpectedReadMacroStabilityInwardsCalculation() + [TestCase("validConfigurationCalculationContainingAssessmentLevelAndInfinities")] + [TestCase("validConfigurationCalculationContainingWaterLevelAndInfinities")] + public void Read_ValidConfigurationWithCalculationContainingInfinities_ReturnExpectedReadMacroStabilityInwardsCalculation(string fileName) { // Setup - string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContainingInfinities.xml"); + string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml"); var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call @@ -335,14 +339,14 @@ } [Test] - [TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml", - TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnCalculation(AssessmentLevel)")] - [TestCase("validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml", - TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnCalculation(AssessmentLevel_differentOrder)")] + [TestCase("validConfigurationFullCalculationContainingAssessmentLevel")] + [TestCase("validConfigurationFullCalculationContainingWaterLevel")] + [TestCase("validConfigurationFullCalculationContainingAssessmentLevel_differentOrder")] + [TestCase("validConfigurationFullCalculationContainingWaterLevel_differentOrder")] public void Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnExpectedReadMacroStabilityInwardsCalculation(string fileName) { // Setup - string filePath = Path.Combine(testDirectoryPath, fileName); + string filePath = Path.Combine(testDirectoryPath, $"{fileName}.xml"); var reader = new MacroStabilityInwardsCalculationConfigurationReader(filePath); // Call @@ -451,7 +455,7 @@ var configuration = (MacroStabilityInwardsCalculationConfiguration) readConfigurationItems.Single(); Assert.AreEqual("Calculation", configuration.Name); - Assert.AreEqual(1.1, configuration.AssessmentLevel); + Assert.IsNull(configuration.AssessmentLevel); Assert.IsNull(configuration.HydraulicBoundaryLocationName); Assert.IsNull(configuration.SurfaceLineName); Assert.IsNull(configuration.StochasticSoilModelName); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndInfinities.xml (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -0,0 +1,78 @@ + + + + -INF + + INF + + INF + INF + + + INF + INF + + + INF + INF + + + INF + INF + + + INF + INF + + + INF + + true + INF + INF + INF + INF + + + + INF + INF + + INF + INF + INF + INF + + + + INF + INF + INF + + + + INF + INF + + + INF + INF + INF + INF + 0 + 0 + + + -INF + -INF + -INF + -INF + 0 + 0 + + + + INF + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingAssessmentLevelAndNaNs.xml (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -0,0 +1,78 @@ + + + + NaN + + NaN + + NaN + NaN + + + NaN + NaN + + + NaN + NaN + + + NaN + NaN + + + NaN + NaN + + + NaN + + true + NaN + NaN + NaN + NaN + + + + NaN + NaN + + NaN + NaN + NaN + NaN + + + + NaN + NaN + NaN + + + + NaN + NaN + + + NaN + NaN + NaN + NaN + 0 + 0 + + + NaN + NaN + NaN + NaN + 0 + 0 + + + + NaN + + + \ No newline at end of file Fisheye: Tag 0e7a8b96cacaabb259e60bee2bf1c2b263492991 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingInfinities.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0e7a8b96cacaabb259e60bee2bf1c2b263492991 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingNaNs.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndInfinities.xml (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -0,0 +1,78 @@ + + + + -INF + + INF + + INF + INF + + + INF + INF + + + INF + INF + + + INF + INF + + + INF + INF + + + INF + + true + INF + INF + INF + INF + + + + INF + INF + + INF + INF + INF + INF + + + + INF + INF + INF + + + + INF + INF + + + INF + INF + INF + INF + 0 + 0 + + + -INF + -INF + -INF + -INF + 0 + 0 + + + + INF + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationCalculationContainingWaterLevelAndNaNs.xml (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -0,0 +1,78 @@ + + + + NaN + + NaN + + NaN + NaN + + + NaN + NaN + + + NaN + NaN + + + NaN + NaN + + + NaN + NaN + + + NaN + + true + NaN + NaN + NaN + NaN + + + + NaN + NaN + + NaN + NaN + NaN + NaN + + + + NaN + NaN + NaN + + + + NaN + NaN + + + NaN + NaN + NaN + NaN + 0 + 0 + + + NaN + NaN + NaN + NaN + 0 + 0 + + + + NaN + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel.xml (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -0,0 +1,95 @@ + + + + 1.1 + Profielschematisatie + Ondergrondmodel + Ondergrondschematisatie + zanddijkopklei + + 10.5 + + true + 10.6 + 10.7 + + + 10.8 + 10.9 + + true + + 10.1 + 10.2 + + + 10.3 + 10.4 + + + 20.1 + 20.2 + + + 2.2 + + true + 2.21 + 2.22 + 2.23 + 2.24 + + + + 15.2 + 16.2 + + false + 15.21 + 15.22 + 15.23 + 15.24 + + + + 0.4 + 0.5 + 0.6 + + true + handmatig + 10 + 43.5 + + + true + automatisch + + laagscheiding + 10 + 1 + 5 + + + NaN + NaN + NaN + NaN + 6 + 5 + + + 1 + 2 + 4 + 3 + 5 + 6 + + + + false + 8.8 + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingWaterLevel_differentOrder.xml (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -0,0 +1,95 @@ + + + + Ondergrondschematisatie + Ondergrondmodel + + false + 8.8 + + + + 1 + 2 + 4 + 3 + 5 + 6 + + true + automatisch + + NaN + NaN + NaN + NaN + 6 + 5 + + + 5 + laagscheiding + 10 + 1 + + + zanddijkopklei + + + 15.2 + 16.2 + + false + 15.21 + 15.22 + 15.23 + 15.24 + + + 10.5 + true + + + true + 2.21 + 2.22 + 2.23 + 2.24 + + 2.2 + + + 10.8 + 10.9 + + + 20.1 + 20.2 + + + 10.3 + 10.4 + + + 10.1 + 10.2 + + + 10.7 + true + 10.6 + + + 0.6 + 0.4 + 0.5 + + true + handmatig + 10 + 43.5 + + Profielschematisatie + 1.1 + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml =================================================================== diff -u -r578d9ed2cd2330f233659f25ff91910533cabf39 -r0e7a8b96cacaabb259e60bee2bf1c2b263492991 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision 578d9ed2cd2330f233659f25ff91910533cabf39) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationPartialCalculation.xml (.../validConfigurationPartialCalculation.xml) (revision 0e7a8b96cacaabb259e60bee2bf1c2b263492991) @@ -1,7 +1,6 @@ - 1.1 Ondergrondschematisatie kleidijkopklei