Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r0a94ed42cb943659d68be2ce6fb430f8f29fc3f3 -r07b2fbe1224aadaa0682f3744d755142280fb21c --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 0a94ed42cb943659d68be2ce6fb430f8f29fc3f3) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 07b2fbe1224aadaa0682f3744d755142280fb21c) @@ -9,6 +9,7 @@ using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.IO; +using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; using Ringtoets.Integration.Plugin.FileImporters; @@ -63,9 +64,12 @@ InitializeDemoHydraulicBoundaryDatabase(demoAssessmentSection); InitializeDemoFailureMechanismSections(demoAssessmentSection); InitializeDemoPipingData(demoAssessmentSection); + InitializeGrassCoverErosionInwardsData(demoAssessmentSection); return demoAssessmentSection; } + + private void InitializeDemoReferenceLine(AssessmentSection demoAssessmentSection) { using (var embeddedResourceFileWriter = new EmbeddedResourceFileWriter(GetType().Assembly, true, "traject_6-3.shp", "traject_6-3.dbf", "traject_6-3.prj", "traject_6-3.shx")) @@ -140,6 +144,16 @@ calculation.InputParameters.NotifyObservers(); } + private void InitializeGrassCoverErosionInwardsData(AssessmentSection demoAssessmentSection) + { + var failureMechanism = demoAssessmentSection.GrassCoverErosionInwards; + + var calculation = new GrassCoverErosionInwardsCalculation(failureMechanism.GeneralInput); + failureMechanism.CalculationsGroup.Children.Add(calculation); + calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001); + calculation.InputParameters.NotifyObservers(); + } + private void SetHydraulicBoundaryLocationValues(ICollection locations) { locations.ElementAt(0).DesignWaterLevel = 5.78; Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj =================================================================== diff -u -r8b5a6f938fe2b04cd78623649df37580e145055f -r07b2fbe1224aadaa0682f3744d755142280fb21c --- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 8b5a6f938fe2b04cd78623649df37580e145055f) +++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 07b2fbe1224aadaa0682f3744d755142280fb21c) @@ -115,6 +115,11 @@ Ringtoets.Common.IO False + + {90de728e-48ef-4665-ab38-3d88e41d9f4d} + Ringtoets.GrassCoverErosionInwards.Data + False + {70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2} Ringtoets.HydraRing.Data Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r64d5609bb2912cd52dc74deffdd189222e240599 -r07b2fbe1224aadaa0682f3744d755142280fb21c --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 64d5609bb2912cd52dc74deffdd189222e240599) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 07b2fbe1224aadaa0682f3744d755142280fb21c) @@ -11,6 +11,7 @@ using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; using Ringtoets.Piping.Data; @@ -83,10 +84,13 @@ AssertCharacteristicPointsOnSurfaceLines(surfaceLines); Assert.AreEqual(1, demoAssessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Count); - var calculation = demoAssessmentSection.PipingFailureMechanism.CalculationsGroup.GetCalculations().OfType().First(); - AssertCalculationAbleToCalculate(calculation); - AssertCalculationInFailureMechanismSectionResult(calculation, demoAssessmentSection.PipingFailureMechanism.SectionResults.ToArray()); + var pipingCalculationScenario = demoAssessmentSection.PipingFailureMechanism.CalculationsGroup.GetCalculations().OfType().First(); + AssertCalculationAbleToCalculate(pipingCalculationScenario); + AssertCalculationInFailureMechanismSectionResult(pipingCalculationScenario, demoAssessmentSection.PipingFailureMechanism.SectionResults.ToArray()); + Assert.AreEqual(1, demoAssessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Count); + var grassCoverErosionInwardsCalculation = demoAssessmentSection.GrassCoverErosionInwards.CalculationsGroup.GetCalculations().OfType().First(); + AssertExpectedGrassCoverErosionInwardsInput(grassCoverErosionInwardsCalculation.InputParameters); foreach (var failureMechanism in demoAssessmentSection.GetFailureMechanisms()) { Assert.AreEqual(283, failureMechanism.Sections.Count()); @@ -99,7 +103,10 @@ Assert.AreEqual(283, sectionResults.Length); var sectionResultWithCalculation = sectionResults[22]; - CollectionAssert.AreEqual(new[] { calculation }, sectionResultWithCalculation.CalculationScenarios); + CollectionAssert.AreEqual(new[] + { + calculation + }, sectionResultWithCalculation.CalculationScenarios); } private void AssertValuesOnHydraulicBoundaryLocations(HydraulicBoundaryLocation[] hydraulicBoundaryLocations) @@ -221,6 +228,11 @@ GetAccuracy(inputParameters.DampingFactorExit)); } + private static void AssertExpectedGrassCoverErosionInwardsInput(GrassCoverErosionInwardsInput inputParameters) + { + Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id); + } + private static double GetAccuracy(IDistribution distribution) { return Math.Pow(10.0, -distribution.Mean.NumberOfDecimalPlaces); Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj =================================================================== diff -u -r8b5a6f938fe2b04cd78623649df37580e145055f -r07b2fbe1224aadaa0682f3744d755142280fb21c --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj (.../Demo.Ringtoets.Test.csproj) (revision 8b5a6f938fe2b04cd78623649df37580e145055f) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj (.../Demo.Ringtoets.Test.csproj) (revision 07b2fbe1224aadaa0682f3744d755142280fb21c) @@ -84,6 +84,11 @@ {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data + + {90de728e-48ef-4665-ab38-3d88e41d9f4d} + Ringtoets.GrassCoverErosionInwards.Data + True + {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} Ringtoets.HydraRing.Data