Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -rb3687b70a3ff1795a2b1867bbc273f0b06fc3cac -ra5d8c4e18432d6f49a7e98d4a79762093d84c681 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision b3687b70a3ff1795a2b1867bbc273f0b06fc3cac) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision a5d8c4e18432d6f49a7e98d4a79762093d84c681) @@ -95,11 +95,11 @@ ObservableList sourceWaterLevelProbabilities = sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities; HydraulicBoundaryLocationCalculationsForTargetProbability[] waterLevelProbabilitiesToMerge = sourceAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities - .Where(sp => targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities - .Select(c => c.TargetProbability) - .Contains(sp.TargetProbability)).ToArray(); + .Where(stp => targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities + .Select(c => c.TargetProbability) + .Contains(stp.TargetProbability)).ToArray(); - MergeWaterLevelProbabilities(targetAssessmentSection, changedObjects, waterLevelProbabilitiesToMerge); + MergeProbabilities(targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities, changedObjects, waterLevelProbabilitiesToMerge); IEnumerable uniqueWaterLevelSourceProbabilities = sourceWaterLevelProbabilities.Except(waterLevelProbabilitiesToMerge); @@ -108,11 +108,11 @@ ObservableList sourceWaveHeightProbabilities = sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities; HydraulicBoundaryLocationCalculationsForTargetProbability[] waveHeightProbabilitiesToMerge = sourceAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities - .Where(sp => targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities - .Select(c => c.TargetProbability) - .Contains(sp.TargetProbability)).ToArray(); + .Where(stp => targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities + .Select(c => c.TargetProbability) + .Contains(stp.TargetProbability)).ToArray(); - MergeWaveHeightProbabilities(targetAssessmentSection, changedObjects, waveHeightProbabilitiesToMerge); + MergeProbabilities(targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities, changedObjects, waveHeightProbabilitiesToMerge); IEnumerable uniqueWaveHeightSourceProbabilities = sourceWaveHeightProbabilities.Except(waveHeightProbabilitiesToMerge); @@ -125,11 +125,11 @@ return changedObjects; } - private static void MergeWaterLevelProbabilities(IAssessmentSection targetAssessmentSection, List changedObjects, HydraulicBoundaryLocationCalculationsForTargetProbability[] probabilitiesToMerge) + private static void MergeProbabilities(IEnumerable userDefinedTargetProbabilities, List changedObjects, HydraulicBoundaryLocationCalculationsForTargetProbability[] probabilitiesToMerge) { foreach (HydraulicBoundaryLocationCalculationsForTargetProbability sourceProbability in probabilitiesToMerge) { - HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability = targetAssessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First(c => c.TargetProbability.Equals(sourceProbability.TargetProbability)); + HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability = userDefinedTargetProbabilities.First(c => c.TargetProbability.Equals(sourceProbability.TargetProbability)); changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetProbability.HydraulicBoundaryLocationCalculations, sourceProbability.HydraulicBoundaryLocationCalculations)); } @@ -152,16 +152,6 @@ } } - private static void MergeWaveHeightProbabilities(IAssessmentSection targetAssessmentSection, List changedObjects, HydraulicBoundaryLocationCalculationsForTargetProbability[] probabilitiesToMerge) - { - foreach (HydraulicBoundaryLocationCalculationsForTargetProbability sourceProbability in probabilitiesToMerge) - { - HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability = targetAssessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.First(c => c.TargetProbability.Equals(sourceProbability.TargetProbability)); - - changedObjects.AddRange(MergeHydraulicBoundaryLocationCalculations(targetProbability.HydraulicBoundaryLocationCalculations, sourceProbability.HydraulicBoundaryLocationCalculations)); - } - } - private static void MergeUniqueWaveHeightProbabilities(IAssessmentSection targetAssessmentSection, IEnumerable targetProbabilities) { foreach (HydraulicBoundaryLocationCalculationsForTargetProbability targetProbability in targetProbabilities)