Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs =================================================================== diff -u -r95e76a7e90e94621a5e9773c2a365fa8e3b6dd31 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision 95e76a7e90e94621a5e9773c2a365fa8e3b6dd31) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -53,7 +53,7 @@ throw new ArgumentNullException("probabilityAssessmentInput"); } Name = Resources.GrassCoverErosionInwardsCalculation_DefaultName; - InputParameters = new GrassCoverErosionInwardsInput(generalInputParameters); + InputParameters = new GrassCoverErosionInwardsInput(); ProbabilityAssessmentInput = probabilityAssessmentInput; AddDemoInput(); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs =================================================================== diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision 5b8f476716cb75977616203318fa250f608fe7a5) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -36,23 +36,14 @@ public class GrassCoverErosionInwardsInput : Observable, ICalculationInput { private readonly LogNormalDistribution criticalFlowRate; - private readonly GeneralGrassCoverErosionInwardsInput generalInputParameters; private RoundedDouble orientation; private RoundedDouble dikeHeight; /// /// Creates a new instance of . /// - /// General grass cover erosion inwards calculation input parameters that apply to each calculation. - /// When is null. - public GrassCoverErosionInwardsInput(GeneralGrassCoverErosionInwardsInput generalInputParameters) + public GrassCoverErosionInwardsInput() { - if (generalInputParameters == null) - { - throw new ArgumentNullException("generalInputParameters"); - } - this.generalInputParameters = generalInputParameters; - orientation = new RoundedDouble(2); dikeHeight = new RoundedDouble(2); BreakWater = new BreakWater(BreakWaterType.Caisson, 0); @@ -167,75 +158,5 @@ } ForeshoreGeometry = profileSections; } - - #region General input parameters - - /// - /// Gets the model factor critical overtopping. - /// - public double CriticalOvertoppingModelFactor - { - get - { - return generalInputParameters.CriticalOvertoppingModelFactor; - } - } - - /// - /// Gets the factor fb variable. - /// - public NormalDistribution FbFactor - { - get - { - return generalInputParameters.FbFactor; - } - } - - /// - /// Gets the factor fn variable. - /// - public NormalDistribution FnFactor - { - get - { - return generalInputParameters.FnFactor; - } - } - - /// - /// Gets the model factor overtopping. - /// - public double OvertoppingModelFactor - { - get - { - return generalInputParameters.OvertoppingModelFactor; - } - } - - /// - /// Gets the factor mz2 (or frunup) variable. - /// - public NormalDistribution FrunupModelFactor - { - get - { - return generalInputParameters.FrunupModelFactor; - } - } - - /// - /// Gets the factor fshallow variable. - /// - public NormalDistribution FshallowModelFactor - { - get - { - return generalInputParameters.FshallowModelFactor; - } - } - - #endregion } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs =================================================================== diff -u -r7676712daa085088f4d58fd0ac088d1e0f72d48c -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 7676712daa085088f4d58fd0ac088d1e0f72d48c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -31,7 +31,6 @@ using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; -using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PresentationObjects; @@ -136,12 +135,14 @@ EmptyProbabilityAssessmentOutputContextMenuStrip); } - private static ExceedanceProbabilityCalculationActivity CreateHydraRingExceedenceProbabilityCalculationActivity(FailureMechanismSection failureMechanismSection, - string hlcdDirectory, - GrassCoverErosionInwardsCalculation calculation) + private static ExceedanceProbabilityCalculationActivity CreateHydraRingExceedenceProbabilityCalculationActivity(GrassCoverErosionInwardsFailureMechanism failureMechanism, + string hlcdDirectory, + GrassCoverErosionInwardsCalculation calculation) { var hydraulicBoundaryLocationId = (int) calculation.InputParameters.HydraulicBoundaryLocation.Id; + var failureMechanismSection = failureMechanism.Sections.First(); // TODO: Pass dike section based on cross section of calculation with reference line var sectionLength = failureMechanismSection.GetSectionLength(); + var generalInput = failureMechanism.GeneralInput; var inwardsInput = calculation.InputParameters; return HydraRingActivityFactory.Create( @@ -153,13 +154,13 @@ new OvertoppingCalculationInput(hydraulicBoundaryLocationId, new HydraRingSection(1, failureMechanismSection.Name, sectionLength, inwardsInput.Orientation), inwardsInput.DikeHeight, - inwardsInput.CriticalOvertoppingModelFactor, - inwardsInput.FbFactor.Mean, inwardsInput.FbFactor.StandardDeviation, - inwardsInput.FnFactor.Mean, inwardsInput.FnFactor.StandardDeviation, - inwardsInput.OvertoppingModelFactor, + generalInput.CriticalOvertoppingModelFactor, + generalInput.FbFactor.Mean, generalInput.FbFactor.StandardDeviation, + generalInput.FnFactor.Mean, generalInput.FnFactor.StandardDeviation, + generalInput.OvertoppingModelFactor, inwardsInput.CriticalFlowRate.Mean, inwardsInput.CriticalFlowRate.StandardDeviation, - inwardsInput.FrunupModelFactor.Mean, inwardsInput.FrunupModelFactor.StandardDeviation, - inwardsInput.FshallowModelFactor.Mean, inwardsInput.FshallowModelFactor.StandardDeviation, + generalInput.FrunupModelFactor.Mean, generalInput.FrunupModelFactor.StandardDeviation, + generalInput.FshallowModelFactor.Mean, generalInput.FshallowModelFactor.StandardDeviation, ParseProfilePoints(inwardsInput.DikeGeometry), ParseForeshore(inwardsInput), ParseBreakWater(inwardsInput) @@ -224,7 +225,7 @@ // TODO: Remove "Where" filter when validation is implemented ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations.Where(calc => calc.InputParameters.HydraulicBoundaryLocation != null) .Select(calc => CreateHydraRingExceedenceProbabilityCalculationActivity( - failureMechanism.Sections.First(), // TODO: Pass dike section based on cross section of calculation with reference line + failureMechanism, Path.GetDirectoryName(assessmentSection.HydraulicBoundaryDatabase.FilePath), calc)).ToList()); } @@ -531,7 +532,7 @@ return; } var activity = CreateHydraRingExceedenceProbabilityCalculationActivity( - context.FailureMechanism.Sections.First(), // TODO: Pass dike section based on cross section of calculation with reference line + context.FailureMechanism, Path.GetDirectoryName(context.AssessmentSection.HydraulicBoundaryDatabase.FilePath), calculation); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs =================================================================== diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision 5b8f476716cb75977616203318fa250f608fe7a5) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs (.../GrassCoverErosionInwardsInputTest.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -33,23 +33,10 @@ public class GrassCoverErosionInwardsInputTest { [Test] - public void Constructor_NullGeneralInput_ThrowsArgumentNullException() - { - // Setup & Call - TestDelegate test = () => new GrassCoverErosionInwardsInput(null); - - // Assert - Assert.Throws(test); - } - - [Test] public void Constructor_ExpectedValues() { - // Setup - var generalInput = new GeneralGrassCoverErosionInwardsInput(); - // Call - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); // Assert Assert.IsInstanceOf(input); @@ -64,21 +51,13 @@ }; Assert.AreEqual(criticalFlowRate.Mean, input.CriticalFlowRate.Mean); Assert.AreEqual(criticalFlowRate.StandardDeviation, input.CriticalFlowRate.StandardDeviation); - - Assert.AreEqual(generalInput.FbFactor, input.FbFactor); - Assert.AreEqual(generalInput.FnFactor, input.FnFactor); - Assert.AreEqual(generalInput.FshallowModelFactor, input.FshallowModelFactor); - Assert.AreEqual(generalInput.FrunupModelFactor, input.FrunupModelFactor); - Assert.AreEqual(generalInput.CriticalOvertoppingModelFactor, input.CriticalOvertoppingModelFactor); - Assert.AreEqual(generalInput.OvertoppingModelFactor, input.OvertoppingModelFactor); } [Test] public void Properties_ExpectedValues() { // Setup - var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); var orientation = new RoundedDouble(2, 1.18); var logNormal = new LogNormalDistribution(2); const bool useForeshore = true; @@ -112,8 +91,7 @@ public void SetDikeGeometry_NullRoughnessProfileSections_ThrowsArgumentNullException() { // Setup - var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); // Call TestDelegate test = () => input.SetDikeGeometry(null); @@ -126,8 +104,7 @@ public void SetForeshoreGeometry_NullProfileSections_ThrowsArgumentNullException() { // Setup - var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); // Call TestDelegate test = () => input.SetForeshoreGeometry(null); @@ -140,8 +117,7 @@ public void SetDikeGeometry_ValidGeometry_ReturnsExpectedValues() { // Setup - var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); var sections = new[] { new RoughnessProfileSection(new Point2D(1.1, 2.2), new Point2D(3.3, 4.4), 1.1), @@ -159,8 +135,7 @@ public void SetForeshoreGeometry_ValidGeometry_ReturnsExpectedValues() { // Setup - var generalInput = new GeneralGrassCoverErosionInwardsInput(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); var sections = new[] { new ProfileSection(new Point2D(1.1, 2.2), new Point2D(3.3, 4.4)), Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs =================================================================== diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 49084c971c0de5668befdcf5c8d6b65debf0b659) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs (.../BreakWaterPropertiesTest.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -92,7 +92,7 @@ var calculationMock = mockRepository.StrictMock(generalInput, new ProbabilityAssessmentInput()); mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); input.Attach(observerMock); var properties = new BreakWaterProperties { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs =================================================================== diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs (.../DikeGeometryPropertiesTest.cs) (revision 49084c971c0de5668befdcf5c8d6b65debf0b659) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeGeometryPropertiesTest.cs (.../DikeGeometryPropertiesTest.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -66,7 +66,7 @@ var calculationMock = mockRepository.StrictMock(generalInput, new ProbabilityAssessmentInput()); mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); var properties = new DikeGeometryProperties(); // Call @@ -123,7 +123,7 @@ var calculationMock = mockRepository.StrictMock(generalInput, new ProbabilityAssessmentInput()); mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); // Call var properties = new DikeGeometryProperties Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs =================================================================== diff -u -r5150f97d1c5e019d39723b22ff200e48b2112e71 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs (.../ForeshorePropertiesTest.cs) (revision 5150f97d1c5e019d39723b22ff200e48b2112e71) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs (.../ForeshorePropertiesTest.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -90,7 +90,7 @@ var calculationMock = mockRepository.StrictMock(generalInput, new ProbabilityAssessmentInput()); mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); input.Attach(observerMock); var properties = new ForeshoreProperties { @@ -115,7 +115,7 @@ var calculationMock = mockRepository.StrictMock(generalInput, new ProbabilityAssessmentInput()); mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); // Call var properties = new ForeshoreProperties Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 49084c971c0de5668befdcf5c8d6b65debf0b659) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -66,7 +66,7 @@ var calculationMock = mockRepository.StrictMock(generalInput, new ProbabilityAssessmentInput()); mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); var properties = new GrassCoverErosionInwardsInputContextProperties(); @@ -124,7 +124,7 @@ var calculationMock = mockRepository.StrictMock(generalInput, new ProbabilityAssessmentInput()); mockRepository.ReplayAll(); - var input = new GrassCoverErosionInwardsInput(generalInput); + var input = new GrassCoverErosionInwardsInput(); input.Attach(observerMock); var properties = new GrassCoverErosionInwardsInputContextProperties { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs =================================================================== diff -u -r37a53b1ca9a4cdfc6e6df7f065cd540c627f2622 -r9b3a37b954fab3dd61b73794d641d709b609dcc5 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs (.../GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 37a53b1ca9a4cdfc6e6df7f065cd540c627f2622) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs (.../GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 9b3a37b954fab3dd61b73794d641d709b609dcc5) @@ -54,7 +54,7 @@ hydraulicBoundaryDatabase.Locations.Add(new TestHydraulicBoundaryLocation()); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput(failureMechanism.GeneralInput); + var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput(); var calculationMock = mockRepository.StrictMock(); var assessmentSectionMock = mockRepository.StrictMock(); @@ -101,7 +101,7 @@ hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput(failureMechanism.GeneralInput) + var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput() { HydraulicBoundaryLocation = hydraulicBoundaryLocation };