Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs =================================================================== diff -u -rfc05d28b1d3b14433c890521c0f276ab14b73506 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision fc05d28b1d3b14433c890521c0f276ab14b73506) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs (.../ClosingStructuresFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -205,9 +205,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -242,10 +242,10 @@ switch (normType) { case NormType.Signaling: - calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm; + calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations; break; case NormType.LowerLimit: - calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; + calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations; break; default: throw new NotSupportedException(); @@ -283,10 +283,10 @@ calculations = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm; break; case AssessmentSectionCategoryType.SignalingNorm: - calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm; + calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations; break; case AssessmentSectionCategoryType.LowerLimitNorm: - calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; + calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations; break; case AssessmentSectionCategoryType.FactorizedLowerLimitNorm: calculations = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm; Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs =================================================================== diff -u -rcc93e5b13b806df71bdc32d42cad40fbe8896ec2 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision cc93e5b13b806df71bdc32d42cad40fbe8896ec2) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -81,12 +81,12 @@ /// /// Gets the water level calculations corresponding to the signaling norm. /// - IObservableEnumerable WaterLevelCalculationsForSignalingNorm { get; } + HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForSignalingNorm { get; } /// /// Gets the water level calculations corresponding to the lower limit norm. /// - IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm { get; } + HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForLowerLimitNorm { get; } /// /// Gets the water level calculations corresponding to the factorized lower limit norm. Index: Riskeer/Common/src/Riskeer.Common.Util/AggregatedHydraulicBoundaryLocationFactory.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/src/Riskeer.Common.Util/AggregatedHydraulicBoundaryLocationFactory.cs (.../AggregatedHydraulicBoundaryLocationFactory.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/src/Riskeer.Common.Util/AggregatedHydraulicBoundaryLocationFactory.cs (.../AggregatedHydraulicBoundaryLocationFactory.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -51,11 +51,11 @@ assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.ToDictionary(c => c.HydraulicBoundaryLocation, c => c); Dictionary waterLevelLookupForSignalingNorm = - assessmentSection.WaterLevelCalculationsForSignalingNorm.ToDictionary(c => c.HydraulicBoundaryLocation, - c => c); + assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.ToDictionary(c => c.HydraulicBoundaryLocation, + c => c); Dictionary waterLevelLookupForLowerLimitNorm = - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ToDictionary(c => c.HydraulicBoundaryLocation, - c => c); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ToDictionary(c => c.HydraulicBoundaryLocation, + c => c); Dictionary waterLevelLookupForFactorizedLowerLimitNorm = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.ToDictionary(c => c.HydraulicBoundaryLocation, c => c); Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs =================================================================== diff -u -rf3c0feca6537b292a0c7d73f058ce13c8096f5e5 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision f3c0feca6537b292a0c7d73f058ce13c8096f5e5) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -485,13 +485,13 @@ assessmentSection, hydraulicBoundaryLocation, NormType.Signaling, - assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0)); + assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.ElementAt(0)); yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, NormType.LowerLimit, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0)); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(0)); } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs =================================================================== diff -u -r37a94ceb828e1896ab8d0c17c292c6277fbf87ca -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision 37a94ceb828e1896ab8d0c17c292c6277fbf87ca) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -37,8 +37,8 @@ private static readonly Random random = new Random(21); private readonly IEnumerable failureMechanisms; private readonly ObservableList waterLevelCalculationsForFactorizedSignalingNorm; - private readonly ObservableList waterLevelCalculationsForSignalingNorm; - private readonly ObservableList waterLevelCalculationsForLowerLimitNorm; + private readonly HydraulicBoundaryLocationCalculationsForTargetProbability waterLevelCalculationsForSignalingNorm; + private readonly HydraulicBoundaryLocationCalculationsForTargetProbability waterLevelCalculationsForLowerLimitNorm; private readonly ObservableList waterLevelCalculationsForFactorizedLowerLimitNorm; private readonly ObservableList waveHeightCalculationsForFactorizedSignalingNorm; private readonly ObservableList waveHeightCalculationsForSignalingNorm; @@ -74,8 +74,8 @@ }; waterLevelCalculationsForFactorizedSignalingNorm = new ObservableList(); - waterLevelCalculationsForSignalingNorm = new ObservableList(); - waterLevelCalculationsForLowerLimitNorm = new ObservableList(); + waterLevelCalculationsForSignalingNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); + waterLevelCalculationsForLowerLimitNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); waterLevelCalculationsForFactorizedLowerLimitNorm = new ObservableList(); waveHeightCalculationsForFactorizedSignalingNorm = new ObservableList(); waveHeightCalculationsForSignalingNorm = new ObservableList(); @@ -107,15 +107,15 @@ } } - public IObservableEnumerable WaterLevelCalculationsForSignalingNorm + public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForSignalingNorm { get { return waterLevelCalculationsForSignalingNorm; } } - public IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm + public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForLowerLimitNorm { get { @@ -177,8 +177,8 @@ { HydraulicBoundaryDatabase.Locations.Clear(); waterLevelCalculationsForFactorizedSignalingNorm.Clear(); - waterLevelCalculationsForSignalingNorm.Clear(); - waterLevelCalculationsForLowerLimitNorm.Clear(); + waterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Clear(); + waterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Clear(); waterLevelCalculationsForFactorizedLowerLimitNorm.Clear(); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities) @@ -222,8 +222,8 @@ HydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); waterLevelCalculationsForFactorizedSignalingNorm.Add(CreateHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, setCalculationOutput)); - waterLevelCalculationsForSignalingNorm.Add(CreateHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, setCalculationOutput)); - waterLevelCalculationsForLowerLimitNorm.Add(CreateHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, setCalculationOutput)); + waterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Add(CreateHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, setCalculationOutput)); + waterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Add(CreateHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, setCalculationOutput)); waterLevelCalculationsForFactorizedLowerLimitNorm.Add(CreateHydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation, setCalculationOutput)); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities) Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs =================================================================== diff -u -rdc44d30a2cf7ddd964551e24ed4e86d12245b354 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs (.../AssessmentSectionTestHelper.cs) (revision dc44d30a2cf7ddd964551e24ed4e86d12245b354) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionTestHelper.cs (.../AssessmentSectionTestHelper.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -124,13 +124,13 @@ assessmentSection, hydraulicBoundaryLocation, AssessmentSectionCategoryType.SignalingNorm, - assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0)); + assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.ElementAt(0)); yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, AssessmentSectionCategoryType.LowerLimitNorm, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0)); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(0)); yield return new TestCaseData( assessmentSection, Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapFeaturesTestHelper.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapFeaturesTestHelper.cs (.../MapFeaturesTestHelper.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapFeaturesTestHelper.cs (.../MapFeaturesTestHelper.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -77,10 +77,10 @@ GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, hydraulicBoundaryLocation), mapFeature, "h_Aplus"); MapFeaturesMetaDataTestHelper.AssertMetaData( - GetExpectedResult(assessmentSection.WaterLevelCalculationsForSignalingNorm, hydraulicBoundaryLocation), + GetExpectedResult(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, hydraulicBoundaryLocation), mapFeature, "h_A"); MapFeaturesMetaDataTestHelper.AssertMetaData( - GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation), + GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, hydraulicBoundaryLocation), mapFeature, "h_B"); MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation), Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapViewTestHelper.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapViewTestHelper.cs (.../MapViewTestHelper.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapViewTestHelper.cs (.../MapViewTestHelper.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -44,9 +44,9 @@ yield return new TestCaseData(new Func( assessmentSection => assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.First())); yield return new TestCaseData(new Func( - assessmentSection => assessmentSection.WaterLevelCalculationsForSignalingNorm.First())); + assessmentSection => assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.First())); yield return new TestCaseData(new Func( - assessmentSection => assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First())); + assessmentSection => assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First())); yield return new TestCaseData(new Func( assessmentSection => assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.First())); yield return new TestCaseData(new Func( Index: Riskeer/Common/test/Riskeer.Common.Util.Test/AggregatedHydraulicBoundaryLocationFactoryTest.cs =================================================================== diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Common/test/Riskeer.Common.Util.Test/AggregatedHydraulicBoundaryLocationFactoryTest.cs (.../AggregatedHydraulicBoundaryLocationFactoryTest.cs) (revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a) +++ Riskeer/Common/test/Riskeer.Common.Util.Test/AggregatedHydraulicBoundaryLocationFactoryTest.cs (.../AggregatedHydraulicBoundaryLocationFactoryTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -69,9 +69,9 @@ Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, expectedLocations[i]), aggregatedLocations[i].WaterLevelCalculationForFactorizedSignalingNorm); - Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForSignalingNorm, expectedLocations[i]), + Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, expectedLocations[i]), aggregatedLocations[i].WaterLevelCalculationForSignalingNorm); - Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, expectedLocations[i]), + Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, expectedLocations[i]), aggregatedLocations[i].WaterLevelCalculationForLowerLimitNorm); Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, expectedLocations[i]), aggregatedLocations[i].WaterLevelCalculationForFactorizedLowerLimitNorm); Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs =================================================================== diff -u -rff114959b42b165f4b9e6d4715c1625aade95ab9 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision ff114959b42b165f4b9e6d4715c1625aade95ab9) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs (.../GrassCoverErosionInwardsFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -202,9 +202,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -186,7 +186,7 @@ calculations = failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm; break; case FailureMechanismCategoryType.LowerLimitNorm: - calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; + calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations; break; case FailureMechanismCategoryType.FactorizedLowerLimitNorm: calculations = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm; Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs =================================================================== diff -u -r3162980397466df2d771d171a531fe3104645f00 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision 3162980397466df2d771d171a531fe3104645f00) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs (.../GrassCoverErosionOutwardsFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -209,7 +209,7 @@ waterLevelCalculationsForMechanismSpecificLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( FailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForMechanismSpecificFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs (.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs (.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -65,8 +65,8 @@ failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.ToDictionary(c => c.HydraulicBoundaryLocation, c => c); Dictionary waterLevelLookupForLowerLimitNorm = - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ToDictionary(c => c.HydraulicBoundaryLocation, - c => c); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ToDictionary(c => c.HydraulicBoundaryLocation, + c => c); Dictionary waterLevelLookupForFactorizedLowerLimitNorm = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.ToDictionary(c => c.HydraulicBoundaryLocation, c => c); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsAssessmentSectionTestHelper.cs =================================================================== diff -u -r5d4ce1b80a2b42ef653f826603115b86230b39a0 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsAssessmentSectionTestHelper.cs (.../GrassCoverErosionOutwardsAssessmentSectionTestHelper.cs) (revision 5d4ce1b80a2b42ef653f826603115b86230b39a0) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.TestUtil/GrassCoverErosionOutwardsAssessmentSectionTestHelper.cs (.../GrassCoverErosionOutwardsAssessmentSectionTestHelper.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -88,7 +88,7 @@ failureMechanism, hydraulicBoundaryLocation, FailureMechanismCategoryType.LowerLimitNorm, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0)); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(0)); yield return new TestCaseData( assessmentSection, Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs =================================================================== diff -u -r2d1b590dd680ce0450549d8b293f86bc8849c1a2 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision 2d1b590dd680ce0450549d8b293f86bc8849c1a2) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -70,7 +70,7 @@ yield return new TestCaseData(new Func( (assessmentSection, failureMechanism) => failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First())); yield return new TestCaseData(new Func( - (assessmentSection, failureMechanism) => assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First())); + (assessmentSection, failureMechanism) => assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First())); yield return new TestCaseData(new Func( (assessmentSection, failureMechanism) => assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.First())); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs (.../GrassCoverErosionOutwardsMapFeaturesTestHelper.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.TestUtil/GrassCoverErosionOutwardsMapFeaturesTestHelper.cs (.../GrassCoverErosionOutwardsMapFeaturesTestHelper.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -80,7 +80,7 @@ GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, hydraulicBoundaryLocation), mapFeature, "h_IIIv"); MapFeaturesMetaDataTestHelper.AssertMetaData( - GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation), + GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, hydraulicBoundaryLocation), mapFeature, "h_IVv"); MapFeaturesMetaDataTestHelper.AssertMetaData( GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation), Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs (.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs (.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -101,7 +101,7 @@ aggregatedLocations[i].WaterLevelCalculationForMechanismSpecificSignalingNorm); Assert.AreEqual(GetExpectedResult(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, expectedLocations[i]), aggregatedLocations[i].WaterLevelCalculationForMechanismSpecificLowerLimitNorm); - Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, expectedLocations[i]), + Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, expectedLocations[i]), aggregatedLocations[i].WaterLevelCalculationForLowerLimitNorm); Assert.AreEqual(GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, expectedLocations[i]), aggregatedLocations[i].WaterLevelCalculationForFactorizedLowerLimitNorm); Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs =================================================================== diff -u -r4e75e6ffc07323cd6f8fa3e6b22eac54b95943e6 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision 4e75e6ffc07323cd6f8fa3e6b22eac54b95943e6) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs (.../HeightStructuresFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -205,9 +205,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs =================================================================== diff -u -rf915ec7d90e730b1b3ec807cd2d428e8f47d33d2 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision f915ec7d90e730b1b3ec807cd2d428e8f47d33d2) +++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -53,8 +53,8 @@ private const RiskeerWellKnownTileSource defaultWellKnownTileSource = RiskeerWellKnownTileSource.BingAerial; private readonly ObservableList waterLevelCalculationsForFactorizedSignalingNorm = new ObservableList(); - private readonly ObservableList waterLevelCalculationsForSignalingNorm = new ObservableList(); - private readonly ObservableList waterLevelCalculationsForLowerLimitNorm = new ObservableList(); + private readonly HydraulicBoundaryLocationCalculationsForTargetProbability waterLevelCalculationsForSignalingNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(defaultNorm); + private readonly HydraulicBoundaryLocationCalculationsForTargetProbability waterLevelCalculationsForLowerLimitNorm = new HydraulicBoundaryLocationCalculationsForTargetProbability(defaultNorm); private readonly ObservableList waterLevelCalculationsForFactorizedLowerLimitNorm = new ObservableList(); private readonly ObservableList waveHeightCalculationsForFactorizedSignalingNorm = new ObservableList(); private readonly ObservableList waveHeightCalculationsForSignalingNorm = new ObservableList(); @@ -495,15 +495,15 @@ } } - public IObservableEnumerable WaterLevelCalculationsForSignalingNorm + public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForSignalingNorm { get { return waterLevelCalculationsForSignalingNorm; } } - public IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm + public HydraulicBoundaryLocationCalculationsForTargetProbability WaterLevelCalculationsForLowerLimitNorm { get { @@ -719,8 +719,8 @@ private void ClearHydraulicBoundaryLocationCalculations() { waterLevelCalculationsForFactorizedSignalingNorm.Clear(); - waterLevelCalculationsForSignalingNorm.Clear(); - waterLevelCalculationsForLowerLimitNorm.Clear(); + waterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Clear(); + waterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Clear(); waterLevelCalculationsForFactorizedLowerLimitNorm.Clear(); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities) @@ -742,8 +742,8 @@ private void AddHydraulicBoundaryLocationCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation) { waterLevelCalculationsForFactorizedSignalingNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); - waterLevelCalculationsForSignalingNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); - waterLevelCalculationsForLowerLimitNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); + waterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); + waterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); waterLevelCalculationsForFactorizedLowerLimitNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities) Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionMapView.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionMapView.cs (.../AssemblyResultPerSectionMapView.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionMapView.cs (.../AssemblyResultPerSectionMapView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -140,9 +140,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs =================================================================== diff -u -re054fcd0823dc4bdd99fd5f8d7b055c86ac7b0b3 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs (.../AssessmentSectionExtendedView.cs) (revision e054fcd0823dc4bdd99fd5f8d7b055c86ac7b0b3) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionExtendedView.cs (.../AssessmentSectionExtendedView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -81,9 +81,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs (.../FailureMechanismWithDetailedAssessmentView.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithDetailedAssessmentView.cs (.../FailureMechanismWithDetailedAssessmentView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -241,9 +241,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.cs (.../FailureMechanismWithoutDetailedAssessmentView.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismWithoutDetailedAssessmentView.cs (.../FailureMechanismWithoutDetailedAssessmentView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -228,9 +228,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -r4c0cc92421b1790567779ec2ece30570a3a36ec5 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 4c0cc92421b1790567779ec2ece30570a3a36ec5) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -88,10 +88,10 @@ { var changedObjects = new List(); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForSignalingNorm, - sourceAssessmentSection.WaterLevelCalculationsForSignalingNorm)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForLowerLimitNorm, - sourceAssessmentSection.WaterLevelCalculationsForLowerLimitNorm)); + changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, + sourceAssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations)); + changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, + sourceAssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations)); changedObjects.AddRange(MergeUserDefinedHydraulicBoundaryLocations(targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities, sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities, Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r8b6d97341faa438655fd58d8bab819d9c7adb9de -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 8b6d97341faa438655fd58d8bab819d9c7adb9de) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -2316,10 +2316,10 @@ { return new object[] { - new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, + new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, context.AssessmentSection, () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm)), - new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForSignalingNorm, + new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, context.AssessmentSection, () => context.AssessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm)) }; @@ -2576,8 +2576,8 @@ private static bool WaterLevelCalculationsForNormTargetProbabilitiesHaveIllustrationPoints(IAssessmentSection assessmentSection) { - return IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForSignalingNorm) - || IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + return IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations) + || IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); } private static bool WaterLevelCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(IAssessmentSection assessmentSection) Index: Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs =================================================================== diff -u -r12a3072cbaf39329e8f7a6c96de24be7da43a896 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs) (revision 12a3072cbaf39329e8f7a6c96de24be7da43a896) +++ Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -76,14 +76,14 @@ double lowerLimitNorm = assessmentSection.FailureMechanismContribution.LowerLimitNorm; activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, assessmentSection, lowerLimitNorm, noProbabilityValueDoubleConverter.ConvertToString(lowerLimitNorm))); double signalingNorm = assessmentSection.FailureMechanismContribution.SignalingNorm; activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( - assessmentSection.WaterLevelCalculationsForSignalingNorm, + assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, assessmentSection, signalingNorm, noProbabilityValueDoubleConverter.ConvertToString(signalingNorm))); Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs =================================================================== diff -u -r303c565eb1e9b87cfbc70b29f88d746cff92551e -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 303c565eb1e9b87cfbc70b29f88d746cff92551e) +++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -209,8 +209,8 @@ } IObservableEnumerable locationCalculationsToClear = assessmentSection.FailureMechanismContribution.NormativeNorm == NormType.LowerLimit - ? assessmentSection.WaterLevelCalculationsForLowerLimitNorm - : assessmentSection.WaterLevelCalculationsForSignalingNorm; + ? assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations + : assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations; return RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(locationCalculationsToClear) .ToArray(); @@ -237,9 +237,9 @@ .OfType() .Single())); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput( - assessmentSection.WaterLevelCalculationsForSignalingNorm)); + assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations)); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm)); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations)); foreach (IEnumerable calculations in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities .Select(c => c.HydraulicBoundaryLocationCalculations)) @@ -289,9 +289,9 @@ var affectedObjects = new List(); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationIllustrationPoints( - assessmentSection.WaterLevelCalculationsForSignalingNorm)); + assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations)); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationIllustrationPoints( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm)); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations)); return affectedObjects; } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs =================================================================== diff -u -r1819db6fcb144d5da5a73b101e7a64571a02c342 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 1819db6fcb144d5da5a73b101e7a64571a02c342) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -112,8 +112,8 @@ Assert.AreEqual(RiskeerWellKnownTileSource.BingAerial, configuration.WellKnownTileSource); CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm); CollectionAssert.IsEmpty(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm); CollectionAssert.IsEmpty(assessmentSection.WaveHeightCalculationsForSignalingNorm); @@ -372,8 +372,8 @@ // Precondition CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm); - CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm); CollectionAssert.IsNotEmpty(waterLevelCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations); CollectionAssert.IsNotEmpty(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm); @@ -387,8 +387,8 @@ // Assert CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm); CollectionAssert.IsEmpty(waterLevelCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations); CollectionAssert.IsEmpty(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm); @@ -582,8 +582,8 @@ private static void AssertNumberOfHydraulicBoundaryLocationCalculations(AssessmentSection assessmentSection, int expectedNumberOfCalculations) { Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Count()); - Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForSignalingNorm.Count()); - Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Count()); + Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Count()); + Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Count()); Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Count()); Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First().HydraulicBoundaryLocationCalculations.Count()); Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Count()); @@ -596,8 +596,8 @@ private static void AssertDefaultHydraulicBoundaryLocationCalculations(AssessmentSection assessmentSection, int index, HydraulicBoundaryLocation hydraulicBoundaryLocation) { AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.ElementAt(index), hydraulicBoundaryLocation); - AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(index), hydraulicBoundaryLocation); - AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(index), hydraulicBoundaryLocation); + AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.ElementAt(index), hydraulicBoundaryLocation); + AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(index), hydraulicBoundaryLocation); AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.ElementAt(index), hydraulicBoundaryLocation); AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First().HydraulicBoundaryLocationCalculations.ElementAt(index), hydraulicBoundaryLocation); AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.ElementAt(index), hydraulicBoundaryLocation); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -r4faecc6433b803b965ac16012138f5993e85ed9c -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 4faecc6433b803b965ac16012138f5993e85ed9c) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -298,7 +298,7 @@ { assessmentSection.FailureMechanismContribution }) - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations) .ToArray(); var mocks = new MockRepository(); @@ -311,7 +311,7 @@ var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection); // Precondition - CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Where(c => c.HasOutput)); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Where(c => c.HasOutput)); // When var actionPerformed = false; @@ -327,7 +327,7 @@ Assert.IsTrue(actionPerformed); CollectionAssert.IsEmpty(expectedAffectedCalculations.Where(c => c.HasOutput)); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Where(c => c.HasOutput)); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Where(c => c.HasOutput)); mocks.VerifyAll(); } @@ -362,7 +362,7 @@ c.ClearOutput(); c.Attach(observer); }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ForEachElementDo(c => + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ForEachElementDo(c => { c.Output = null; c.Attach(observer); @@ -450,7 +450,7 @@ { assessmentSection.FailureMechanismContribution } - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations) .ToArray(); var mocks = new MockRepository(); @@ -463,7 +463,7 @@ var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection); // Precondition - CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Where(c => c.HasOutput)); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Where(c => c.HasOutput)); // When var actionPerformed = false; @@ -477,7 +477,7 @@ TestHelper.AssertLogMessagesAreGenerated(Call, expectedMessages, 1); Assert.IsTrue(actionPerformed); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Where(c => c.HasOutput)); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Where(c => c.HasOutput)); mocks.VerifyAll(); } @@ -498,7 +498,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Once(); mocks.ReplayAll(); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ForEachElementDo(c => + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ForEachElementDo(c => { c.Output = null; c.Attach(observer); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r9bfba35cc19f3b515b8590636502a0684c611179 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision 9bfba35cc19f3b515b8590636502a0684c611179) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -515,8 +515,8 @@ // Assert CollectionAssert.IsNotSubsetOf(oldLocations, hydraulicBoundaryDatabase.Locations); CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); - CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); - CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Select(hblc => hblc.HydraulicBoundaryLocation)); CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaveHeightCalculationsForSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); @@ -959,8 +959,8 @@ private static void AssertHydraulicBoundaryLocationsAndCalculations(IEnumerable locations, AssessmentSection assessmentSection) { CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); - CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); - CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Select(hblc => hblc.HydraulicBoundaryLocation)); CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); CollectionAssert.AreEqual(locations, assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); CollectionAssert.AreEqual(locations, assessmentSection.WaveHeightCalculationsForSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r4c9ed3a249bd48f981dc6a6a07cd4dbdf438a5d2 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 4c9ed3a249bd48f981dc6a6a07cd4dbdf438a5d2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -260,8 +260,8 @@ { var calculations = new List(); - calculations.AddRange(assessmentSection.WaterLevelCalculationsForSignalingNorm); - calculations.AddRange(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + calculations.AddRange(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + calculations.AddRange(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities) { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -r6c024cb346f6f7f497a596ec3f1193dce605d6ba -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 6c024cb346f6f7f497a596ec3f1193dce605d6ba) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -850,9 +850,9 @@ private static IEnumerable GetHydraulicBoundaryLocationCalculationFuncs() { yield return new TestCaseData(new Func>( - section => section.WaterLevelCalculationsForSignalingNorm)); + section => section.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations)); yield return new TestCaseData(new Func>( - section => section.WaterLevelCalculationsForLowerLimitNorm)); + section => section.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations)); yield return new TestCaseData(new Func>( section => section.WaterLevelCalculationsForUserDefinedTargetProbabilities .SelectMany(c => c.HydraulicBoundaryLocationCalculations))); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rd8ec9b8eec266efcbd1044008022bcf5171efb31 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision d8ec9b8eec266efcbd1044008022bcf5171efb31) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -809,8 +809,8 @@ new TestHydraulicBoundaryLocation() }); - SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForSignalingNorm); - SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].HydraulicBoundaryLocationCalculations); SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[1].HydraulicBoundaryLocationCalculations); @@ -838,8 +838,8 @@ private static IEnumerable GetAllHydraulicLocationCalculationsWithOutput(IAssessmentSection assessmentSection) { return assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm - .Concat(assessmentSection.WaterLevelCalculationsForSignalingNorm) - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + .Concat(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations) + .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations) .Concat(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].HydraulicBoundaryLocationCalculations) .Concat(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[1].HydraulicBoundaryLocationCalculations) .Concat(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities[0].HydraulicBoundaryLocationCalculations) @@ -850,9 +850,9 @@ private static IEnumerable GetHydraulicBoundaryLocationCalculations() { yield return new TestCaseData(new Func( - section => section.WaterLevelCalculationsForSignalingNorm.First())); + section => section.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.First())); yield return new TestCaseData(new Func( - section => section.WaterLevelCalculationsForLowerLimitNorm.First())); + section => section.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First())); yield return new TestCaseData(new Func( section => section.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].HydraulicBoundaryLocationCalculations.First())); yield return new TestCaseData(new Func( Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r69d9a6153989bad805d933f7bc29325144801367 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 69d9a6153989bad805d933f7bc29325144801367) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -149,11 +149,11 @@ WaterLevelCalculationsForNormTargetProbabilityContext[] calculationsContexts = childNodeObjects.OfType().ToArray(); Assert.AreEqual(2, calculationsContexts.Length); - Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, calculationsContexts[0].WrappedData); + Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, calculationsContexts[0].WrappedData); Assert.AreSame(assessmentSection, calculationsContexts[0].AssessmentSection); Assert.AreEqual(lowerLimitNorm, calculationsContexts[0].GetNormFunc()); - Assert.AreSame(assessmentSection.WaterLevelCalculationsForSignalingNorm, calculationsContexts[1].WrappedData); + Assert.AreSame(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, calculationsContexts[1].WrappedData); Assert.AreSame(assessmentSection, calculationsContexts[1].AssessmentSection); Assert.AreEqual(signalingNorm, calculationsContexts[1].GetNormFunc()); } @@ -548,8 +548,8 @@ hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "1/500", msgs, 8); }); - AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output); - AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Single().Output); + AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Single().Output); + AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Single().Output); } } } @@ -703,15 +703,15 @@ private static IEnumerable GetAllWaterLevelCalculationsWithOutput(IAssessmentSection assessmentSection) { - return assessmentSection.WaterLevelCalculationsForSignalingNorm - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + return assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations + .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations) .Where(calc => calc.HasOutput); } private static IEnumerable GetWaterLevelCalculations() { - yield return new TestCaseData(new Func(section => section.WaterLevelCalculationsForSignalingNorm.First())); - yield return new TestCaseData(new Func(section => section.WaterLevelCalculationsForLowerLimitNorm.First())); + yield return new TestCaseData(new Func(section => section.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.First())); + yield return new TestCaseData(new Func(section => section.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First())); } private static TreeNodeInfo GetInfo(RiskeerPlugin plugin) Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r9453b0efd19b36bd38b1bc4e79e4c29923965fce -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -399,9 +399,9 @@ hydraulicBoundaryLocation2 }); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculationForLowerLimitNorm = assessmentSection.WaterLevelCalculationsForLowerLimitNorm + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculationForLowerLimitNorm = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculationForSignalingNorm = assessmentSection.WaterLevelCalculationsForSignalingNorm + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculationForSignalingNorm = assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); hydraulicBoundaryLocationCalculationForLowerLimitNorm.Output = new TestHydraulicBoundaryLocationCalculationOutput(); @@ -492,9 +492,9 @@ hydraulicBoundaryLocation2 }); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForSignalingNorm + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation3 = waterLevelCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); @@ -1517,8 +1517,8 @@ private static IEnumerable GetWaterLevelCalculationsForNormTargetProbabilitiesWithOutput(IAssessmentSection assessmentSection) { - return assessmentSection.WaterLevelCalculationsForSignalingNorm - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + return assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations + .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations) .Where(calc => calc.HasOutput); } @@ -1875,8 +1875,8 @@ assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations, true); - SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForSignalingNorm); - SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].HydraulicBoundaryLocationCalculations); SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[1].HydraulicBoundaryLocationCalculations); Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r9453b0efd19b36bd38b1bc4e79e4c29923965fce -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 9453b0efd19b36bd38b1bc4e79e4c29923965fce) +++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -101,8 +101,8 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First() .HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs =================================================================== diff -u -rd4521664029b561b3b102a3531170565283054f3 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision d4521664029b561b3b102a3531170565283054f3) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismView.cs (.../MacroStabilityInwardsFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -208,9 +208,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs =================================================================== diff -u -r9a83eb890b0d3aac04ee48d4999fae0c92e7e10c -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 9a83eb890b0d3aac04ee48d4999fae0c92e7e10c) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -94,7 +94,7 @@ Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); - double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output.Result; + double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.ElementAt(0).Output.Result; Assert.AreEqual(expectedAssessmentLevel, ((MacroStabilityInwardsInputContextProperties) objectProperties).AssessmentLevel); } @@ -140,7 +140,7 @@ Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); - double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0).Output.Result; + double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(0).Output.Result; Assert.AreEqual(expectedAssessmentLevel, ((MacroStabilityInwardsInputContextProperties) objectProperties).AssessmentLevel); } } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r80c53924c7488a48f8148ba8b73260446a262883 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision 80c53924c7488a48f8148ba8b73260446a262883) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -112,7 +112,7 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Single(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Single(); hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); MacroStabilityInwardsCalculationScenario calculation = CreateValidCalculation(hydraulicBoundaryLocation); @@ -192,10 +192,10 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(1); hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); MacroStabilityInwardsCalculationScenario calculation1 = CreateValidCalculation(hydraulicBoundaryLocation1); @@ -272,10 +272,10 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(1); hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); MacroStabilityInwardsCalculationScenario calculation1 = CreateValidCalculation(hydraulicBoundaryLocation1); Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.cs =================================================================== diff -u -rea2a9d44f6579bdb6134864522fef926b4064d8e -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision ea2a9d44f6579bdb6134864522fef926b4064d8e) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -238,9 +238,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs =================================================================== diff -u -raadbaf228b074ae1d2a2ec3163a5705fc2bf69e0 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision aadbaf228b074ae1d2a2ec3163a5705fc2bf69e0) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -103,7 +103,7 @@ Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); - double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output.Result; + double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.ElementAt(0).Output.Result; Assert.AreEqual(expectedAssessmentLevel, ((SemiProbabilisticPipingInputContextProperties) objectProperties).AssessmentLevel); } @@ -149,7 +149,7 @@ Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); - double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0).Output.Result; + double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(0).Output.Result; Assert.AreEqual(expectedAssessmentLevel, ((SemiProbabilisticPipingInputContextProperties) objectProperties).AssessmentLevel); } } Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs =================================================================== diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision c37eebd9171a53987f5929013edbe3d82e618ed0) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -112,10 +112,10 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(1); hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); var calculation1 = @@ -265,10 +265,10 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.ElementAt(1); hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); var calculation1 = @@ -419,7 +419,7 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Single(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Single(); hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); var calculation = Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs =================================================================== diff -u -r37079ed26ef3699cfc8d94f55f8b867ffb933663 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision 37079ed26ef3699cfc8d94f55f8b867ffb933663) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs (.../StabilityPointStructuresFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -205,9 +205,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs =================================================================== diff -u -rfd240e19cd135e570b4589511bf3183834de30b6 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs (.../StabilityStoneCoverFailureMechanismView.cs) (revision fd240e19cd135e570b4589511bf3183834de30b6) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs (.../StabilityStoneCoverFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -200,9 +200,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverHydraulicLoadsContextTreeNodeInfoTest.cs =================================================================== diff -u -r1dd2c22368f99235c15314f434505d4b5fc27a90 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverHydraulicLoadsContextTreeNodeInfoTest.cs (.../StabilityStoneCoverHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 1dd2c22368f99235c15314f434505d4b5fc27a90) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverHydraulicLoadsContextTreeNodeInfoTest.cs (.../StabilityStoneCoverHydraulicLoadsContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -367,7 +367,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r0e0eff94d9452eeebda5f68f183414d4ee3df413 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -1795,7 +1795,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r0e0eff94d9452eeebda5f68f183414d4ee3df413 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 0e0eff94d9452eeebda5f68f183414d4ee3df413) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -1901,7 +1901,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -134,8 +134,8 @@ private static void AddHydraulicLocationCalculationEntities(AssessmentSection assessmentSection, AssessmentSectionEntity entity, PersistenceRegistry registry) { entity.HydraulicLocationCalculationCollectionEntity7 = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity6 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity5 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity6 = assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity5 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Create(registry); entity.HydraulicLocationCalculationCollectionEntity4 = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Create(registry); entity.HydraulicLocationCalculationCollectionEntity3 = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Create(registry); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -139,8 +139,8 @@ ReadConversionCollector collector) { entity.HydraulicLocationCalculationCollectionEntity7.Read(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity6.Read(assessmentSection.WaterLevelCalculationsForSignalingNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity5.Read(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity6.Read(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, collector); + entity.HydraulicLocationCalculationCollectionEntity5.Read(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, collector); entity.HydraulicLocationCalculationCollectionEntity4.Read(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, collector); entity.HydraulicLocationCalculationCollectionEntity3.Read(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, collector); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -288,9 +288,9 @@ AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, entity.HydraulicLocationCalculationCollectionEntity4); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, entity.HydraulicLocationCalculationCollectionEntity5); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm, + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, entity.HydraulicLocationCalculationCollectionEntity6); AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, entity.HydraulicLocationCalculationCollectionEntity7); @@ -299,12 +299,12 @@ private static void SetHydraulicBoundaryLocationCalculationInputsOfAssessmentSection(AssessmentSection assessmentSection) { SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, 1); - SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalingNorm, 2); - SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, 3); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, 2); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, 3); SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, 4); SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, 5); - SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalingNorm, 6); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, 6); SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, 7); SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, 8); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rae63828db6c6e20bc476fe8adfef362e3966a5ad -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision ae63828db6c6e20bc476fe8adfef362e3966a5ad) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -2141,10 +2141,10 @@ { AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForFactorizedSignalingNorm, actual.WaterLevelCalculationsForFactorizedSignalingNorm); - AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForSignalingNorm, - actual.WaterLevelCalculationsForSignalingNorm); - AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForLowerLimitNorm, - actual.WaterLevelCalculationsForLowerLimitNorm); + AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, + actual.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, + actual.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForFactorizedLowerLimitNorm, actual.WaterLevelCalculationsForFactorizedLowerLimitNorm); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rda1df87d94dcc61aa26d5f033c6bf579c2249cdd -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision da1df87d94dcc61aa26d5f033c6bf579c2249cdd) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -240,15 +240,15 @@ hydraulicBoundaryLocation, calculation); - calculation = section.WaterLevelCalculationsForSignalingNorm.Single(); + calculation = section.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations.Single(); hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity6 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); - calculation = section.WaterLevelCalculationsForLowerLimitNorm.Single(); + calculation = section.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.Single(); hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity5 .HydraulicLocationCalculationEntities .Single(); @@ -316,8 +316,8 @@ Assert.IsNull(hydraulicBoundaryDatabase.Version); CollectionAssert.IsEmpty(section.WaterLevelCalculationsForFactorizedSignalingNorm); - CollectionAssert.IsEmpty(section.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsEmpty(section.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsEmpty(section.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations); + CollectionAssert.IsEmpty(section.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations); CollectionAssert.IsEmpty(section.WaterLevelCalculationsForFactorizedLowerLimitNorm); CollectionAssert.IsEmpty(section.WaveHeightCalculationsForFactorizedSignalingNorm); CollectionAssert.IsEmpty(section.WaveHeightCalculationsForSignalingNorm); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r00f65fcd53be961475ead6a549bedb7b157803a7 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 00f65fcd53be961475ead6a549bedb7b157803a7) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -399,7 +399,7 @@ .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation)); ConfigureDesignWaterLevelCalculation(designWaterLevelCalculation, hasIllustrationPoints); - designWaterLevelCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm + designWaterLevelCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation)); ConfigureDesignWaterLevelCalculation(designWaterLevelCalculation, hasIllustrationPoints); @@ -420,7 +420,7 @@ .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation)); ConfigureDesignWaterLevelCalculation(designWaterLevelCalculation, hasIllustrationPoints); - designWaterLevelCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm + designWaterLevelCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation)); ConfigureDesignWaterLevelCalculation(designWaterLevelCalculation, hasIllustrationPoints); Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs =================================================================== diff -u -r7e8b7562d2dec62c1c5c0a205e1f7f4eca7243fc -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision 7e8b7562d2dec62c1c5c0a205e1f7f4eca7243fc) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs (.../WaveImpactAsphaltCoverFailureMechanismView.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -200,9 +200,9 @@ waterLevelCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForSignalingNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); + AssessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations, UpdateHydraulicBoundaryLocationsMapData); waterLevelCalculationsForFactorizedLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, UpdateHydraulicBoundaryLocationsMapData); waveHeightCalculationsForFactorizedSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs =================================================================== diff -u -r1dd2c22368f99235c15314f434505d4b5fc27a90 -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs) (revision 1dd2c22368f99235c15314f434505d4b5fc27a90) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverHydraulicLoadsContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -364,7 +364,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r805f1c45d686b1334f741f909441ee2dac73ee0e -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 805f1c45d686b1334f741f909441ee2dac73ee0e) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -1739,7 +1739,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r805f1c45d686b1334f741f909441ee2dac73ee0e -ra1246836188dc9e7c752531415362d6c14cc9978 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 805f1c45d686b1334f741f909441ee2dac73ee0e) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision a1246836188dc9e7c752531415362d6c14cc9978) @@ -1925,7 +1925,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForLowerLimitNorm.HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; }