Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -56,13 +56,13 @@ Name = location.Name.DeepClone(), LocationX = location.Location.X.ToNaNAsNull(), LocationY = location.Location.Y.ToNaNAsNull(), - ShouldDesignWaterLevelIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.DesignWaterLevelCalculation), - ShouldWaveHeightIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.WaveHeightCalculation), + ShouldDesignWaterLevelIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.DesignWaterLevelCalculation1), + ShouldWaveHeightIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.WaveHeightCalculation1), Order = order }; - CreateHydraulicLocationOutput(entity, location.DesignWaterLevelCalculation.Output, HydraulicLocationOutputType.DesignWaterLevel); - CreateHydraulicLocationOutput(entity, location.WaveHeightCalculation.Output, HydraulicLocationOutputType.WaveHeight); + CreateHydraulicLocationOutput(entity, location.DesignWaterLevelCalculation1.Output, HydraulicLocationOutputType.DesignWaterLevel); + CreateHydraulicLocationOutput(entity, location.WaveHeightCalculation1.Output, HydraulicLocationOutputType.WaveHeight); registry.Register(entity, location); return entity; @@ -111,14 +111,14 @@ Name = location.Name.DeepClone(), LocationX = location.Location.X.ToNaNAsNull(), LocationY = location.Location.Y.ToNaNAsNull(), - ShouldDesignWaterLevelIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.DesignWaterLevelCalculation), - ShouldWaveHeightIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.WaveHeightCalculation), + ShouldDesignWaterLevelIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.DesignWaterLevelCalculation1), + ShouldWaveHeightIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.WaveHeightCalculation1), Order = order }; - CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.DesignWaterLevelCalculation.Output, + CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.DesignWaterLevelCalculation1.Output, HydraulicLocationOutputType.DesignWaterLevel); - CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.WaveHeightCalculation.Output, + CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.WaveHeightCalculation1.Output, HydraulicLocationOutputType.WaveHeight); registry.Register(entity, location); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs =================================================================== diff -u -rdae8dd28223d61ff9d5ae061f77834aa74e94f6f -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs) (revision dae8dd28223d61ff9d5ae061f77834aa74e94f6f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -62,8 +62,8 @@ entity.LocationX.ToNullAsNaN(), entity.LocationY.ToNullAsNaN()); - SetDesignWaterLevelCalculation(entity, hydraulicBoundaryLocation.DesignWaterLevelCalculation); - SetWaveHeightCalculation(entity, hydraulicBoundaryLocation.WaveHeightCalculation); + SetDesignWaterLevelCalculation(entity, hydraulicBoundaryLocation.DesignWaterLevelCalculation1); + SetWaveHeightCalculation(entity, hydraulicBoundaryLocation.WaveHeightCalculation1); collector.Read(entity, hydraulicBoundaryLocation); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs =================================================================== diff -u -re6671f07e31bef1e5617d8998ce01be60cc648d2 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs (.../HydraulicLocationEntityReadExtensions.cs) (revision e6671f07e31bef1e5617d8998ce01be60cc648d2) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs (.../HydraulicLocationEntityReadExtensions.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -59,8 +59,8 @@ entity.LocationX.ToNullAsNaN(), entity.LocationY.ToNullAsNaN()); - SetDesignWaterLevelCalculation(entity, hydraulicBoundaryLocation.DesignWaterLevelCalculation); - SetWaveHeightCalculation(entity, hydraulicBoundaryLocation.WaveHeightCalculation); + SetDesignWaterLevelCalculation(entity, hydraulicBoundaryLocation.DesignWaterLevelCalculation1); + SetWaveHeightCalculation(entity, hydraulicBoundaryLocation.WaveHeightCalculation1); collector.Read(entity, hydraulicBoundaryLocation); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -65,14 +65,14 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, testName, coordinateX, coordinateY) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { ShouldIllustrationPointsBeCalculated = shouldDesignWaterLevelIllustrationPointsBeCalculated } }, - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -130,11 +130,11 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "testName", random.NextDouble(), random.NextDouble()) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = hydraulicBoundaryLocationDesignWaterLevelOutput }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = hydraulicBoundaryLocationWaveHeightOutput } @@ -176,15 +176,15 @@ bool shouldIllustrationPointsBeCalculated = random.NextBoolean(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "testName", random.NextDouble(), random.NextDouble()) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { ShouldIllustrationPointsBeCalculated = shouldIllustrationPointsBeCalculated }, Output = hydraulicBoundaryLocationDesignWaterLevelOutput }, - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -261,14 +261,14 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, testName, coordinateX, coordinateY) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { ShouldIllustrationPointsBeCalculated = shouldDesignWaterLevelIllustrationPointsBeCalculated } }, - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -327,11 +327,11 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "testName", random.NextDouble(), random.NextDouble()) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = hydraulicBoundaryLocationDesignWaterLevelOutput }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = hydraulicBoundaryLocationWaveHeightOutput } @@ -373,15 +373,15 @@ bool shouldIllustrationPointsBeCalculated = random.NextBoolean(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "testName", random.NextDouble(), random.NextDouble()) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { ShouldIllustrationPointsBeCalculated = shouldIllustrationPointsBeCalculated }, Output = hydraulicBoundaryLocationDesignWaterLevelOutput }, - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -2064,15 +2064,15 @@ Assert.AreEqual(expectedBoundaryLocation.Name, actualBoundaryLocation.Name); Assert.AreEqual(expectedBoundaryLocation.Location, actualBoundaryLocation.Location); - HydraulicBoundaryLocationCalculation expectedDesignWaterLevelCalculation = expectedBoundaryLocation.DesignWaterLevelCalculation; - HydraulicBoundaryLocationCalculation actualDesignWaterLevelCalculation = actualBoundaryLocation.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation expectedDesignWaterLevelCalculation = expectedBoundaryLocation.DesignWaterLevelCalculation1; + HydraulicBoundaryLocationCalculation actualDesignWaterLevelCalculation = actualBoundaryLocation.DesignWaterLevelCalculation1; Assert.AreEqual(expectedDesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, actualDesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(expectedDesignWaterLevelCalculation.Output, actualDesignWaterLevelCalculation.Output); - HydraulicBoundaryLocationCalculation expectedWaveHeightCalculation = expectedBoundaryLocation.WaveHeightCalculation; - HydraulicBoundaryLocationCalculation actualWaveHeightCalculation = actualBoundaryLocation.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation expectedWaveHeightCalculation = expectedBoundaryLocation.WaveHeightCalculation1; + HydraulicBoundaryLocationCalculation actualWaveHeightCalculation = actualBoundaryLocation.WaveHeightCalculation1; Assert.AreEqual(expectedWaveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, actualWaveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(expectedWaveHeightCalculation.Output, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs =================================================================== diff -u -r08216054a962813f931c0e90264b62f85a8f2683 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs) (revision 08216054a962813f931c0e90264b62f85a8f2683) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -94,11 +94,11 @@ Assert.AreEqual(x, location.Location.X, 1e-6); Assert.AreEqual(y, location.Location.Y, 1e-6); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation1; Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); Assert.IsFalse(designWaterLevelCalculation.HasOutput); - HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation1; Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); Assert.IsFalse(waveHeightCalculation.HasOutput); @@ -149,8 +149,8 @@ // Assert Assert.IsNotNull(location); - AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, location.DesignWaterLevelCalculation.Output); - AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, location.WaveHeightCalculation.Output); + AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, location.DesignWaterLevelCalculation1.Output); + AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, location.WaveHeightCalculation1.Output); } [Test] @@ -219,11 +219,11 @@ // Assert Assert.IsNotNull(location); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation1; Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, designWaterLevelCalculation.Output); - HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation1; Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, waveHeightCalculation.Output); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs =================================================================== diff -u -re5f26d97bb506d502aa9d4b2dc592a598e2d956d -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs (.../HydraulicLocationEntityReadExtensionsTest.cs) (revision e5f26d97bb506d502aa9d4b2dc592a598e2d956d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs (.../HydraulicLocationEntityReadExtensionsTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -93,11 +93,11 @@ Assert.AreEqual(x, location.Location.X, 1e-6); Assert.AreEqual(y, location.Location.Y, 1e-6); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation1; Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); Assert.IsFalse(designWaterLevelCalculation.HasOutput); - HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation1; Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); Assert.IsFalse(waveHeightCalculation.HasOutput); @@ -154,11 +154,11 @@ // Assert Assert.IsNotNull(location); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation1; Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, designWaterLevelCalculation.Output); - HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation1; Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(waveHeightOutputEntity, waveHeightCalculation.Output); } @@ -229,11 +229,11 @@ // Assert Assert.IsNotNull(location); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = location.DesignWaterLevelCalculation1; Assert.AreEqual(shouldDesignWaterLevelIllustrationPointsBeCalculated, designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(designWaterLevelOutputEntity, designWaterLevelCalculation.Output); - HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = location.WaveHeightCalculation1; Assert.AreEqual(shouldWaveHeightIllustrationPointsBeCalculated, waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationOutput(waveheightOutputEntity, waveHeightCalculation.Output); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -re5f26d97bb506d502aa9d4b2dc592a598e2d956d -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision e5f26d97bb506d502aa9d4b2dc592a598e2d956d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -214,7 +214,7 @@ // Assert Assert.AreSame(hydraulicBoundaryLocation, calculation.InputParameters.HydraulicBoundaryLocation); - Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.Result, calculation.InputParameters.AssessmentLevel); + Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.Result, calculation.InputParameters.AssessmentLevel); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -489,11 +489,11 @@ Assert.AreEqual(152.3, hydraulicBoundaryLocation.Location.X); Assert.AreEqual(2938.5, hydraulicBoundaryLocation.Location.Y); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = hydraulicBoundaryLocation.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = hydraulicBoundaryLocation.DesignWaterLevelCalculation1; Assert.IsFalse(designWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(designWaterLevelCalculation); - HydraulicBoundaryLocationCalculation waveHeightCalculation = hydraulicBoundaryLocation.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = hydraulicBoundaryLocation.WaveHeightCalculation1; Assert.IsFalse(waveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationWaveHeightCalculation(waveHeightCalculation); @@ -504,13 +504,13 @@ Assert.AreEqual(5293.8, hydraulicBoundaryLocationWithIllustrationPoints.Location.Y); HydraulicBoundaryLocationCalculation designWaterLevelCalculationWithIllustrationPoints = - hydraulicBoundaryLocationWithIllustrationPoints.DesignWaterLevelCalculation; + hydraulicBoundaryLocationWithIllustrationPoints.DesignWaterLevelCalculation1; Assert.IsTrue(designWaterLevelCalculationWithIllustrationPoints.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationDesignWaterLevelCalculation(designWaterLevelCalculationWithIllustrationPoints); AssertGeneralResultTopLevelSubMechanismIllustrationPoint(designWaterLevelCalculationWithIllustrationPoints.Output.GeneralResult); HydraulicBoundaryLocationCalculation waveHeightCalculationWithIllustrationPoints = - hydraulicBoundaryLocationWithIllustrationPoints.WaveHeightCalculation; + hydraulicBoundaryLocationWithIllustrationPoints.WaveHeightCalculation1; Assert.IsTrue(waveHeightCalculationWithIllustrationPoints.InputParameters.ShouldIllustrationPointsBeCalculated); AssertHydraulicBoundaryLocationWaveHeightCalculation(waveHeightCalculationWithIllustrationPoints); AssertGeneralResultTopLevelSubMechanismIllustrationPoint(waveHeightCalculationWithIllustrationPoints.Output.GeneralResult); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -340,13 +340,13 @@ { yield return new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new HydraulicBoundaryLocationOutput(12.4, double.NaN, double.NaN, double.NaN, double.NaN, CalculationConvergence.CalculatedConverged, null) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new HydraulicBoundaryLocationOutput(2.4, 0, 0, 0, 0, CalculationConvergence.CalculatedNotConverged, null) } @@ -360,15 +360,15 @@ GetConfiguredGeneralResultTopLevelSubMechanismIllustrationPoint()); yield return new HydraulicBoundaryLocation(13002, "test2", 135.2, 5293.8) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { ShouldIllustrationPointsBeCalculated = true }, Output = designWaterLevelOutput }, - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -r83ac738ad69ef53eba6ca4f647657e5b7f024b96 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 83ac738ad69ef53eba6ca4f647657e5b7f024b96) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -197,109 +197,109 @@ const double targetProbability = 1.0 / 200000; ObservableList locations = failureMechanism.HydraulicBoundaryLocations; GeneralResult generalResult = null; - locations.ElementAt(0).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.19, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(1).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.19, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(2).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196727, 4.78959, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(3).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196787, 4.78960, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(4).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.18, targetProbability, 4.79014, 1.0 / 1196787, 4.78960, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(5).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(6).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(7).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.39, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(8).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196489, 4.78955, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(9).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(10).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(11).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(12).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.40, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(13).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.41, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(14).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.41, targetProbability, 4.79014, 1.0 / 1196429, 4.78954, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(15).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 6.91, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(16).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.53, targetProbability, 4.79014, 1.0 / 1195476, 4.78938, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(17).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 7.80, targetProbability, 4.79014, 1.0 / 1194761, 4.78926, @@ -312,109 +312,109 @@ const double targetProbability = 1.0 / 200000; ObservableList locations = failureMechanism.HydraulicBoundaryLocations; GeneralResult generalResult = null; - locations.ElementAt(0).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.99, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(1).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.04, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(2).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.87, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(3).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.73, targetProbability, 4.79014, 1.0 / 1199892, 4.79012, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(4).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.59, targetProbability, 4.79014, 1.0 / 1199833, 4.79011, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(5).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.35, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(6).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.83, targetProbability, 4.79014, 1.0 / 1196906, 4.78962, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(7).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.00, targetProbability, 4.79014, 1.0 / 1197264, 4.78968, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(8).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.20, targetProbability, 4.79014, 1.0 / 1197324, 4.78969, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(9).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.41, targetProbability, 4.79014, 1.0 / 1197324, 4.78969, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(10).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.50, targetProbability, 4.79014, 1.0 / 1197622, 4.78974, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(11).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.57, targetProbability, 4.79014, 1.0 / 1197145, 4.78966, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(12).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.63, targetProbability, 4.79014, 1.0 / 1196608, 4.78957, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(13).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.68, targetProbability, 4.79014, 1.0 / 1196549, 4.78956, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(14).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.17, targetProbability, 4.79014, 1.0 / 1199713, 4.79009, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(15).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 11.13, targetProbability, 4.79014, 1.0 / 201269, 4.79035, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(16).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 9.24, targetProbability, 4.79014, 1.0 / 197742, 4.78976, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(17).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.34, targetProbability, 4.79014, 1.0 / 199056, 4.78998, @@ -810,109 +810,109 @@ { const double targetProbability = 1.0 / 30000; GeneralResult generalResult = null; - locations.ElementAt(0).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.78, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(1).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.77, targetProbability, 3.98787893, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(2).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.77, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(3).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.77, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(4).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.76865, targetProbability, 3.98788, 1.0 / 29996, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(5).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(6).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(7).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(8).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(9).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(10).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(11).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(12).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(13).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(14).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.93, targetProbability, 3.98788, 1.0 / 29995, 3.98784, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(15).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.54, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(16).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 5.86, targetProbability, 3.98788, 1.0 / 29994, 3.98783, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(17).DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( 6.00, targetProbability, 3.98788, 1.0 / 29993, 3.98782, @@ -924,109 +924,109 @@ { const double targetProbability = 1.0 / 30000; GeneralResult generalResult = null; - locations.ElementAt(0).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(0).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.13, targetProbability, 3.98788, 1.0 / 29972, 3.98766, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(1).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(1).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.19, targetProbability, 3.98788, 1.0 / 29962, 3.98770, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(2).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(2).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.02, targetProbability, 3.98788, 1.0 / 29977, 3.98758, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(3).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(3).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.87, targetProbability, 3.98788, 1.0 / 29963, 3.98759, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(4).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(4).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.73, targetProbability, 3.98788, 1.0 / 29957, 3.98754, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(5).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(5).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 2.65, targetProbability, 3.98788, 1.0 / 30022, 3.98805, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(6).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(6).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.04, targetProbability, 3.98788, 1.0 / 30001, 3.98789, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(7).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(7).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.20, targetProbability, 3.98788, 1.0 / 30000, 3.98788, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(8).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(8).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.35, targetProbability, 3.98788, 1.0 / 29996, 3.98785, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(9).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(9).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.53, targetProbability, 3.98788, 1.0 / 29999, 3.98787, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(10).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(10).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.62, targetProbability, 3.98788, 1.0 / 29888, 3.98699, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(11).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(11).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.68, targetProbability, 3.98788, 1.0 / 29890, 3.98701, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(12).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(12).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.73, targetProbability, 3.98788, 1.0 / 29882, 3.98694, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(13).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(13).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.75, targetProbability, 3.98788, 1.0 / 29902, 3.98710, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(14).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(14).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 3.30, targetProbability, 3.98788, 1.0 / 30037, 3.98817, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(15).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(15).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 9.57, targetProbability, 3.98788, 1.0 / 29999, 3.98787, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(16).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(16).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 8.02, targetProbability, 3.98788, 1.0 / 30108, 3.98873, CalculationConvergence.CalculatedConverged, generalResult); - locations.ElementAt(17).WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + locations.ElementAt(17).WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( 4.11, targetProbability, 3.98788, 1.0 / 29929, 3.98732, Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -r5a58d1cc2aa83be2f3217fd764b7d324c70bfc13 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 5a58d1cc2aa83be2f3217fd764b7d324c70bfc13) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -126,14 +126,14 @@ private static void AssertDesignWaterLevel(double expectedValue, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - RoundedDouble designWaterLevel = hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.Result; + RoundedDouble designWaterLevel = hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.Result; Assert.AreEqual((RoundedDouble) expectedValue, designWaterLevel, designWaterLevel.GetAccuracy()); } private static void AssertWaveHeight(double expectedValue, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - RoundedDouble waveHeight = hydraulicBoundaryLocation.WaveHeightCalculation.Output.Result; + RoundedDouble waveHeight = hydraulicBoundaryLocation.WaveHeightCalculation1.Output.Result; Assert.AreEqual((RoundedDouble) expectedValue, waveHeight, waveHeight.GetAccuracy()); } @@ -175,9 +175,9 @@ Assert.AreEqual(hydraulicBoundaryLocations.Count, hydraulicBoundaryLocationsGrassOutwards.Count); AssertDesignWaterLevelsForGrassCoverErosionOutwards(hydraulicBoundaryLocationsGrassOutwards); - AssertCalculationConvergence(hydraulicBoundaryLocationsGrassOutwards.Select(l => l.DesignWaterLevelCalculation)); + AssertCalculationConvergence(hydraulicBoundaryLocationsGrassOutwards.Select(l => l.DesignWaterLevelCalculation1)); AssertWaveHeightsForGrassCoverErosionOutwards(hydraulicBoundaryLocationsGrassOutwards); - AssertCalculationConvergence(hydraulicBoundaryLocationsGrassOutwards.Select(l => l.WaveHeightCalculation)); + AssertCalculationConvergence(hydraulicBoundaryLocationsGrassOutwards.Select(l => l.WaveHeightCalculation1)); Assert.AreEqual(1, demoAssessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Count); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = demoAssessmentSection.GrassCoverErosionOutwards @@ -418,7 +418,7 @@ Assert.AreEqual("PK001_0001_Piping", inputParameters.StochasticSoilModel.Name); Assert.AreEqual("W1-6_0_1D1", inputParameters.StochasticSoilProfile.SoilProfile.Name); Assert.AreEqual(1300001, inputParameters.HydraulicBoundaryLocation.Id); - Assert.AreEqual(5.78, inputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.Result, 1e-3); + Assert.AreEqual(5.78, inputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.Result, 1e-3); Assert.AreEqual(0.875, PipingSemiProbabilisticDesignVariableFactory.GetDampingFactorExit(inputParameters).GetDesignValue(), inputParameters.DampingFactorExit.GetAccuracy()); @@ -606,9 +606,9 @@ ObservableList hydraulicBoundaryLocations = demoAssessmentSection.HydraulicBoundaryDatabase.Locations; Assert.AreEqual(18, hydraulicBoundaryLocations.Count); AssertDesignWaterLevelsForAssessmentSection(hydraulicBoundaryLocations); - AssertCalculationConvergence(hydraulicBoundaryLocations.Select(hbl => hbl.DesignWaterLevelCalculation)); + AssertCalculationConvergence(hydraulicBoundaryLocations.Select(hbl => hbl.DesignWaterLevelCalculation1)); AssertWaveHeightValuesForAssessmentSection(hydraulicBoundaryLocations); - AssertCalculationConvergence(hydraulicBoundaryLocations.Select(hbl => hbl.WaveHeightCalculation)); + AssertCalculationConvergence(hydraulicBoundaryLocations.Select(hbl => hbl.WaveHeightCalculation1)); } private static void AssertDesignWaterLevelsForAssessmentSection(ObservableList locations) Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs =================================================================== diff -u -re855d4739bb02a913644ca71efac87196ce7229b -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision e855d4739bb02a913644ca71efac87196ce7229b) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs (.../ClosingStructuresFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -365,8 +365,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs =================================================================== diff -u -r702a415565e8ad6476847e2ef5349ab7df56d376 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs (.../HydraulicBoundaryLocation.cs) (revision 702a415565e8ad6476847e2ef5349ab7df56d376) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs (.../HydraulicBoundaryLocation.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -50,11 +50,11 @@ Name = name; Location = new Point2D(coordinateX, coordinateY); - DesignWaterLevelCalculation = new HydraulicBoundaryLocationCalculation(); + DesignWaterLevelCalculation1 = new HydraulicBoundaryLocationCalculation(); DesignWaterLevelCalculation2 = new HydraulicBoundaryLocationCalculation(); DesignWaterLevelCalculation3 = new HydraulicBoundaryLocationCalculation(); DesignWaterLevelCalculation4 = new HydraulicBoundaryLocationCalculation(); - WaveHeightCalculation = new HydraulicBoundaryLocationCalculation(); + WaveHeightCalculation1 = new HydraulicBoundaryLocationCalculation(); WaveHeightCalculation2 = new HydraulicBoundaryLocationCalculation(); WaveHeightCalculation3 = new HydraulicBoundaryLocationCalculation(); WaveHeightCalculation4 = new HydraulicBoundaryLocationCalculation(); @@ -85,7 +85,7 @@ /// /// Gets the first design water level calculation. /// - public HydraulicBoundaryLocationCalculation DesignWaterLevelCalculation { get; } + public HydraulicBoundaryLocationCalculation DesignWaterLevelCalculation1 { get; } /// /// Gets the second design water level calculation. @@ -109,7 +109,7 @@ { get { - return DesignWaterLevelCalculation.Output?.Result ?? RoundedDouble.NaN; + return DesignWaterLevelCalculation1.Output?.Result ?? RoundedDouble.NaN; } } @@ -120,7 +120,7 @@ /// /// Gets the first wave height calculation. /// - public HydraulicBoundaryLocationCalculation WaveHeightCalculation { get; } + public HydraulicBoundaryLocationCalculation WaveHeightCalculation1 { get; } /// /// Gets the second wave height calculation. @@ -144,7 +144,7 @@ { get { - return WaveHeightCalculation.Output?.Result ?? RoundedDouble.NaN; + return WaveHeightCalculation1.Output?.Result ?? RoundedDouble.NaN; } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs =================================================================== diff -u -r5a58d1cc2aa83be2f3217fd764b7d324c70bfc13 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 5a58d1cc2aa83be2f3217fd764b7d324c70bfc13) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -152,8 +152,8 @@ MapFeature feature = CreateSinglePointMapFeature(location.Location); feature.MetaData[Resources.MetaData_ID] = location.Id; feature.MetaData[Resources.MetaData_Name] = location.Name; - feature.MetaData[designWaterLevelAttributeName] = location.DesignWaterLevelCalculation.Output?.Result ?? RoundedDouble.NaN; - feature.MetaData[waveHeightAttributeName] = location.WaveHeightCalculation.Output?.Result ?? RoundedDouble.NaN; + feature.MetaData[designWaterLevelAttributeName] = location.DesignWaterLevelCalculation1.Output?.Result ?? RoundedDouble.NaN; + feature.MetaData[waveHeightAttributeName] = location.WaveHeightCalculation1.Output?.Result ?? RoundedDouble.NaN; features[i] = feature; } Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs =================================================================== diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs (.../RingtoetsCommonDataSynchronizationService.cs) (revision fcad48d7beb394e1ac15cfe4289a7381e05aa883) +++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs (.../RingtoetsCommonDataSynchronizationService.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -222,10 +222,10 @@ private static IEnumerable ClearHydraulicBoundaryLocationOutput(HydraulicBoundaryLocation location) { - if (location.DesignWaterLevelCalculation.HasOutput || location.WaveHeightCalculation.HasOutput) + if (location.DesignWaterLevelCalculation1.HasOutput || location.WaveHeightCalculation1.HasOutput) { - location.DesignWaterLevelCalculation.Output = null; - location.WaveHeightCalculation.Output = null; + location.DesignWaterLevelCalculation1.Output = null; + location.WaveHeightCalculation1.Output = null; return new[] { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs =================================================================== diff -u -r5a58d1cc2aa83be2f3217fd764b7d324c70bfc13 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs (.../HydraulicBoundaryLocationTest.cs) (revision 5a58d1cc2aa83be2f3217fd764b7d324c70bfc13) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs (.../HydraulicBoundaryLocationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -62,12 +62,12 @@ Assert.AreEqual(x, location.X); Assert.AreEqual(y, location.Y); - AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation); + AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation1); AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation2); AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation3); AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.DesignWaterLevelCalculation4); - AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation); + AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation1); AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation2); AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation3); AssertHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation.WaveHeightCalculation4); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs =================================================================== diff -u -rd31a3249d32f54af091fadacfb5a5ca59df18e29 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs (.../TestHydraulicBoundaryLocationTest.cs) (revision d31a3249d32f54af091fadacfb5a5ca59df18e29) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs (.../TestHydraulicBoundaryLocationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -40,12 +40,12 @@ Assert.IsEmpty(testLocation.Name); Assert.AreEqual(new Point2D(0, 0), testLocation.Location); - AssertHydraulicBoundaryLocationCalculation(testLocation.DesignWaterLevelCalculation); + AssertHydraulicBoundaryLocationCalculation(testLocation.DesignWaterLevelCalculation1); AssertHydraulicBoundaryLocationCalculation(testLocation.DesignWaterLevelCalculation2); AssertHydraulicBoundaryLocationCalculation(testLocation.DesignWaterLevelCalculation3); AssertHydraulicBoundaryLocationCalculation(testLocation.DesignWaterLevelCalculation4); - AssertHydraulicBoundaryLocationCalculation(testLocation.WaveHeightCalculation); + AssertHydraulicBoundaryLocationCalculation(testLocation.WaveHeightCalculation1); AssertHydraulicBoundaryLocationCalculation(testLocation.WaveHeightCalculation2); AssertHydraulicBoundaryLocationCalculation(testLocation.WaveHeightCalculation3); AssertHydraulicBoundaryLocationCalculation(testLocation.WaveHeightCalculation4); @@ -66,8 +66,8 @@ Assert.AreEqual(name, testLocation.Name); Assert.AreEqual(new Point2D(0, 0), testLocation.Location); - Assert.IsNull(testLocation.DesignWaterLevelCalculation.Output); - Assert.IsNull(testLocation.WaveHeightCalculation.Output); + Assert.IsNull(testLocation.DesignWaterLevelCalculation1.Output); + Assert.IsNull(testLocation.WaveHeightCalculation1.Output); Assert.IsNaN(testLocation.DesignWaterLevel); Assert.IsNaN(testLocation.WaveHeight); @@ -89,14 +89,14 @@ Assert.AreEqual(new Point2D(0, 0), testLocation.Location); HydraulicBoundaryLocationOutput expectedDesignWaterLevelOutput = CreateHydraulicBoundaryLocationOutput(designWaterLevelValue); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = testLocation.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = testLocation.DesignWaterLevelCalculation1; AssertAreEqual(expectedDesignWaterLevelOutput, designWaterLevelCalculation.Output); Assert.IsNull(designWaterLevelCalculation.Output.GeneralResult); Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output); Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output); Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output); - Assert.IsNull(testLocation.WaveHeightCalculation.Output); + Assert.IsNull(testLocation.WaveHeightCalculation1.Output); Assert.IsNull(testLocation.WaveHeightCalculation2.Output); Assert.IsNull(testLocation.WaveHeightCalculation3.Output); Assert.IsNull(testLocation.WaveHeightCalculation4.Output); @@ -117,13 +117,13 @@ Assert.IsEmpty(testLocation.Name); Assert.AreEqual(new Point2D(0, 0), testLocation.Location); - Assert.IsNull(testLocation.DesignWaterLevelCalculation.Output); + Assert.IsNull(testLocation.DesignWaterLevelCalculation1.Output); Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output); Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output); Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output); HydraulicBoundaryLocationOutput expectedWaveHeightOutput = CreateHydraulicBoundaryLocationOutput(waveHeightValue); - HydraulicBoundaryLocationCalculation waveHeightCalculation = testLocation.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = testLocation.WaveHeightCalculation1; AssertAreEqual(expectedWaveHeightOutput, waveHeightCalculation.Output); Assert.IsNull(waveHeightCalculation.Output.GeneralResult); @@ -145,7 +145,7 @@ Assert.AreEqual(new Point2D(0, 0), testLocation.Location); HydraulicBoundaryLocationOutput expectedDesignWaterLevelOutput = CreateHydraulicBoundaryLocationOutput(4.5); - HydraulicBoundaryLocationCalculation designWaterLevelCalculation = testLocation.DesignWaterLevelCalculation; + HydraulicBoundaryLocationCalculation designWaterLevelCalculation = testLocation.DesignWaterLevelCalculation1; AssertAreEqual(expectedDesignWaterLevelOutput, designWaterLevelCalculation.Output); Assert.IsNull(designWaterLevelCalculation.Output.GeneralResult); @@ -154,7 +154,7 @@ Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output); HydraulicBoundaryLocationOutput expectedWaveHeightOutput = CreateHydraulicBoundaryLocationOutput(5.5); - HydraulicBoundaryLocationCalculation waveHeightCalculation = testLocation.WaveHeightCalculation; + HydraulicBoundaryLocationCalculation waveHeightCalculation = testLocation.WaveHeightCalculation1; AssertAreEqual(expectedWaveHeightOutput, waveHeightCalculation.Output); Assert.IsNull(waveHeightCalculation.Output.GeneralResult); Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs =================================================================== diff -u -rd31a3249d32f54af091fadacfb5a5ca59df18e29 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs (.../TestHydraulicBoundaryLocation.cs) (revision d31a3249d32f54af091fadacfb5a5ca59df18e29) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs (.../TestHydraulicBoundaryLocation.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -52,22 +52,22 @@ { if (designWaterLevel.HasValue) { - DesignWaterLevelCalculation.Output = new HydraulicBoundaryLocationOutput( + DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput( designWaterLevel.Value, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null); } if (waveHeight.HasValue) { - WaveHeightCalculation.Output = new HydraulicBoundaryLocationOutput( + WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput( waveHeight.Value, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null); } } /// /// Creates a new instance of with /// set for - /// - /// and . + /// + /// and . /// /// A new . public static TestHydraulicBoundaryLocation CreateFullyCalculated() @@ -78,7 +78,7 @@ /// /// Creates a new instance of with /// set for - /// . + /// . /// /// The design water level result to set in the output. /// A new . @@ -90,7 +90,7 @@ /// /// Creates a new instance of with /// set for - /// . + /// . /// /// The wave height result to set in the output. /// A new . Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs =================================================================== diff -u -re54fdbbe09236acfd5fc7051e847a3c978e0c2c2 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision e54fdbbe09236acfd5fc7051e847a3c978e0c2c2) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs (.../FailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -301,8 +301,8 @@ hydraulicBoundaryLocationsMapData); // Call - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Assert Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs =================================================================== diff -u -r3ec1b0d4ff7f42b7dbdd0b15fb17e80886e6cfd6 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 3ec1b0d4ff7f42b7dbdd0b15fb17e80886e6cfd6) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -278,21 +278,21 @@ new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(1.23) } }, new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.45) } }, new HydraulicBoundaryLocation(4, "4", 4.0, 4.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -341,7 +341,7 @@ protected override HydraulicBoundaryLocationCalculation GetCalculation(HydraulicBoundaryLocation location) { GetCalculationsCallArgument = location; - return ItemToCreate ?? location.WaveHeightCalculation; + return ItemToCreate ?? location.WaveHeightCalculation1; } } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs =================================================================== diff -u -ra16becf5d0a010bc9d38ccb06dc330732fcbbee4 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision a16becf5d0a010bc9d38ccb06dc330732fcbbee4) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil.Test/MapDataTestHelperTest.cs (.../MapDataTestHelperTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -426,8 +426,8 @@ var random = new Random(21); location = new HydraulicBoundaryLocation(1, "test1", 1, 0); - location.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - location.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + location.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + location.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); var mapFeatureWithOutput = new MapFeature(new[] { mapGeometry Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs =================================================================== diff -u -r61ec7f61542fbcb75392332755c5770ecea8d3a5 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs (.../LocationsViewSynchronizationTester.cs) (revision 61ec7f61542fbcb75392332755c5770ecea8d3a5) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/LocationsViewSynchronizationTester.cs (.../LocationsViewSynchronizationTester.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -105,8 +105,8 @@ locations.ForEach(loc => { - loc.DesignWaterLevelCalculation.Output = null; - loc.WaveHeightCalculation.Output = null; + loc.DesignWaterLevelCalculation1.Output = null; + loc.WaveHeightCalculation1.Output = null; loc.NotifyObservers(); }); } @@ -116,8 +116,8 @@ ObservableList locations = GetLocationsInView(view); HydraulicBoundaryLocation hydraulicBoundaryLocation = locations.First(); - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()); hydraulicBoundaryLocation.NotifyObservers(); } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Hydraulics/HydraulicBoundaryLocationsExporterTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Hydraulics/HydraulicBoundaryLocationsExporterTest.cs (.../HydraulicBoundaryLocationsExporterTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Hydraulics/HydraulicBoundaryLocationsExporterTest.cs (.../HydraulicBoundaryLocationsExporterTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -121,11 +121,11 @@ // Setup var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(123, "aName", 1.1, 2.2) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(111.111) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(222.222) } @@ -164,11 +164,11 @@ // Setup var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(123, "aName", 1.1, 2.2) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(111.111) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(222.222) } @@ -208,11 +208,11 @@ // Setup var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(123, "aName", 1.1, 2.2) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(111.111) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(222.222) } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Hydraulics/HydraulicBoundaryLocationsWriterTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Hydraulics/HydraulicBoundaryLocationsWriterTest.cs (.../HydraulicBoundaryLocationsWriterTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Hydraulics/HydraulicBoundaryLocationsWriterTest.cs (.../HydraulicBoundaryLocationsWriterTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -90,11 +90,11 @@ // Setup var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(123, "aName", 1.1, 2.2) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(111.111) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(222.222) } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataSynchronizationServiceTest.cs =================================================================== diff -u -r9d8a58b3c03aaa71c5a3e69cfedd69fc7bf7eb70 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataSynchronizationServiceTest.cs (.../RingtoetsCommonDataSynchronizationServiceTest.cs) (revision 9d8a58b3c03aaa71c5a3e69cfedd69fc7bf7eb70) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataSynchronizationServiceTest.cs (.../RingtoetsCommonDataSynchronizationServiceTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -58,11 +58,11 @@ // Setup HydraulicBoundaryLocation location = new TestHydraulicBoundaryLocation { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(waveHeight) } @@ -76,8 +76,8 @@ IEnumerable affectedObjects = RingtoetsCommonDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(locations); // Assert - Assert.IsFalse(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(location.WaveHeightCalculation.HasOutput); + Assert.IsFalse(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(location.WaveHeightCalculation1.HasOutput); Assert.IsNaN(location.DesignWaterLevel); Assert.IsNaN(location.WaveHeight); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs =================================================================== diff -u -re855d4739bb02a913644ca71efac87196ce7229b -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision e855d4739bb02a913644ca71efac87196ce7229b) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -359,8 +359,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -46,7 +46,7 @@ protected override bool RequiresConfirmation(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { return base.RequiresConfirmation(failureMechanism) || - failureMechanism.HydraulicBoundaryLocations.Any(c => c.WaveHeightCalculation.HasOutput || c.DesignWaterLevelCalculation.HasOutput); + failureMechanism.HydraulicBoundaryLocations.Any(c => c.WaveHeightCalculation1.HasOutput || c.DesignWaterLevelCalculation1.HasOutput); } protected override IEnumerable PropertyChanged(GrassCoverErosionOutwardsFailureMechanism failureMechanism) Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rb8ff7df872b7bc80a92cdc5276bfd4818a29b138 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision b8ff7df872b7bc80a92cdc5276bfd4818a29b138) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -80,12 +80,12 @@ yield return new PropertyInfo { CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(context.WrappedData, - hbl => hbl.DesignWaterLevelCalculation) + hbl => hbl.DesignWaterLevelCalculation1) }; yield return new PropertyInfo { CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightLocationsProperties(context.WrappedData, - hbl => hbl.WaveHeightCalculation) + hbl => hbl.WaveHeightCalculation1) }; yield return new PropertyInfo(); @@ -100,13 +100,13 @@ yield return new PropertyInfo { CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelLocationProperties(context.WrappedData, - context.WrappedData.DesignWaterLevelCalculation) + context.WrappedData.DesignWaterLevelCalculation1) }; yield return new PropertyInfo { CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightLocationProperties(context.WrappedData, - context.WrappedData.WaveHeightCalculation) + context.WrappedData.WaveHeightCalculation1) }; } @@ -152,7 +152,7 @@ GetViewData = context => context.WrappedData, Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(context.FailureMechanism, - hbl => hbl.DesignWaterLevelCalculation, + hbl => hbl.DesignWaterLevelCalculation1, context.AssessmentSection, () => context.AssessmentSection.FailureMechanismContribution.Norm), AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }, @@ -169,7 +169,7 @@ CloseForData = CloseGrassCoverErosionOutwardsLocationsViewForData, Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightLocationsView(context.FailureMechanism, - hbl => hbl.WaveHeightCalculation, + hbl => hbl.WaveHeightCalculation1, context.AssessmentSection, () => context.AssessmentSection.FailureMechanismContribution.Norm), AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; } @@ -540,7 +540,7 @@ assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), nodeData.WrappedData, - hbl => hbl.DesignWaterLevelCalculation, + hbl => hbl.DesignWaterLevelCalculation1, mechanismSpecificNorm, new GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider()); }); @@ -591,7 +591,7 @@ assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), nodeData.WrappedData, - hbl => hbl.WaveHeightCalculation, + hbl => hbl.WaveHeightCalculation1, mechanismSpecificNorm, new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider()); }); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -184,7 +184,7 @@ Calculations = calculations; ExpectedAffectedCalculations = calculations.Where(c => c.HasOutput).ToArray(); Locations = locations; - ExpectedAffectedLocations = locations.Where(c => c.DesignWaterLevelCalculation.HasOutput || c.WaveHeightCalculation.HasOutput).ToArray(); + ExpectedAffectedLocations = locations.Where(c => c.DesignWaterLevelCalculation1.HasOutput || c.WaveHeightCalculation1.HasOutput).ToArray(); } public ICollection Locations { get; } @@ -315,11 +315,11 @@ { return new TestHydraulicBoundaryLocation { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(0.5) }, - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.3) } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs =================================================================== diff -u -r9b83f33bbdd0e5bcd78e60342e5c780599c12c93 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs) (revision 9b83f33bbdd0e5bcd78e60342e5c780599c12c93) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -107,7 +107,7 @@ TestHelper.AssertTypeConverter( nameof(GrassCoverErosionOutwardsDesignWaterLevelLocationProperties.CalculatedReliability)); Assert.IsEmpty(properties.Convergence); - Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); + Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); } [Test] Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs =================================================================== diff -u -r7a444ffa77c3d02690d809fab1ba0d7033ef646a -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs) (revision 7a444ffa77c3d02690d809fab1ba0d7033ef646a) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -58,7 +58,7 @@ // Call var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(hydraulicBoundaryLocations, - hbl => hbl.DesignWaterLevelCalculation); + hbl => hbl.DesignWaterLevelCalculation1); // Assert Assert.IsInstanceOf(properties); @@ -95,7 +95,7 @@ // Call var properties = new GrassCoverErosionOutwardsDesignWaterLevelLocationsProperties(hydraulicBoundaryLocations, - hbl => hbl.DesignWaterLevelCalculation); + hbl => hbl.DesignWaterLevelCalculation1); // Assert Assert.AreEqual(1, properties.Locations.Length); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs =================================================================== diff -u -r9b83f33bbdd0e5bcd78e60342e5c780599c12c93 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs) (revision 9b83f33bbdd0e5bcd78e60342e5c780599c12c93) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -107,7 +107,7 @@ TestHelper.AssertTypeConverter( nameof(GrassCoverErosionOutwardsWaveHeightLocationProperties.CalculatedReliability)); Assert.IsEmpty(properties.Convergence); - Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); + Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); } [Test] Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs =================================================================== diff -u -r7a444ffa77c3d02690d809fab1ba0d7033ef646a -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs) (revision 7a444ffa77c3d02690d809fab1ba0d7033ef646a) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -59,7 +59,7 @@ // Call var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(hydraulicBoundaryLocations, - hbl => hbl.DesignWaterLevelCalculation); + hbl => hbl.DesignWaterLevelCalculation1); // Assert Assert.IsInstanceOf(properties); @@ -95,7 +95,7 @@ // Call var properties = new GrassCoverErosionOutwardsWaveHeightLocationsProperties(hydraulicBoundaryLocations, - hbl => hbl.WaveHeightCalculation); + hbl => hbl.WaveHeightCalculation1); // Assert Assert.AreEqual(1, properties.Locations.Length); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r838a5bdd820612299de40b8c452384a2ccfe14a0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 838a5bdd820612299de40b8c452384a2ccfe14a0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -247,7 +247,7 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { @@ -305,7 +305,7 @@ ObservableList locations = view.FailureMechanism.HydraulicBoundaryLocations; // Call - locations[3].DesignWaterLevelCalculation.Output = output; + locations[3].DesignWaterLevelCalculation1.Output = output; locations[3].NotifyObservers(); // Assert @@ -474,7 +474,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = locations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.DesignWaterLevelCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.DesignWaterLevelCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -544,7 +544,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = failureMechanism.HydraulicBoundaryLocations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.DesignWaterLevelCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.DesignWaterLevelCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -613,7 +613,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = failureMechanism.HydraulicBoundaryLocations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.DesignWaterLevelCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.DesignWaterLevelCalculation1, getCalculationFunc(expectedLocation)); } private DataGridView GetLocationsDataGridView() @@ -658,7 +658,7 @@ failureMechanism.HydraulicBoundaryLocations.AddRange(locations); var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(failureMechanism, - hbl => hbl.DesignWaterLevelCalculation, + hbl => hbl.DesignWaterLevelCalculation1, assessmentSection, () => norm); @@ -696,21 +696,21 @@ new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(1.23) } }, new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.45) } }, new HydraulicBoundaryLocation(4, "4", 4.0, 4.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { @@ -720,7 +720,7 @@ }, new HydraulicBoundaryLocation(5, "5", 5.0, 5.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs =================================================================== diff -u -ra0c67b5cae9f7bb451b51cdb20d6f343d12acf39 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision a0c67b5cae9f7bb451b51cdb20d6f343d12acf39) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -343,8 +343,8 @@ AssertHydraulicBoundaryLocationOutputsMapData(failureMechanism.HydraulicBoundaryLocations, hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs =================================================================== diff -u -r838a5bdd820612299de40b8c452384a2ccfe14a0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 838a5bdd820612299de40b8c452384a2ccfe14a0) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -247,7 +247,7 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10, 10) { - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -305,7 +305,7 @@ ObservableList locations = view.FailureMechanism.HydraulicBoundaryLocations; // Call - locations[3].WaveHeightCalculation.Output = output; + locations[3].WaveHeightCalculation1.Output = output; locations[3].NotifyObservers(); // Assert @@ -473,7 +473,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = failureMechanism.HydraulicBoundaryLocations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -543,7 +543,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = failureMechanism.HydraulicBoundaryLocations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -612,7 +612,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = failureMechanism.HydraulicBoundaryLocations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation)); } private DataGridView GetLocationsDataGridView() @@ -657,7 +657,7 @@ failureMechanism.HydraulicBoundaryLocations.AddRange(locations); var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(failureMechanism, - hbl => hbl.WaveHeightCalculation, + hbl => hbl.WaveHeightCalculation1, assessmentSection, () => norm); @@ -695,21 +695,21 @@ new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(1.23) } }, new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.45) } }, new HydraulicBoundaryLocation(4, "4", 4.0, 4.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -719,7 +719,7 @@ }, new HydraulicBoundaryLocation(5, "5", 5.0, 5.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -152,7 +152,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(28.36844) } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs =================================================================== diff -u -r0226807215afa67cd8769b30e0b7af5a5dfce001 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs) (revision 0226807215afa67cd8769b30e0b7af5a5dfce001) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewIntegrationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -103,22 +103,22 @@ new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(1.23) } }, new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.45) } } }); var view = new GrassCoverErosionOutwardsDesignWaterLevelLocationsView(failureMechanism, - hbl => hbl.DesignWaterLevelCalculation, + hbl => hbl.DesignWaterLevelCalculation1, new AssessmentSection(AssessmentSectionComposition.Dike), () => 0.01); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision a2ce3e55443ed38bd6d7dbc7b33ff66e5d9c0d64) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -664,7 +664,7 @@ LowerBoundaryWaterLevels = (RoundedDouble) 7.1 } }; - calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(9.3); + calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(9.3); return calculation; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs =================================================================== diff -u -r0226807215afa67cd8769b30e0b7af5a5dfce001 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs) (revision 0226807215afa67cd8769b30e0b7af5a5dfce001) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewIntegrationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -103,22 +103,22 @@ new HydraulicBoundaryLocation(1, "1", 1.0, 1.0), new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(1.23) } }, new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.45) } } }); var view = new GrassCoverErosionOutwardsWaveHeightLocationsView(failureMechanism, - hbl => hbl.WaveHeightCalculation, + hbl => hbl.WaveHeightCalculation1, new AssessmentSection(AssessmentSectionComposition.Dike), () => 0.01); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r73b4f6d22205e989634d53404cb8197547f7f02a -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 73b4f6d22205e989634d53404cb8197547f7f02a) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -608,7 +608,7 @@ }); Assert.AreEqual(0, hydraulicBoundaryLocation.DesignWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy()); - Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.CalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.CalculationConvergence); } } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r0dbfa36e6c561ad33bc12caf2fe76c3e90e37949 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 0dbfa36e6c561ad33bc12caf2fe76c3e90e37949) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -242,7 +242,7 @@ mockRepository.ReplayAll(); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = GetDefaultCalculation(); - calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = null; + calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = null; var isValid = true; @@ -982,7 +982,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, "locationName", 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(9.3) } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs =================================================================== diff -u -re855d4739bb02a913644ca71efac87196ce7229b -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision e855d4739bb02a913644ca71efac87196ce7229b) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs (.../HeightStructuresFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -367,8 +367,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r23a6dd9ff6a575884879762e0e4aff01e21611ea -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 23a6dd9ff6a575884879762e0e4aff01e21611ea) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -317,20 +317,20 @@ yield return new PropertyInfo { CreateInstance = context => new DesignWaterLevelLocationsProperties(context.WrappedData, - hbl => hbl.DesignWaterLevelCalculation) + hbl => hbl.DesignWaterLevelCalculation1) }; yield return new PropertyInfo { - CreateInstance = context => new DesignWaterLevelLocationProperties(context.WrappedData, context.WrappedData.DesignWaterLevelCalculation) + CreateInstance = context => new DesignWaterLevelLocationProperties(context.WrappedData, context.WrappedData.DesignWaterLevelCalculation1) }; yield return new PropertyInfo { CreateInstance = context => new WaveHeightLocationsProperties(context.WrappedData, - hbl => hbl.WaveHeightCalculation) + hbl => hbl.WaveHeightCalculation1) }; yield return new PropertyInfo { - CreateInstance = context => new WaveHeightLocationProperties(context.WrappedData, context.WrappedData.WaveHeightCalculation) + CreateInstance = context => new WaveHeightLocationProperties(context.WrappedData, context.WrappedData.WaveHeightCalculation1) }; yield return new PropertyInfo(); yield return new PropertyInfo @@ -391,7 +391,7 @@ Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, CloseForData = CloseHydraulicBoundaryLocationsViewForData, CreateInstance = context => new DesignWaterLevelLocationsView(context.WrappedData, - hbl => hbl.DesignWaterLevelCalculation, + hbl => hbl.DesignWaterLevelCalculation1, context.AssessmentSection, () => context.AssessmentSection.FailureMechanismContribution.Norm), AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; } @@ -404,7 +404,7 @@ Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, CloseForData = CloseHydraulicBoundaryLocationsViewForData, CreateInstance = context => new WaveHeightLocationsView(context.WrappedData, - hbl => hbl.WaveHeightCalculation, + hbl => hbl.WaveHeightCalculation1, context.AssessmentSection, () => context.AssessmentSection.FailureMechanismContribution.Norm), AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; } @@ -1477,7 +1477,7 @@ hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), assessmentSection.HydraulicBoundaryDatabase.Locations, - hbl => hbl.DesignWaterLevelCalculation, + hbl => hbl.DesignWaterLevelCalculation1, assessmentSection.FailureMechanismContribution.Norm, new DesignWaterLevelCalculationMessageProvider()); }); @@ -1510,7 +1510,7 @@ hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), assessmentSection.HydraulicBoundaryDatabase.Locations, - hbl => hbl.WaveHeightCalculation, + hbl => hbl.WaveHeightCalculation1, assessmentSection.FailureMechanismContribution.Norm, new WaveHeightCalculationMessageProvider()); }); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs =================================================================== diff -u -r03db4c2a6708630d26b6a615620347dc755c50d0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs (.../DesignWaterLevelLocationPropertiesTest.cs) (revision 03db4c2a6708630d26b6a615620347dc755c50d0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationPropertiesTest.cs (.../DesignWaterLevelLocationPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -107,7 +107,7 @@ TestHelper.AssertTypeConverter( nameof(DesignWaterLevelLocationProperties.CalculatedReliability)); Assert.IsEmpty(properties.Convergence); - Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); + Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs =================================================================== diff -u -r13a01ffdbf2301d2959171f8899765fc0c6d62d4 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs (.../DesignWaterLevelLocationsPropertiesTest.cs) (revision 13a01ffdbf2301d2959171f8899765fc0c6d62d4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs (.../DesignWaterLevelLocationsPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -79,7 +79,7 @@ // Call var properties = new DesignWaterLevelLocationsProperties(hydraulicBoundaryLocations, - hbl => hbl.DesignWaterLevelCalculation); + hbl => hbl.DesignWaterLevelCalculation1); // Assert CollectionAssert.AllItemsAreInstancesOfType(properties.Locations, typeof(DesignWaterLevelLocationProperties)); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs =================================================================== diff -u -rc5f24c4581ad3b1361d2261732480ec8fea32e16 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs (.../FailureMechanismContributionPropertiesIntegrationTest.cs) (revision c5f24c4581ad3b1361d2261732480ec8fea32e16) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs (.../FailureMechanismContributionPropertiesIntegrationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -271,10 +271,10 @@ Assert.AreEqual(originalNormativeNorm, failureMechanismContribution.NormativeNorm); Assert.AreEqual(originalNorm, failureMechanismContribution.Norm); - Assert.IsTrue(hydraulicBoundaryLocation.WaveHeightCalculation.HasOutput); - Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput); - Assert.IsTrue(grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeightCalculation.HasOutput); - Assert.IsTrue(grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput); + Assert.IsTrue(hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput); + Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput); + Assert.IsTrue(grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput); + Assert.IsTrue(grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput); Assert.IsNotNull(pipingCalculation.Output); Assert.IsNotNull(pipingCalculation.SemiProbabilisticOutput); Assert.IsNotNull(grassCoverErosionInwardsCalculation.Output); @@ -804,8 +804,8 @@ private static void AssertHydraulicBoundaryLocationOutputClear(HydraulicBoundaryLocation hydraulicBoundaryLocation) { - Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation.HasOutput); - Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput); + Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput); + Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput); } private static void AssertNormValues(FailureMechanismContributionProperties properties, FailureMechanismContribution failureMechanismContribution) Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs =================================================================== diff -u -r03db4c2a6708630d26b6a615620347dc755c50d0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs (.../WaveHeightLocationPropertiesTest.cs) (revision 03db4c2a6708630d26b6a615620347dc755c50d0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs (.../WaveHeightLocationPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -111,7 +111,7 @@ NoValueRoundedDoubleConverter>( nameof(WaveHeightLocationProperties.CalculatedReliability)); Assert.IsEmpty(properties.Convergence); - Assert.AreEqual(hydraulicBoundaryLocation.WaveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); + Assert.AreEqual(hydraulicBoundaryLocation.WaveHeightCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated, properties.ShouldIllustrationPointsBeCalculated); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsPropertiesTest.cs =================================================================== diff -u -r13a01ffdbf2301d2959171f8899765fc0c6d62d4 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsPropertiesTest.cs (.../WaveHeightLocationsPropertiesTest.cs) (revision 13a01ffdbf2301d2959171f8899765fc0c6d62d4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationsPropertiesTest.cs (.../WaveHeightLocationsPropertiesTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -79,7 +79,7 @@ // Call var properties = new WaveHeightLocationsProperties(hydraulicBoundaryDatabase, - hbl => hbl.WaveHeightCalculation); + hbl => hbl.WaveHeightCalculation1); // Assert CollectionAssert.AllItemsAreInstancesOfType(properties.Locations, typeof(WaveHeightLocationProperties)); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs =================================================================== diff -u -r9d82d6b39110207a65b41ba33f79e365b301b099 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 9d82d6b39110207a65b41ba33f79e365b301b099) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -234,8 +234,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -214,7 +214,7 @@ ShowFullyConfiguredDesignWaterLevelLocationsView(locations, testForm); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { @@ -265,7 +265,7 @@ HydraulicBoundaryLocation location = locations.First(); // Call - location.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = true; + location.DesignWaterLevelCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated = true; location.NotifyObservers(); // Assert @@ -299,7 +299,7 @@ // Call HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[3]; - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = output; + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = output; hydraulicBoundaryLocation.NotifyObservers(); // Assert @@ -417,7 +417,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.DesignWaterLevelCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.DesignWaterLevelCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -483,7 +483,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.DesignWaterLevelCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.DesignWaterLevelCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -548,7 +548,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.DesignWaterLevelCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.DesignWaterLevelCalculation1, getCalculationFunc(expectedLocation)); } private DataGridView GetLocationsDataGridView() @@ -587,7 +587,7 @@ Form form) { var view = new DesignWaterLevelLocationsView(locations, - hbl => hbl.DesignWaterLevelCalculation, + hbl => hbl.DesignWaterLevelCalculation1, assessmentSection, () => norm); @@ -617,21 +617,21 @@ Locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)); Locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(1.23) } }); Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.45) } }); Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { @@ -655,7 +655,7 @@ Locations.Add(new HydraulicBoundaryLocation(5, "5", 5.0, 5.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { InputParameters = { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs =================================================================== diff -u -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -214,7 +214,7 @@ ShowFullyConfiguredWaveHeightLocationsView(locations, testForm); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -265,7 +265,7 @@ HydraulicBoundaryLocation location = locations.First(); // Call - location.WaveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated = true; + location.WaveHeightCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated = true; location.NotifyObservers(); // Assert @@ -299,7 +299,7 @@ // Call HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[3]; - hydraulicBoundaryLocation.WaveHeightCalculation.Output = output; + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = output; hydraulicBoundaryLocation.NotifyObservers(); // Assert @@ -417,7 +417,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -483,7 +483,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation)); } [Test] @@ -548,7 +548,7 @@ Assert.AreEqual(1, calculatedLocationsValue.Length); HydraulicBoundaryLocation expectedLocation = hydraulicBoundaryDatabase.Locations.First(); Assert.AreEqual(expectedLocation, calculatedLocationsValue.First()); - Assert.AreSame(expectedLocation.WaveHeightCalculation, getCalculationFunc(expectedLocation)); + Assert.AreSame(expectedLocation.WaveHeightCalculation1, getCalculationFunc(expectedLocation)); } private DataGridView GetLocationsDataGridView() @@ -587,7 +587,7 @@ Form form) { var view = new WaveHeightLocationsView(locations, - hbl => hbl.WaveHeightCalculation, + hbl => hbl.WaveHeightCalculation1, assessmentSection, () => norm); @@ -617,21 +617,21 @@ Locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0)); Locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(1.23) } }); Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(2.45) } }); Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { @@ -655,7 +655,7 @@ Locations.Add(new HydraulicBoundaryLocation(5, "5", 5.0, 5.0) { - WaveHeightCalculation = + WaveHeightCalculation1 = { InputParameters = { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -201,8 +201,8 @@ HydraulicBoundaryLocation[] hblWithOutput = assessmentSection.GetFailureMechanisms().OfType() .SelectMany(f => f.HydraulicBoundaryLocations) - .Where(loc => loc.DesignWaterLevelCalculation.HasOutput - || loc.WaveHeightCalculation.HasOutput) + .Where(loc => loc.DesignWaterLevelCalculation1.HasOutput + || loc.WaveHeightCalculation1.HasOutput) .ToArray(); var handler = new AssessmentSectionCompositionChangeHandler(viewCommands); @@ -215,7 +215,7 @@ "All calculations that had output still have them."); Assert.True(duneLocationWithOutput.All(loc => loc.Calculation.Output != null)); - Assert.True(hblWithOutput.All(loc => loc.DesignWaterLevelCalculation.HasOutput || loc.WaveHeightCalculation.HasOutput)); + Assert.True(hblWithOutput.All(loc => loc.DesignWaterLevelCalculation1.HasOutput || loc.WaveHeightCalculation1.HasOutput)); CollectionAssert.IsEmpty(affectedObjects); mocks.VerifyAll(); @@ -279,8 +279,8 @@ foreach (HydraulicBoundaryLocation location in assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations) { - Assert.IsFalse(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(location.WaveHeightCalculation.HasOutput); + Assert.IsFalse(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(location.WaveHeightCalculation1.HasOutput); } foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations) { @@ -337,8 +337,8 @@ foreach (HydraulicBoundaryLocation location in assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations) { - Assert.IsTrue(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsTrue(location.WaveHeightCalculation.HasOutput); + Assert.IsTrue(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsTrue(location.WaveHeightCalculation1.HasOutput); } foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations) @@ -396,8 +396,8 @@ foreach (HydraulicBoundaryLocation location in assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations) { - Assert.IsFalse(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(location.WaveHeightCalculation.HasOutput); + Assert.IsFalse(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(location.WaveHeightCalculation1.HasOutput); } foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations) { @@ -445,8 +445,8 @@ foreach (HydraulicBoundaryLocation location in assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations) { - Assert.IsTrue(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsTrue(location.WaveHeightCalculation.HasOutput); + Assert.IsTrue(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsTrue(location.WaveHeightCalculation1.HasOutput); } foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -161,8 +161,8 @@ foreach (HydraulicBoundaryLocation location in assessmentSection.HydraulicBoundaryDatabase.Locations .Concat(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations)) { - Assert.IsFalse(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(location.WaveHeightCalculation.HasOutput); + Assert.IsFalse(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(location.WaveHeightCalculation1.HasOutput); } foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations) { @@ -206,8 +206,8 @@ foreach (HydraulicBoundaryLocation location in assessmentSection.HydraulicBoundaryDatabase.Locations .Concat(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations)) { - Assert.IsFalse(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(location.WaveHeightCalculation.HasOutput); + Assert.IsFalse(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(location.WaveHeightCalculation1.HasOutput); } foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations) { @@ -300,8 +300,8 @@ foreach (HydraulicBoundaryLocation location in assessmentSection.HydraulicBoundaryDatabase.Locations .Concat(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations)) { - Assert.IsTrue(location.DesignWaterLevelCalculation.HasOutput); - Assert.IsTrue(location.WaveHeightCalculation.HasOutput); + Assert.IsTrue(location.DesignWaterLevelCalculation1.HasOutput); + Assert.IsTrue(location.WaveHeightCalculation1.HasOutput); } Assert.IsNotNull(assessmentSection.DuneErosion.DuneLocations[1].Calculation.Output); CollectionAssert.IsEmpty(affectedObjects); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r73b4f6d22205e989634d53404cb8197547f7f02a -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 73b4f6d22205e989634d53404cb8197547f7f02a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -556,7 +556,7 @@ Assert.AreEqual($"Toetspeil berekenen voor locatie '{location.Name}' is gelukt.", msgs[7]); }); Assert.AreEqual(0, location.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy()); - Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, location.DesignWaterLevelCalculation.Output.CalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, location.DesignWaterLevelCalculation1.Output.CalculationConvergence); } } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r61ab2a112211952c337eea98bae62a4c93335229 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 61ab2a112211952c337eea98bae62a4c93335229) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -563,7 +563,7 @@ CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]); Assert.AreEqual($"Golfhoogte berekenen voor locatie '{locationName}' is gelukt.", msgs[7]); }); - Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, location.WaveHeightCalculation.Output.CalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, location.WaveHeightCalculation1.Output.CalculationConvergence); } } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -340,8 +340,8 @@ // Note: To make sure the clear is performed regardless of what is done with // the return result, no ToArray() should be called before these assertions: CollectionAssert.AreEquivalent(expectedAffectedItems, affectedObjects); - Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation.HasOutput); + Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation1.HasOutput); Assert.IsNull(duneLocation.Calculation.Output); mockRepository.VerifyAll(); @@ -408,8 +408,8 @@ // Note: To make sure the clear is performed regardless of what is done with // the return result, no ToArray() should be called before these assertions: CollectionAssert.AreEquivalent(expectedAffectedItems, affectedObjects); - Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation.HasOutput); + Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation1.HasOutput); Assert.IsNull(duneLocation.Calculation.Output); } @@ -464,10 +464,10 @@ // Note: To make sure the clear is performed regardless of what is done with // the return result, no ToArray() should be called before these assertions: CollectionAssert.AreEquivalent(expectedAffectedItems, affectedObjects); - Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation.HasOutput); - Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation.HasOutput); - Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation.HasOutput); + Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput); + Assert.IsFalse(grassCoverErosionLocation.DesignWaterLevelCalculation1.HasOutput); + Assert.IsFalse(grassCoverErosionLocation.WaveHeightCalculation1.HasOutput); Assert.IsNull(duneLocation.Calculation.Output); mockRepository.VerifyAll(); @@ -1605,7 +1605,7 @@ private static bool HasHydraulicBoundaryLocationOutput(HydraulicBoundaryLocation hydraulicBoundaryLocation) { - return hydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput || hydraulicBoundaryLocation.WaveHeightCalculation.HasOutput; + return hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput || hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput; } #region TestData Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs =================================================================== diff -u -rb0e228408016f88b94ac63d6896e5bc7668a75c1 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision b0e228408016f88b94ac63d6896e5bc7668a75c1) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs (.../TestDataGeneratorTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -55,8 +55,8 @@ // Assert Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation.HasOutput - && loc.WaveHeightCalculation.HasOutput)); + Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation1.HasOutput + && loc.WaveHeightCalculation1.HasOutput)); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -78,8 +78,8 @@ // Assert Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation.HasOutput - && loc.WaveHeightCalculation.HasOutput)); + Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation1.HasOutput + && loc.WaveHeightCalculation1.HasOutput)); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -97,8 +97,8 @@ // Assert Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => !(loc.DesignWaterLevelCalculation.HasOutput - && loc.WaveHeightCalculation.HasOutput))); + Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => !(loc.DesignWaterLevelCalculation1.HasOutput + && loc.WaveHeightCalculation1.HasOutput))); Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Calculation.Output == null)); } @@ -115,8 +115,8 @@ // Assert Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(assessmentSection); - Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => !(loc.DesignWaterLevelCalculation.HasOutput - && loc.WaveHeightCalculation.HasOutput))); + Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => !(loc.DesignWaterLevelCalculation1.HasOutput + && loc.WaveHeightCalculation1.HasOutput))); Assert.True(assessmentSection.DuneErosion.DuneLocations.All(dl => dl.Calculation.Output == null)); } @@ -130,8 +130,8 @@ Assert.AreEqual(AssessmentSectionComposition.Dike, assessmentSection.Composition); AssertFailureMechanismsHaveAllCalculationConfigurationsWithoutCalculationOutputs(assessmentSection); Assert.False(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(calc => calc.HasOutput)); - Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation.HasOutput - && loc.WaveHeightCalculation.HasOutput)); + Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation1.HasOutput + && loc.WaveHeightCalculation1.HasOutput)); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -154,8 +154,8 @@ Assert.AreEqual(composition, assessmentSection.Composition); AssertFailureMechanismsHaveAllCalculationConfigurationsWithoutCalculationOutputs(assessmentSection); Assert.False(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(calc => calc.HasOutput)); - Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation.HasOutput - && loc.WaveHeightCalculation.HasOutput)); + Assert.True(assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation1.HasOutput + && loc.WaveHeightCalculation1.HasOutput)); DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.GetFailureMechanisms() .OfType() @@ -587,8 +587,8 @@ GrassCoverErosionOutwardsFailureMechanism failureMechanism = TestDataGenerator.GetGrassCoverErosionOutwardsFailureMechanismWithAllCalculationConfigurations(); // Assert - Assert.IsTrue(failureMechanism.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation.HasOutput - && loc.WaveHeightCalculation.HasOutput)); + Assert.IsTrue(failureMechanism.HydraulicBoundaryLocations.All(loc => loc.DesignWaterLevelCalculation1.HasOutput + && loc.WaveHeightCalculation1.HasOutput)); AssertHasForeshoreProfiles(failureMechanism); AssertGrassCoverErosionOutwardsFailureMechanismCalculationConfigurationsWithOutputs(failureMechanism); AssertGrassCoverErosionOutwardsFailureMechanismCalculationConfigurationsWithoutOutputs(failureMechanism); Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r3a00a0eebc0e3aab9e56fe287d0fad1ff9a1e2c2 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 3a00a0eebc0e3aab9e56fe287d0fad1ff9a1e2c2) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -63,12 +63,12 @@ { var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new HydraulicBoundaryLocationOutput( 1.1, double.NaN, double.NaN, double.NaN, double.NaN, CalculationConvergence.CalculatedConverged, null) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new HydraulicBoundaryLocationOutput( 2.2, double.NaN, double.NaN, double.NaN, double.NaN, CalculationConvergence.CalculatedConverged, null) @@ -104,13 +104,13 @@ /// /// Gets a fully configured with a desired and /// possible configurations of the parent and nested calculations, but without the output of the - /// , + /// , /// and . /// /// The desired to initialize the with. /// A fully configured with all possible calculation configurations of the parent and - /// nested calculations inside the failure mechanisms, but without the output of the , - /// and . + /// nested calculations inside the failure mechanisms, but without the output of the , + /// and . public static AssessmentSection GetAssessmentSectionWithAllCalculationConfigurationsWithoutHydraulicBoundaryLocationAndDuneOutput( AssessmentSectionComposition composition = AssessmentSectionComposition.Dike) { @@ -171,12 +171,12 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new HydraulicBoundaryLocationOutput( 1.1, double.NaN, double.NaN, double.NaN, double.NaN, CalculationConvergence.CalculatedConverged, null) }, - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new HydraulicBoundaryLocationOutput( 2.2, double.NaN, double.NaN, double.NaN, double.NaN, CalculationConvergence.CalculatedConverged, null) @@ -874,17 +874,17 @@ hydraulicBoundaryLocation.Location.X, hydraulicBoundaryLocation.Location.Y) { - WaveHeightCalculation = + WaveHeightCalculation1 = { Output = new HydraulicBoundaryLocationOutput( hydraulicBoundaryLocation.WaveHeight + 0.2, double.NaN, double.NaN, double.NaN, double.NaN, - hydraulicBoundaryLocation.WaveHeightCalculation.Output.CalculationConvergence, null) + hydraulicBoundaryLocation.WaveHeightCalculation1.Output.CalculationConvergence, null) }, - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new HydraulicBoundaryLocationOutput( hydraulicBoundaryLocation.DesignWaterLevel + 0.3, double.NaN, double.NaN, double.NaN, double.NaN, - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output.CalculationConvergence, null) + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output.CalculationConvergence, null) } }; failureMechanism.HydraulicBoundaryLocations.Add(internalHydroLocation); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs =================================================================== diff -u -r8d246ac6328e6e649ff6e78dfe3fac210d789ba0 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision 8d246ac6328e6e649ff6e78dfe3fac210d789ba0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs (.../MacroStabilityInwardsInputTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -343,7 +343,7 @@ double calculatedAssessmentLevel = new Random(21).NextDouble(); HydraulicBoundaryLocation testHydraulicBoundaryLocation = new TestHydraulicBoundaryLocation { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(calculatedAssessmentLevel) } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs =================================================================== diff -u -re855d4739bb02a913644ca71efac87196ce7229b -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision e855d4739bb02a913644ca71efac87196ce7229b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -404,8 +404,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -rc1bb09f8fce943d069316e4d9bac7c85aca50c58 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision c1bb09f8fce943d069316e4d9bac7c85aca50c58) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -674,7 +674,7 @@ input.HydraulicBoundaryLocation = testHydraulicBoundaryLocation; double calculatedAssessmentLevel = new Random(21).NextDouble(); - testHydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(calculatedAssessmentLevel); + testHydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(calculatedAssessmentLevel); // Call RoundedDouble newAssessmentLevel = input.AssessmentLevel; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -re855d4739bb02a913644ca71efac87196ce7229b -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision e855d4739bb02a913644ca71efac87196ce7229b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -402,8 +402,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs =================================================================== diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision 07f3d67fe9512b3c8303ff09398b0a234900d546) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -469,7 +469,7 @@ // Call waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) } @@ -796,7 +796,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) } @@ -823,7 +823,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(5.78) } @@ -877,7 +877,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -r5dabca97fffab41012aafa58da5bc4cd0192e947 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision 5dabca97fffab41012aafa58da5bc4cd0192e947) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -62,7 +62,7 @@ yield return new TestCaseData(new Func(wci => { const double expectedWaterLevel = 5.2; - wci.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(expectedWaterLevel, CalculationConvergence.CalculatedConverged); + wci.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(expectedWaterLevel, CalculationConvergence.CalculatedConverged); wci.HydraulicBoundaryLocation.NotifyObservers(); return expectedWaterLevel; })).SetName("UpdateWaterLevel"); @@ -75,7 +75,7 @@ wci.HydraulicBoundaryLocation = newLocation; wci.NotifyObservers(); - newLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(expectedWaterLevel, CalculationConvergence.CalculatedConverged); + newLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(expectedWaterLevel, CalculationConvergence.CalculatedConverged); newLocation.NotifyObservers(); return expectedWaterLevel; @@ -87,7 +87,7 @@ var newLocation = new TestHydraulicBoundaryLocation { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(expectedWaterLevel, CalculationConvergence.CalculatedConverged) } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -123,7 +123,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(12.34567) } @@ -138,7 +138,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(28.36844) } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -146,7 +146,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(12.34567) } @@ -162,7 +162,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(28.36844) } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs =================================================================== diff -u -r61702582a3dce7f9e122b9404fa5bcfc70756f1d -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision 61702582a3dce7f9e122b9404fa5bcfc70756f1d) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs (.../StabilityPointStructuresFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -364,8 +364,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs =================================================================== diff -u -rab44ffd44a9c83fb7947e86ea93d8a4e6d6643f4 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision ab44ffd44a9c83fb7947e86ea93d8a4e6d6643f4) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs (.../StabilityStoneCoverFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -354,8 +354,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/Exporters/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -145,7 +145,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(28.36844) } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r39e18750ccb61ad1f367279f9dac39a232d4f843 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 39e18750ccb61ad1f367279f9dac39a232d4f843) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -828,7 +828,7 @@ { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(12.0) } @@ -849,7 +849,7 @@ { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(12.0) } @@ -1901,7 +1901,7 @@ { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(9.3) } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r39e18750ccb61ad1f367279f9dac39a232d4f843 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 39e18750ccb61ad1f367279f9dac39a232d4f843) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -241,7 +241,7 @@ mockRepository.ReplayAll(); StabilityStoneCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); - calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = null; + calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = null; var isValid = true; Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs =================================================================== diff -u -r67ad3766c0cc12d75831dd0369a6ce0a6dfc6f03 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision 67ad3766c0cc12d75831dd0369a6ce0a6dfc6f03) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -355,8 +355,8 @@ hydraulicBoundaryLocationsMapData); // When - hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); - hydraulicBoundaryLocation.WaveHeightCalculation.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); + hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble()); hydraulicBoundaryLocation.NotifyObservers(); // Then Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs =================================================================== diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs) (revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.IO.Test/Exporters/WaveImpactAsphaltCoverWaveConditionsExporterTest.cs (.../WaveImpactAsphaltCoverWaveConditionsExporterTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -156,7 +156,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(28.36844) } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rd16b956efd5a1a40741037d55c88e9d24b0c0027 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision d16b956efd5a1a40741037d55c88e9d24b0c0027) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -575,7 +575,7 @@ LowerBoundaryWaterLevels = (RoundedDouble) 7.1 } }; - calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = new TestHydraulicBoundaryLocationOutput(9.3); + calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(9.3); return calculation; } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r39e18750ccb61ad1f367279f9dac39a232d4f843 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 39e18750ccb61ad1f367279f9dac39a232d4f843) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -1003,7 +1003,7 @@ { calculation.InputParameters.HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation { - DesignWaterLevelCalculation = + DesignWaterLevelCalculation1 = { Output = new TestHydraulicBoundaryLocationOutput(12) } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r0dbfa36e6c561ad33bc12caf2fe76c3e90e37949 -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 0dbfa36e6c561ad33bc12caf2fe76c3e90e37949) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c) @@ -241,7 +241,7 @@ mockRepository.ReplayAll(); WaveImpactAsphaltCoverWaveConditionsCalculation calculation = GetDefaultCalculation(); - calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation.Output = null; + calculation.InputParameters.HydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = null; var isValid = true;