Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -re16f73a8ea5c5652ec259895aa7314b85ee3c20d -rae19a21d64c4d6466f0e8e6d6d23225aaca8e0ec --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision e16f73a8ea5c5652ec259895aa7314b85ee3c20d) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision ae19a21d64c4d6466f0e8e6d6d23225aaca8e0ec) @@ -87,22 +87,10 @@ { var changedObjects = new List(); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, - sourceAssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm)); changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForSignalingNorm, sourceAssessmentSection.WaterLevelCalculationsForSignalingNorm)); changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForLowerLimitNorm, sourceAssessmentSection.WaterLevelCalculationsForLowerLimitNorm)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, - sourceAssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, - sourceAssessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaveHeightCalculationsForSignalingNorm, - sourceAssessmentSection.WaveHeightCalculationsForSignalingNorm)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaveHeightCalculationsForLowerLimitNorm, - sourceAssessmentSection.WaveHeightCalculationsForLowerLimitNorm)); - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetAssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, - sourceAssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm)); ObservableList sourceWaterLevelProbabilities = sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities; Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -re16f73a8ea5c5652ec259895aa7314b85ee3c20d -rae19a21d64c4d6466f0e8e6d6d23225aaca8e0ec --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision e16f73a8ea5c5652ec259895aa7314b85ee3c20d) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision ae19a21d64c4d6466f0e8e6d6d23225aaca8e0ec) @@ -882,22 +882,9 @@ private static IEnumerable GetHydraulicBoundaryLocationCalculationFuncs() { yield return new TestCaseData(new Func>( - section => section.WaterLevelCalculationsForFactorizedSignalingNorm)); - yield return new TestCaseData(new Func>( section => section.WaterLevelCalculationsForSignalingNorm)); yield return new TestCaseData(new Func>( section => section.WaterLevelCalculationsForLowerLimitNorm)); - yield return new TestCaseData(new Func>( - section => section.WaterLevelCalculationsForFactorizedLowerLimitNorm)); - - yield return new TestCaseData(new Func>( - section => section.WaveHeightCalculationsForFactorizedSignalingNorm)); - yield return new TestCaseData(new Func>( - section => section.WaveHeightCalculationsForSignalingNorm)); - yield return new TestCaseData(new Func>( - section => section.WaveHeightCalculationsForLowerLimitNorm)); - yield return new TestCaseData(new Func>( - section => section.WaveHeightCalculationsForFactorizedLowerLimitNorm)); } #endregion