Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs =================================================================== diff -u -r41c99cb11975b9b16074ee02e189fb071692ccfd -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs (.../HydraulicBoundaryLocationCalculationCreateExtensions.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs (.../HydraulicBoundaryLocationCalculationCreateExtensions.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -58,13 +58,13 @@ HydraulicLocationEntity = registry.Get(calculation.HydraulicBoundaryLocation) }; - CreateHydraulicBoundaryLocationOutput(hydraulicLocationCalculationEntity, calculation.Output); + CreateHydraulicBoundaryLocationCalculationOutput(hydraulicLocationCalculationEntity, calculation.Output); return hydraulicLocationCalculationEntity; } - private static void CreateHydraulicBoundaryLocationOutput(HydraulicLocationCalculationEntity hydraulicLocationCalculationEntity, - HydraulicBoundaryLocationOutput output) + private static void CreateHydraulicBoundaryLocationCalculationOutput(HydraulicLocationCalculationEntity hydraulicLocationCalculationEntity, + HydraulicBoundaryLocationCalculationOutput output) { if (output != null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs =================================================================== diff -u -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs (.../HydraulicBoundaryLocationOutputCreateExtensions.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs (.../HydraulicBoundaryLocationOutputCreateExtensions.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -27,18 +27,18 @@ namespace Application.Ringtoets.Storage.Create { /// - /// Extension methods for related to creating a hydraulic boundary location output entity. + /// Extension methods for related to creating a hydraulic boundary location output entity. /// internal static class HydraulicBoundaryLocationOutputCreateExtensions { /// /// Creates a based - /// on the information of the . + /// on the information of the . /// /// The output to create a database entity for. /// A new . /// Thrown when is null. - internal static HydraulicLocationOutputEntity CreateHydraulicLocationOutputEntity(this HydraulicBoundaryLocationOutput output) + internal static HydraulicLocationOutputEntity CreateHydraulicLocationOutputEntity(this HydraulicBoundaryLocationCalculationOutput output) { if (output == null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationOutputEntityReadExtensions.cs =================================================================== diff -u -rf04bc7a1a7cac4b688ab59088e47f7e0a162c86a -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationOutputEntityReadExtensions.cs (.../HydraulicLocationOutputEntityReadExtensions.cs) (revision f04bc7a1a7cac4b688ab59088e47f7e0a162c86a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationOutputEntityReadExtensions.cs (.../HydraulicLocationOutputEntityReadExtensions.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -28,30 +28,30 @@ { /// /// Extension methods for related to creating - /// a . + /// a . /// internal static class HydraulicLocationOutputEntityReadExtensions { /// - /// Read the and use the information to construct a . + /// Read the and use the information to construct a . /// - /// The to create for. - /// A new . + /// The to create for. + /// A new . /// Thrown when is null. - internal static HydraulicBoundaryLocationOutput Read(this HydraulicLocationOutputEntity entity) + internal static HydraulicBoundaryLocationCalculationOutput Read(this HydraulicLocationOutputEntity entity) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } - return new HydraulicBoundaryLocationOutput(entity.Result.ToNullAsNaN(), - entity.TargetProbability.ToNullAsNaN(), - entity.TargetReliability.ToNullAsNaN(), - entity.CalculatedProbability.ToNullAsNaN(), - entity.CalculatedReliability.ToNullAsNaN(), - (CalculationConvergence) entity.CalculationConvergence, - entity.GeneralResultSubMechanismIllustrationPointEntity?.Read()); + return new HydraulicBoundaryLocationCalculationOutput(entity.Result.ToNullAsNaN(), + entity.TargetProbability.ToNullAsNaN(), + entity.TargetReliability.ToNullAsNaN(), + entity.CalculatedProbability.ToNullAsNaN(), + entity.CalculatedReliability.ToNullAsNaN(), + (CalculationConvergence) entity.CalculationConvergence, + entity.GeneralResultSubMechanismIllustrationPointEntity?.Read()); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCalculationCreateExtensionsTest.cs =================================================================== diff -u -r06b82f3137d117242ecf5f69bded51c103216c0a -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCalculationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCalculationCreateExtensionsTest.cs) (revision 06b82f3137d117242ecf5f69bded51c103216c0a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCalculationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCalculationCreateExtensionsTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -102,7 +102,7 @@ { ShouldIllustrationPointsBeCalculated = shouldIllustrationPointsBeCalculated }, - Output = new HydraulicBoundaryLocationOutput( + Output = new HydraulicBoundaryLocationCalculationOutput( random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextEnumValue(), null) @@ -121,7 +121,7 @@ HydraulicLocationOutputEntity outputEntity = entity.HydraulicLocationOutputEntities.Single(); - HydraulicBoundaryLocationOutput expectedOutput = calculation.Output; + HydraulicBoundaryLocationCalculationOutput expectedOutput = calculation.Output; Assert.AreEqual(expectedOutput.CalculatedProbability, outputEntity.CalculatedProbability); Assert.AreEqual(expectedOutput.CalculatedReliability, outputEntity.CalculatedReliability); Assert.AreEqual(expectedOutput.TargetReliability, outputEntity.TargetReliability); @@ -141,7 +141,7 @@ registry.Register(hydraulicLocationEntity, hydraulicLocation); var calculation = new HydraulicBoundaryLocationCalculation(hydraulicLocation); - + // Call HydraulicLocationCalculationEntity entity = calculation.Create(registry); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs =================================================================== diff -u -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs (.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs (.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -39,7 +39,7 @@ public void CreateHydraulicLocationOutputEntity_HydraulicLocationOutputNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((HydraulicBoundaryLocationOutput) null).CreateHydraulicLocationOutputEntity(); + TestDelegate call = () => ((HydraulicBoundaryLocationCalculationOutput) null).CreateHydraulicLocationOutputEntity(); // Assert var exception = Assert.Throws(call); @@ -51,7 +51,7 @@ { // Setup var random = new Random(21); - var output = new HydraulicBoundaryLocationOutput( + var output = new HydraulicBoundaryLocationCalculationOutput( random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextEnumValue(), null); @@ -75,8 +75,8 @@ { // Setup var random = new Random(21); - var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN, - double.NaN, double.NaN, random.NextEnumValue(), null); + var output = new HydraulicBoundaryLocationCalculationOutput(double.NaN, double.NaN, double.NaN, + double.NaN, double.NaN, random.NextEnumValue(), null); // Call HydraulicLocationOutputEntity entity = output.CreateHydraulicLocationOutputEntity(); @@ -98,9 +98,9 @@ { // Setup var random = new Random(21); - var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN, - double.NaN, double.NaN, random.NextEnumValue(), - GetGeneralResult()); + var output = new HydraulicBoundaryLocationCalculationOutput(double.NaN, double.NaN, double.NaN, + double.NaN, double.NaN, random.NextEnumValue(), + GetGeneralResult()); // Call HydraulicLocationOutputEntity entity = output.CreateHydraulicLocationOutputEntity(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r0f0f6f476c14310d187fe5737a6a6e71fcbdb60d -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 0f0f6f476c14310d187fe5737a6a6e71fcbdb60d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -2115,8 +2115,8 @@ AssertHydraulicBoundaryLocationOutput(expected.Output, actual.Output); } - private static void AssertHydraulicBoundaryLocationOutput(HydraulicBoundaryLocationOutput expectedOutput, - HydraulicBoundaryLocationOutput actualOutput) + private static void AssertHydraulicBoundaryLocationOutput(HydraulicBoundaryLocationCalculationOutput expectedOutput, + HydraulicBoundaryLocationCalculationOutput actualOutput) { if (expectedOutput == null) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r41c99cb11975b9b16074ee02e189fb071692ccfd -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationCalculationEntityReadExtensionsTest.cs (.../HydraulicLocationCalculationEntityReadExtensionsTest.cs) (revision 41c99cb11975b9b16074ee02e189fb071692ccfd) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationCalculationEntityReadExtensionsTest.cs (.../HydraulicLocationCalculationEntityReadExtensionsTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -169,7 +169,7 @@ actual.Output); } - private static void AssertHydraulicBoundaryLocationOutput(HydraulicLocationOutputEntity expected, HydraulicBoundaryLocationOutput actual) + private static void AssertHydraulicBoundaryLocationOutput(HydraulicLocationOutputEntity expected, HydraulicBoundaryLocationCalculationOutput actual) { if (expected == null) { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r81c23df3e9ae714f3708c7d655c39e83be210b9a -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs (.../HydraulicLocationOutputEntityReadExtensionsTest.cs) (revision 81c23df3e9ae714f3708c7d655c39e83be210b9a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs (.../HydraulicLocationOutputEntityReadExtensionsTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -68,7 +68,7 @@ }; // Call - HydraulicBoundaryLocationOutput output = entity.Read(); + HydraulicBoundaryLocationCalculationOutput output = entity.Read(); // Assert Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); @@ -98,7 +98,7 @@ }; // Call - HydraulicBoundaryLocationOutput output = entity.Read(); + HydraulicBoundaryLocationCalculationOutput output = entity.Read(); // Assert Assert.IsNaN(output.Result); @@ -160,7 +160,7 @@ }; // Call - HydraulicBoundaryLocationOutput output = entity.Read(); + HydraulicBoundaryLocationCalculationOutput output = entity.Read(); // Assert GeneralResult generalResult = output.GeneralResult; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -r7d16dde6e8e3f63ded46bc1b474362806f517113 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 7d16dde6e8e3f63ded46bc1b474362806f517113) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -676,7 +676,7 @@ private static void AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(HydraulicBoundaryLocationCalculation calculation) { - HydraulicBoundaryLocationOutput output = calculation.Output; + HydraulicBoundaryLocationCalculationOutput output = calculation.Output; Assert.AreEqual(12.4, output.Result, output.Result.GetAccuracy()); Assert.IsNaN(output.TargetProbability); Assert.IsNaN(output.TargetReliability); @@ -687,7 +687,7 @@ private static void AssertHydraulicBoundaryLocationWaveHeightCalculation(HydraulicBoundaryLocationCalculation calculation) { - HydraulicBoundaryLocationOutput output = calculation.Output; + HydraulicBoundaryLocationCalculationOutput output = calculation.Output; Assert.AreEqual(2.4, output.Result, output.Result.GetAccuracy()); Assert.AreEqual(0, output.TargetProbability); Assert.AreEqual(0, output.TargetReliability, output.TargetReliability.GetAccuracy()); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r3f39f03a5882e75dc3742ff7c3d84bae6fb757dd -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 3f39f03a5882e75dc3742ff7c3d84bae6fb757dd) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -439,24 +439,24 @@ waveHeightCalculation.Output = GetWaveHeightOutput(hasIllustrationPoints); } - private static HydraulicBoundaryLocationOutput GetWaveHeightOutput(bool hasIllustrationPoints) + private static HydraulicBoundaryLocationCalculationOutput GetWaveHeightOutput(bool hasIllustrationPoints) { GeneralResult illustrationPoints = hasIllustrationPoints ? GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint() : null; - return new HydraulicBoundaryLocationOutput(2.4, 0, 0, 0, 0, CalculationConvergence.CalculatedNotConverged, illustrationPoints); + return new HydraulicBoundaryLocationCalculationOutput(2.4, 0, 0, 0, 0, CalculationConvergence.CalculatedNotConverged, illustrationPoints); } - private static HydraulicBoundaryLocationOutput GetDesignWaterLevelOutput(bool hasIllustrationPoints) + private static HydraulicBoundaryLocationCalculationOutput GetDesignWaterLevelOutput(bool hasIllustrationPoints) { GeneralResult illustrationPoints = hasIllustrationPoints ? GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint() : null; - return new HydraulicBoundaryLocationOutput(12.4, double.NaN, - double.NaN, double.NaN, - double.NaN, CalculationConvergence.CalculatedConverged, illustrationPoints); + return new HydraulicBoundaryLocationCalculationOutput(12.4, double.NaN, + double.NaN, double.NaN, + double.NaN, CalculationConvergence.CalculatedConverged, illustrationPoints); } private static GeneralResult GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint() Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r6345fd6a8fffc7852289a9c0e7ed2e0aad96c908 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 6345fd6a8fffc7852289a9c0e7ed2e0aad96c908) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -197,109 +197,109 @@ IObservableEnumerable calculations = failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm; GeneralResult generalResult = null; - calculations.ElementAt(0).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(0).Output = new HydraulicBoundaryLocationCalculationOutput( 7.19, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(1).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(1).Output = new HydraulicBoundaryLocationCalculationOutput( 7.19, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(2).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(2).Output = new HydraulicBoundaryLocationCalculationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(3).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(3).Output = new HydraulicBoundaryLocationCalculationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196787, 4.78960, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(4).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(4).Output = new HydraulicBoundaryLocationCalculationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196787, 4.78960, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(5).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(5).Output = new HydraulicBoundaryLocationCalculationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(6).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(6).Output = new HydraulicBoundaryLocationCalculationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(7).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(7).Output = new HydraulicBoundaryLocationCalculationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(8).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(8).Output = new HydraulicBoundaryLocationCalculationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(9).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(9).Output = new HydraulicBoundaryLocationCalculationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(10).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(10).Output = new HydraulicBoundaryLocationCalculationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(11).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(11).Output = new HydraulicBoundaryLocationCalculationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(12).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(12).Output = new HydraulicBoundaryLocationCalculationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(13).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(13).Output = new HydraulicBoundaryLocationCalculationOutput( 7.41, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(14).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(14).Output = new HydraulicBoundaryLocationCalculationOutput( 7.41, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(15).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(15).Output = new HydraulicBoundaryLocationCalculationOutput( 6.91, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(16).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(16).Output = new HydraulicBoundaryLocationCalculationOutput( 7.53, targetProbability, 4.79014, 1.0 / 1195476, 4.78938, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(17).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(17).Output = new HydraulicBoundaryLocationCalculationOutput( 7.80, targetProbability, 4.79014, 1.0 / 1194761, 4.78926, @@ -312,109 +312,109 @@ const double targetProbability = 1.0 / 200000; IObservableEnumerable calculations = failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm; GeneralResult generalResult = null; - calculations.ElementAt(0).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(0).Output = new HydraulicBoundaryLocationCalculationOutput( 4.99, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(1).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(1).Output = new HydraulicBoundaryLocationCalculationOutput( 5.04, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(2).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(2).Output = new HydraulicBoundaryLocationCalculationOutput( 4.87, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(3).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(3).Output = new HydraulicBoundaryLocationCalculationOutput( 4.73, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(4).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(4).Output = new HydraulicBoundaryLocationCalculationOutput( 4.59, targetProbability, 4.79014, 1.0 / 1199833, 4.79011, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(5).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(5).Output = new HydraulicBoundaryLocationCalculationOutput( 3.35, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(6).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(6).Output = new HydraulicBoundaryLocationCalculationOutput( 3.83, targetProbability, 4.79014, 1.0 / 1196906, 4.78962, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(7).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(7).Output = new HydraulicBoundaryLocationCalculationOutput( 4.00, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(8).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(8).Output = new HydraulicBoundaryLocationCalculationOutput( 4.20, targetProbability, 4.79014, 1.0 / 1197324, 4.78969, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(9).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(9).Output = new HydraulicBoundaryLocationCalculationOutput( 4.41, targetProbability, 4.79014, 1.0 / 1197324, 4.78969, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(10).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(10).Output = new HydraulicBoundaryLocationCalculationOutput( 4.50, targetProbability, 4.79014, 1.0 / 1197622, 4.78974, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(11).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(11).Output = new HydraulicBoundaryLocationCalculationOutput( 4.57, targetProbability, 4.79014, 1.0 / 1197145, 4.78966, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(12).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(12).Output = new HydraulicBoundaryLocationCalculationOutput( 4.63, targetProbability, 4.79014, 1.0 / 1196608, 4.78957, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(13).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(13).Output = new HydraulicBoundaryLocationCalculationOutput( 4.68, targetProbability, 4.79014, 1.0 / 1196549, 4.78956, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(14).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(14).Output = new HydraulicBoundaryLocationCalculationOutput( 4.17, targetProbability, 4.79014, 1.0 / 1199713, 4.79009, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(15).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(15).Output = new HydraulicBoundaryLocationCalculationOutput( 11.13, targetProbability, 4.79014, 1.0 / 201269, 4.79035, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(16).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(16).Output = new HydraulicBoundaryLocationCalculationOutput( 9.24, targetProbability, 4.79014, 1.0 / 197742, 4.78976, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(17).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(17).Output = new HydraulicBoundaryLocationCalculationOutput( 5.34, targetProbability, 4.79014, 1.0 / 199056, 4.78998, @@ -816,109 +816,109 @@ IObservableEnumerable calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; - calculations.ElementAt(0).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(0).Output = new HydraulicBoundaryLocationCalculationOutput( 5.78, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(1).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(1).Output = new HydraulicBoundaryLocationCalculationOutput( 5.77, targetProbability, 3.98787893, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(2).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(2).Output = new HydraulicBoundaryLocationCalculationOutput( 5.77, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(3).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(3).Output = new HydraulicBoundaryLocationCalculationOutput( 5.77, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(4).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(4).Output = new HydraulicBoundaryLocationCalculationOutput( 5.76865, targetProbability, 3.98788, 1.0 / 29996, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(5).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(5).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(6).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(6).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(7).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(7).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(8).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(8).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(9).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(9).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(10).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(10).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(11).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(11).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(12).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(12).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(13).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(13).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(14).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(14).Output = new HydraulicBoundaryLocationCalculationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(15).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(15).Output = new HydraulicBoundaryLocationCalculationOutput( 5.54, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(16).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(16).Output = new HydraulicBoundaryLocationCalculationOutput( 5.86, targetProbability, 3.98788, 1.0 / 29994, 3.98783, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(17).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(17).Output = new HydraulicBoundaryLocationCalculationOutput( 6.00, targetProbability, 3.98788, 1.0 / 29993, 3.98782, @@ -933,109 +933,109 @@ IObservableEnumerable calculations = assessmentSection.WaveHeightCalculationsForLowerLimitNorm; - calculations.ElementAt(0).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(0).Output = new HydraulicBoundaryLocationCalculationOutput( 4.13, targetProbability, 3.98788, 1.0 / 29972, 3.98766, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(1).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(1).Output = new HydraulicBoundaryLocationCalculationOutput( 4.19, targetProbability, 3.98788, 1.0 / 29962, 3.98770, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(2).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(2).Output = new HydraulicBoundaryLocationCalculationOutput( 4.02, targetProbability, 3.98788, 1.0 / 29977, 3.98758, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(3).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(3).Output = new HydraulicBoundaryLocationCalculationOutput( 3.87, targetProbability, 3.98788, 1.0 / 29963, 3.98759, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(4).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(4).Output = new HydraulicBoundaryLocationCalculationOutput( 3.73, targetProbability, 3.98788, 1.0 / 29957, 3.98754, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(5).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(5).Output = new HydraulicBoundaryLocationCalculationOutput( 2.65, targetProbability, 3.98788, 1.0 / 30022, 3.98805, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(6).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(6).Output = new HydraulicBoundaryLocationCalculationOutput( 3.04, targetProbability, 3.98788, 1.0 / 30001, 3.98789, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(7).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(7).Output = new HydraulicBoundaryLocationCalculationOutput( 3.20, targetProbability, 3.98788, 1.0 / 30000, 3.98788, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(8).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(8).Output = new HydraulicBoundaryLocationCalculationOutput( 3.35, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(9).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(9).Output = new HydraulicBoundaryLocationCalculationOutput( 3.53, targetProbability, 3.98788, 1.0 / 29999, 3.98787, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(10).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(10).Output = new HydraulicBoundaryLocationCalculationOutput( 3.62, targetProbability, 3.98788, 1.0 / 29888, 3.98699, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(11).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(11).Output = new HydraulicBoundaryLocationCalculationOutput( 3.68, targetProbability, 3.98788, 1.0 / 29890, 3.98701, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(12).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(12).Output = new HydraulicBoundaryLocationCalculationOutput( 3.73, targetProbability, 3.98788, 1.0 / 29882, 3.98694, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(13).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(13).Output = new HydraulicBoundaryLocationCalculationOutput( 3.75, targetProbability, 3.98788, 1.0 / 29902, 3.98710, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(14).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(14).Output = new HydraulicBoundaryLocationCalculationOutput( 3.30, targetProbability, 3.98788, 1.0 / 30037, 3.98817, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(15).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(15).Output = new HydraulicBoundaryLocationCalculationOutput( 9.57, targetProbability, 3.98788, 1.0 / 29999, 3.98787, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(16).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(16).Output = new HydraulicBoundaryLocationCalculationOutput( 8.02, targetProbability, 3.98788, 1.0 / 30108, 3.98873, CalculationConvergence.CalculatedConverged, generalResult); - calculations.ElementAt(17).Output = new HydraulicBoundaryLocationOutput( + calculations.ElementAt(17).Output = new HydraulicBoundaryLocationCalculationOutput( 4.11, targetProbability, 3.98788, 1.0 / 29929, 3.98732, Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -282,7 +282,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculation.cs =================================================================== diff -u -r1026dd2d5cef03cffca2f390ef5e7ce0a07e33dd -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculation.cs (.../HydraulicBoundaryLocationCalculation.cs) (revision 1026dd2d5cef03cffca2f390ef5e7ce0a07e33dd) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculation.cs (.../HydraulicBoundaryLocationCalculation.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -58,7 +58,7 @@ /// /// Gets or sets the output of the hydraulic boundary location calculation. /// - public HydraulicBoundaryLocationOutput Output { get; set; } + public HydraulicBoundaryLocationCalculationOutput Output { get; set; } /// /// Gets a value indicating whether this calculation item has output. Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculationOutput.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculationOutput.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationCalculationOutput.cs (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -0,0 +1,118 @@ +// Copyright (C) Stichting Deltares 2017. 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.IllustrationPoints; +using Ringtoets.Common.Data.Probability; + +namespace Ringtoets.Common.Data.Hydraulics +{ + /// + /// Class that holds all hydraulic boundary calculation specific output parameters. + /// + public class HydraulicBoundaryLocationCalculationOutput + { + /// + /// Creates a new instance of . + /// + /// The calculation result. + /// The norm used during the calculation. + /// The reliability index used during the calculation. + /// The calculated probability. + /// The calculated reliability. + /// The convergence status of the calculation. + /// The general result of this output with sub mechanism illustration points. + /// Thrown when + /// or falls outside the [0.0, 1.0] range and is not . + public HydraulicBoundaryLocationCalculationOutput(double result, + double targetProbability, + double targetReliability, + double calculatedProbability, + double calculatedReliability, + CalculationConvergence calculationConvergence, + GeneralResult generalResult) + { + 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; + GeneralResult = generalResult; + } + + /// + /// Gets the result of the calculation. + /// + public RoundedDouble Result { get; } + + /// + /// Gets the target probability. + /// [1/year] + /// + public double TargetProbability { get; } + + /// + /// Gets the target beta. + /// [-] + /// + public RoundedDouble TargetReliability { get; } + + /// + /// Gets the calculated probability. + /// [1/year] + /// + public double CalculatedProbability { get; } + + /// + /// Gets the calculated reliability. + /// [-] + /// + public RoundedDouble CalculatedReliability { get; } + + /// + /// Gets the convergence status of the calculation. + /// [-] + /// + public CalculationConvergence CalculationConvergence { get; } + + /// + /// Gets the general results with the sub mechanism illustration points. + /// + public GeneralResult GeneralResult { get; } + + /// + /// Gets the value indicating whether the output contains a general result with illustration points. + /// + public bool HasGeneralResult + { + get + { + return GeneralResult != null; + } + } + } +} \ No newline at end of file Fisheye: Tag da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocationOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -r9146cb4eb11b38d0052b4ceb4ce5d5f22b431f67 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 9146cb4eb11b38d0052b4ceb4ce5d5f22b431f67) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -50,7 +50,7 @@ - + Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs =================================================================== diff -u -r13ee3abc211d121019b140a75e51bc9fd8acef28 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (.../HydraulicBoundaryCalculationsView.cs) (revision 13ee3abc211d121019b140a75e51bc9fd8acef28) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryCalculationsView.cs (.../HydraulicBoundaryCalculationsView.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -135,11 +135,11 @@ HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = ((HydraulicBoundaryLocationCalculationRow) currentRow.DataBoundItem).CalculatableObject; - HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = hydraulicBoundaryLocationCalculation.Output; + HydraulicBoundaryLocationCalculationOutput hydraulicBoundaryLocationCalculationOutput = hydraulicBoundaryLocationCalculation.Output; if (hydraulicBoundaryLocationCalculation.HasOutput - && hydraulicBoundaryLocationOutput.HasGeneralResult) + && hydraulicBoundaryLocationCalculationOutput.HasGeneralResult) { - return hydraulicBoundaryLocationOutput.GeneralResult.TopLevelIllustrationPoints.Select( + return hydraulicBoundaryLocationCalculationOutput.GeneralResult.TopLevelIllustrationPoints.Select( topLevelSubMechanismIllustrationPoint => { SubMechanismIllustrationPoint subMechanismIllustrationPoint = Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r1513447d61c0a667d233af5da6ba0480ffe5c3c3 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 1513447d61c0a667d233af5da6ba0480ffe5c3c3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -236,10 +236,10 @@ e.Message)); } - HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput( + HydraulicBoundaryLocationCalculationOutput hydraulicBoundaryLocationCalculationOutput = CreateOutput( messageProvider, hydraulicBoundaryLocation.Name, calculationInput.Beta, norm, calculator.Converged, generalResult); - hydraulicBoundaryLocationCalculation.Output = hydraulicBoundaryLocationOutput; + hydraulicBoundaryLocationCalculation.Output = hydraulicBoundaryLocationCalculationOutput; } /// @@ -277,15 +277,15 @@ /// The target probability for the calculation. /// The value indicating whether the calculation converged. /// The general result with illustration points. - /// A . + /// A . /// Thrown when /// or the calculated probability falls outside the [0.0, 1.0] range and is not . - private HydraulicBoundaryLocationOutput CreateHydraulicBoundaryLocationOutput(ICalculationMessageProvider messageProvider, - string hydraulicBoundaryLocationName, - double targetReliability, - double targetProbability, - bool? calculatorConverged, - GeneralResult generalResult) + private HydraulicBoundaryLocationCalculationOutput CreateOutput(ICalculationMessageProvider messageProvider, + string hydraulicBoundaryLocationName, + double targetReliability, + double targetProbability, + bool? calculatorConverged, + GeneralResult generalResult) { double designWaterLevel = calculator.DesignWaterLevel; double reliability = calculator.ReliabilityIndex; @@ -298,10 +298,10 @@ log.Warn(messageProvider.GetCalculatedNotConvergedMessage(hydraulicBoundaryLocationName)); } - return new HydraulicBoundaryLocationOutput(designWaterLevel, targetProbability, - targetReliability, probability, reliability, - converged, - generalResult); + return new HydraulicBoundaryLocationCalculationOutput(designWaterLevel, targetProbability, + targetReliability, probability, reliability, + converged, + generalResult); } /// Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r1513447d61c0a667d233af5da6ba0480ffe5c3c3 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 1513447d61c0a667d233af5da6ba0480ffe5c3c3) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -236,10 +236,10 @@ e.Message)); } - HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput( + HydraulicBoundaryLocationCalculationOutput hydraulicBoundaryLocationCalculationOutput = CreateOutput( messageProvider, hydraulicBoundaryLocation.Name, calculationInput.Beta, norm, calculator.Converged, generalResult); - hydraulicBoundaryLocationCalculation.Output = hydraulicBoundaryLocationOutput; + hydraulicBoundaryLocationCalculation.Output = hydraulicBoundaryLocationCalculationOutput; } /// @@ -277,15 +277,15 @@ /// The target probability for the calculation. /// The value indicating whether the calculation converged. /// The general result with illustration points. - /// A . + /// A . /// Thrown when /// or the calculated probability falls outside the [0.0, 1.0] range and is not . - private HydraulicBoundaryLocationOutput CreateHydraulicBoundaryLocationOutput(ICalculationMessageProvider messageProvider, - string hydraulicBoundaryLocationName, - double targetReliability, - double targetProbability, - bool? calculatorConverged, - GeneralResult generalResult) + private HydraulicBoundaryLocationCalculationOutput CreateOutput(ICalculationMessageProvider messageProvider, + string hydraulicBoundaryLocationName, + double targetReliability, + double targetProbability, + bool? calculatorConverged, + GeneralResult generalResult) { double waveHeight = calculator.WaveHeight; double reliability = calculator.ReliabilityIndex; @@ -298,9 +298,9 @@ log.Warn(messageProvider.GetCalculatedNotConvergedMessage(hydraulicBoundaryLocationName)); } - return new HydraulicBoundaryLocationOutput(waveHeight, targetProbability, - targetReliability, probability, reliability, - converged, generalResult); + return new HydraulicBoundaryLocationCalculationOutput(waveHeight, targetProbability, + targetReliability, probability, reliability, + converged, generalResult); } /// Index: Ringtoets/Common/src/Ringtoets.Common.Util/AggregatedHydraulicBoundaryLocationFactory.cs =================================================================== diff -u -r5ddc9c8c424e9a85e22bde50f7133111cbf16348 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/src/Ringtoets.Common.Util/AggregatedHydraulicBoundaryLocationFactory.cs (.../AggregatedHydraulicBoundaryLocationFactory.cs) (revision 5ddc9c8c424e9a85e22bde50f7133111cbf16348) +++ Ringtoets/Common/src/Ringtoets.Common.Util/AggregatedHydraulicBoundaryLocationFactory.cs (.../AggregatedHydraulicBoundaryLocationFactory.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -86,7 +86,7 @@ GetCalculationResult(waveHeightLookupForFactorizedLowerLimitNorm[location].Output))).ToArray(); } - private static RoundedDouble GetCalculationResult(HydraulicBoundaryLocationOutput output) + private static RoundedDouble GetCalculationResult(HydraulicBoundaryLocationCalculationOutput output) { return output?.Result ?? RoundedDouble.NaN; } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationOutputTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationOutputTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationOutputTest.cs (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -0,0 +1,157 @@ +// Copyright (C) Stichting Deltares 2017. 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; +using Ringtoets.Common.Data.TestUtil.IllustrationPoints; + +namespace Ringtoets.Common.Data.Test.Hydraulics +{ + [TestFixture] + public class HydraulicBoundaryLocationCalculationOutputTest + { + [Test] + [SetCulture("nl-NL")] + [Combinatorial] + public void Constructor_InvalidTargetProbability_ThrowsArgumentOutOfRangeException([Values(-0.01, 1.01)] double targetProbability, + [Values(true, false)] bool withIllustrationPoints) + { + // Setup + var random = new Random(32); + TestGeneralResultSubMechanismIllustrationPoint generalResult = withIllustrationPoints + ? new TestGeneralResultSubMechanismIllustrationPoint() + : null; + + // Call + TestDelegate call = () => + { + new HydraulicBoundaryLocationCalculationOutput(random.NextDouble(), + targetProbability, + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + random.NextEnumValue(), + generalResult); + }; + + // 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")] + [Combinatorial] + public void Constructor_InvalidCalculatedProbability_ThrowsArgumentOutOfRangeException([Values(-0.01, 1.01)] double calculatedProbability, + [Values(true, false)] bool withIllustrationPoints) + { + // Setup + var random = new Random(32); + TestGeneralResultSubMechanismIllustrationPoint generalResult = withIllustrationPoints + ? new TestGeneralResultSubMechanismIllustrationPoint() + : null; + + // Call + TestDelegate call = () => new HydraulicBoundaryLocationCalculationOutput(random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + calculatedProbability, + random.NextDouble(), + random.NextEnumValue(), + generalResult); + + // 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] + public void Constructor_ValidInputAndGeneralResultNull_ExpectedProperties() + { + // Setup + var random = new Random(32); + double result = random.NextDouble(); + double targetProbability = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedProbability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + // Call + var output = new HydraulicBoundaryLocationCalculationOutput(result, + targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence, + null); + + // 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); + Assert.IsNull(output.GeneralResult); + Assert.IsFalse(output.HasGeneralResult); + } + + [Test] + public void Constructor_ValidInputAndGeneralResultNotNull_ExpectedProperties() + { + // Setup + var random = new Random(32); + double result = random.NextDouble(); + double targetProbability = random.NextDouble(); + double targetReliability = random.NextDouble(); + double calculatedProbability = random.NextDouble(); + double calculatedReliability = random.NextDouble(); + var convergence = random.NextEnumValue(); + + var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(); + + // Call + var output = new HydraulicBoundaryLocationCalculationOutput(result, + targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence, + generalResult); + + // 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); + Assert.AreSame(generalResult, output.GeneralResult); + Assert.IsTrue(output.HasGeneralResult); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationTest.cs =================================================================== diff -u -r1026dd2d5cef03cffca2f390ef5e7ce0a07e33dd -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationTest.cs (.../HydraulicBoundaryLocationCalculationTest.cs) (revision 1026dd2d5cef03cffca2f390ef5e7ce0a07e33dd) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationTest.cs (.../HydraulicBoundaryLocationCalculationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -67,7 +67,7 @@ var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); if (setOutput) { - calculation.Output = new TestHydraulicBoundaryLocationOutput(5); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(5); } // Call @@ -97,14 +97,14 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.0, CalculationConvergence.CalculatedConverged) }, false); yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()), false); yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.0, CalculationConvergence.CalculatedConverged) }, true); yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) @@ -113,12 +113,12 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.0, new TestGeneralResultSubMechanismIllustrationPoint()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.0, new TestGeneralResultSubMechanismIllustrationPoint()) }, true); yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(1.0, new TestGeneralResultSubMechanismIllustrationPoint()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.0, new TestGeneralResultSubMechanismIllustrationPoint()) }, false); } } Fisheye: Tag da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationOutputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj =================================================================== diff -u -r9146cb4eb11b38d0052b4ceb4ce5d5f22b431f67 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision 9146cb4eb11b38d0052b4ceb4ce5d5f22b431f67) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -49,7 +49,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/Ringtoets.Common.Data.TestUtil.Test.csproj (.../Ringtoets.Common.Data.TestUtil.Test.csproj) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -45,7 +45,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationCalculationOutputTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationCalculationOutputTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationCalculationOutputTest.cs (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -0,0 +1,134 @@ +// Copyright (C) Stichting Deltares 2017. 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 NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil.IllustrationPoints; + +namespace Ringtoets.Common.Data.TestUtil.Test +{ + [TestFixture] + public class TestHydraulicBoundaryLocationCalculationOutputTest + { + [Test] + public void TestHydraulicBoundaryLocationCalculationOutput_NoArguments_ReturnsExpectedValues() + { + // Call + var output = new TestHydraulicBoundaryLocationCalculationOutput(); + + // Assert + Assert.IsInstanceOf(output); + Assert.IsNaN(output.Result); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.TargetReliability); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.AreEqual(CalculationConvergence.NotCalculated, output.CalculationConvergence); + Assert.IsNull(output.GeneralResult); + } + + [Test] + public void TestHydraulicBoundaryLocationCalculationOutput_WithoutConvergence_ReturnsExpectedValues() + { + // Setup + const double result = 9.0; + + // Call + var output = new TestHydraulicBoundaryLocationCalculationOutput(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); + Assert.IsNull(output.GeneralResult); + } + + [Test] + [TestCase(CalculationConvergence.CalculatedConverged)] + [TestCase(CalculationConvergence.NotCalculated)] + [TestCase(CalculationConvergence.CalculatedNotConverged)] + public void TestHydraulicBoundaryLocationCalculationOutput_WithConvergence_ReturnsExpectedValues(CalculationConvergence convergence) + { + // Setup + const double result = 9.5; + + // Call + var output = new TestHydraulicBoundaryLocationCalculationOutput(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); + Assert.IsNull(output.GeneralResult); + } + + [Test] + public void TestHydraulicBoundaryLocationCalculationOutput_WithGeneralResultAndResult_ReturnsExpectedValues() + { + // Setup + const double result = 9.5; + var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(); + + // Call + var output = new TestHydraulicBoundaryLocationCalculationOutput(result, generalResult); + + // Assert + Assert.IsInstanceOf(output); + Assert.AreEqual(result, output.Result, output.Result.GetAccuracy()); + Assert.AreSame(generalResult, output.GeneralResult); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.TargetReliability); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, + output.CalculationConvergence); + } + + [Test] + public void TestHydraulicBoundaryLocationCalculationOutput_WithGeneralResult_ReturnsExpectedValues() + { + // Setup + var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(); + + // Call + var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); + + // Assert + Assert.IsInstanceOf(output); + Assert.AreSame(output.GeneralResult, generalResult); + Assert.IsNaN(output.Result); + Assert.IsNaN(output.TargetProbability); + Assert.IsNaN(output.TargetReliability); + Assert.IsNaN(output.CalculatedProbability); + Assert.IsNaN(output.CalculatedReliability); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, + output.CalculationConvergence); + } + } +} \ No newline at end of file Fisheye: Tag da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationOutputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionStub.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -203,7 +203,7 @@ if (setCalculationOutput) { - hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); } return hydraulicBoundaryLocationCalculation; Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/Ringtoets.Common.Data.TestUtil.csproj (.../Ringtoets.Common.Data.TestUtil.csproj) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -51,7 +51,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocationCalculationOutput.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocationCalculationOutput.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocationCalculationOutput.cs (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -0,0 +1,61 @@ +// Copyright (C) Stichting Deltares 2017. 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; +using Ringtoets.Common.Data.IllustrationPoints; + +namespace Ringtoets.Common.Data.TestUtil +{ + /// + /// Class which creates simple instances of , + /// which can be used during testing. + /// + public class TestHydraulicBoundaryLocationCalculationOutput : HydraulicBoundaryLocationCalculationOutput + { + /// + /// Creates a new instance of . + /// + public TestHydraulicBoundaryLocationCalculationOutput() : this(double.NaN) {} + + /// + /// Creates a new instance of . + /// + /// The result to set in the output. + /// The to set in the output. + public TestHydraulicBoundaryLocationCalculationOutput(double result, CalculationConvergence calculationConvergence = CalculationConvergence.NotCalculated) : + base(result, double.NaN, double.NaN, double.NaN, double.NaN, calculationConvergence, null) {} + + /// + /// Creates a new instance of with a specified general result. + /// + /// The to set in the output. + public TestHydraulicBoundaryLocationCalculationOutput(GeneralResult generalResult) : + base(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, CalculationConvergence.CalculatedConverged, generalResult) {} + + /// + /// Creates a new instance of with a specified general result. + /// + /// The result to set in the output. + /// The to set in the output. + public TestHydraulicBoundaryLocationCalculationOutput(double result, GeneralResult generalResult) : + base(result, double.NaN, double.NaN, double.NaN, double.NaN, CalculationConvergence.CalculatedConverged, generalResult) {} + } +} \ No newline at end of file Fisheye: Tag da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocationOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs =================================================================== diff -u -r7e856a043295f1db377b4cdc63ecb4be7d5aa341 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationPropertiesTest.cs) (revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -172,7 +172,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) }; // Call @@ -305,18 +305,18 @@ illustrationPoints) : null; - var hydraulicBoundaryLocationOutput = new HydraulicBoundaryLocationOutput(result, - targetProbability, - targetReliability, - calculatedProbability, - calculatedReliability, - convergence, - generalResult); + var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(result, + targetProbability, + targetReliability, + calculatedProbability, + calculatedReliability, + convergence, + generalResult); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) { - Output = hydraulicBoundaryLocationOutput + Output = hydraulicBoundaryLocationCalculationOutput }; // Call @@ -335,7 +335,7 @@ if (withIllustrationPoints) { - GeneralResult expectedGeneralResult = hydraulicBoundaryLocationOutput.GeneralResult; + GeneralResult expectedGeneralResult = hydraulicBoundaryLocationCalculationOutput.GeneralResult; CollectionAssert.AreEqual(expectedGeneralResult.Stochasts, properties.AlphaValues); CollectionAssert.AreEqual(expectedGeneralResult.Stochasts, properties.Durations); CollectionAssert.AreEqual(expectedGeneralResult.TopLevelIllustrationPoints, properties.IllustrationPoints.Select(ip => ip.Data)); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -201,7 +201,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (.../HydraulicBoundaryCalculationsViewTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (.../HydraulicBoundaryCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -190,7 +190,7 @@ }; var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); - var output = new TestHydraulicBoundaryLocationOutput(generalResult); + var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); var calculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { @@ -251,7 +251,7 @@ new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) { - Output = new TestHydraulicBoundaryLocationOutput(1.23) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.23) }, new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs =================================================================== diff -u -r86a422d2f0c29eebb2c1c1efdcb3540bde62de17 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs (.../HydraulicBoundaryLocationCalculationRowTest.cs) (revision 86a422d2f0c29eebb2c1c1efdcb3540bde62de17) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationCalculationRowTest.cs (.../HydraulicBoundaryLocationCalculationRowTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -21,7 +21,6 @@ using System; using Core.Common.Base; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; @@ -99,7 +98,7 @@ var row = new HydraulicBoundaryLocationCalculationRow(hydraulicBoundaryLocationCalculation); var random = new Random(432); - var output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + var output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); // Call hydraulicBoundaryLocationCalculation.Output = output; Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationsViewSynchronizationTester.cs =================================================================== diff -u -r682dfada6e821a0dd7cf3f6be9a2823eb72d9302 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationsViewSynchronizationTester.cs (.../CalculationsViewSynchronizationTester.cs) (revision 682dfada6e821a0dd7cf3f6be9a2823eb72d9302) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/CalculationsViewSynchronizationTester.cs (.../CalculationsViewSynchronizationTester.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -114,7 +114,7 @@ ObservableList calculations = GetCalculationsInView(view); HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = calculations.First(); - hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()); + hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new TestGeneralResultSubMechanismIllustrationPoint()); hydraulicBoundaryLocationCalculation.NotifyObservers(); } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -r25af784999b04dc8156272632e7f6c638c55a18c -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 25af784999b04dc8156272632e7f6c638c55a18c) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -59,7 +59,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.0, CalculationConvergence.CalculatedConverged) }); yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation("Test"))); @@ -275,7 +275,7 @@ { ShouldIllustrationPointsBeCalculated = false }, - Output = new TestHydraulicBoundaryLocationOutput(3.0, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(3.0, CalculationConvergence.CalculatedConverged) }; var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocationCalculation, @@ -330,7 +330,7 @@ } // Assert - HydraulicBoundaryLocationOutput calculationOutput = hydraulicBoundaryLocationCalculation.Output; + HydraulicBoundaryLocationCalculationOutput calculationOutput = hydraulicBoundaryLocationCalculation.Output; Assert.IsNotNull(calculationOutput); Assert.AreEqual(expectedDesignWaterLevel, calculationOutput.Result, calculationOutput.Result.GetAccuracy()); Assert.AreEqual(CalculationConvergence.CalculatedConverged, calculationOutput.CalculationConvergence); @@ -373,7 +373,7 @@ mockRepository.ReplayAll(); - var output = new TestHydraulicBoundaryLocationOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var output = new TestHydraulicBoundaryLocationCalculationOutput(double.NaN, CalculationConvergence.CalculatedConverged); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)) { InputParameters = @@ -429,7 +429,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(double.NaN, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(double.NaN, CalculationConvergence.CalculatedConverged) }; const double norm = 1.0 / 300; Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataSynchronizationServiceTest.cs =================================================================== diff -u -r6e16427bb9a893702e7ce19a754c24c100a99958 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataSynchronizationServiceTest.cs (.../RingtoetsCommonDataSynchronizationServiceTest.cs) (revision 6e16427bb9a893702e7ce19a754c24c100a99958) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataSynchronizationServiceTest.cs (.../RingtoetsCommonDataSynchronizationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -55,12 +55,12 @@ var calculationWithOutput1 = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()) }; var calculationWithOutput2 = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()) }; var calculations = new ObservableList Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -r25af784999b04dc8156272632e7f6c638c55a18c -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 25af784999b04dc8156272632e7f6c638c55a18c) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -58,7 +58,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.0, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.0, CalculationConvergence.CalculatedConverged) }); yield return new TestCaseData(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation("Test"))); @@ -272,7 +272,7 @@ { ShouldIllustrationPointsBeCalculated = false }, - Output = new TestHydraulicBoundaryLocationOutput(3.0, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(3.0, CalculationConvergence.CalculatedConverged) }; var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocationCalculation, @@ -327,7 +327,7 @@ } // Assert - HydraulicBoundaryLocationOutput calculationOutput = hydraulicBoundaryLocationCalculation.Output; + HydraulicBoundaryLocationCalculationOutput calculationOutput = hydraulicBoundaryLocationCalculation.Output; Assert.IsNotNull(calculationOutput); Assert.AreEqual(expectedWaveHeight, calculationOutput.Result, calculationOutput.Result.GetAccuracy()); Assert.AreEqual(CalculationConvergence.CalculatedConverged, calculationOutput.CalculationConvergence); @@ -370,7 +370,7 @@ mockRepository.ReplayAll(); - var output = new TestHydraulicBoundaryLocationOutput(double.NaN, CalculationConvergence.CalculatedConverged); + var output = new TestHydraulicBoundaryLocationCalculationOutput(double.NaN, CalculationConvergence.CalculatedConverged); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)) { InputParameters = @@ -426,7 +426,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(double.NaN, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(double.NaN, CalculationConvergence.CalculatedConverged) }; const double norm = 1.0 / 300; Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationOutput.cs =================================================================== diff -u -radadf1a820c1c6f418f30411352bf661214dd2ae -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationOutput.cs (.../DuneLocationOutput.cs) (revision adadf1a820c1c6f418f30411352bf661214dd2ae) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationOutput.cs (.../DuneLocationOutput.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -29,7 +29,7 @@ public class DuneLocationOutput { /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// The convergence status of the calculation. /// The container for the properties for the . Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -277,7 +277,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs =================================================================== diff -u -r14708ad2bb047af38e5cdafb60946ed51c6462e5 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs (.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs) (revision 14708ad2bb047af38e5cdafb60946ed51c6462e5) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs (.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -102,7 +102,7 @@ GetCalculationResult(waveHeightLookupForFactorizedLowerLimitNorm[location].Output))).ToArray(); } - private static RoundedDouble GetCalculationResult(HydraulicBoundaryLocationOutput output) + private static RoundedDouble GetCalculationResult(HydraulicBoundaryLocationCalculationOutput output) { return output?.Result ?? RoundedDouble.NaN; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -rf6b0f29c37bc58e3833c68bbd5b6bae6ddf90d5c -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision f6b0f29c37bc58e3833c68bbd5b6bae6ddf90d5c) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -347,7 +347,7 @@ private static void SetHydraulicBoundaryLocationCalculationOutput(IEnumerable calculations) { - calculations.First().Output = new TestHydraulicBoundaryLocationOutput(); + calculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); } private static GrassCoverErosionOutwardsWaveConditionsCalculation CreateCalculationWithoutOutput() Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs =================================================================== diff -u -r7e856a043295f1db377b4cdc63ecb4be7d5aa341 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs) (revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -158,7 +158,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) }; // Call @@ -278,17 +278,17 @@ double designWaterLevel = random.NextDouble(); var convergence = random.NextEnumValue(); - var hydraulicBoundaryLocationOutput = new HydraulicBoundaryLocationOutput(designWaterLevel, - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - convergence, - new TestGeneralResultSubMechanismIllustrationPoint()); + var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(designWaterLevel, + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + convergence, + new TestGeneralResultSubMechanismIllustrationPoint()); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = hydraulicBoundaryLocationOutput + Output = hydraulicBoundaryLocationCalculationOutput }; // Call Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs =================================================================== diff -u -r05f07423a3cae17b52aaacb83570e8bd6c9071c2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs) (revision 05f07423a3cae17b52aaacb83570e8bd6c9071c2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -77,7 +77,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(1.5, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.5, CalculationConvergence.CalculatedConverged) }; // Call Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs =================================================================== diff -u -r7e856a043295f1db377b4cdc63ecb4be7d5aa341 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs) (revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -158,7 +158,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) }; // Call @@ -278,17 +278,17 @@ double waveHeight = random.NextDouble(); var convergence = random.NextEnumValue(); - var hydraulicBoundaryLocationOutput = new HydraulicBoundaryLocationOutput(waveHeight, - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - convergence, - new TestGeneralResultSubMechanismIllustrationPoint()); + var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(waveHeight, + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + convergence, + new TestGeneralResultSubMechanismIllustrationPoint()); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = hydraulicBoundaryLocationOutput + Output = hydraulicBoundaryLocationCalculationOutput }; // Call Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs =================================================================== diff -u -r05f07423a3cae17b52aaacb83570e8bd6c9071c2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs) (revision 05f07423a3cae17b52aaacb83570e8bd6c9071c2) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -77,7 +77,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(1.5, CalculationConvergence.CalculatedConverged) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.5, CalculationConvergence.CalculatedConverged) }; // Call Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs =================================================================== diff -u -r9aba4d42d9c7b62146ee8e45970ab70f90a6caea -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs) (revision 9aba4d42d9c7b62146ee8e45970ab70f90a6caea) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -245,7 +245,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) + Output = new TestHydraulicBoundaryLocationCalculationOutput(designWaterLevel) }); // Call @@ -290,7 +290,7 @@ new TestSubMechanismIllustrationPoint()) }; var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); - var output = new TestHydraulicBoundaryLocationOutput(generalResult); + var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); // Call calculations[2].Output = output; @@ -656,7 +656,7 @@ new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) { - Output = new TestHydraulicBoundaryLocationOutput(1.23) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.23) }, new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) { @@ -671,7 +671,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.01, generalResult) } }; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs =================================================================== diff -u -re1c27b68145eb5867a2c08ac1ee18bb671205bbf -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision e1c27b68145eb5867a2c08ac1ee18bb671205bbf) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -308,7 +308,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection, failureMechanism); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs =================================================================== diff -u -r8b013118f28fcc57054216f614fe556ee72d9eeb -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs) (revision 8b013118f28fcc57054216f614fe556ee72d9eeb) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -245,7 +245,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(waveHeight) + Output = new TestHydraulicBoundaryLocationCalculationOutput(waveHeight) }); // Call @@ -290,7 +290,7 @@ new TestSubMechanismIllustrationPoint()) }; var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); - var output = new TestHydraulicBoundaryLocationOutput(generalResult); + var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); // Call calculations[2].Output = output; @@ -656,7 +656,7 @@ new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) { - Output = new TestHydraulicBoundaryLocationOutput(1.23) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.23) }, new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) { @@ -671,7 +671,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.01, generalResult) } }; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs =================================================================== diff -u -r66517b122d50b79f9177a60398424102f23f2d11 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs) (revision 66517b122d50b79f9177a60398424102f23f2d11) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -105,11 +105,11 @@ new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) { - Output = new TestHydraulicBoundaryLocationOutput(1.23) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.23) }, new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) { - Output = new TestHydraulicBoundaryLocationOutput(2.45) + Output = new TestHydraulicBoundaryLocationCalculationOutput(2.45) } }; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8ab9e7894ce5161b5bea48311e53fefb8b8d23f1 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 8ab9e7894ce5161b5bea48311e53fefb8b8d23f1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -69,7 +69,7 @@ ConfigureFailureMechanismWithHydraulicBoundaryOutput(failureMechanism); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - + string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); var mockRepository = new MockRepository(); @@ -117,7 +117,7 @@ ConfigureFailureMechanismWithHydraulicBoundaryOutput(failureMechanism); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - + assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true; assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "NonExistingPreprocessorDirectory"; @@ -167,7 +167,7 @@ ConfigureFailureMechanismWithHydraulicBoundaryOutput(failureMechanism); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - + var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, validFilePath, failureMechanism, @@ -221,7 +221,7 @@ ConfigureFailureMechanismWithHydraulicBoundaryOutput(failureMechanism); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - + calculation.InputParameters.BreakWater.Type = breakWaterType; var activity = new GrassCoverErosionOutwardsWaveConditionsCalculationActivity(calculation, @@ -666,7 +666,7 @@ private static void ConfigureFailureMechanismWithHydraulicBoundaryOutput(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); } private static GrassCoverErosionOutwardsWaveConditionsCalculation CreateValidCalculation(HydraulicBoundaryLocation location) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs =================================================================== diff -u -r66517b122d50b79f9177a60398424102f23f2d11 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs) (revision 66517b122d50b79f9177a60398424102f23f2d11) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsViewIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -105,11 +105,11 @@ new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) { - Output = new TestHydraulicBoundaryLocationOutput(1.23) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.23) }, new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) { - Output = new TestHydraulicBoundaryLocationOutput(2.45) + Output = new TestHydraulicBoundaryLocationCalculationOutput(2.45) } }; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rc7d35c31724fb469b38c6c3773d2e9aa1c38fdbb -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision c7d35c31724fb469b38c6c3773d2e9aa1c38fdbb) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -39,7 +39,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.Service; using Ringtoets.Common.Service.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; @@ -628,7 +627,7 @@ Assert.AreEqual($"Waterstand bij doorsnede-eis berekenen voor locatie '{hydraulicBoundaryLocation.Name}' is gelukt.", msgs[7]); }); - HydraulicBoundaryLocationOutput output = hydraulicBoundaryLocationCalculation.Output; + HydraulicBoundaryLocationCalculationOutput output = hydraulicBoundaryLocationCalculation.Output; Assert.AreEqual(0, output.Result, output.Result.GetAccuracy()); Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, output.CalculationConvergence); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r8ab9e7894ce5161b5bea48311e53fefb8b8d23f1 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 8ab9e7894ce5161b5bea48311e53fefb8b8d23f1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1742,7 +1742,7 @@ // Given AssessmentSectionStub assessmentSection = CreateAssessmentSection(); var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - + var parent = new CalculationGroup(); var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -1935,7 +1935,7 @@ private static void ConfigureFailureMechanismWithHydraulicBoundaryOutput(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { failureMechanism.Contribution = 5; - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(12); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(12); } private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation location) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1982,7 +1982,7 @@ private static void ConfigureFailureMechanismWithHydraulicBoundaryOutput(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { failureMechanism.Contribution = 5; - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); } private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation location) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r22937a4c42a0ae32f8210f7d8d6c5f5a380211f1 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs) (revision 22937a4c42a0ae32f8210f7d8d6c5f5a380211f1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs (.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -228,12 +228,12 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations); - failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); IEnumerable expectedAffectedItems = GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r8ab9e7894ce5161b5bea48311e53fefb8b8d23f1 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 8ab9e7894ce5161b5bea48311e53fefb8b8d23f1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1066,7 +1066,7 @@ private static void ConfigureFailureMechanismWithHydraulicBoundaryOutput(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { failureMechanism.Contribution = 20; - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); } private static double CalculateTargetNorm(double norm, double contribution, RoundedDouble N) Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs =================================================================== diff -u -r22937a4c42a0ae32f8210f7d8d6c5f5a380211f1 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs) (revision 22937a4c42a0ae32f8210f7d8d6c5f5a380211f1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -115,12 +115,12 @@ HydraulicBoundaryLocationCalculation calculation5 = failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First(); HydraulicBoundaryLocationCalculation calculation6 = failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First(); - calculation1.Output = new TestHydraulicBoundaryLocationOutput(); - calculation2.Output = new TestHydraulicBoundaryLocationOutput(); - calculation3.Output = new TestHydraulicBoundaryLocationOutput(); - calculation4.Output = new TestHydraulicBoundaryLocationOutput(); - calculation5.Output = new TestHydraulicBoundaryLocationOutput(); - calculation6.Output = new TestHydraulicBoundaryLocationOutput(); + calculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + calculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + calculation3.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + calculation4.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + calculation5.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + calculation6.Output = new TestHydraulicBoundaryLocationCalculationOutput(); // Call IEnumerable calculations = Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs =================================================================== diff -u -r84f89794ee99ca0abe46b7162285ffae01b2ef19 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs) (revision 84f89794ee99ca0abe46b7162285ffae01b2ef19) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -115,7 +115,7 @@ { foreach (HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation in hydraulicBoundaryLocationCalculations) { - hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); } } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -283,7 +283,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs =================================================================== diff -u -r7e856a043295f1db377b4cdc63ecb4be7d5aa341 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs (.../DesignWaterLevelCalculationPropertiesTest.cs) (revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs (.../DesignWaterLevelCalculationPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -158,7 +158,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) }; // Call @@ -278,17 +278,17 @@ double designWaterLevel = random.NextDouble(); var convergence = random.NextEnumValue(); - var hydraulicBoundaryLocationOutput = new HydraulicBoundaryLocationOutput(designWaterLevel, - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - convergence, - new TestGeneralResultSubMechanismIllustrationPoint()); + var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(designWaterLevel, + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + convergence, + new TestGeneralResultSubMechanismIllustrationPoint()); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = hydraulicBoundaryLocationOutput + Output = hydraulicBoundaryLocationCalculationOutput }; // Call Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs =================================================================== diff -u -r05f07423a3cae17b52aaacb83570e8bd6c9071c2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs (.../DesignWaterLevelCalculationsPropertiesTest.cs) (revision 05f07423a3cae17b52aaacb83570e8bd6c9071c2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs (.../DesignWaterLevelCalculationsPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -77,7 +77,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(1.5) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.5) }; // Call Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs =================================================================== diff -u -rafc174f27b49be4208cbc9714b526fc14e8057f3 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs (.../NormPropertiesIntegrationTest.cs) (revision afc174f27b49be4208cbc9714b526fc14e8057f3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs (.../NormPropertiesIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -306,28 +306,28 @@ { assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaterLevelCalculationsForSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaterLevelCalculationsForLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaveHeightCalculationsForSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaveHeightCalculationsForLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); } private static void SetOutputToHydraulicBoundaryLocationCalculations(GrassCoverErosionOutwardsFailureMechanism failureMechanism, @@ -336,22 +336,22 @@ { failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)) - .Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + .Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); } private static void AttachObserver(MockRepository mockRepository, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs =================================================================== diff -u -r7e856a043295f1db377b4cdc63ecb4be7d5aa341 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs (.../WaveHeightCalculationPropertiesTest.cs) (revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs (.../WaveHeightCalculationPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -158,7 +158,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) }; // Call @@ -278,17 +278,17 @@ double waveHeight = random.NextDouble(); var convergence = random.NextEnumValue(); - var hydraulicBoundaryLocationOutput = new HydraulicBoundaryLocationOutput(waveHeight, - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - convergence, - new TestGeneralResultSubMechanismIllustrationPoint()); + var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(waveHeight, + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + random.NextDouble(), + convergence, + new TestGeneralResultSubMechanismIllustrationPoint()); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = hydraulicBoundaryLocationOutput + Output = hydraulicBoundaryLocationCalculationOutput }; // Call Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs =================================================================== diff -u -r05f07423a3cae17b52aaacb83570e8bd6c9071c2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs (.../WaveHeightCalculationsPropertiesTest.cs) (revision 05f07423a3cae17b52aaacb83570e8bd6c9071c2) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs (.../WaveHeightCalculationsPropertiesTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -77,7 +77,7 @@ // Setup var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(1.5) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.5) }; // Call Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs =================================================================== diff -u -r5b86ad568d5780c215318f6f9231d1319fae6293 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 5b86ad568d5780c215318f6f9231d1319fae6293) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -156,7 +156,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -212,7 +212,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) + Output = new TestHydraulicBoundaryLocationCalculationOutput(designWaterLevel) }; // Precondition @@ -286,7 +286,7 @@ new TestSubMechanismIllustrationPoint()) }; var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); - var output = new TestHydraulicBoundaryLocationOutput(generalResult); + var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); // Call HydraulicBoundaryLocationCalculation boundaryLocationCalculation = hydraulicBoundaryLocationCalculations.ElementAt(2); @@ -632,7 +632,7 @@ new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) { - Output = new TestHydraulicBoundaryLocationOutput(1.23) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.23) }, new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) { @@ -647,7 +647,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.01, generalResult) } }; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -212,7 +212,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(waveHeight) + Output = new TestHydraulicBoundaryLocationCalculationOutput(waveHeight) }; // Precondition @@ -286,7 +286,7 @@ new TestSubMechanismIllustrationPoint()) }; var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); - var output = new TestHydraulicBoundaryLocationOutput(generalResult); + var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); // Call HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocationCalculations.ElementAt(2); @@ -632,7 +632,7 @@ new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)), new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)) { - Output = new TestHydraulicBoundaryLocationOutput(1.23) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.23) }, new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)) { @@ -647,7 +647,7 @@ { ShouldIllustrationPointsBeCalculated = true }, - Output = new TestHydraulicBoundaryLocationOutput(1.01, generalResult) + Output = new TestHydraulicBoundaryLocationCalculationOutput(1.01, generalResult) } }; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -ra6c8ce99232f4695f07c75d8bee5a7a101be46b3 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision a6c8ce99232f4695f07c75d8bee5a7a101be46b3) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -596,7 +596,7 @@ Assert.AreEqual($"Toetspeil berekenen voor locatie '{locationName}' ({categoryBoundaryName}) is gelukt.", msgs[7]); }); - HydraulicBoundaryLocationOutput output = hydraulicBoundaryLocationCalculation.Output; + HydraulicBoundaryLocationCalculationOutput output = hydraulicBoundaryLocationCalculation.Output; Assert.AreEqual(calculator.DesignWaterLevel, output.Result, output.Result.GetAccuracy()); Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, output.CalculationConvergence); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -rd1f9d5bcdee552dd29c64194d455de245db0190d -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision d1f9d5bcdee552dd29c64194d455de245db0190d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -599,7 +599,7 @@ Assert.AreEqual($"Golfhoogte berekenen voor locatie '{locationName}' ({categoryBoundaryName}) is gelukt.", msgs[7]); }); - HydraulicBoundaryLocationOutput output = hydraulicBoundaryLocationCalculation.Output; + HydraulicBoundaryLocationCalculationOutput output = hydraulicBoundaryLocationCalculation.Output; Assert.AreEqual(calculator.WaveHeight, output.Result, output.Result.GetAccuracy()); Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocationCalculation.Output.CalculationConvergence); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs =================================================================== diff -u -r61f1174cf2e321ad5b691a93f242557f8a0d3ad6 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision 61f1174cf2e321ad5b691a93f242557f8a0d3ad6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelCalculationsViewInfoTest.cs (.../DesignWaterLevelCalculationsViewInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -161,11 +161,11 @@ { new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()) }, new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()) } }; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs =================================================================== diff -u -rcff4b928800b2a49ccaaaa49e7c87755d79b0169 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision cff4b928800b2a49ccaaaa49e7c87755d79b0169) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs (.../WaveConditionsInputViewInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -31,7 +31,6 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Data; @@ -525,13 +524,13 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations( failureMechanism, assessmentSection, - new [] + new[] { hydraulicBoundaryLocation }); - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(assessmentLevel); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(assessmentLevel); yield return new TestCaseData( new GrassCoverErosionOutwardsWaveConditionsInputContext( Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs =================================================================== diff -u -r61f1174cf2e321ad5b691a93f242557f8a0d3ad6 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision 61f1174cf2e321ad5b691a93f242557f8a0d3ad6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs (.../WaveHeightCalculationsViewInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -161,11 +161,11 @@ { new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()) }, new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()) + Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()) } }; Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -raa7d4d7c13ed3eacfe01bfae2b13ce9e8940dad6 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision aa7d4d7c13ed3eacfe01bfae2b13ce9e8940dad6) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -312,14 +312,14 @@ HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation8 = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); - hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationOutput(); - hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationOutput(); - hydraulicBoundaryLocationCalculation3.Output = new TestHydraulicBoundaryLocationOutput(); - hydraulicBoundaryLocationCalculation4.Output = new TestHydraulicBoundaryLocationOutput(); - hydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationOutput(); - hydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationOutput(); - hydraulicBoundaryLocationCalculation7.Output = new TestHydraulicBoundaryLocationOutput(); - hydraulicBoundaryLocationCalculation8.Output = new TestHydraulicBoundaryLocationOutput(); + hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation3.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation4.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation7.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation8.Output = new TestHydraulicBoundaryLocationCalculationOutput(); HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation1 = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); @@ -334,12 +334,12 @@ HydraulicBoundaryLocationCalculation grassHydraulicBoundaryLocationCalculation6 = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); - grassHydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationOutput(); - grassHydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationOutput(); - grassHydraulicBoundaryLocationCalculation3.Output = new TestHydraulicBoundaryLocationOutput(); - grassHydraulicBoundaryLocationCalculation4.Output = new TestHydraulicBoundaryLocationOutput(); - grassHydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationOutput(); - grassHydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationOutput(); + grassHydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + grassHydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + grassHydraulicBoundaryLocationCalculation3.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + grassHydraulicBoundaryLocationCalculation4.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + grassHydraulicBoundaryLocationCalculation5.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + grassHydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationCalculationOutput(); var expectedAffectedItems = new List { @@ -517,7 +517,7 @@ var grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); ConfigureGrassCoverErosionOutwardsFailureMechanism(grassCoverErosionOutwardsFailureMechanism, hasOutput); - IEnumerable expectedAffectedItems = + IEnumerable expectedAffectedItems = GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(grassCoverErosionOutwardsFailureMechanism); // Call @@ -1679,12 +1679,12 @@ if (hasOutput) { - failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); - failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); + failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -81,14 +81,14 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - assessmentSection.WaterLevelCalculationsForSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - assessmentSection.WaveHeightCalculationsForSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - assessmentSection.WaveHeightCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaveHeightCalculationsForSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaveHeightCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); SetFullyConfiguredFailureMechanism(assessmentSection.ClosingStructures, hydraulicBoundaryLocation); SetFullyConfiguredFailureMechanism(assessmentSection.GrassCoverErosionInwards, hydraulicBoundaryLocation); @@ -869,12 +869,12 @@ hydraulicBoundaryLocation }); - failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); var profile1 = new ForeshoreProfile(new Point2D(0, 0), new[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -299,7 +299,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -296,7 +296,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -278,7 +278,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -276,7 +276,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -698,7 +698,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1846,7 +1846,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1891,7 +1891,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1200,7 +1200,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs =================================================================== diff -u -r06ce31cd7af024e22f8fd263b9ca85470ba3fda2 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision 06ce31cd7af024e22f8fd263b9ca85470ba3fda2) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -277,7 +277,7 @@ // When HydraulicBoundaryLocationCalculation calculation = getCalculationFunc(assessmentSection); - calculation.Output = new TestHydraulicBoundaryLocationOutput(new Random(21).NextDouble()); + calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(new Random(21).NextDouble()); calculation.NotifyObservers(); // Then Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -536,7 +536,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1826,7 +1826,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r5d32f059a2c417ffaab9d7404acdf2e133ec4f18 -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 5d32f059a2c417ffaab9d7404acdf2e133ec4f18) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1900,7 +1900,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -rda7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 6f33b44599df032ecae3342b0aacd606a9e87c1f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision da7bb9a6d96d7118d6dcdc2ee17a11d5b43f44c7) @@ -1012,7 +1012,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; }