Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensions.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensions.cs (.../DikeHeightAssessmentOutputCreateExtensions.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensions.cs (.../DikeHeightAssessmentOutputCreateExtensions.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -26,21 +26,21 @@ namespace Application.Ringtoets.Storage.Create.GrassCoverErosionInwards { /// - /// Extension methods for - /// related to creating a - /// or a . + /// Extension methods for related to creating a + /// or a + /// . /// internal static class DikeHeightAssessmentOutputCreateExtensions { /// /// Creates a - /// based on the information of the . + /// based on the information of the . /// /// The output to create a database entity for. /// A new . /// Thrown when /// is null. - internal static GrassCoverErosionInwardsDikeHeightOutputEntity CreateDikeHeight(this SubCalculationAssessmentOutput output) + internal static GrassCoverErosionInwardsDikeHeightOutputEntity CreateDikeHeight(this HydraulicLoadsOutput output) { if (output == null) { @@ -70,13 +70,13 @@ /// /// Creates a - /// based on the information of the . + /// based on the information of the . /// /// The output to create a database entity for. /// A new . /// Thrown when /// is null. - internal static GrassCoverErosionInwardsOvertoppingRateOutputEntity CreateOvertoppingRate(this SubCalculationAssessmentOutput output) + internal static GrassCoverErosionInwardsOvertoppingRateOutputEntity CreateOvertoppingRate(this HydraulicLoadsOutput output) { if (output == null) { @@ -86,8 +86,8 @@ return new GrassCoverErosionInwardsOvertoppingRateOutputEntity { OvertoppingRate = double.IsNaN(output.Result) - ? (double?) null - : output.Result, + ? (double?) null + : output.Result, TargetProbability = double.IsNaN(output.TargetProbability) ? (double?) null : output.TargetProbability, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -58,7 +58,7 @@ } private static void AddEntityForDikeHeightAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity, - SubCalculationAssessmentOutput output) + HydraulicLoadsOutput output) { if (output != null) { @@ -67,7 +67,7 @@ } private static void AddEntityForOvertoppingRateAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity, - SubCalculationAssessmentOutput output) + HydraulicLoadsOutput output) { if (output != null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensions.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -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 SubCalculationAssessmentOutput Read(this GrassCoverErosionInwardsDikeHeightOutputEntity entity) + internal static HydraulicLoadsOutput Read(this GrassCoverErosionInwardsDikeHeightOutputEntity entity) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } - return new SubCalculationAssessmentOutput(entity.DikeHeight.ToNullAsNaN(), - entity.TargetProbability.ToNullAsNaN(), - entity.TargetReliability.ToNullAsNaN(), - entity.CalculatedProbability.ToNullAsNaN(), - entity.CalculatedReliability.ToNullAsNaN(), - (CalculationConvergence) entity.CalculationConvergence); + return new HydraulicLoadsOutput(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 -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -58,13 +58,13 @@ entity.FactorOfSafety.ToNullAsNaN()); } - private static SubCalculationAssessmentOutput GetDikeHeightAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity) + private static HydraulicLoadsOutput GetDikeHeightAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity) { GrassCoverErosionInwardsDikeHeightOutputEntity dikeHeightOutputEntity = entity.GrassCoverErosionInwardsDikeHeightOutputEntities.FirstOrDefault(); return dikeHeightOutputEntity?.Read(); } - private static SubCalculationAssessmentOutput GetOvertoppingRateAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity) + private static HydraulicLoadsOutput GetOvertoppingRateAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity) { GrassCoverErosionInwardsOvertoppingRateOutputEntity overtoppingRateOutputEntity = entity.GrassCoverErosionInwardsOvertoppingRateOutputEntities.FirstOrDefault(); return overtoppingRateOutputEntity?.Read(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensions.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -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 SubCalculationAssessmentOutput Read(this GrassCoverErosionInwardsOvertoppingRateOutputEntity entity) + internal static HydraulicLoadsOutput Read(this GrassCoverErosionInwardsOvertoppingRateOutputEntity entity) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } - return new SubCalculationAssessmentOutput(entity.OvertoppingRate.ToNullAsNaN(), - entity.TargetProbability.ToNullAsNaN(), - entity.TargetReliability.ToNullAsNaN(), - entity.CalculatedProbability.ToNullAsNaN(), - entity.CalculatedReliability.ToNullAsNaN(), - (CalculationConvergence) entity.CalculationConvergence); + return new HydraulicLoadsOutput(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/DikeHeightAssessmentOutputCreateExtensionsTest.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensionsTest.cs (.../DikeHeightAssessmentOutputCreateExtensionsTest.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensionsTest.cs (.../DikeHeightAssessmentOutputCreateExtensionsTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -37,7 +37,7 @@ public void CreateDikeHeight_OutputNull_ThrowArgumentNullException() { // Setup - SubCalculationAssessmentOutput output = null; + HydraulicLoadsOutput output = null; // Call TestDelegate test = () => output.CreateDikeHeight(); @@ -52,7 +52,7 @@ { // Setup var random = new Random(21); - var output = new SubCalculationAssessmentOutput( + var output = new HydraulicLoadsOutput( random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextEnumValue()); @@ -74,8 +74,8 @@ { // Setup var random = new Random(21); - var output = new SubCalculationAssessmentOutput(double.NaN, double.NaN, double.NaN, - double.NaN, double.NaN, random.NextEnumValue()); + var output = new HydraulicLoadsOutput(double.NaN, double.NaN, double.NaN, + double.NaN, double.NaN, random.NextEnumValue()); // Call GrassCoverErosionInwardsDikeHeightOutputEntity entity = output.CreateDikeHeight(); @@ -94,7 +94,7 @@ public void CreateOvertoppingRate_OutputNull_ThrowArgumentNullException() { // Setup - SubCalculationAssessmentOutput output = null; + HydraulicLoadsOutput output = null; // Call TestDelegate test = () => output.CreateOvertoppingRate(); @@ -109,7 +109,7 @@ { // Setup var random = new Random(21); - var output = new SubCalculationAssessmentOutput( + var output = new HydraulicLoadsOutput( random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextEnumValue()); @@ -131,8 +131,8 @@ { // Setup var random = new Random(21); - var output = new SubCalculationAssessmentOutput(double.NaN, double.NaN, double.NaN, - double.NaN, double.NaN, random.NextEnumValue()); + var output = new HydraulicLoadsOutput(double.NaN, double.NaN, double.NaN, + double.NaN, double.NaN, random.NextEnumValue()); // Call GrassCoverErosionInwardsOvertoppingRateOutputEntity entity = output.CreateOvertoppingRate(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -240,8 +240,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1, true, new ProbabilityAssessmentOutput(1, 1, 1, 1, 1), - new TestSubCalculationAssessmentOutput(2), - new TestSubCalculationAssessmentOutput(3)) + new TestHydraulicLoadsOutput(2), + new TestHydraulicLoadsOutput(3)) }; var registry = new PersistenceRegistry(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -46,12 +46,12 @@ random.NextDouble()); var dikeHeightConvergence = random.NextEnumValue(); var overtoppingRateConvergence = random.NextEnumValue(); - var dikeHeightAssessmentOutput = new SubCalculationAssessmentOutput(random.NextDouble(), random.NextDouble(), - random.NextDouble(), random.NextDouble(), - random.NextDouble(), dikeHeightConvergence); - var overtoppingRateAssessmentOutput = new SubCalculationAssessmentOutput(random.NextDouble(), random.NextDouble(), - random.NextDouble(), random.NextDouble(), - random.NextDouble(), overtoppingRateConvergence); + var dikeHeightAssessmentOutput = new HydraulicLoadsOutput(random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), + random.NextDouble(), dikeHeightConvergence); + var overtoppingRateAssessmentOutput = new HydraulicLoadsOutput(random.NextDouble(), random.NextDouble(), + random.NextDouble(), random.NextDouble(), + random.NextDouble(), overtoppingRateConvergence); var output = new GrassCoverErosionInwardsOutput(random.NextDouble(), false, probabilityAssessmentOutput, dikeHeightAssessmentOutput, overtoppingRateAssessmentOutput); @@ -90,8 +90,8 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var dikeHeightAssessmentOutput = new TestSubCalculationAssessmentOutput(double.NaN, CalculationConvergence.CalculatedConverged); - var overtoppingRateAssessmentOutput = new TestSubCalculationAssessmentOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var dikeHeightAssessmentOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var overtoppingRateAssessmentOutput = new TestHydraulicLoadsOutput(double.NaN, CalculationConvergence.CalculatedConverged); var output = new GrassCoverErosionInwardsOutput(double.NaN, true, probabilityAssessmentOutput, dikeHeightAssessmentOutput, overtoppingRateAssessmentOutput); // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r56ac4eb28f5fcc5b20117474e9e4030399d6806a -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 56ac4eb28f5fcc5b20117474e9e4030399d6806a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -1567,8 +1567,8 @@ AssertDikeHeightAssessmentOutput(expectedOutput.DikeHeightAssessmentOutput, actualOutput.DikeHeightAssessmentOutput); } - private static void AssertDikeHeightAssessmentOutput(SubCalculationAssessmentOutput expectedOutput, - SubCalculationAssessmentOutput actualOutput) + private static void AssertDikeHeightAssessmentOutput(HydraulicLoadsOutput expectedOutput, + HydraulicLoadsOutput actualOutput) { if (expectedOutput == null) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -69,7 +69,7 @@ }; // Call - SubCalculationAssessmentOutput output = entity.Read(); + HydraulicLoadsOutput output = entity.Read(); // Assert Assert.AreEqual(dikeHeight, output.Result, output.Result.GetAccuracy()); @@ -92,7 +92,7 @@ }; // Call - SubCalculationAssessmentOutput output = entity.Read(); + HydraulicLoadsOutput output = entity.Read(); // Assert Assert.IsNaN(output.Result); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs =================================================================== diff -u -reec680fe322aea5d1ecf8fdf1f14a273afdf6c53 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs) (revision eec680fe322aea5d1ecf8fdf1f14a273afdf6c53) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -69,7 +69,7 @@ }; // Call - SubCalculationAssessmentOutput output = entity.Read(); + HydraulicLoadsOutput output = entity.Read(); // Assert Assert.AreEqual(overtoppingRate, output.Result, output.Result.GetAccuracy()); @@ -92,7 +92,7 @@ }; // Call - SubCalculationAssessmentOutput output = entity.Read(); + HydraulicLoadsOutput output = entity.Read(); // Assert Assert.IsNaN(output.Result); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r56ac4eb28f5fcc5b20117474e9e4030399d6806a -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 56ac4eb28f5fcc5b20117474e9e4030399d6806a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -917,8 +917,8 @@ UseBreakWater = true }, Output = new GrassCoverErosionInwardsOutput(0.45, true, new ProbabilityAssessmentOutput(0.004, 0.95, 0.00003, 1.1, 4.5), - new SubCalculationAssessmentOutput(0.56, 0.05, 2, 0.06, 3, CalculationConvergence.CalculatedConverged), - new SubCalculationAssessmentOutput(0.57, 0.07, 4, 0.08, 5, CalculationConvergence.CalculatedConverged)) + new HydraulicLoadsOutput(0.56, 0.05, 2, 0.06, 3, CalculationConvergence.CalculatedConverged), + new HydraulicLoadsOutput(0.57, 0.07, 4, 0.08, 5, CalculationConvergence.CalculatedConverged)) } } }); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs =================================================================== diff -u -rb63c17a1ec42d980aad2b4e19664fd5414fb995e -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs (.../GrassCoverErosionInwardsOutput.cs) (revision b63c17a1ec42d980aad2b4e19664fd5414fb995e) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs (.../GrassCoverErosionInwardsOutput.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -44,8 +44,8 @@ /// based on the grass cover erosion inwards calculation output. public GrassCoverErosionInwardsOutput(double waveHeight, bool isOvertoppingDominant, ProbabilityAssessmentOutput probabilityAssessmentOutput, - SubCalculationAssessmentOutput dikeHeightAssessmentOutput, - SubCalculationAssessmentOutput overtoppingRateAssessmentOutput) + HydraulicLoadsOutput dikeHeightAssessmentOutput, + HydraulicLoadsOutput overtoppingRateAssessmentOutput) { IsOvertoppingDominant = isOvertoppingDominant; WaveHeight = new RoundedDouble(2, waveHeight); @@ -75,12 +75,12 @@ /// Gets the dike height assessment output based on the grass cover erosion /// inwards calculation output. /// - public SubCalculationAssessmentOutput DikeHeightAssessmentOutput { get; private set; } + public HydraulicLoadsOutput DikeHeightAssessmentOutput { get; private set; } /// /// Gets the overtopping rate assessment output based on the grass cover erosion /// inwards calculation output. /// - public SubCalculationAssessmentOutput OvertoppingRateAssessmentOutput { get; private set; } + public HydraulicLoadsOutput OvertoppingRateAssessmentOutput { get; private set; } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/HydraulicLoadsOutput.cs (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -0,0 +1,96 @@ +// 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.Base.Data; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.Probability; + +namespace Ringtoets.GrassCoverErosionInwards.Data +{ + /// + /// This class contains the result of a hydraulic loads calculation. + /// + public class HydraulicLoadsOutput + { + /// + /// Creates a new instance of . + /// + /// The calculated result. + /// The norm used during the calculation. + /// The reliability index used during the calculation. + /// The calculated probability. + /// The calculated reliability index. + /// The convergence status of the calculation. + /// Thrown when + /// or falls outside the [0.0, 1.0] range and is not . + public HydraulicLoadsOutput(double result, double targetProbability, double targetReliability, + double calculatedProbability, double calculatedReliability, + CalculationConvergence calculationConvergence) + { + ProbabilityHelper.ValidateProbability(targetProbability, nameof(targetProbability), true); + ProbabilityHelper.ValidateProbability(calculatedProbability, nameof(calculatedProbability), true); + + Result = new RoundedDouble(2, result); + + TargetProbability = targetProbability; + TargetReliability = new RoundedDouble(5, targetReliability); + CalculatedProbability = calculatedProbability; + CalculatedReliability = new RoundedDouble(5, calculatedReliability); + CalculationConvergence = calculationConvergence; + } + + /// + /// Gets the calculated result. + /// + public RoundedDouble Result { get; private set; } + + /// + /// Gets the norm used during the calculation. + /// [1/year] + /// + public double TargetProbability { get; private set; } + + /// + /// Gets the reliability index used during the calculation. + /// [-] + /// + public RoundedDouble TargetReliability { get; private set; } + + /// + /// Gets the calculated probability. + /// [1/year] + /// + public double CalculatedProbability { get; private set; } + + /// + /// Gets the calculated reliability index. + /// [-] + /// + public RoundedDouble CalculatedReliability { get; private set; } + + /// + /// Gets the convergence status of the calculation. + /// [-] + /// + public CalculationConvergence CalculationConvergence { get; private set; } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.csproj) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.csproj) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -39,7 +39,7 @@ Properties\GlobalAssembly.cs - + Fisheye: Tag 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/SubCalculationAssessmentOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r63528bbe6b6682aec44ecd150560fe797ed67a5c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 63528bbe6b6682aec44ecd150560fe797ed67a5c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -169,24 +169,24 @@ return; } - SubCalculationAssessmentOutput dikeHeightOutput = CalculateDikeHeight(calculation, - assessmentSection, - generalInput, - failureMechanismContribution, - hydraulicBoundaryDatabaseFilePath, - numberOfCalculators); + HydraulicLoadsOutput dikeHeightOutput = CalculateDikeHeight(calculation, + assessmentSection, + generalInput, + failureMechanismContribution, + hydraulicBoundaryDatabaseFilePath, + numberOfCalculators); if (canceled) { return; } - SubCalculationAssessmentOutput overtoppingRateOutput = CalculateOvertoppingRate(calculation, - assessmentSection, - generalInput, - failureMechanismContribution, - hydraulicBoundaryDatabaseFilePath, - numberOfCalculators); + HydraulicLoadsOutput overtoppingRateOutput = CalculateOvertoppingRate(calculation, + assessmentSection, + generalInput, + failureMechanismContribution, + hydraulicBoundaryDatabaseFilePath, + numberOfCalculators); if (canceled) { @@ -261,12 +261,12 @@ Resources.GrassCoverErosionInwardsCalculationService_Overtopping); } - private SubCalculationAssessmentOutput CalculateDikeHeight(GrassCoverErosionInwardsCalculation calculation, - IAssessmentSection assessmentSection, - GeneralGrassCoverErosionInwardsInput generalInput, - double failureMechanismContribution, - string hydraulicBoundaryDatabaseFilePath, - int numberOfCalculators) + private HydraulicLoadsOutput CalculateDikeHeight(GrassCoverErosionInwardsCalculation calculation, + IAssessmentSection assessmentSection, + GeneralGrassCoverErosionInwardsInput generalInput, + double failureMechanismContribution, + string hydraulicBoundaryDatabaseFilePath, + int numberOfCalculators) { if (dikeHeightCalculator == null) { @@ -315,12 +315,12 @@ norm); } - private SubCalculationAssessmentOutput CalculateOvertoppingRate(GrassCoverErosionInwardsCalculation calculation, - IAssessmentSection assessmentSection, - GeneralGrassCoverErosionInwardsInput generalInput, - double failureMechanismContribution, - string hydraulicBoundaryDatabaseFilePath, - int numberOfCalculators) + private HydraulicLoadsOutput CalculateOvertoppingRate(GrassCoverErosionInwardsCalculation calculation, + IAssessmentSection assessmentSection, + GeneralGrassCoverErosionInwardsInput generalInput, + double failureMechanismContribution, + string hydraulicBoundaryDatabaseFilePath, + int numberOfCalculators) { if (overtoppingRateCalculator == null) { @@ -557,14 +557,14 @@ /// 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 SubCalculationAssessmentOutput CreateHydraulicLoadsAssessmentOutput(IHydraulicLoadsCalculator calculator, - string calculationName, - string stepName, - double targetReliability, - double targetProbability) + private static HydraulicLoadsOutput CreateHydraulicLoadsAssessmentOutput(IHydraulicLoadsCalculator calculator, + string calculationName, + string stepName, + double targetReliability, + double targetProbability) { double value = calculator.Value; double reliability = calculator.ReliabilityIndex; @@ -580,9 +580,9 @@ calculationName)); } - return new SubCalculationAssessmentOutput(value, targetProbability, - targetReliability, probability, reliability, - converged); + return new HydraulicLoadsOutput(value, targetProbability, + targetReliability, probability, reliability, + converged); } private static IEnumerable ParseProfilePoints(RoughnessPoint[] roughnessProfilePoints) Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -92,8 +92,8 @@ Calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.0, false, probabilityAssessmentOutput, - new TestSubCalculationAssessmentOutput(double.NaN), - new TestSubCalculationAssessmentOutput(double.NaN)) + new TestHydraulicLoadsOutput(double.NaN), + new TestHydraulicLoadsOutput(double.NaN)) } }; @@ -117,8 +117,8 @@ Calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.0, false, probabilityAssessmentOutput, - new TestSubCalculationAssessmentOutput(double.NaN), - new TestSubCalculationAssessmentOutput(double.NaN)) + new TestHydraulicLoadsOutput(double.NaN), + new TestHydraulicLoadsOutput(double.NaN)) } }; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsOutputTest.cs (.../GrassCoverErosionInwardsOutputTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -45,8 +45,8 @@ const double overtoppingRate = 0.9; var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(requiredProbability, requiredReliability, probability, reliability, factorOfSafety); - var dikeHeightAssessmentOutput = new TestSubCalculationAssessmentOutput(dikeHeight); - var overtoppingRateAssessmentOutput = new TestSubCalculationAssessmentOutput(overtoppingRate); + var dikeHeightAssessmentOutput = new TestHydraulicLoadsOutput(dikeHeight); + var overtoppingRateAssessmentOutput = new TestHydraulicLoadsOutput(overtoppingRate); // Call var output = new GrassCoverErosionInwardsOutput(waveHeight, true, probabilityAssessmentOutput, dikeHeightAssessmentOutput, overtoppingRateAssessmentOutput); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/HydraulicLoadsOutputTest.cs (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -0,0 +1,115 @@ +// 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.Test +{ + [TestFixture] + public class HydraulicLoadsOutputTest + { + [Test] + [SetCulture("nl-NL")] + [TestCase(-0.01)] + [TestCase(1.01)] + public void Constructor_InvalidTargetProbability_ThrowsArgumentOutOfRangeException(double targetProbability) + { + // Setup + var random = new Random(32); + double result = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedProbability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + TestDelegate call = () => new HydraulicLoadsOutput(result, targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("targetProbability", exception.ParamName); + StringAssert.Contains("Kans moet in het bereik [0,0, 1,0] liggen.", exception.Message); + } + + [Test] + [SetCulture("nl-NL")] + [TestCase(-0.01)] + [TestCase(1.01)] + public void Constructor_InvalidCalculatedProbability_ThrowsArgumentOutOfRangeException(double calculatedProbability) + { + // Setup + var random = new Random(32); + double result = random.NextDouble(); + double targetProbability = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + TestDelegate call = () => new HydraulicLoadsOutput(result, targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("calculatedProbability", exception.ParamName); + StringAssert.Contains("Kans moet in het bereik [0,0, 1,0] liggen.", exception.Message); + } + + [Test] + [TestCase(double.NaN, 0.8457)] + [TestCase(0.654, double.NaN)] + public void Constructor_ValidInput_ExpectedProperties(double targetProbability, double calculatedProbability) + { + // Setup + var random = new Random(32); + double result = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + var output = new HydraulicLoadsOutput(result, targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence); + + // Assert + Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); + Assert.AreEqual(targetProbability, output.TargetProbability); + Assert.AreEqual(targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy()); + Assert.AreEqual(calculatedProbability, output.CalculatedProbability); + Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); + Assert.AreEqual(convergence, output.CalculationConvergence); + } + } +} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -53,7 +53,7 @@ Properties\GlobalAssembly.cs - + Fisheye: Tag 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/SubCalculationAssessmentOutputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -51,7 +51,7 @@ Properties\GlobalAssembly.cs - + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestGrassCoverErosionInwardsOutputTest.cs (.../TestGrassCoverErosionInwardsOutputTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -38,8 +38,8 @@ Assert.AreEqual(0.0, output.WaveHeight.Value); Assert.IsTrue(output.IsOvertoppingDominant); Assert.IsInstanceOf(output.ProbabilityAssessmentOutput); - Assert.IsInstanceOf(output.DikeHeightAssessmentOutput); - Assert.IsInstanceOf(output.OvertoppingRateAssessmentOutput); + Assert.IsInstanceOf(output.DikeHeightAssessmentOutput); + Assert.IsInstanceOf(output.OvertoppingRateAssessmentOutput); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestHydraulicLoadsOutputTest.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestHydraulicLoadsOutputTest.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestHydraulicLoadsOutputTest.cs (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -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 TestHydraulicLoadsOutputTest + { + [Test] + public void TestHydraulicLoadsOutput_WithoutConvergence_ReturnsExpectedValues() + { + // Setup + var random = new Random(12); + double result = random.NextDouble(); + + // Call + var output = new TestHydraulicLoadsOutput(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 TestHydraulicLoadsOutput_WithConvergence_ReturnsExpectedValues() + { + // Setup + var random = new Random(12); + double result = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + var output = new TestHydraulicLoadsOutput(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 Fisheye: Tag 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestSubCalculationAssessmentOutputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.csproj) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -47,7 +47,7 @@ Properties\GlobalAssembly.cs - + Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestGrassCoverErosionInwardsOutput.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestGrassCoverErosionInwardsOutput.cs (.../TestGrassCoverErosionInwardsOutput.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestGrassCoverErosionInwardsOutput.cs (.../TestGrassCoverErosionInwardsOutput.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -33,7 +33,7 @@ /// Creates a new instance of . /// public TestGrassCoverErosionInwardsOutput() : base(0.0, true, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) {} + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) {} } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestHydraulicLoadsOutput.cs =================================================================== diff -u --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestHydraulicLoadsOutput.cs (revision 0) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestHydraulicLoadsOutput.cs (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -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 TestHydraulicLoadsOutput : HydraulicLoadsOutput + { + /// + /// Creates a new instance of . + /// + /// The result to set to the output. + /// The to set to the output. + public TestHydraulicLoadsOutput(double result, CalculationConvergence calculationConvergence = CalculationConvergence.NotCalculated) : + base(result, double.NaN, double.NaN, double.NaN, double.NaN, calculationConvergence) {} + } +} \ No newline at end of file Fisheye: Tag 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae refers to a dead (removed) revision in file `Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestSubCalculationAssessmentOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs =================================================================== diff -u -ra39f463976dde75aa79b34ddb0b27323b95e295a -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision a39f463976dde75aa79b34ddb0b27323b95e295a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -87,8 +87,8 @@ double overtoppingRateCalculatedReliability = random.NextDouble(); var overtoppingRateConvergence = random.NextEnumValue(); var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(requiredProbability, requiredReliability, probability, reliability, factorOfSafety); - var dikeHeightAssessmentOutput = new SubCalculationAssessmentOutput(dikeHeight, dikeHeightTargetProbability, dikeHeightTargetReliability, dikeHeightCalculatedProbability, dikeHeightCalculatedReliability, dikeHeightConvergence); - var overtoppingRateAssessmentOutput = new SubCalculationAssessmentOutput(overtoppingRate, overtoppingRateTargetProbability, overtoppingRateTargetReliability, + var dikeHeightAssessmentOutput = new HydraulicLoadsOutput(dikeHeight, dikeHeightTargetProbability, dikeHeightTargetReliability, dikeHeightCalculatedProbability, dikeHeightCalculatedReliability, dikeHeightConvergence); + var overtoppingRateAssessmentOutput = new HydraulicLoadsOutput(overtoppingRate, overtoppingRateTargetProbability, overtoppingRateTargetReliability, overtoppingRateCalculatedProbability, overtoppingRateCalculatedReliability, overtoppingRateConvergence); var output = new GrassCoverErosionInwardsOutput(waveHeight, isOvertoppingDominant, probabilityAssessmentOutput, dikeHeightAssessmentOutput, overtoppingRateAssessmentOutput); @@ -153,8 +153,8 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var dikeHeightAssessmentOutput = new TestSubCalculationAssessmentOutput(double.NaN); - var overtoppingRateAssessmentOutput = new TestSubCalculationAssessmentOutput(double.NaN); + var dikeHeightAssessmentOutput = new TestHydraulicLoadsOutput(double.NaN); + var overtoppingRateAssessmentOutput = new TestHydraulicLoadsOutput(double.NaN); var output = new GrassCoverErosionInwardsOutput(double.NaN, true, probabilityAssessmentOutput, dikeHeightAssessmentOutput, overtoppingRateAssessmentOutput); @@ -182,17 +182,17 @@ { // Setup var probabilityAssessmentOutput = new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - SubCalculationAssessmentOutput dikeHeightAssessmentOutput = null; - SubCalculationAssessmentOutput overtoppingRateAssessmentOutput = null; + HydraulicLoadsOutput dikeHeightAssessmentOutput = null; + HydraulicLoadsOutput overtoppingRateAssessmentOutput = null; if (dikeHeightCalculated) { - dikeHeightAssessmentOutput = new TestSubCalculationAssessmentOutput(double.NaN); + dikeHeightAssessmentOutput = new TestHydraulicLoadsOutput(double.NaN); } if (overtoppingRateCalculated) { - overtoppingRateAssessmentOutput = new TestSubCalculationAssessmentOutput(double.NaN); + overtoppingRateAssessmentOutput = new TestHydraulicLoadsOutput(double.NaN); } var output = new GrassCoverErosionInwardsOutput(double.NaN, true, probabilityAssessmentOutput, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -347,8 +347,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(1.0, false, probabilityAssessmentOutput, - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(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 TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(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 TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(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 TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(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 TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(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 TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) } }, ProbabilityFormattingHelper.Format(probability)).SetName("SectionWithValidCalculationOutput"); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -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 TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)); + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)); } FailureMechanismSection section = CreateSection(); @@ -111,8 +111,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0.5, true, probabilityAssessmentOutput, - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; FailureMechanismSection section = CreateSection(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rd79d565a3560a7314f2e1860db1c91481edac364 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision d79d565a3560a7314f2e1860db1c91481edac364) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -558,7 +558,7 @@ Assert.IsNotNull(calculation.Output); ProbabilityAssessmentOutput probabilisticAssessmentOutput = calculation.Output.ProbabilityAssessmentOutput; Assert.IsFalse(double.IsNaN(probabilisticAssessmentOutput.Reliability)); - SubCalculationAssessmentOutput dikeHeightAssessmentOutput = calculation.Output.DikeHeightAssessmentOutput; + HydraulicLoadsOutput dikeHeightAssessmentOutput = calculation.Output.DikeHeightAssessmentOutput; Assert.IsNotNull(dikeHeightAssessmentOutput); Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.Result)); mocks.VerifyAll(); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r56ac4eb28f5fcc5b20117474e9e4030399d6806a -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 56ac4eb28f5fcc5b20117474e9e4030399d6806a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -151,8 +151,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, true, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0.0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0.0), + new TestHydraulicLoadsOutput(0)) }; var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); var calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSection); @@ -944,8 +944,8 @@ var initialOutput = new GrassCoverErosionInwardsOutput(0, true, new ProbabilityAssessmentOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN), - new TestSubCalculationAssessmentOutput(double.NaN), - new TestSubCalculationAssessmentOutput(double.NaN)); + new TestHydraulicLoadsOutput(double.NaN), + new TestHydraulicLoadsOutput(double.NaN)); var calculation = new GrassCoverErosionInwardsCalculation { Output = initialOutput, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -rd79d565a3560a7314f2e1860db1c91481edac364 -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision d79d565a3560a7314f2e1860db1c91481edac364) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -548,7 +548,7 @@ Assert.IsFalse(calculation.Output.IsOvertoppingDominant); if (dikeHeightCalculationType != DikeHeightCalculationType.NoCalculation) { - SubCalculationAssessmentOutput dikeHeightAssessmentOutput = calculation.Output.DikeHeightAssessmentOutput; + HydraulicLoadsOutput dikeHeightAssessmentOutput = calculation.Output.DikeHeightAssessmentOutput; Assert.IsNotNull(dikeHeightAssessmentOutput); Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.Result)); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r56ac4eb28f5fcc5b20117474e9e4030399d6806a -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionInwardsDataSynchronizationServiceTest.cs) (revision 56ac4eb28f5fcc5b20117474e9e4030399d6806a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionInwardsDataSynchronizationServiceTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -57,8 +57,8 @@ var calculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; // Call @@ -343,8 +343,8 @@ var calculationWithOutput = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; var calculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -353,8 +353,8 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(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 TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; var subCalculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { @@ -402,8 +402,8 @@ HydraulicBoundaryLocation = hydraulicBoundaryLocation }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; var subCalculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs =================================================================== diff -u -r8cb270db5fbcb82f19d6f3a390f083e9e0516d8c -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs (.../FailureMechanismContributionPropertiesIntegrationTest.cs) (revision 8cb270db5fbcb82f19d6f3a390f083e9e0516d8c) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs (.../FailureMechanismContributionPropertiesIntegrationTest.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -83,8 +83,8 @@ var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; var emptyHeightStructuresCalculation = new StructuresCalculation(); var heightStructuresCalculation = new StructuresCalculation @@ -286,8 +286,8 @@ GrassCoverErosionInwardsCalculation grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; var emptyHeightStructuresCalculation = new StructuresCalculation(); var heightStructuresCalculation = new StructuresCalculation @@ -388,8 +388,8 @@ GrassCoverErosionInwardsCalculation grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation { Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new TestSubCalculationAssessmentOutput(0), - new TestSubCalculationAssessmentOutput(0)) + new TestHydraulicLoadsOutput(0), + new TestHydraulicLoadsOutput(0)) }; var emptyHeightStructuresCalculation = new StructuresCalculation(); var heightStructuresCalculation = new StructuresCalculation Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs =================================================================== diff -u -r56ac4eb28f5fcc5b20117474e9e4030399d6806a -r617e9d4ecc8ca783391a7483bbccc1f9fafb6dae --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 56ac4eb28f5fcc5b20117474e9e4030399d6806a) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 617e9d4ecc8ca783391a7483bbccc1f9fafb6dae) @@ -317,8 +317,8 @@ DikeProfile = dikeprofile1 }, Output = new GrassCoverErosionInwardsOutput(0, false, new ProbabilityAssessmentOutput(0, 0, 0, 0, 0), - new SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new HydraulicLoadsOutput(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 SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new HydraulicLoadsOutput(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 SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new HydraulicLoadsOutput(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 SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), - new SubCalculationAssessmentOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) + new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged), + new HydraulicLoadsOutput(0, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged)) }; var subCalculationWithHydraulicBoundaryLocation = new GrassCoverErosionInwardsCalculation {