Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs (.../AssessmentSectionExtensions.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -124,10 +124,10 @@ switch (normativeProbabilityType) { case NormativeProbabilityType.SignalFloodingProbability: - calculations = assessmentSection.WaterLevelCalculationsForSignalingNorm; + calculations = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability; break; case NormativeProbabilityType.MaximumAllowableFloodingProbability: - calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; + calculations = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability; break; default: throw new NotSupportedException(); Index: Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Common/src/Riskeer.Common.Data/AssessmentSection/IAssessmentSection.cs (.../IAssessmentSection.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -74,14 +74,14 @@ BackgroundData BackgroundData { get; } /// - /// Gets the water level calculations corresponding to the signaling norm. + /// Gets the water level calculations corresponding to the signal flooding probability. /// - IObservableEnumerable WaterLevelCalculationsForSignalingNorm { get; } + IObservableEnumerable WaterLevelCalculationsForSignalFloodingProbability { get; } /// - /// Gets the water level calculations corresponding to the lower limit norm. + /// Gets the water level calculations corresponding to the maximum allowable flooding probability. /// - IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm { get; } + IObservableEnumerable WaterLevelCalculationsForMaximumAllowableFloodingProbability { get; } /// /// Gets the water level calculations corresponding to the user defined target probabilities. Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/TargetProbabilityCalculationsDisplayNameHelper.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/TargetProbabilityCalculationsDisplayNameHelper.cs (.../TargetProbabilityCalculationsDisplayNameHelper.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/TargetProbabilityCalculationsDisplayNameHelper.cs (.../TargetProbabilityCalculationsDisplayNameHelper.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -60,11 +60,11 @@ var nonUniqueWaterLevelCalculationsDisplayNameLookup = new Dictionary { { - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, noProbabilityValueDoubleConverter.ConvertToString(assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability) }, { - assessmentSection.WaterLevelCalculationsForSignalingNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, noProbabilityValueDoubleConverter.ConvertToString(assessmentSection.FailureMechanismContribution.SignalFloodingProbability) } }; Index: Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/HydraulicBoundaryLocationsMapLayer.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/HydraulicBoundaryLocationsMapLayer.cs (.../HydraulicBoundaryLocationsMapLayer.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Common/src/Riskeer.Common.Forms/MapLayers/HydraulicBoundaryLocationsMapLayer.cs (.../HydraulicBoundaryLocationsMapLayer.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -122,9 +122,9 @@ }; waterLevelCalculationsForSignalingNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - assessmentSection.WaterLevelCalculationsForSignalingNorm, UpdateFeatures); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, UpdateFeatures); waterLevelCalculationsForLowerLimitNormObserver = ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, UpdateFeatures); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, UpdateFeatures); waterLevelForUserDefinedTargetProbabilitiesCollectionObserver = new Observer(() => { @@ -253,8 +253,8 @@ tp => (IObservableEnumerable) tp.HydraulicBoundaryLocationCalculations, tp => tp.TargetProbability); - waterLevelCalculations.Add(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability); - waterLevelCalculations.Add(assessmentSection.WaterLevelCalculationsForSignalingNorm, assessmentSection.FailureMechanismContribution.SignalFloodingProbability); + waterLevelCalculations.Add(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability); + waterLevelCalculations.Add(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, assessmentSection.FailureMechanismContribution.SignalFloodingProbability); return waterLevelCalculations.OrderByDescending(pair => pair.Value) .ToDictionary(x => x.Key, x => string.Format(Resources.MetaData_WaterLevel_TargetProbability_0, Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs (.../AssessmentSectionExtensionsTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -255,13 +255,13 @@ assessmentSection, hydraulicBoundaryLocation, NormativeProbabilityType.SignalFloodingProbability, - assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0)); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.ElementAt(0)); yield return new TestCaseData( assessmentSection, hydraulicBoundaryLocation, NormativeProbabilityType.MaximumAllowableFloodingProbability, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(0)); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.ElementAt(0)); } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -89,15 +89,15 @@ public BackgroundData BackgroundData { get; set; } - public IObservableEnumerable WaterLevelCalculationsForSignalingNorm + public IObservableEnumerable WaterLevelCalculationsForSignalFloodingProbability { get { return waterLevelCalculationsForSignalingNorm; } } - public IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm + public IObservableEnumerable WaterLevelCalculationsForMaximumAllowableFloodingProbability { get { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/RiskeerMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r9742f296d8b16a23a2143b2e4ebd3e1deb1a0af1 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/RiskeerMapDataFeaturesFactoryTest.cs (.../RiskeerMapDataFeaturesFactoryTest.cs) (revision 9742f296d8b16a23a2143b2e4ebd3e1deb1a0af1) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/RiskeerMapDataFeaturesFactoryTest.cs (.../RiskeerMapDataFeaturesFactoryTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -168,8 +168,8 @@ tp => (IObservableEnumerable) tp.HydraulicBoundaryLocationCalculations, tp => $"h - {ProbabilityFormattingHelper.Format(tp.TargetProbability)}"); - waterLevels.Add(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, "h - 1/30.000"); - waterLevels.Add(assessmentSection.WaterLevelCalculationsForSignalingNorm, "h - 1/30.000 (1)"); + waterLevels.Add(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, "h - 1/30.000"); + waterLevels.Add(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, "h - 1/30.000 (1)"); IEnumerable locations = AggregatedHydraulicBoundaryLocationFactory.CreateAggregatedHydraulicBoundaryLocations( assessmentSection.HydraulicBoundaryDatabase.Locations, Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/TargetProbabilityCalculationsDisplayNameHelperTest.cs =================================================================== diff -u -r948224ba18427dc94d0d4bbaf77f57f9f601a5b2 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/TargetProbabilityCalculationsDisplayNameHelperTest.cs (.../TargetProbabilityCalculationsDisplayNameHelperTest.cs) (revision 948224ba18427dc94d0d4bbaf77f57f9f601a5b2) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/TargetProbabilityCalculationsDisplayNameHelperTest.cs (.../TargetProbabilityCalculationsDisplayNameHelperTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -84,8 +84,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(maximumAllowableFloodingProbability, signalFloodingProbability)); - assessmentSection.Stub(a => a.WaterLevelCalculationsForLowerLimitNorm).Return(hydraulicBoundaryLocationCalculations); - assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalingNorm).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(hydraulicBoundaryLocationCalculations); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(new ObservableList()); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return( new ObservableList { @@ -118,8 +118,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(maximumAllowableFloodingProbability, signalFloodingProbability)); - assessmentSection.Stub(a => a.WaterLevelCalculationsForLowerLimitNorm).Return(new ObservableList()); - assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalingNorm).Return(hydraulicBoundaryLocationCalculations); + assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(hydraulicBoundaryLocationCalculations); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return( new ObservableList { @@ -156,8 +156,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(maximumAllowableFloodingProbability, signalFloodingProbability)); - assessmentSection.Stub(a => a.WaterLevelCalculationsForLowerLimitNorm).Return(new ObservableList()); - assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalingNorm).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(new ObservableList()); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return( new ObservableList { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/HydraulicBoundaryLocationsMapLayerTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/HydraulicBoundaryLocationsMapLayerTest.cs (.../HydraulicBoundaryLocationsMapLayerTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/MapLayers/HydraulicBoundaryLocationsMapLayerTest.cs (.../HydraulicBoundaryLocationsMapLayerTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -589,9 +589,9 @@ private static IEnumerable GetCalculationFuncs() { yield return new TestCaseData(new Func( - assessmentSection => assessmentSection.WaterLevelCalculationsForSignalingNorm.First())); + assessmentSection => assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.First())); yield return new TestCaseData(new Func( - assessmentSection => assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First())); + assessmentSection => assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First())); yield return new TestCaseData(new Func( assessmentSection => assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First() .HydraulicBoundaryLocationCalculations.First())); Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapFeaturesTestHelper.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapFeaturesTestHelper.cs (.../MapFeaturesTestHelper.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapFeaturesTestHelper.cs (.../MapFeaturesTestHelper.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -69,9 +69,9 @@ MapFeaturesMetaDataTestHelper.AssertMetaData(hydraulicBoundaryLocation.Name, mapFeature, "Naam"); var presentedMetaDataItems = new List(); - AssertMetaData(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation, mapFeature, + AssertMetaData(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, hydraulicBoundaryLocation, mapFeature, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability, "h - {0}", presentedMetaDataItems); - AssertMetaData(assessmentSection.WaterLevelCalculationsForSignalingNorm, hydraulicBoundaryLocation, mapFeature, + AssertMetaData(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, hydraulicBoundaryLocation, mapFeature, assessmentSection.FailureMechanismContribution.SignalFloodingProbability, "h - {0}", presentedMetaDataItems); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability calculationsForTargetProbability in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -678,7 +678,7 @@ private static void ConfigureAssessmentSectionWithHydraulicBoundaryOutput(IAssessmentSection assessmentSection) { - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); } private static GrassCoverErosionOutwardsWaveConditionsCalculation CreateValidCalculation(HydraulicBoundaryLocation location) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1919,7 +1919,7 @@ private static void ConfigureAssessmentSectionWithHydraulicBoundaryOutput(IAssessmentSection assessmentSection) { - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); } private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation location) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rbe73db4b4573dd45d63d960bd5826b3ac33fbdf3 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision be73db4b4573dd45d63d960bd5826b3ac33fbdf3) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1724,7 +1724,7 @@ private static void ConfigureAssessmentSectionWithHydraulicBoundaryOutput(IAssessmentSection assessmentSection) { - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(12); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(12); } private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation location) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r0a681eea5c0949690e9a61d735f2f02e8523dc99 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 0a681eea5c0949690e9a61d735f2f02e8523dc99) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -316,7 +316,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); - assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output = + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.ElementAt(0).Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation); @@ -375,7 +375,7 @@ CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.ElementAt(3)); IEnumerable waterLevels = calculation.InputParameters.GetWaterLevels( - assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result); Assert.AreEqual(3, waterLevels.Count()); AssertWaveConditionsCalculationMessages(msgs, waterLevels, "golfoploop", 4); AssertWaveConditionsCalculationMessages(msgs, waterLevels, "golfklap", 15); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r43d5c05c6ac93418aafe870fac4c8386bc5c66cc -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 43d5c05c6ac93418aafe870fac4c8386bc5c66cc) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs (.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -128,7 +128,7 @@ AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity( activity, calculation, - assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result, hydraulicBoundaryDatabase); } @@ -215,7 +215,7 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(GrassCoverErosionOutwardsWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result; + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result; AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel, hydraulicBoundaryDatabase); AssertGrassCoverErosionOutwardsWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel, hydraulicBoundaryDatabase); } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1033,7 +1033,7 @@ private static void ConfigureAssessmentSectionWithHydraulicBoundaryOutput(IAssessmentSection assessmentSection) { - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); } private static GrassCoverErosionOutwardsWaveConditionsCalculation GetValidCalculation(HydraulicBoundaryLocation location) Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs =================================================================== diff -u -ree120d063723b2694988f2670db940d1f89e38a2 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision ee120d063723b2694988f2670db940d1f89e38a2) +++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -51,8 +51,8 @@ private const double defaultFloodingProbability = 1.0 / 30000; private const RiskeerWellKnownTileSource defaultWellKnownTileSource = RiskeerWellKnownTileSource.BingAerial; - private readonly ObservableList waterLevelCalculationsForSignalingNorm = new ObservableList(); - private readonly ObservableList waterLevelCalculationsForLowerLimitNorm = new ObservableList(); + private readonly ObservableList waterLevelCalculationsForSignalFloodingProbability; + private readonly ObservableList waterLevelCalculationsForMaximumAllowableFloodingProbability; /// /// Initializes a new instance of the class. @@ -89,6 +89,8 @@ HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); SpecificFailureMechanisms = new ObservableList(); + waterLevelCalculationsForSignalFloodingProbability = new ObservableList(); + waterLevelCalculationsForMaximumAllowableFloodingProbability = new ObservableList(); WaterLevelCalculationsForUserDefinedTargetProbabilities = new ObservableList(); WaveHeightCalculationsForUserDefinedTargetProbabilities = new ObservableList(); @@ -187,9 +189,9 @@ /// public DuneErosionFailureMechanism DuneErosion { get; set; } - public IObservableEnumerable WaterLevelCalculationsForSignalingNorm => waterLevelCalculationsForSignalingNorm; + public IObservableEnumerable WaterLevelCalculationsForSignalFloodingProbability => waterLevelCalculationsForSignalFloodingProbability; - public IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm => waterLevelCalculationsForLowerLimitNorm; + public IObservableEnumerable WaterLevelCalculationsForMaximumAllowableFloodingProbability => waterLevelCalculationsForMaximumAllowableFloodingProbability; public ObservableList WaterLevelCalculationsForUserDefinedTargetProbabilities { get; } @@ -270,8 +272,8 @@ private void ClearHydraulicBoundaryLocationCalculations() { - waterLevelCalculationsForSignalingNorm.Clear(); - waterLevelCalculationsForLowerLimitNorm.Clear(); + waterLevelCalculationsForSignalFloodingProbability.Clear(); + waterLevelCalculationsForMaximumAllowableFloodingProbability.Clear(); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities) { @@ -286,8 +288,8 @@ private void AddHydraulicBoundaryLocationCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation) { - waterLevelCalculationsForSignalingNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); - waterLevelCalculationsForLowerLimitNorm.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); + waterLevelCalculationsForSignalFloodingProbability.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); + waterLevelCalculationsForMaximumAllowableFloodingProbability.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in WaterLevelCalculationsForUserDefinedTargetProbabilities) { Index: Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/HydraulicBoundaryLocationCalculationsExporter.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/HydraulicBoundaryLocationCalculationsExporter.cs (.../HydraulicBoundaryLocationCalculationsExporter.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/HydraulicBoundaryLocationCalculationsExporter.cs (.../HydraulicBoundaryLocationCalculationsExporter.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -104,9 +104,9 @@ new[] { new Tuple, double>( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability), + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability), new Tuple, double>( - assessmentSection.WaterLevelCalculationsForSignalingNorm, assessmentSection.FailureMechanismContribution.SignalFloodingProbability) + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, assessmentSection.FailureMechanismContribution.SignalFloodingProbability) }, HydraulicBoundaryLocationCalculationsType.WaterLevel, Path.Combine(tempFolderPath, RiskeerCommonUtilResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName)); Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -177,8 +177,8 @@ private IEnumerable GetHydraulicBoundaryLocationCalculationsToClear(NormativeProbabilityType normativeProbabilityToClearFor) { return normativeProbabilityToClearFor == NormativeProbabilityType.MaximumAllowableFloodingProbability - ? assessmentSection.WaterLevelCalculationsForLowerLimitNorm - : assessmentSection.WaterLevelCalculationsForSignalingNorm; + ? assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability + : assessmentSection.WaterLevelCalculationsForSignalFloodingProbability; } } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs =================================================================== diff -u -r3295aac109aed492f67d85bc657f29f4d061cfef -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision 3295aac109aed492f67d85bc657f29f4d061cfef) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -189,8 +189,8 @@ var locationsAndCalculationsObservables = new List { hydraulicBoundaryDatabase.Locations, - assessmentSection.WaterLevelCalculationsForSignalingNorm, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, assessmentSection.DuneErosion.DuneLocations, assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities }; Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -rbaf12de07f7b83eca598811f56ebd9997d6e40b4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision baf12de07f7b83eca598811f56ebd9997d6e40b4) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -130,10 +130,10 @@ { var changedObjects = new List(); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForSignalingNorm, - sourceAssessmentSection.WaterLevelCalculationsForSignalingNorm)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForLowerLimitNorm, - sourceAssessmentSection.WaterLevelCalculationsForLowerLimitNorm)); + changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForSignalFloodingProbability, + sourceAssessmentSection.WaterLevelCalculationsForSignalFloodingProbability)); + changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, + sourceAssessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability)); changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities, sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities, targetAssessmentSection.HydraulicBoundaryDatabase.Locations)); Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -628,10 +628,10 @@ new[] { new Tuple, double>( - context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, + context.AssessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, context.AssessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability), new Tuple, double>( - context.AssessmentSection.WaterLevelCalculationsForSignalingNorm, + context.AssessmentSection.WaterLevelCalculationsForSignalFloodingProbability, context.AssessmentSection.FailureMechanismContribution.SignalFloodingProbability) }, HydraulicBoundaryLocationCalculationsType.WaterLevel, filePath), IsEnabled = context => true, @@ -1197,13 +1197,13 @@ IAssessmentSection assessmentSection = designWaterLevelCalculationsView.AssessmentSection; object viewData = designWaterLevelCalculationsView.Data; - if (ReferenceEquals(viewData, assessmentSection.WaterLevelCalculationsForSignalingNorm) - || ReferenceEquals(viewData, assessmentSection.WaterLevelCalculationsForLowerLimitNorm)) + if (ReferenceEquals(viewData, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability) + || ReferenceEquals(viewData, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability)) { IObservableEnumerable calculationsForUserDefinedTargetProbability = - ReferenceEquals(viewData, assessmentSection.WaterLevelCalculationsForSignalingNorm) - ? assessmentSection.WaterLevelCalculationsForSignalingNorm - : assessmentSection.WaterLevelCalculationsForLowerLimitNorm; + ReferenceEquals(viewData, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability) + ? assessmentSection.WaterLevelCalculationsForSignalFloodingProbability + : assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability; Func getTitleFunc = () => GetWaterLevelCalculationsForNormTargetProbabilitiesViewName(calculationsForUserDefinedTargetProbability, assessmentSection); @@ -2457,10 +2457,10 @@ { return new object[] { - new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm, + new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, context.AssessmentSection, () => context.AssessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability), - new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForSignalingNorm, + new WaterLevelCalculationsForNormTargetProbabilityContext(context.AssessmentSection.WaterLevelCalculationsForSignalFloodingProbability, context.AssessmentSection, () => context.AssessmentSection.FailureMechanismContribution.SignalFloodingProbability) }; @@ -2716,8 +2716,8 @@ private static bool WaterLevelCalculationsForNormTargetProbabilitiesHaveIllustrationPoints(IAssessmentSection assessmentSection) { - return IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForSignalingNorm) - || IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + return IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability) + || IllustrationPointsHelper.HasIllustrationPoints(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability); } private static bool WaterLevelCalculationsForUserDefinedTargetProbabilitiesHaveIllustrationPoints(IAssessmentSection assessmentSection) Index: Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -74,18 +74,18 @@ double lowerLimitNorm = assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability; activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, assessmentSection, lowerLimitNorm, - TargetProbabilityCalculationsDisplayNameHelper.GetUniqueDisplayNameForWaterLevelCalculations(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + TargetProbabilityCalculationsDisplayNameHelper.GetUniqueDisplayNameForWaterLevelCalculations(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, assessmentSection))); double signalingNorm = assessmentSection.FailureMechanismContribution.SignalFloodingProbability; activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities( - assessmentSection.WaterLevelCalculationsForSignalingNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, assessmentSection, signalingNorm, - TargetProbabilityCalculationsDisplayNameHelper.GetUniqueDisplayNameForWaterLevelCalculations(assessmentSection.WaterLevelCalculationsForSignalingNorm, + TargetProbabilityCalculationsDisplayNameHelper.GetUniqueDisplayNameForWaterLevelCalculations(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, assessmentSection))); return activities; Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs =================================================================== diff -u -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) +++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -214,9 +214,9 @@ .OfType() .Single())); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput( - assessmentSection.WaterLevelCalculationsForSignalingNorm)); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability)); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm)); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability)); foreach (IEnumerable calculations in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities .Select(c => c.HydraulicBoundaryLocationCalculations)) @@ -404,9 +404,9 @@ var affectedObjects = new List(); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationIllustrationPoints( - assessmentSection.WaterLevelCalculationsForSignalingNorm)); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability)); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationIllustrationPoints( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm)); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability)); return affectedObjects; } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs =================================================================== diff -u -ree120d063723b2694988f2670db940d1f89e38a2 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision ee120d063723b2694988f2670db940d1f89e38a2) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -66,10 +66,12 @@ Assert.IsNull(hydraulicBoundaryDatabase.Version); Assert.IsFalse(hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor); - Assert.IsEmpty(assessmentSection.SpecificFailureMechanisms); + CollectionAssert.IsEmpty(assessmentSection.SpecificFailureMechanisms); - Assert.IsEmpty(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities); - Assert.IsEmpty(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities); + CollectionAssert.IsEmpty(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities); CollectionAssert.IsEmpty(assessmentSection.Piping.StochasticSoilModels); CollectionAssert.IsEmpty(assessmentSection.Piping.SurfaceLines); @@ -96,9 +98,6 @@ Assert.AreEqual("Bing Maps - Satelliet", backgroundData.Name); var configuration = (WellKnownBackgroundDataConfiguration) backgroundData.Configuration; Assert.AreEqual(RiskeerWellKnownTileSource.BingAerial, configuration.WellKnownTileSource); - - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); } [Test] @@ -292,17 +291,17 @@ }); // Precondition - CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability); + CollectionAssert.IsNotEmpty(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability); CollectionAssert.IsNotEmpty(waterLevelCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations); CollectionAssert.IsNotEmpty(waveHeightCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations); // Call assessmentSection.SetHydraulicBoundaryLocationCalculations(Enumerable.Empty()); // Assert - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability); + CollectionAssert.IsEmpty(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability); CollectionAssert.IsEmpty(waterLevelCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations); CollectionAssert.IsEmpty(waveHeightCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations); } @@ -402,16 +401,16 @@ private static void AssertNumberOfHydraulicBoundaryLocationCalculations(AssessmentSection assessmentSection, int expectedNumberOfCalculations) { - Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForSignalingNorm.Count()); - Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Count()); + Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Count()); + Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Count()); Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First().HydraulicBoundaryLocationCalculations.Count()); Assert.AreEqual(expectedNumberOfCalculations, assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.First().HydraulicBoundaryLocationCalculations.Count()); } private static void AssertDefaultHydraulicBoundaryLocationCalculations(AssessmentSection assessmentSection, int index, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(index), hydraulicBoundaryLocation); - AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(index), hydraulicBoundaryLocation); + AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.ElementAt(index), hydraulicBoundaryLocation); + AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.ElementAt(index), hydraulicBoundaryLocation); AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First().HydraulicBoundaryLocationCalculations.ElementAt(index), hydraulicBoundaryLocation); AssertDefaultHydraulicBoundaryLocationCalculation(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.First().HydraulicBoundaryLocationCalculations.ElementAt(index), hydraulicBoundaryLocation); } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs (.../AssessmentSectionCompositionChangeHandlerTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -108,8 +108,8 @@ .Where(HasDuneLocationCalculationOutput) .ToArray(); - IEnumerable hydraulicBoundaryLocationCalculationsWithOutput = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Where(HasHydraulicBoundaryLocationCalculationOutput) - .Concat(assessmentSection.WaterLevelCalculationsForSignalingNorm.Where(HasHydraulicBoundaryLocationCalculationOutput)) + IEnumerable hydraulicBoundaryLocationCalculationsWithOutput = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Where(HasHydraulicBoundaryLocationCalculationOutput) + .Concat(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Where(HasHydraulicBoundaryLocationCalculationOutput)) .Concat(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.SelectMany(tp => tp.HydraulicBoundaryLocationCalculations)) .ToArray(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs (.../FailureMechanismContributionNormChangeHandlerTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -603,23 +603,23 @@ { yield return new TestCaseData( NormativeProbabilityType.MaximumAllowableFloodingProbability, new Func>( - section => section.WaterLevelCalculationsForLowerLimitNorm), + section => section.WaterLevelCalculationsForMaximumAllowableFloodingProbability), WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability); yield return new TestCaseData( NormativeProbabilityType.SignalFloodingProbability, new Func>( - section => section.WaterLevelCalculationsForSignalingNorm), + section => section.WaterLevelCalculationsForSignalFloodingProbability), WaveConditionsInputWaterLevelType.SignalFloodingProbability); } private static IEnumerable GetChangeNormCases() { yield return new TestCaseData( NormativeProbabilityType.MaximumAllowableFloodingProbability, new Func>( - section => section.WaterLevelCalculationsForSignalingNorm), + section => section.WaterLevelCalculationsForSignalFloodingProbability), WaveConditionsInputWaterLevelType.SignalFloodingProbability); yield return new TestCaseData( NormativeProbabilityType.SignalFloodingProbability, new Func>( - section => section.WaterLevelCalculationsForLowerLimitNorm), + section => section.WaterLevelCalculationsForMaximumAllowableFloodingProbability), WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability); } } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r21ded87c36d9ef4309ae4b85dc60b67358b1e1c2 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision 21ded87c36d9ef4309ae4b85dc60b67358b1e1c2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs (.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -511,8 +511,8 @@ // Assert CollectionAssert.IsNotSubsetOf(oldLocations, hydraulicBoundaryDatabase.Locations); - CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); - CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.IsNotSubsetOf(oldLocations, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Select(hblc => hblc.HydraulicBoundaryLocation)); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities) { @@ -792,8 +792,8 @@ var observables = new List { hydraulicBoundaryDatabase.Locations, - assessmentSection.WaterLevelCalculationsForSignalingNorm, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, assessmentSection.DuneErosion.DuneLocations, assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities }; @@ -954,8 +954,8 @@ private static void AssertHydraulicBoundaryLocationsAndCalculations(IEnumerable locations, AssessmentSection assessmentSection) { - CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForSignalingNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); - CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Select(hblc => hblc.HydraulicBoundaryLocation)); + CollectionAssert.AreEqual(locations, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Select(hblc => hblc.HydraulicBoundaryLocation)); AssertHydraulicBoundaryLocationsOfUserDefinedTargetProbabilities(locations, assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities); AssertHydraulicBoundaryLocationsOfUserDefinedTargetProbabilities(locations, assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities); } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs =================================================================== diff -u -r21ded87c36d9ef4309ae4b85dc60b67358b1e1c2 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 21ded87c36d9ef4309ae4b85dc60b67358b1e1c2) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -262,8 +262,8 @@ { var calculations = new List(); - calculations.AddRange(assessmentSection.WaterLevelCalculationsForSignalingNorm); - calculations.AddRange(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + calculations.AddRange(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability); + calculations.AddRange(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability); foreach (HydraulicBoundaryLocationCalculationsForTargetProbability element in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities) { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -r23efff6e3a186384e8ae130a53ff5a47afb866d3 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 23efff6e3a186384e8ae130a53ff5a47afb866d3) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -976,9 +976,9 @@ private static IEnumerable GetHydraulicBoundaryLocationCalculationFuncs() { yield return new TestCaseData(new Func>( - section => section.WaterLevelCalculationsForSignalingNorm)); + section => section.WaterLevelCalculationsForSignalFloodingProbability)); yield return new TestCaseData(new Func>( - section => section.WaterLevelCalculationsForLowerLimitNorm)); + section => section.WaterLevelCalculationsForMaximumAllowableFloodingProbability)); yield return new TestCaseData(new Func>( section => section.WaterLevelCalculationsForUserDefinedTargetProbabilities .SelectMany(c => c.HydraulicBoundaryLocationCalculations))); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -814,7 +814,7 @@ gui.DocumentViewController.CloseAllViews(); gui.DocumentViewController.OpenViewForData(new WaterLevelCalculationsForNormTargetProbabilityContext( - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, assessmentSection, () => 0.1)); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, assessmentSection, () => 0.1)); IView view = gui.ViewHost.DocumentViews.First(); @@ -867,7 +867,7 @@ gui.DocumentViewController.CloseAllViews(); gui.DocumentViewController.OpenViewForData(new WaterLevelCalculationsForNormTargetProbabilityContext( - assessmentSection.WaterLevelCalculationsForSignalingNorm, assessmentSection, () => 0.1)); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, assessmentSection, () => 0.1)); IView view = gui.ViewHost.DocumentViews.First(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -rec0ab8efb8b68f383e9317609b0307e612485703 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision ec0ab8efb8b68f383e9317609b0307e612485703) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -806,8 +806,8 @@ new TestHydraulicBoundaryLocation() }); - SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForSignalingNorm); - SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability); + SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability); SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].HydraulicBoundaryLocationCalculations); SetHydraulicBoundaryLocationOutput(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[1].HydraulicBoundaryLocationCalculations); @@ -834,8 +834,8 @@ private static IEnumerable GetAllHydraulicLocationCalculationsWithOutput(IAssessmentSection assessmentSection) { - return assessmentSection.WaterLevelCalculationsForSignalingNorm - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + return assessmentSection.WaterLevelCalculationsForSignalFloodingProbability + .Concat(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability) .Concat(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.SelectMany(tp => tp.HydraulicBoundaryLocationCalculations)) .Concat(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.SelectMany(tp => tp.HydraulicBoundaryLocationCalculations)) .Where(calc => calc.HasOutput); @@ -844,9 +844,9 @@ private static IEnumerable GetHydraulicBoundaryLocationCalculations() { yield return new TestCaseData(new Func( - section => section.WaterLevelCalculationsForSignalingNorm.First())); + section => section.WaterLevelCalculationsForSignalFloodingProbability.First())); yield return new TestCaseData(new Func( - section => section.WaterLevelCalculationsForLowerLimitNorm.First())); + section => section.WaterLevelCalculationsForMaximumAllowableFloodingProbability.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 -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilitiesGroupContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -149,11 +149,11 @@ WaterLevelCalculationsForNormTargetProbabilityContext[] calculationsContexts = childNodeObjects.OfType().ToArray(); Assert.AreEqual(2, calculationsContexts.Length); - Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, calculationsContexts[0].WrappedData); + Assert.AreSame(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, 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.WaterLevelCalculationsForSignalFloodingProbability, calculationsContexts[1].WrappedData); Assert.AreSame(assessmentSection, calculationsContexts[1].AssessmentSection); Assert.AreEqual(signalingNorm, calculationsContexts[1].GetNormFunc()); } @@ -550,8 +550,8 @@ hydraulicBoundaryLocation.Name, calculationTypeDisplayName, calculationDisplayName, "1/500", msgs, 8); }); - AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output); - AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Single().Output); + AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output); + AssertHydraulicBoundaryLocationCalculationOutput(designWaterLevelCalculator, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Single().Output); } } } @@ -705,15 +705,15 @@ private static IEnumerable GetAllWaterLevelCalculationsWithOutput(IAssessmentSection assessmentSection) { - return assessmentSection.WaterLevelCalculationsForSignalingNorm - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + return assessmentSection.WaterLevelCalculationsForSignalFloodingProbability + .Concat(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability) .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.WaterLevelCalculationsForSignalFloodingProbability.First())); + yield return new TestCaseData(new Func(section => section.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First())); } private static TreeNodeInfo GetInfo(RiskeerPlugin plugin) Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -108,8 +108,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(lowerLimitNorm, signalingNorm)); - assessmentSection.Stub(a => a.WaterLevelCalculationsForLowerLimitNorm).Return(lowerLimitNormCalculations); - assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalingNorm).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(lowerLimitNormCalculations); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(new ObservableList()); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return(new ObservableList()); mockRepository.ReplayAll(); @@ -141,8 +141,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(lowerLimitNorm, signalingNorm)); - assessmentSection.Stub(a => a.WaterLevelCalculationsForLowerLimitNorm).Return(new ObservableList()); - assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalingNorm).Return(signalingNormCalculations); + assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(signalingNormCalculations); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return(new ObservableList()); mockRepository.ReplayAll(); @@ -486,7 +486,7 @@ new TestHydraulicBoundaryLocation() }); - IObservableEnumerable calculations = assessmentSection.WaterLevelCalculationsForLowerLimitNorm; + IObservableEnumerable calculations = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability; HydraulicBoundaryLocationCalculation calculation = calculations.First(); calculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); @@ -994,29 +994,29 @@ private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculations() { - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm)) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability)) .SetName("SignalingNormCalculations"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm)) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability)) .SetName("LowerLimitNormCalculations"); } private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculationConfigurations() { - yield return new TestCaseData(1 / 10.0, 1 / 100.0, new Func>(a => a.WaterLevelCalculationsForSignalingNorm)) + yield return new TestCaseData(1 / 10.0, 1 / 100.0, new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability)) .SetName("SignalingNormCalculations"); - yield return new TestCaseData(1 / 100.0, 1 / 200.0, new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm)) + yield return new TestCaseData(1 / 100.0, 1 / 200.0, new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability)) .SetName("LowerLimitNormCalculations"); } private static IEnumerable GetWaterLevelForNormTargetProbabilityCalculationContinuationCases() { - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm), true) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), true) .SetName("SignalingNormCalculationsContinued"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm), false) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), false) .SetName("SignalingNormCalculationsCancelled"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm), true) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), true) .SetName("LowerLimitNormCalculationsContinued"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm), false) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), false) .SetName("LowerLimitNormCalculationsCancelled"); } @@ -1025,16 +1025,16 @@ const double lowerLimitNorm = 0.1; const double signalingNorm = 0.01; - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), signalingNorm, signalingNorm, "1/100 (1)") .SetName("SignalingNormCalculationsNormsSame"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), lowerLimitNorm, signalingNorm, "1/100") .SetName("SignalingNormCalculationsNormsDifferent"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), lowerLimitNorm, lowerLimitNorm, "1/10") .SetName("LowerLimitNormCalculationsNormsSame"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), lowerLimitNorm, signalingNorm, "1/10") .SetName("LowerLimitNormCalculationsNormsDifferent"); } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -123,8 +123,8 @@ IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mockRepository); assessmentSection.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(lowerLimitNorm, signalingNorm)); - assessmentSection.Stub(a => a.WaterLevelCalculationsForLowerLimitNorm).Return(new ObservableList()); - assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalingNorm).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability).Return(new ObservableList()); + assessmentSection.Stub(a => a.WaterLevelCalculationsForSignalFloodingProbability).Return(new ObservableList()); assessmentSection.Stub(a => a.WaterLevelCalculationsForUserDefinedTargetProbabilities).Return( new ObservableList { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextViewInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -375,9 +375,9 @@ private static IEnumerable GetWaterLevelForNormTargetProbabilities() { - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm)) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability)) .SetName("SignalingNorm"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm)) + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability)) .SetName("LowerLimitNorm"); } @@ -386,16 +386,16 @@ const double lowerLimitNorm = 0.1; const double signalingNorm = 0.01; - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), signalingNorm, signalingNorm, "1/100 (1)") .SetName("SignalingNormCalculationsNormsSame"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalingNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForSignalFloodingProbability), lowerLimitNorm, signalingNorm, "1/100") .SetName("SignalingNormCalculationsNormsDifferent"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), lowerLimitNorm, lowerLimitNorm, "1/10") .SetName("LowerLimitNormCalculationsNormsSame"); - yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForLowerLimitNorm), + yield return new TestCaseData(new Func>(a => a.WaterLevelCalculationsForMaximumAllowableFloodingProbability), lowerLimitNorm, signalingNorm, "1/10") .SetName("LowerLimitNormCalculationsNormsDifferent"); } Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -429,9 +429,9 @@ hydraulicBoundaryLocation2 }); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForSignalingNorm + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation3 = waterLevelCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); @@ -1639,8 +1639,8 @@ private static IEnumerable GetWaterLevelCalculationsForNormTargetProbabilitiesWithOutput(IAssessmentSection assessmentSection) { - return assessmentSection.WaterLevelCalculationsForSignalingNorm - .Concat(assessmentSection.WaterLevelCalculationsForLowerLimitNorm) + return assessmentSection.WaterLevelCalculationsForSignalFloodingProbability + .Concat(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability) .Where(calc => calc.HasOutput); } @@ -1993,8 +1993,8 @@ assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations, true); - SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForSignalingNorm); - SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForLowerLimitNorm); + SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability); + SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability); SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[0].HydraulicBoundaryLocationCalculations); SetHydraulicBoundaryLocationCalculationOutputConfigurations(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities[1].HydraulicBoundaryLocationCalculations); Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r0ba7d884907fd3019e6d70a2a50b13a4282b557a -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 0ba7d884907fd3019e6d70a2a50b13a4282b557a) +++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -102,8 +102,8 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForSignalingNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First() .HydraulicBoundaryLocationCalculations.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs (.../MacroStabilityInwardsInputContextPropertyInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -94,7 +94,7 @@ Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); - double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output.Result; + double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.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.WaterLevelCalculationsForMaximumAllowableFloodingProbability.ElementAt(0).Output.Result; Assert.AreEqual(expectedAssessmentLevel, ((MacroStabilityInwardsInputContextProperties) objectProperties).AssessmentLevel); } } Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityFactoryTest.cs (.../MacroStabilityInwardsCalculationActivityFactoryTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -112,7 +112,7 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Single(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.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.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.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.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.ElementAt(1); hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); MacroStabilityInwardsCalculationScenario calculation1 = CreateValidCalculation(hydraulicBoundaryLocation1); Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs (.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -103,7 +103,7 @@ Assert.IsInstanceOf(objectProperties); Assert.AreSame(context, objectProperties.Data); - double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.ElementAt(0).Output.Result; + double expectedAssessmentLevel = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.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.WaterLevelCalculationsForMaximumAllowableFloodingProbability.ElementAt(0).Output.Result; Assert.AreEqual(expectedAssessmentLevel, ((SemiProbabilisticPipingInputContextProperties) objectProperties).AssessmentLevel); } } Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -112,10 +112,10 @@ var random = new Random(39); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation1 = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.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.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First(); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ElementAt(1); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation2 = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.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.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Single(); hydraulicBoundaryLocationCalculation.Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble()); var calculation = Index: Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs (.../WaveConditionsInputHelper.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs (.../WaveConditionsInputHelper.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -131,9 +131,9 @@ case WaveConditionsInputWaterLevelType.None: return null; case WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability: - return GetRelatedHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, input); + return GetRelatedHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, input); case WaveConditionsInputWaterLevelType.SignalFloodingProbability: - return GetRelatedHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForSignalingNorm, input); + return GetRelatedHydraulicBoundaryLocationCalculation(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, input); case WaveConditionsInputWaterLevelType.UserDefinedTargetProbability: return GetRelatedHydraulicBoundaryLocationCalculation(input.CalculationsTargetProbability.HydraulicBoundaryLocationCalculations, input); default: @@ -233,9 +233,9 @@ case WaveConditionsInputWaterLevelType.None: return RoundedDouble.NaN; case WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability: - return GetAssessmentLevelFromHydraulicBoundaryLocationCalculations(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, input); + return GetAssessmentLevelFromHydraulicBoundaryLocationCalculations(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, input); case WaveConditionsInputWaterLevelType.SignalFloodingProbability: - return GetAssessmentLevelFromHydraulicBoundaryLocationCalculations(assessmentSection.WaterLevelCalculationsForSignalingNorm, input); + return GetAssessmentLevelFromHydraulicBoundaryLocationCalculations(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, input); case WaveConditionsInputWaterLevelType.UserDefinedTargetProbability: return GetAssessmentLevelFromHydraulicBoundaryLocationCalculations(input.CalculationsTargetProbability.HydraulicBoundaryLocationCalculations, input); default: Index: Riskeer/Revetment/src/Riskeer.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Revetment/src/Riskeer.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Revetment/src/Riskeer.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -393,11 +393,11 @@ var targetProbabilities = new List { - CreateSelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + CreateSelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability), CreateSelectableTargetProbability(assessmentSection, - assessmentSection.WaterLevelCalculationsForSignalingNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, assessmentSection.FailureMechanismContribution.SignalFloodingProbability) }; @@ -435,11 +435,11 @@ switch (data.WrappedData.WaterLevelType) { case WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability: - return CreateSelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + return CreateSelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability); case WaveConditionsInputWaterLevelType.SignalFloodingProbability: - return CreateSelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalingNorm, + return CreateSelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, assessmentSection.FailureMechanismContribution.SignalFloodingProbability); case WaveConditionsInputWaterLevelType.UserDefinedTargetProbability: Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -336,10 +336,10 @@ (Func) ((input, assessmentSection) => null)); yield return new TestCaseData( WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, - (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First())); + (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First())); yield return new TestCaseData( WaveConditionsInputWaterLevelType.SignalFloodingProbability, - (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForSignalingNorm.First())); + (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.First())); yield return new TestCaseData( WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, (Func) ((input, assessmentSection) => input.CalculationsTargetProbability.HydraulicBoundaryLocationCalculations.First())); @@ -368,10 +368,10 @@ (Func) ((input, assessmentSection) => double.NaN)); yield return new TestCaseData( WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, - (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output.Result)); + (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output.Result)); yield return new TestCaseData( WaveConditionsInputWaterLevelType.SignalFloodingProbability, - (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForSignalingNorm.First().Output.Result)); + (Func) ((input, assessmentSection) => assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.First().Output.Result)); yield return new TestCaseData( WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, (Func) ((input, assessmentSection) => input.CalculationsTargetProbability.HydraulicBoundaryLocationCalculations.First().Output.Result)); Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsInputTestHelper.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsInputTestHelper.cs (.../WaveConditionsInputTestHelper.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/WaveConditionsInputTestHelper.cs (.../WaveConditionsInputTestHelper.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -81,7 +81,7 @@ input.HydraulicBoundaryLocation = hydraulicBoundaryLocation; input.WaterLevelType = WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; }), - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output.Result); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output.Result); yield return new TestCaseData( assessmentSection, @@ -90,7 +90,7 @@ input.HydraulicBoundaryLocation = hydraulicBoundaryLocation; input.WaterLevelType = WaveConditionsInputWaterLevelType.SignalFloodingProbability; }), - assessmentSection.WaterLevelCalculationsForSignalingNorm.First().Output.Result); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.First().Output.Result); yield return new TestCaseData( assessmentSection, Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PresentationObjects/SelectableTargetProbabilityTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PresentationObjects/SelectableTargetProbabilityTest.cs (.../SelectableTargetProbabilityTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PresentationObjects/SelectableTargetProbabilityTest.cs (.../SelectableTargetProbabilityTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -104,9 +104,9 @@ { var assessmentSection = new AssessmentSectionStub(); - yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability), "1/30.000"); - yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalingNorm, + yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, assessmentSection.FailureMechanismContribution.SignalFloodingProbability), "1/30.000 (1)"); var sectionWithNonUniqueTargetProbability = new AssessmentSectionStub(); @@ -143,38 +143,38 @@ protected override SelectableTargetProbability CreateObject() { - return new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalingNorm, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1); + return new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1); } private static IEnumerable GetUnequalTestCases() { yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, - assessmentSection.WaterLevelCalculationsForSignalingNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.01)); yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, - assessmentSection.WaterLevelCalculationsForSignalingNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, 0.1)); yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, - assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1)); var otherAssessmentSection = new AssessmentSectionStub(); yield return new TestCaseData(new SelectableTargetProbability(otherAssessmentSection, - assessmentSection.WaterLevelCalculationsForSignalingNorm, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1)) .SetName("differentAssessmentSection"); } private static IEnumerable GetEqualTestCases() { - yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalingNorm, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1), - new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalingNorm, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1)); + yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1), + new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, 0.1)); - yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, 0.1), - new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, 0.1)); + yield return new TestCaseData(new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, 0.1), + new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, 0.1)); } } } Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -971,9 +971,9 @@ new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First().HydraulicBoundaryLocationCalculations, WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First().TargetProbability), - new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, + new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, assessmentSection.FailureMechanismContribution.MaximumAllowableFloodingProbability), - new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalingNorm, WaveConditionsInputWaterLevelType.SignalFloodingProbability, + new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, WaveConditionsInputWaterLevelType.SignalFloodingProbability, assessmentSection.FailureMechanismContribution.SignalFloodingProbability), new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Last().HydraulicBoundaryLocationCalculations, WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, @@ -1026,13 +1026,13 @@ yield return new TestCaseData( WaveConditionsInputWaterLevelType.SignalFloodingProbability, new Func>( - section => section.WaterLevelCalculationsForSignalingNorm), + section => section.WaterLevelCalculationsForSignalFloodingProbability), new Func( section => section.FailureMechanismContribution.SignalFloodingProbability)); yield return new TestCaseData( WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability, new Func>( - section => section.WaterLevelCalculationsForLowerLimitNorm), + section => section.WaterLevelCalculationsForMaximumAllowableFloodingProbability), new Func( section => section.FailureMechanismContribution.MaximumAllowableFloodingProbability)); yield return new TestCaseData( Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextTargetProbabilitySelectionEditorTest.cs =================================================================== diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextTargetProbabilitySelectionEditorTest.cs (.../WaveConditionsInputContextTargetProbabilitySelectionEditorTest.cs) (revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextTargetProbabilitySelectionEditorTest.cs (.../WaveConditionsInputContextTargetProbabilitySelectionEditorTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -90,12 +90,12 @@ const WaveConditionsInputWaterLevelType waterLevelType = WaveConditionsInputWaterLevelType.MaximumAllowableFloodingProbability; const double targetProbability = 0.1; - var selectableTargetProbability = new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, waterLevelType, targetProbability); + var selectableTargetProbability = new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, waterLevelType, targetProbability); var properties = new ObjectPropertiesWithSelectableTargetProbability( selectableTargetProbability, new[] { - new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForLowerLimitNorm, waterLevelType, targetProbability) + new SelectableTargetProbability(assessmentSection, assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, waterLevelType, targetProbability) }); var propertyBag = new DynamicPropertyBag(properties); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -757,7 +757,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r4661d9386b3ce16ab6aa0453417fd371a64b9808 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 4661d9386b3ce16ab6aa0453417fd371a64b9808) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -368,7 +368,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1883,7 +1883,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rbe73db4b4573dd45d63d960bd5826b3ac33fbdf3 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision be73db4b4573dd45d63d960bd5826b3ac33fbdf3) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1774,7 +1774,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs =================================================================== diff -u -rce73d815b0583615c74550ba004fd553202b43fe -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision ce73d815b0583615c74550ba004fd553202b43fe) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -105,7 +105,7 @@ // Assert CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(StabilityStoneCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result; + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result; HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(0), calculation1, assessmentLevel, hydraulicBoundaryDatabase); AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel, hydraulicBoundaryDatabase); @@ -185,7 +185,7 @@ Assert.IsInstanceOf(activity); AssertStabilityStoneCoverWaveConditionsCalculationActivity(activity, calculation, - assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result, assessmentSection.HydraulicBoundaryDatabase); } @@ -269,7 +269,7 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(StabilityStoneCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result; + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result; HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel, hydraulicBoundaryDatabase); AssertStabilityStoneCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel, hydraulicBoundaryDatabase); @@ -282,7 +282,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); } private static AssessmentSectionStub CreateAssessmentSection() Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -995,7 +995,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -141,8 +141,8 @@ AssessmentSectionEntity entity, PersistenceRegistry registry) { - entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Create(registry); } private static void AddHydraulicLocationCalculationForTargetProbabilityCollectionEntities(AssessmentSection assessmentSection, Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -158,8 +158,8 @@ IAssessmentSection assessmentSection, ReadConversionCollector collector) { - entity.HydraulicLocationCalculationCollectionEntity1.Read(assessmentSection.WaterLevelCalculationsForSignalingNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity.Read(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity1.Read(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, collector); + entity.HydraulicLocationCalculationCollectionEntity.Read(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, collector); } private static void ReadPipingFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -291,9 +291,9 @@ private static void AssertHydraulicLocationCalculationCollectionEntities(AssessmentSection assessmentSection, AssessmentSectionEntity entity) { - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm, + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, entity.HydraulicLocationCalculationCollectionEntity1.HydraulicLocationCalculationEntities); - AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, entity.HydraulicLocationCalculationCollectionEntity.HydraulicLocationCalculationEntities); AssertHydraulicLocationCalculationForTargetProbabilityCollectionEntity(assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities, @@ -308,8 +308,8 @@ private static void SetHydraulicBoundaryLocationCalculationInputsOfAssessmentSection(AssessmentSection assessmentSection) { var random = new Random(21); - SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalingNorm, random.Next()); - SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, random.Next()); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalFloodingProbability, random.Next()); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability, random.Next()); SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities .SelectMany(calc => calc.HydraulicBoundaryLocationCalculations), random.Next()); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1904,10 +1904,10 @@ private static void AssertHydraulicBoundaryLocationCalculations(AssessmentSection expected, AssessmentSection actual) { - AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForSignalingNorm, - actual.WaterLevelCalculationsForSignalingNorm); - AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForLowerLimitNorm, - actual.WaterLevelCalculationsForLowerLimitNorm); + AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForSignalFloodingProbability, + actual.WaterLevelCalculationsForSignalFloodingProbability); + AssertHydraulicBoundaryLocationCalculations(expected.WaterLevelCalculationsForMaximumAllowableFloodingProbability, + actual.WaterLevelCalculationsForMaximumAllowableFloodingProbability); AssertHydraulicBoundaryLocationCalculationsForTargetProbabilities(expected.WaterLevelCalculationsForUserDefinedTargetProbabilities, actual.WaterLevelCalculationsForUserDefinedTargetProbabilities); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -225,15 +225,15 @@ // Assert HydraulicBoundaryLocation hydraulicBoundaryLocation = section.HydraulicBoundaryDatabase.Locations.Single(); - HydraulicBoundaryLocationCalculation calculation = section.WaterLevelCalculationsForSignalingNorm.Single(); + HydraulicBoundaryLocationCalculation calculation = section.WaterLevelCalculationsForSignalFloodingProbability.Single(); HydraulicLocationCalculationEntity hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity1 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); - calculation = section.WaterLevelCalculationsForLowerLimitNorm.Single(); + calculation = section.WaterLevelCalculationsForMaximumAllowableFloodingProbability.Single(); hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity .HydraulicLocationCalculationEntities .Single(); @@ -271,8 +271,8 @@ Assert.IsNull(hydraulicBoundaryDatabase.FilePath); Assert.IsNull(hydraulicBoundaryDatabase.Version); - CollectionAssert.IsEmpty(section.WaterLevelCalculationsForSignalingNorm); - CollectionAssert.IsEmpty(section.WaterLevelCalculationsForLowerLimitNorm); + CollectionAssert.IsEmpty(section.WaterLevelCalculationsForSignalFloodingProbability); + CollectionAssert.IsEmpty(section.WaterLevelCalculationsForMaximumAllowableFloodingProbability); CollectionAssert.IsEmpty(section.WaterLevelCalculationsForUserDefinedTargetProbabilities); CollectionAssert.IsEmpty(section.WaveHeightCalculationsForUserDefinedTargetProbabilities); Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -322,11 +322,11 @@ HydraulicBoundaryLocation hydraulicBoundaryLocation) { var random = new Random(21); - HydraulicBoundaryLocationCalculation signalingNormCalculation = assessmentSection.WaterLevelCalculationsForSignalingNorm + HydraulicBoundaryLocationCalculation signalingNormCalculation = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation)); ConfigureDesignWaterLevelCalculation(signalingNormCalculation, random.NextBoolean()); - HydraulicBoundaryLocationCalculation lowerLimitNormCalculation = assessmentSection.WaterLevelCalculationsForLowerLimitNorm + HydraulicBoundaryLocationCalculation lowerLimitNormCalculation = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation)); ConfigureDesignWaterLevelCalculation(lowerLimitNormCalculation, random.NextBoolean()); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -668,7 +668,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r2b84b471a13e5c8189d319143b7357993b3a5e54 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 2b84b471a13e5c8189d319143b7357993b3a5e54) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -365,7 +365,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r787256a33f37778f3af02aa20c9a770deaeefa0d -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision 787256a33f37778f3af02aa20c9a770deaeefa0d) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1906,7 +1906,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r8da89db9c186cedc26c4baa657f2dd8961877ec4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 8da89db9c186cedc26c4baa657f2dd8961877ec4) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -1717,7 +1717,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs =================================================================== diff -u -r8c072e47f45c99aa325cb8d2e2d5dad3f4b43888 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision 8c072e47f45c99aa325cb8d2e2d5dad3f4b43888) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactoryTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -105,7 +105,7 @@ // Assert CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(WaveImpactAsphaltCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result; + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result; HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(0), calculation1, assessmentLevel, hydraulicBoundaryDatabase); AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel, hydraulicBoundaryDatabase); @@ -185,7 +185,7 @@ Assert.IsInstanceOf(activity); AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activity, calculation, - assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result, + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result, assessmentSection.HydraulicBoundaryDatabase); } @@ -269,7 +269,7 @@ CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(WaveImpactAsphaltCoverWaveConditionsCalculationActivity)); Assert.AreEqual(2, activities.Count()); - RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output.Result; + RoundedDouble assessmentLevel = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output.Result; HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.First(), calculation1, assessmentLevel, hydraulicBoundaryDatabase); AssertWaveImpactAsphaltCoverWaveConditionsCalculationActivity(activities.ElementAt(1), calculation2, assessmentLevel, hydraulicBoundaryDatabase); @@ -282,7 +282,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForSignalingNorm.Single().Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); + assessmentSection.WaterLevelCalculationsForSignalFloodingProbability.Single().Output = new TestHydraulicBoundaryLocationCalculationOutput(2.0); } private static AssessmentSectionStub CreateAssessmentSection() Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -r552512346182908793906e5195f4aec36bc5039b --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 391d022746e1bd895983935af75594fd3b1912d4) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 552512346182908793906e5195f4aec36bc5039b) @@ -752,7 +752,7 @@ hydraulicBoundaryLocation }); - assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); + assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability.First().Output = new TestHydraulicBoundaryLocationCalculationOutput(9.3); return assessmentSection; }