Index: Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs =================================================================== diff -u -rda7b7a01f44d2440b564e71ace0b1d6bd3a39f74 -rd07b60062d9f625bb8cceb70799b73aeeb7bf050 --- Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision da7b7a01f44d2440b564e71ace0b1d6bd3a39f74) +++ Riskeer/Integration/src/Riskeer.Integration.Service/RiskeerDataSynchronizationService.cs (.../RiskeerDataSynchronizationService.cs) (revision d07b60062d9f625bb8cceb70799b73aeeb7bf050) @@ -255,6 +255,16 @@ affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(assessmentSection.WaveHeightCalculationsForLowerLimitNorm)); affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm)); + foreach (ObservableList hydraulicBoundaryLocationCalculations in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Select(c => c.HydraulicBoundaryLocationCalculations)) + { + affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(hydraulicBoundaryLocationCalculations)); + } + + foreach (ObservableList hydraulicBoundaryLocationCalculations in assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Select(c => c.HydraulicBoundaryLocationCalculations)) + { + affectedObjects.AddRange(RiskeerCommonDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutput(hydraulicBoundaryLocationCalculations)); + } + return affectedObjects.ToArray(); } Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs =================================================================== diff -u -r958ec3ca6d7aac0a6b47f25208121e06281f15e6 -rd07b60062d9f625bb8cceb70799b73aeeb7bf050 --- Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision 958ec3ca6d7aac0a6b47f25208121e06281f15e6) +++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/RiskeerDataSynchronizationServiceTest.cs (.../RiskeerDataSynchronizationServiceTest.cs) (revision d07b60062d9f625bb8cceb70799b73aeeb7bf050) @@ -268,6 +268,19 @@ } }; + var waterLevelCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + var waveHeightCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(); + + assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.AddRange(new[] + { + waterLevelCalculationsForTargetProbability + }); + + assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.AddRange(new[] + { + waveHeightCalculationsForTargetProbability + }); + DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; var duneLocationCalculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); @@ -307,6 +320,10 @@ .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation8 = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation9 = waterLevelCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation10 = waveHeightCalculationsForTargetProbability.HydraulicBoundaryLocationCalculations + .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation1)); hydraulicBoundaryLocationCalculation1.Output = new TestHydraulicBoundaryLocationCalculationOutput(); hydraulicBoundaryLocationCalculation2.Output = new TestHydraulicBoundaryLocationCalculationOutput(); @@ -316,6 +333,8 @@ hydraulicBoundaryLocationCalculation6.Output = new TestHydraulicBoundaryLocationCalculationOutput(); hydraulicBoundaryLocationCalculation7.Output = new TestHydraulicBoundaryLocationCalculationOutput(); hydraulicBoundaryLocationCalculation8.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation9.Output = new TestHydraulicBoundaryLocationCalculationOutput(); + hydraulicBoundaryLocationCalculation10.Output = new TestHydraulicBoundaryLocationCalculationOutput(); DuneLocationCalculation duneLocationCalculation1 = duneLocationCalculationsForTargetProbability1.DuneLocationCalculations.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); DuneLocationCalculation duneLocationCalculation2 = duneLocationCalculationsForTargetProbability2.DuneLocationCalculations.First(c => ReferenceEquals(c.DuneLocation, duneLocation1)); @@ -333,6 +352,8 @@ hydraulicBoundaryLocationCalculation6, hydraulicBoundaryLocationCalculation7, hydraulicBoundaryLocationCalculation8, + hydraulicBoundaryLocationCalculation9, + hydraulicBoundaryLocationCalculation10, duneLocationCalculation1, duneLocationCalculation2 }; @@ -351,6 +372,8 @@ Assert.IsFalse(hydraulicBoundaryLocationCalculation6.HasOutput); Assert.IsFalse(hydraulicBoundaryLocationCalculation7.HasOutput); Assert.IsFalse(hydraulicBoundaryLocationCalculation8.HasOutput); + Assert.IsFalse(hydraulicBoundaryLocationCalculation9.HasOutput); + Assert.IsFalse(hydraulicBoundaryLocationCalculation10.HasOutput); Assert.IsNull(duneLocationCalculation1.Output); Assert.IsNull(duneLocationCalculation2.Output);