Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r62492ce3e891365124204d4b570917c4ee298a41 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -28,32 +28,32 @@ { /// /// Extension methods for - /// related to creating a . + /// related to creating a . /// internal static class GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions { /// /// Reads the and use - /// the information to construct a . + /// the information to construct a . /// /// The - /// to create for. - /// A new . + /// to create for. + /// A new . /// Thrown when /// is null. - internal static HydraulicLoadsOutput Read(this GrassCoverErosionInwardsDikeHeightOutputEntity entity) + internal static DikeHeightOutput Read(this GrassCoverErosionInwardsDikeHeightOutputEntity entity) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } - return new HydraulicLoadsOutput(entity.DikeHeight.ToNullAsNaN(), - entity.TargetProbability.ToNullAsNaN(), - entity.TargetReliability.ToNullAsNaN(), - entity.CalculatedProbability.ToNullAsNaN(), - entity.CalculatedReliability.ToNullAsNaN(), - (CalculationConvergence) entity.CalculationConvergence); + return new DikeHeightOutput(entity.DikeHeight.ToNullAsNaN(), + entity.TargetProbability.ToNullAsNaN(), + entity.TargetReliability.ToNullAsNaN(), + entity.CalculatedProbability.ToNullAsNaN(), + entity.CalculatedReliability.ToNullAsNaN(), + (CalculationConvergence) entity.CalculationConvergence); } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs =================================================================== diff -u -r2d40530f727a2e56821b962d627492f885bffda0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision 2d40530f727a2e56821b962d627492f885bffda0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -58,13 +58,13 @@ entity.FactorOfSafety.ToNullAsNaN()); } - private static HydraulicLoadsOutput GetDikeHeightOutput(GrassCoverErosionInwardsOutputEntity entity) + private static DikeHeightOutput GetDikeHeightOutput(GrassCoverErosionInwardsOutputEntity entity) { GrassCoverErosionInwardsDikeHeightOutputEntity dikeHeightOutputEntity = entity.GrassCoverErosionInwardsDikeHeightOutputEntities.FirstOrDefault(); return dikeHeightOutputEntity?.Read(); } - private static HydraulicLoadsOutput GetOvertoppingRateOutput(GrassCoverErosionInwardsOutputEntity entity) + private static OvertoppingRateOutput GetOvertoppingRateOutput(GrassCoverErosionInwardsOutputEntity entity) { GrassCoverErosionInwardsOvertoppingRateOutputEntity overtoppingRateOutputEntity = entity.GrassCoverErosionInwardsOvertoppingRateOutputEntities.FirstOrDefault(); return overtoppingRateOutputEntity?.Read(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r62492ce3e891365124204d4b570917c4ee298a41 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -28,32 +28,32 @@ { /// /// Extension methods for - /// related to creating a . + /// related to creating a . /// internal static class GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions { /// /// Reads the and use - /// the information to construct a . + /// the information to construct a . /// /// The - /// to create for. - /// A new . + /// to create for. + /// A new . /// Thrown when /// is null. - internal static HydraulicLoadsOutput Read(this GrassCoverErosionInwardsOvertoppingRateOutputEntity entity) + internal static OvertoppingRateOutput Read(this GrassCoverErosionInwardsOvertoppingRateOutputEntity entity) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } - return new HydraulicLoadsOutput(entity.OvertoppingRate.ToNullAsNaN(), - entity.TargetProbability.ToNullAsNaN(), - entity.TargetReliability.ToNullAsNaN(), - entity.CalculatedProbability.ToNullAsNaN(), - entity.CalculatedReliability.ToNullAsNaN(), - (CalculationConvergence) entity.CalculationConvergence); + return new OvertoppingRateOutput(entity.OvertoppingRate.ToNullAsNaN(), + entity.TargetProbability.ToNullAsNaN(), + entity.TargetReliability.ToNullAsNaN(), + entity.CalculatedProbability.ToNullAsNaN(), + entity.CalculatedReliability.ToNullAsNaN(), + (CalculationConvergence) entity.CalculationConvergence); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r2a210b0032d2a1ac4c4bdedaaf3aee426f717b4d -r62492ce3e891365124204d4b570917c4ee298a41 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision 2a210b0032d2a1ac4c4bdedaaf3aee426f717b4d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -240,8 +240,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1, true, new ProbabilityAssessmentOutput(1, 1, 1, 1, 1), - new TestHydraulicLoadsOutput(2), - new TestHydraulicLoadsOutput(3)) + new TestDikeHeightOutput(2), + new TestOvertoppingRateOutput(3)) }; var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -r2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9 -r62492ce3e891365124204d4b570917c4ee298a41 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 2e185a3c26ee13106bf74883ccb5fb3dcf38e9a9) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -46,12 +46,12 @@ random.NextDouble()); var dikeHeightConvergence = random.NextEnumValue(); var overtoppingRateConvergence = random.NextEnumValue(); - var dikeHeightOutput = new HydraulicLoadsOutput(random.NextDouble(), random.NextDouble(), - random.NextDouble(), random.NextDouble(), - random.NextDouble(), dikeHeightConvergence); - var overtoppingRateOutput = new HydraulicLoadsOutput(random.NextDouble(), random.NextDouble(), - random.NextDouble(), random.NextDouble(), - random.NextDouble(), overtoppingRateConvergence); + var dikeHeightOutput = new DikeHeightOutput(random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), + random.NextDouble(), dikeHeightConvergence); + var overtoppingRateOutput = new OvertoppingRateOutput(random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), + random.NextDouble(), overtoppingRateConvergence); var output = new GrassCoverErosionInwardsOutput(random.NextDouble(), false, probabilityAssessmentOutput, dikeHeightOutput, overtoppingRateOutput); @@ -90,8 +90,8 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var dikeHeightOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); - var overtoppingRateOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var dikeHeightOutput = new TestDikeHeightOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var overtoppingRateOutput = new TestOvertoppingRateOutput(double.NaN, CalculationConvergence.CalculatedConverged); var output = new GrassCoverErosionInwardsOutput(double.NaN, true, probabilityAssessmentOutput, dikeHeightOutput, overtoppingRateOutput); // Call @@ -128,7 +128,7 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1, 1, 1, 1, 1); - var overtoppingRateOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var overtoppingRateOutput = new TestOvertoppingRateOutput(double.NaN, CalculationConvergence.CalculatedConverged); var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, null, overtoppingRateOutput); // Call @@ -143,7 +143,7 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(1, 1, 1, 1, 1); - var dikeHeightOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var dikeHeightOutput = new TestDikeHeightOutput(double.NaN, CalculationConvergence.CalculatedConverged); var output = new GrassCoverErosionInwardsOutput(1, true, probabilityAssessmentOutput, dikeHeightOutput, null); // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -rf817bfc2122cfa0a48bd19ad8518a948dfd7c95c -r62492ce3e891365124204d4b570917c4ee298a41 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision f817bfc2122cfa0a48bd19ad8518a948dfd7c95c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -291,7 +291,7 @@ foreshoreProfiles.Add(new ForeshoreProfile( new Point2D(2, 5), Enumerable.Empty(), null, new ForeshoreProfile.ConstructionProperties { - Id = "fpid", + Id = "fpid" })); } @@ -918,8 +918,8 @@ UseBreakWater = true }, Output = new GrassCoverErosionInwardsOutput(0.45, true, new ProbabilityAssessmentOutput(0.004, 0.95, 0.00003, 1.1, 4.5), - new HydraulicLoadsOutput(0.56, 0.05, 2, 0.06, 3, CalculationConvergence.CalculatedConverged), - new HydraulicLoadsOutput(0.57, 0.07, 4, 0.08, 5, CalculationConvergence.CalculatedConverged)) + new DikeHeightOutput(0.56, 0.05, 2, 0.06, 3, CalculationConvergence.CalculatedConverged), + new OvertoppingRateOutput(0.57, 0.07, 4, 0.08, 5, CalculationConvergence.CalculatedConverged)) } } }); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs =================================================================== diff -u -r2d40530f727a2e56821b962d627492f885bffda0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs (.../GrassCoverErosionInwardsOutput.cs) (revision 2d40530f727a2e56821b962d627492f885bffda0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs (.../GrassCoverErosionInwardsOutput.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -36,14 +36,14 @@ /// /// The calculated wave height. /// The value indicating whether overtopping was dominant in the calculation. - /// The probabilistic assessment output based on the grass cover erosion - /// inwards calculation output. + /// The probabilistic assessment output. /// The dike height output. /// The overtopping rate output. - public GrassCoverErosionInwardsOutput(double waveHeight, bool isOvertoppingDominant, + public GrassCoverErosionInwardsOutput(double waveHeight, + bool isOvertoppingDominant, ProbabilityAssessmentOutput probabilityAssessmentOutput, - HydraulicLoadsOutput dikeHeightOutput, - HydraulicLoadsOutput overtoppingRateOutput) + DikeHeightOutput dikeHeightOutput, + OvertoppingRateOutput overtoppingRateOutput) { IsOvertoppingDominant = isOvertoppingDominant; WaveHeight = new RoundedDouble(2, waveHeight); @@ -64,19 +64,18 @@ public bool IsOvertoppingDominant { get; private set; } /// - /// Gets the probabilistic assessment output based on the grass cover erosion - /// inwards calculation output. + /// Gets the probabilistic assessment output. /// public ProbabilityAssessmentOutput ProbabilityAssessmentOutput { get; private set; } /// - /// Gets the dike height output based on the grass cover erosion inwards calculation output. + /// Gets the dike height output. /// - public HydraulicLoadsOutput DikeHeightOutput { get; private set; } + public DikeHeightOutput DikeHeightOutput { get; private set; } /// - /// Gets the overtopping rate output based on the grass cover erosion inwards calculation output. + /// Gets the overtopping rate output. /// - public HydraulicLoadsOutput OvertoppingRateOutput { get; private set; } + public OvertoppingRateOutput OvertoppingRateOutput { get; private set; } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r6194c57c89be64b33e5b9b0e35b8672edda0f162 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 6194c57c89be64b33e5b9b0e35b8672edda0f162) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -169,24 +169,24 @@ return; } - HydraulicLoadsOutput dikeHeightOutput = CalculateDikeHeight(calculation, - assessmentSection, - generalInput, - failureMechanismContribution, - hydraulicBoundaryDatabaseFilePath, - numberOfCalculators); + DikeHeightOutput dikeHeightOutput = CalculateDikeHeight(calculation, + assessmentSection, + generalInput, + failureMechanismContribution, + hydraulicBoundaryDatabaseFilePath, + numberOfCalculators); if (canceled) { return; } - HydraulicLoadsOutput overtoppingRateOutput = CalculateOvertoppingRate(calculation, - assessmentSection, - generalInput, - failureMechanismContribution, - hydraulicBoundaryDatabaseFilePath, - numberOfCalculators); + OvertoppingRateOutput overtoppingRateOutput = CalculateOvertoppingRate(calculation, + assessmentSection, + generalInput, + failureMechanismContribution, + hydraulicBoundaryDatabaseFilePath, + numberOfCalculators); if (canceled) { @@ -261,12 +261,12 @@ Resources.GrassCoverErosionInwardsCalculationService_Overtopping); } - private HydraulicLoadsOutput CalculateDikeHeight(GrassCoverErosionInwardsCalculation calculation, - IAssessmentSection assessmentSection, - GeneralGrassCoverErosionInwardsInput generalInput, - double failureMechanismContribution, - string hydraulicBoundaryDatabaseFilePath, - int numberOfCalculators) + private DikeHeightOutput CalculateDikeHeight(GrassCoverErosionInwardsCalculation calculation, + IAssessmentSection assessmentSection, + GeneralGrassCoverErosionInwardsInput generalInput, + double failureMechanismContribution, + string hydraulicBoundaryDatabaseFilePath, + int numberOfCalculators) { if (dikeHeightCalculator == null) { @@ -308,19 +308,19 @@ return null; } - return CreateHydraulicLoadsAssessmentOutput(dikeHeightCalculator, - calculation.Name, - Resources.GrassCoverErosionInwardsCalculationService_DikeHeight, - dikeHeightCalculationInput.Beta, - norm); + return CreateDikeHeightOutput(dikeHeightCalculator, + calculation.Name, + Resources.GrassCoverErosionInwardsCalculationService_DikeHeight, + dikeHeightCalculationInput.Beta, + norm); } - private HydraulicLoadsOutput CalculateOvertoppingRate(GrassCoverErosionInwardsCalculation calculation, - IAssessmentSection assessmentSection, - GeneralGrassCoverErosionInwardsInput generalInput, - double failureMechanismContribution, - string hydraulicBoundaryDatabaseFilePath, - int numberOfCalculators) + private OvertoppingRateOutput CalculateOvertoppingRate(GrassCoverErosionInwardsCalculation calculation, + IAssessmentSection assessmentSection, + GeneralGrassCoverErosionInwardsInput generalInput, + double failureMechanismContribution, + string hydraulicBoundaryDatabaseFilePath, + int numberOfCalculators) { if (overtoppingRateCalculator == null) { @@ -362,11 +362,11 @@ return null; } - return CreateHydraulicLoadsAssessmentOutput(overtoppingRateCalculator, - calculation.Name, - Resources.GrassCoverErosionInwardsCalculationService_OvertoppingRate, - overtoppingRateCalculationInput.Beta, - norm); + return CreateOvertoppingRateOutput(overtoppingRateCalculator, + calculation.Name, + Resources.GrassCoverErosionInwardsCalculationService_OvertoppingRate, + overtoppingRateCalculationInput.Beta, + norm); } /// @@ -603,23 +603,23 @@ } /// - /// Creates the output of a hydraulic loads calculation. + /// Creates the output of a dike height calculation. /// - /// The calculator to used for performing the calculation. + /// The calculator used for performing the calculation. /// The name of the calculation. /// The name of the step that is performed. /// The target reliability for the calculation. /// The target probability for the calculation. - /// A . + /// A . /// Thrown when /// or the calculated probability falls outside the [0.0, 1.0] range and is not . - private static HydraulicLoadsOutput CreateHydraulicLoadsAssessmentOutput(IHydraulicLoadsCalculator calculator, - string calculationName, - string stepName, - double targetReliability, - double targetProbability) + private static DikeHeightOutput CreateDikeHeightOutput(IHydraulicLoadsCalculator calculator, + string calculationName, + string stepName, + double targetReliability, + double targetProbability) { - double value = calculator.Value; + double dikeHeight = calculator.Value; double reliability = calculator.ReliabilityIndex; double probability = StatisticsConverter.ReliabilityToProbability(reliability); @@ -633,11 +633,47 @@ calculationName)); } - return new HydraulicLoadsOutput(value, targetProbability, - targetReliability, probability, reliability, - converged); + return new DikeHeightOutput(dikeHeight, targetProbability, + targetReliability, probability, reliability, + converged); } + /// + /// Creates the output of an overtopping rate calculation. + /// + /// The calculator used for performing the calculation. + /// The name of the calculation. + /// The name of the step that is performed. + /// The target reliability for the calculation. + /// The target probability for the calculation. + /// A . + /// Thrown when + /// or the calculated probability falls outside the [0.0, 1.0] range and is not . + private static OvertoppingRateOutput CreateOvertoppingRateOutput(IHydraulicLoadsCalculator calculator, + string calculationName, + string stepName, + double targetReliability, + double targetProbability) + { + double overtoppingRate = calculator.Value; + double reliability = calculator.ReliabilityIndex; + double probability = StatisticsConverter.ReliabilityToProbability(reliability); + + CalculationConvergence converged = RingtoetsCommonDataCalculationService.GetCalculationConvergence(calculator.Converged); + + if (converged != CalculationConvergence.CalculatedConverged) + { + log.Warn( + string.Format(Resources.GrassCoverErosionInwardsCalculationService_Calculation_of_type_0_for_calculation_with_name_1_not_converged, + stepName, + calculationName)); + } + + return new OvertoppingRateOutput(overtoppingRate, targetProbability, + targetReliability, probability, reliability, + converged); + } + private static IEnumerable ParseProfilePoints(RoughnessPoint[] roughnessProfilePoints) { return roughnessProfilePoints.Select(roughnessPoint => new HydraRingRoughnessProfilePoint(roughnessPoint.Point.X, roughnessPoint.Point.Y, roughnessPoint.Roughness)); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r6afbb616ce84cccaf56617d60c5cd821b00daab0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 6afbb616ce84cccaf56617d60c5cd821b00daab0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -92,8 +92,8 @@ Calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.0, false, probabilityAssessmentOutput, - new TestHydraulicLoadsOutput(double.NaN), - new TestHydraulicLoadsOutput(double.NaN)) + new TestDikeHeightOutput(double.NaN), + new TestOvertoppingRateOutput(double.NaN)) } }; @@ -117,8 +117,8 @@ Calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.0, false, probabilityAssessmentOutput, - new TestHydraulicLoadsOutput(double.NaN), - new TestHydraulicLoadsOutput(double.NaN)) + new TestDikeHeightOutput(double.NaN), + new TestOvertoppingRateOutput(double.NaN)) } }; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -r2d40530f727a2e56821b962d627492f885bffda0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision 2d40530f727a2e56821b962d627492f885bffda0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -45,8 +45,8 @@ const double overtoppingRate = 0.9; var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(requiredProbability, requiredReliability, probability, reliability, factorOfSafety); - var dikeHeightOutput = new TestHydraulicLoadsOutput(dikeHeight); - var overtoppingRateOutput = new TestHydraulicLoadsOutput(overtoppingRate); + var dikeHeightOutput = new TestDikeHeightOutput(dikeHeight); + var overtoppingRateOutput = new TestOvertoppingRateOutput(overtoppingRate); // Call var output = new GrassCoverErosionInwardsOutput(waveHeight, true, probabilityAssessmentOutput, dikeHeightOutput, overtoppingRateOutput); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -51,7 +51,8 @@ Properties\GlobalAssembly.cs - + + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestDikeHeightOutputTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestDikeHeightOutputTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestDikeHeightOutputTest.cs (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -0,0 +1,74 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; + +namespace Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test +{ + [TestFixture] + public class TestDikeHeightOutputTest + { + [Test] + public void TestDikeHeightOutput_WithoutConvergence_ReturnsExpectedValues() + { + // Setup + var random = new Random(12); + double result = random.NextDouble(); + + // Call + var output = new TestDikeHeightOutput(result); + + // Assert + Assert.IsInstanceOf(output); + Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.TargetReliability); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.AreEqual(CalculationConvergence.NotCalculated, output.CalculationConvergence); + } + + [Test] + public void TestDikeHeightOutput_WithConvergence_ReturnsExpectedValues() + { + // Setup + var random = new Random(12); + double result = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + var output = new TestDikeHeightOutput(result, convergence); + + // Assert + Assert.IsInstanceOf(output); + Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.TargetReliability); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.AreEqual(convergence, output.CalculationConvergence); + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -r2d40530f727a2e56821b962d627492f885bffda0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision 2d40530f727a2e56821b962d627492f885bffda0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -38,8 +38,8 @@ Assert.AreEqual(0.0, output.WaveHeight.Value); Assert.IsTrue(output.IsOvertoppingDominant); Assert.IsInstanceOf(output.ProbabilityAssessmentOutput); - Assert.IsInstanceOf(output.DikeHeightOutput); - Assert.IsInstanceOf(output.OvertoppingRateOutput); + Assert.IsInstanceOf(output.DikeHeightOutput); + Assert.IsInstanceOf(output.OvertoppingRateOutput); } } } \ No newline at end of file Fisheye: Tag 62492ce3e891365124204d4b570917c4ee298a41 refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestHydraulicLoadsOutputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestOvertoppingRateOutputTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestOvertoppingRateOutputTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestOvertoppingRateOutputTest.cs (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -0,0 +1,74 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; + +namespace Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test +{ + [TestFixture] + public class TestOvertoppingRateOutputTest + { + [Test] + public void TestOvertoppingRateOutput_WithoutConvergence_ReturnsExpectedValues() + { + // Setup + var random = new Random(12); + double result = random.NextDouble(); + + // Call + var output = new TestOvertoppingRateOutput(result); + + // Assert + Assert.IsInstanceOf(output); + Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.TargetReliability); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.AreEqual(CalculationConvergence.NotCalculated, output.CalculationConvergence); + } + + [Test] + public void TestOvertoppingRateOutput_WithConvergence_ReturnsExpectedValues() + { + // Setup + var random = new Random(12); + double result = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + var output = new TestOvertoppingRateOutput(result, convergence); + + // Assert + Assert.IsInstanceOf(output); + Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.TargetReliability); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.AreEqual(convergence, output.CalculationConvergence); + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -47,7 +47,8 @@ Properties\GlobalAssembly.cs - + + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightOutput.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightOutput.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightOutput.cs (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -0,0 +1,40 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Ringtoets.Common.Data.Hydraulics; + +namespace Ringtoets.GrassCoverErosionInwards.Data.TestUtil +{ + /// + /// Class which creates simple instances of , + /// which can be used during testing. + /// + public class TestDikeHeightOutput : DikeHeightOutput + { + /// + /// Creates a new instance of . + /// + /// The dike height to set to the output. + /// The to set to the output. + public TestDikeHeightOutput(double dikeHeight, CalculationConvergence calculationConvergence = CalculationConvergence.NotCalculated) : + base(dikeHeight, double.NaN, double.NaN, double.NaN, double.NaN, calculationConvergence) {} + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestGrassCoverErosionInwardsOutput.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestGrassCoverErosionInwardsOutput.cs (.../TestGrassCoverErosionInwardsOutput.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestGrassCoverErosionInwardsOutput.cs (.../TestGrassCoverErosionInwardsOutput.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -32,8 +32,9 @@ /// /// Creates a new instance of . /// - public TestGrassCoverErosionInwardsOutput() : base(0.0, true, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) {} + public TestGrassCoverErosionInwardsOutput() : base(0.0, true, + new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) {} } } \ No newline at end of file Fisheye: Tag 62492ce3e891365124204d4b570917c4ee298a41 refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestHydraulicLoadsOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestOvertoppingRateOutput.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestOvertoppingRateOutput.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestOvertoppingRateOutput.cs (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -0,0 +1,40 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Ringtoets.Common.Data.Hydraulics; + +namespace Ringtoets.GrassCoverErosionInwards.Data.TestUtil +{ + /// + /// Class which creates simple instances of , + /// which can be used during testing. + /// + public class TestOvertoppingRateOutput : OvertoppingRateOutput + { + /// + /// Creates a new instance of . + /// + /// The overtopping rate to set to the output. + /// The to set to the output. + public TestOvertoppingRateOutput(double overtoppingRate, CalculationConvergence calculationConvergence = CalculationConvergence.NotCalculated) : + base(overtoppingRate, double.NaN, double.NaN, double.NaN, double.NaN, calculationConvergence) {} + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs =================================================================== diff -u -r2d40530f727a2e56821b962d627492f885bffda0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 2d40530f727a2e56821b962d627492f885bffda0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -86,10 +86,23 @@ double overtoppingRateCalculatedProbability = random.NextDouble(); double overtoppingRateCalculatedReliability = random.NextDouble(); var overtoppingRateConvergence = random.NextEnumValue(); - var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(requiredProbability, requiredReliability, probability, reliability, factorOfSafety); - var dikeHeightOutput = new HydraulicLoadsOutput(dikeHeight, dikeHeightTargetProbability, dikeHeightTargetReliability, dikeHeightCalculatedProbability, dikeHeightCalculatedReliability, dikeHeightConvergence); - var overtoppingRateOutput = new HydraulicLoadsOutput(overtoppingRate, overtoppingRateTargetProbability, overtoppingRateTargetReliability, - overtoppingRateCalculatedProbability, overtoppingRateCalculatedReliability, overtoppingRateConvergence); + var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(requiredProbability, + requiredReliability, + probability, + reliability, + factorOfSafety); + var dikeHeightOutput = new DikeHeightOutput(dikeHeight, + dikeHeightTargetProbability, + dikeHeightTargetReliability, + dikeHeightCalculatedProbability, + dikeHeightCalculatedReliability, + dikeHeightConvergence); + var overtoppingRateOutput = new OvertoppingRateOutput(overtoppingRate, + overtoppingRateTargetProbability, + overtoppingRateTargetReliability, + overtoppingRateCalculatedProbability, + overtoppingRateCalculatedReliability, + overtoppingRateConvergence); var output = new GrassCoverErosionInwardsOutput(waveHeight, isOvertoppingDominant, probabilityAssessmentOutput, dikeHeightOutput, overtoppingRateOutput); // Call @@ -153,8 +166,8 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var dikeHeightOutput = new TestHydraulicLoadsOutput(double.NaN); - var overtoppingRateOutput = new TestHydraulicLoadsOutput(double.NaN); + var dikeHeightOutput = new TestDikeHeightOutput(double.NaN); + var overtoppingRateOutput = new TestOvertoppingRateOutput(double.NaN); var output = new GrassCoverErosionInwardsOutput(double.NaN, true, probabilityAssessmentOutput, dikeHeightOutput, overtoppingRateOutput); @@ -182,17 +195,17 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - HydraulicLoadsOutput dikeHeightOutput = null; - HydraulicLoadsOutput overtoppingRateOutput = null; + DikeHeightOutput dikeHeightOutput = null; + OvertoppingRateOutput overtoppingRateOutput = null; if (dikeHeightCalculated) { - dikeHeightOutput = new TestHydraulicLoadsOutput(double.NaN); + dikeHeightOutput = new TestDikeHeightOutput(double.NaN); } if (overtoppingRateCalculated) { - overtoppingRateOutput = new TestHydraulicLoadsOutput(double.NaN); + overtoppingRateOutput = new TestOvertoppingRateOutput(double.NaN); } var output = new GrassCoverErosionInwardsOutput(double.NaN, true, probabilityAssessmentOutput, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r6afbb616ce84cccaf56617d60c5cd821b00daab0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 6afbb616ce84cccaf56617d60c5cd821b00daab0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -347,8 +347,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.0, false, probabilityAssessmentOutput, - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) @@ -389,8 +389,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.1, true, probabilityAssessmentOutput, - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) @@ -457,16 +457,16 @@ var successfulCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.1, true, successfulCalculationOutput, - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var failedCalculationOutput = new ProbabilityAssessmentOutput(1.0, 1.0, double.NaN, 1.0, 1.0); var failedCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.1, true, failedCalculationOutput, - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; FailureMechanismSection section = CreateSimpleFailureMechanismSection(); var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(section) @@ -521,8 +521,8 @@ { Output = new GrassCoverErosionInwardsOutput(1.1, true, new ProbabilityAssessmentOutput(1.0, 1.0, double.NaN, 1.0, 1.0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) } }, "-").SetName("SectionWithInvalidCalculationOutput"); yield return new TestCaseData(new GrassCoverErosionInwardsFailureMechanismSectionResult(section) @@ -532,8 +532,8 @@ { Output = new GrassCoverErosionInwardsOutput(1.1, true, new ProbabilityAssessmentOutput(1.0, 1.0, probability, 1.0, 1.0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) } }, ProbabilityFormattingHelper.Format(probability)).SetName("SectionWithValidCalculationOutput"); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r6afbb616ce84cccaf56617d60c5cd821b00daab0 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 6afbb616ce84cccaf56617d60c5cd821b00daab0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -84,8 +84,8 @@ { var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(0.9, 1.0, double.NaN, 1.0, 1.0); calculation.Output = new GrassCoverErosionInwardsOutput(1.1, false, probabilityAssessmentOutput, - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)); + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)); } FailureMechanismSection section = CreateSection(); @@ -111,8 +111,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0.5, true, probabilityAssessmentOutput, - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; FailureMechanismSection section = CreateSection(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r3be9b3d3afa5f4dc4ed422f774405c127baaaf4e -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 3be9b3d3afa5f4dc4ed422f774405c127baaaf4e) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -151,8 +151,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, true, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0.0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0.0), + new TestOvertoppingRateOutput(0)) }; var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSection); @@ -1025,8 +1025,8 @@ var initialOutput = new GrassCoverErosionInwardsOutput(0, true, new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN), - new TestHydraulicLoadsOutput(double.NaN), - new TestHydraulicLoadsOutput(double.NaN)); + new TestDikeHeightOutput(double.NaN), + new TestOvertoppingRateOutput(double.NaN)); var calculation = new GrassCoverErosionInwardsCalculation { Output = initialOutput, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionInwardsDataSynchronizationServiceTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionInwardsDataSynchronizationServiceTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -57,8 +57,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; // Call @@ -343,8 +343,8 @@ var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var calculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -353,8 +353,8 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var calculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -392,8 +392,8 @@ var subCalculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var subCalculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -402,8 +402,8 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var subCalculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs (.../FailureMechanismContributionPropertiesIntegrationTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs (.../FailureMechanismContributionPropertiesIntegrationTest.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -83,8 +83,8 @@ var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var emptyHeightStructuresCalculation = new StructuresCalculation(); var heightStructuresCalculation = new StructuresCalculation @@ -286,8 +286,8 @@ var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var emptyHeightStructuresCalculation = new StructuresCalculation(); var heightStructuresCalculation = new StructuresCalculation @@ -388,8 +388,8 @@ var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestHydraulicLoadsOutput(0), - new TestHydraulicLoadsOutput(0)) + new TestDikeHeightOutput(0), + new TestOvertoppingRateOutput(0)) }; var emptyHeightStructuresCalculation = new StructuresCalculation(); var heightStructuresCalculation = new StructuresCalculation Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs =================================================================== diff -u -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae -r62492ce3e891365124204d4b570917c4ee298a41 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 62492ce3e891365124204d4b570917c4ee298a41) @@ -148,7 +148,7 @@ /// Gets a fully configured with a desired and /// possible configurations of the parent and nested calculations, but without any calculation output of the failure mechanisms. /// - /// The desired to initiailize the with. + /// The desired to initialize the with. /// A fully configured with all possible configurations of the parent and nested calculations /// of the failure mechanisms, but without any calculation output. public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput(AssessmentSectionComposition composition) @@ -317,8 +317,8 @@ DikeProfile = dikeprofile1 }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) }; var calculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -327,8 +327,8 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) }; var calculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -355,8 +355,8 @@ DikeProfile = dikeprofile2 }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) }; var subCalculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -365,8 +365,8 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new DikeHeightOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new OvertoppingRateOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) }; var subCalculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation {