Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs =================================================================== diff -u -r286830ea09ca418fba6b5c26f2e52c71f6dd56bd -rfde9fb747c4afe9b3c32a80e1efeef24b535decd --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 286830ea09ca418fba6b5c26f2e52c71f6dd56bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision fde9fb747c4afe9b3c32a80e1efeef24b535decd) @@ -282,9 +282,7 @@ { if (!UseAssessmentLevelManualInput) { - return HydraulicBoundaryLocation != null - ? HydraulicBoundaryLocation.DesignWaterLevel - : new RoundedDouble(2, double.NaN); + return HydraulicBoundaryLocation?.DesignWaterLevel ?? new RoundedDouble(2, double.NaN); } return assessmentLevel; Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs =================================================================== diff -u -r71b9d1d4d523116119303de98fdd896ed67af9e7 -rfde9fb747c4afe9b3c32a80e1efeef24b535decd --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision 71b9d1d4d523116119303de98fdd896ed67af9e7) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision fde9fb747c4afe9b3c32a80e1efeef24b535decd) @@ -152,15 +152,24 @@ pipingCalculation.InputParameters.HydraulicBoundaryLocation = location; } else - { + { log.Warn("Hydraulische randvoorwaarde locatie bestaat niet. Berekening overgeslagen."); return; } } + else + { + if (readCalculation.AssessmentLevel.HasValue) + { + pipingCalculation.InputParameters.UseAssessmentLevelManualInput = true; + pipingCalculation.InputParameters.AssessmentLevel = (RoundedDouble) readCalculation.AssessmentLevel.Value; + } + } if (readCalculation.SurfaceLine != null) { - RingtoetsPipingSurfaceLine surfaceLine = failureMechanism.SurfaceLines.FirstOrDefault(sl => sl.Name == readCalculation.SurfaceLine); + RingtoetsPipingSurfaceLine surfaceLine = failureMechanism.SurfaceLines + .FirstOrDefault(sl => sl.Name == readCalculation.SurfaceLine); if (surfaceLine != null) { @@ -185,15 +194,17 @@ if (readCalculation.StochasticSoilModel != null) { - StochasticSoilModel soilModel = failureMechanism.StochasticSoilModels.FirstOrDefault(ssm => ssm.Name == readCalculation.StochasticSoilModel); + StochasticSoilModel soilModel = failureMechanism.StochasticSoilModels + .FirstOrDefault(ssm => ssm.Name == readCalculation.StochasticSoilModel); if (soilModel != null) { pipingCalculation.InputParameters.StochasticSoilModel = soilModel; if (readCalculation.StochasticSoilProfile != null) { - StochasticSoilProfile soilProfile = soilModel.StochasticSoilProfiles.FirstOrDefault(ssp => ssp.SoilProfile.Name == readCalculation.StochasticSoilProfile); + StochasticSoilProfile soilProfile = soilModel.StochasticSoilProfiles + .FirstOrDefault(ssp => ssp.SoilProfile.Name == readCalculation.StochasticSoilProfile); if (soilProfile != null) { Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs =================================================================== diff -u -r71b9d1d4d523116119303de98fdd896ed67af9e7 -rfde9fb747c4afe9b3c32a80e1efeef24b535decd --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision 71b9d1d4d523116119303de98fdd896ed67af9e7) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision fde9fb747c4afe9b3c32a80e1efeef24b535decd) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.IO; using System.Linq; using Core.Common.Base.Geometry; @@ -29,6 +30,7 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Piping.Data; +using Ringtoets.Piping.Integration.TestUtils; using Ringtoets.Piping.IO.Importers; using Ringtoets.Piping.Primitives; @@ -333,10 +335,12 @@ } [Test] - public void Import_ValidData_DataAddedToModel() + [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml", false)] + [TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml", true)] + public void Import_ValidData_DataAddedToModel(string file, bool manualAssessmentLevel) { // Setup - string filePath = Path.Combine(path, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml"); + string filePath = Path.Combine(path, file); var calculationGroup = new CalculationGroup(); var surfaceLine = new RingtoetsPipingSurfaceLine @@ -347,7 +351,7 @@ { new Point3D(3.5, 2.3, 8.0), new Point3D(6.9, 2.0, 2.0) - }); + }); var stochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 1) { SoilProfile = new PipingSoilProfile("Ondergrondschematisatie", 0, new[] @@ -387,10 +391,18 @@ PipingCalculation calculation = calculationGroup.Children[0] as PipingCalculation; Assert.AreEqual("Calculation", calculation.Name); - Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation); + Assert.AreEqual(manualAssessmentLevel, calculation.InputParameters.UseAssessmentLevelManualInput); + if (manualAssessmentLevel) + { + Assert.AreEqual(1.1, calculation.InputParameters.AssessmentLevel.Value); + } + else + { + Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation); + } Assert.AreSame(surfaceLine, calculation.InputParameters.SurfaceLine); - Assert.AreEqual(1.1, calculation.InputParameters.EntryPointL.Value); - Assert.AreEqual(2.2, calculation.InputParameters.ExitPointL.Value); + Assert.AreEqual(2.2, calculation.InputParameters.EntryPointL.Value); + Assert.AreEqual(3.3, calculation.InputParameters.ExitPointL.Value); Assert.AreSame(stochasticSoilModel, calculation.InputParameters.StochasticSoilModel); Assert.AreSame(stochasticSoilProfile, calculation.InputParameters.StochasticSoilProfile); } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs =================================================================== diff -u -rf01130d610fadc513e82f78093100fdd55c4b173 -rfde9fb747c4afe9b3c32a80e1efeef24b535decd --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision f01130d610fadc513e82f78093100fdd55c4b173) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingConfigurationReaderTest.cs (.../PipingConfigurationReaderTest.cs) (revision fde9fb747c4afe9b3c32a80e1efeef24b535decd) @@ -466,14 +466,14 @@ Assert.IsNull(calculation.AssessmentLevel); Assert.AreEqual("HRlocatie", calculation.HydraulicBoundaryLocation); Assert.AreEqual("Profielschematisatie", calculation.SurfaceLine); - Assert.AreEqual(1.1, calculation.EntryPointL); - Assert.AreEqual(2.2, calculation.ExitPointL); + Assert.AreEqual(2.2, calculation.EntryPointL); + Assert.AreEqual(3.3, calculation.ExitPointL); Assert.AreEqual("Ondergrondmodel", calculation.StochasticSoilModel); Assert.AreEqual("Ondergrondschematisatie", calculation.StochasticSoilProfile); - Assert.AreEqual(3.3, calculation.PhreaticLevelExitMean); - Assert.AreEqual(4.4, calculation.PhreaticLevelExitStandardDeviation); - Assert.AreEqual(5.5, calculation.DampingFactorExitMean); - Assert.AreEqual(6.6, calculation.DampingFactorExitStandardDeviation); + Assert.AreEqual(4.4, calculation.PhreaticLevelExitMean); + Assert.AreEqual(5.5, calculation.PhreaticLevelExitStandardDeviation); + Assert.AreEqual(6.6, calculation.DampingFactorExitMean); + Assert.AreEqual(7.7, calculation.DampingFactorExitStandardDeviation); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml =================================================================== diff -u -r44a47fde40d66f168e0c80d16c82c687dde1e5d1 -rfde9fb747c4afe9b3c32a80e1efeef24b535decd --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml (.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml) (revision 44a47fde40d66f168e0c80d16c82c687dde1e5d1) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml (.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml) (revision fde9fb747c4afe9b3c32a80e1efeef24b535decd) @@ -3,17 +3,17 @@ HRlocatie Profielschematisatie - 1.1 - 2.2 + 2.2 + 3.3 Ondergrondmodel Ondergrondschematisatie - 3.3 - 4.4 + 4.4 + 5.5 - 5.5 - 6.6 + 6.6 + 7.7 \ No newline at end of file