Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rea1287fdb923357636715f48448521c57b5aeef9 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision ea1287fdb923357636715f48448521c57b5aeef9) @@ -33,9 +33,10 @@ /// Model containing input and output needed to perform different levels of the /// Dune Erosion failure mechanism. /// - public class DuneErosionFailureMechanism : FailureMechanismBase, IHasSectionResults + public class DuneErosionFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly ObservableList sectionResults; + private readonly ObservableList sectionResultsOld; + private readonly ObservableList sectionResults; private readonly ObservableList duneLocationCollection = new ObservableList(); /// @@ -44,7 +45,8 @@ public DuneErosionFailureMechanism() : base(Resources.DuneErosionFailureMechanism_DisplayName, Resources.DuneErosionFailureMechanism_Code, 3) { - sectionResults = new ObservableList(); + sectionResultsOld = new ObservableList(); + sectionResults = new ObservableList(); GeneralInput = new GeneralDuneErosionInput(); DuneLocationCalculationsForUserDefinedTargetProbabilities = new ObservableList(); } @@ -82,10 +84,12 @@ { get { - return sectionResults; + return sectionResultsOld; } } + public IObservableEnumerable SectionResults => sectionResults; + /// /// Sets dune locations and calculations for the failure mechanism. /// @@ -112,12 +116,12 @@ { base.AddSectionDependentData(section); - sectionResults.Add(new DuneErosionFailureMechanismSectionResultOld(section)); + sectionResultsOld.Add(new DuneErosionFailureMechanismSectionResultOld(section)); } protected override void ClearSectionDependentData() { - sectionResults.Clear(); + sectionResultsOld.Clear(); } } } \ No newline at end of file Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rea1287fdb923357636715f48448521c57b5aeef9 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision ea1287fdb923357636715f48448521c57b5aeef9) @@ -40,13 +40,17 @@ // Assert Assert.IsInstanceOf(failureMechanism); + Assert.IsInstanceOf>(failureMechanism); Assert.AreEqual("Duinafslag", failureMechanism.Name); Assert.AreEqual("DA", failureMechanism.Code); Assert.AreEqual(3, failureMechanism.Group); CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.DuneLocations); CollectionAssert.IsEmpty(failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities); Assert.IsNotNull(failureMechanism.GeneralInput); + + CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); } [Test]