Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -ra5d8c4e18432d6f49a7e98d4a79762093d84c681 -r48b447734910e47479811a7b831fafb7316e6ad3 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision a5d8c4e18432d6f49a7e98d4a79762093d84c681) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 48b447734910e47479811a7b831fafb7316e6ad3) @@ -103,7 +103,7 @@ IEnumerable uniqueWaterLevelSourceProbabilities = sourceWaterLevelProbabilities.Except(waterLevelProbabilitiesToMerge); - MergeUniqueWaterLevelProbabilities(targetAssessmentSection, uniqueWaterLevelSourceProbabilities); + MergeUniqueProbabilities(targetAssessmentSection, targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities, uniqueWaterLevelSourceProbabilities); ObservableList sourceWaveHeightProbabilities = sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities; @@ -116,7 +116,7 @@ IEnumerable uniqueWaveHeightSourceProbabilities = sourceWaveHeightProbabilities.Except(waveHeightProbabilitiesToMerge); - MergeUniqueWaveHeightProbabilities(targetAssessmentSection, uniqueWaveHeightSourceProbabilities); + MergeUniqueProbabilities(targetAssessmentSection, targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities, uniqueWaveHeightSourceProbabilities); log.Info(changedObjects.Any() ? Resources.AssessmentSectionMergeHandler_MergeHydraulicBoundaryLocations_HydraulicBoundaryLocations_merged @@ -135,7 +135,7 @@ } } - private static void MergeUniqueWaterLevelProbabilities(IAssessmentSection targetAssessmentSection, IEnumerable targetProbabilities) + private static void MergeUniqueProbabilities(IAssessmentSection targetAssessmentSection, ObservableList userDefinedTargetProbabilities, IEnumerable targetProbabilities) { foreach (HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability in targetProbabilities) { @@ -148,27 +148,10 @@ .Select(calculation => new HydraulicBoundaryLocationCalculation(GetHydraulicBoundaryLocation(calculation.HydraulicBoundaryLocation, targetAssessmentSection.HydraulicBoundaryDatabase.Locations))) .ToArray()); - targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(newTargetProbability); + userDefinedTargetProbabilities.Add(newTargetProbability); } } - private static void MergeUniqueWaveHeightProbabilities(IAssessmentSection targetAssessmentSection, IEnumerable targetProbabilities) - { - foreach (HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability in targetProbabilities) - { - var newTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability - { - TargetProbability = targetProbability.TargetProbability - }; - - newTargetProbability.HydraulicBoundaryLocationCalculations.AddRange(targetProbability.HydraulicBoundaryLocationCalculations - .Select(calculation => new HydraulicBoundaryLocationCalculation(GetHydraulicBoundaryLocation(calculation.HydraulicBoundaryLocation, targetAssessmentSection.HydraulicBoundaryDatabase.Locations))) - .ToArray()); - - targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Add(newTargetProbability); - } - } - private static IEnumerable MergeHydraulicBoundaryLocationCalculations(IEnumerable targetCalculations, IEnumerable sourceCalculations) {