Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rbe1e7f1dbe13d8b51152ed5fde9e6dbf1e94f988 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision be1e7f1dbe13d8b51152ed5fde9e6dbf1e94f988) @@ -35,17 +35,19 @@ /// Model containing input and output needed to perform different levels of the /// Wave Impact on Asphalt failure mechanism. /// - public class WaveImpactAsphaltCoverFailureMechanism : FailureMechanismBase, IHasSectionResults + public class WaveImpactAsphaltCoverFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly ObservableList sectionResults; + private readonly ObservableList sectionResultsOld; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public WaveImpactAsphaltCoverFailureMechanism() : base(Resources.WaveImpactAsphaltCoverFailureMechanism_DisplayName, Resources.WaveImpactAsphaltCoverFailureMechanism_Code, 3) { - sectionResults = new ObservableList(); + sectionResultsOld = new ObservableList(); + sectionResults = new ObservableList(); WaveConditionsCalculationGroup = new CalculationGroup { Name = RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName @@ -75,31 +77,21 @@ /// public CalculationGroup WaveConditionsCalculationGroup { get; } - public override IEnumerable Calculations - { - get - { - return WaveConditionsCalculationGroup.GetCalculations().OfType(); - } - } + public override IEnumerable Calculations => WaveConditionsCalculationGroup.GetCalculations().OfType(); - public IObservableEnumerable SectionResultsOld - { - get - { - return sectionResults; - } - } + public IObservableEnumerable SectionResultsOld => sectionResultsOld; + public IObservableEnumerable SectionResults => sectionResults; + protected override void AddSectionDependentData(FailureMechanismSection section) { base.AddSectionDependentData(section); - sectionResults.Add(new WaveImpactAsphaltCoverFailureMechanismSectionResultOld(section)); + sectionResultsOld.Add(new WaveImpactAsphaltCoverFailureMechanismSectionResultOld(section)); } protected override void ClearSectionDependentData() { - sectionResults.Clear(); + sectionResultsOld.Clear(); } } } \ No newline at end of file Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs =================================================================== diff -u -rdfd2e82406d3cafb83004a065b3ea1f943ced729 -rbe1e7f1dbe13d8b51152ed5fde9e6dbf1e94f988 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision dfd2e82406d3cafb83004a065b3ea1f943ced729) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverFailureMechanismTest.cs (.../WaveImpactAsphaltCoverFailureMechanismTest.cs) (revision be1e7f1dbe13d8b51152ed5fde9e6dbf1e94f988) @@ -51,8 +51,11 @@ Assert.AreEqual("Hydraulische belastingen", failureMechanism.WaveConditionsCalculationGroup.Name); CollectionAssert.IsEmpty(failureMechanism.WaveConditionsCalculationGroup.Children); CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles); - CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.Calculations); + + CollectionAssert.IsEmpty(failureMechanism.Sections); + CollectionAssert.IsEmpty(failureMechanism.SectionResults); + CollectionAssert.IsEmpty(failureMechanism.SectionResultsOld); } [Test]