Index: Riskeer/Integration/src/Riskeer.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs =================================================================== diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r0c116774b9bda37d296c7966939b8a66a5aead54 --- Riskeer/Integration/src/Riskeer.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs (.../AssessmentSectionMergeComparer.cs) (revision 9e9976818f1b446948c3bf815cafe2e023f98ac1) +++ Riskeer/Integration/src/Riskeer.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs (.../AssessmentSectionMergeComparer.cs) (revision 0c116774b9bda37d296c7966939b8a66a5aead54) @@ -31,8 +31,7 @@ namespace Riskeer.Integration.Service.Comparers { /// - /// Class which compares to - /// determine whether they are equal and can be used to merged. + /// Class which compares to determine whether they are equal and can be used to merged. /// public class AssessmentSectionMergeComparer : IAssessmentSectionMergeComparer { @@ -51,7 +50,7 @@ return assessmentSection.Id == otherAssessmentSection.Id && assessmentSection.Composition == otherAssessmentSection.Composition && AreReferenceLinesEquivalent(assessmentSection.ReferenceLine, otherAssessmentSection.ReferenceLine) - && AreHydraulicBoundaryDatabasesEquivalent(assessmentSection.HydraulicBoundaryDatabase, otherAssessmentSection.HydraulicBoundaryDatabase) + && AreHydraulicBoundaryDataInstancesEquivalent(assessmentSection.HydraulicBoundaryDatabase, otherAssessmentSection.HydraulicBoundaryDatabase) && AreFailureMechanismContributionsEquivalent(assessmentSection.FailureMechanismContribution, otherAssessmentSection.FailureMechanismContribution); } @@ -77,12 +76,12 @@ return true; } - private static bool AreHydraulicBoundaryDatabasesEquivalent(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, - HydraulicBoundaryDatabase otherHydraulicBoundaryDatabase) + private static bool AreHydraulicBoundaryDataInstancesEquivalent(HydraulicBoundaryData hydraulicBoundaryData, + HydraulicBoundaryData otherHydraulicBoundaryData) { - return hydraulicBoundaryDatabase.Version == otherHydraulicBoundaryDatabase.Version - && AreHydraulicBoundaryLocationConfigurationSettingsEquivalent(hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings, - otherHydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings); + return hydraulicBoundaryData.Version == otherHydraulicBoundaryData.Version + && AreHydraulicBoundaryLocationConfigurationSettingsEquivalent(hydraulicBoundaryData.HydraulicLocationConfigurationSettings, + otherHydraulicBoundaryData.HydraulicLocationConfigurationSettings); } private static bool AreHydraulicBoundaryLocationConfigurationSettingsEquivalent(HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings,