Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs =================================================================== diff -u -r560ea9f96409cc65f4666adf212a1c135c5e626f -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision 560ea9f96409cc65f4666adf212a1c135c5e626f) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (.../ClosingStructuresFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Linq; +using Core.Common.Base; using Ringtoets.ClosingStructures.Data.Properties; using Ringtoets.Common.Data; using Ringtoets.Common.Data.Calculation; @@ -37,7 +38,7 @@ /// public class ClosingStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults> { - private readonly List> sectionResults; + private readonly ObservableList> sectionResults; /// /// Initializes a new instance of the class. @@ -51,7 +52,7 @@ }; GeneralInput = new GeneralClosingStructuresInput(); ClosingStructures = new StructureCollection(); - sectionResults = new List>(); + sectionResults = new ObservableList>(); ForeshoreProfiles = new ForeshoreProfileCollection(); } @@ -80,7 +81,7 @@ public CalculationGroup CalculationsGroup { get; } - public IEnumerable> SectionResults + public ObservableList> SectionResults { get { Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IHasSectionResults.cs =================================================================== diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IHasSectionResults.cs (.../IHasSectionResults.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IHasSectionResults.cs (.../IHasSectionResults.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -19,19 +19,19 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; +using Core.Common.Base; namespace Ringtoets.Common.Data.FailureMechanism { /// /// This interface describes methods for obtaining objects. /// - /// - public interface IHasSectionResults where T : FailureMechanismSectionResult + /// The type of the section results in . + public interface IHasSectionResults where T : FailureMechanismSectionResult { /// - /// Gets an of . + /// Gets an of . /// - IEnumerable SectionResults { get; } + ObservableList SectionResults { get; } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestFailureMechanism.cs (.../TestFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; @@ -29,7 +30,7 @@ { private const string defaultName = "Test failure mechanism"; private const string defaultCode = "TFM"; - private readonly List sectionResults; + private readonly ObservableList sectionResults; public TestFailureMechanism() : this(defaultName, defaultCode) {} @@ -43,13 +44,13 @@ private TestFailureMechanism(string name, string code, IEnumerable calculations) : base(name, code) { - sectionResults = new List(); + sectionResults = new ObservableList(); Calculations = calculations; } public override IEnumerable Calculations { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -33,15 +33,15 @@ /// public class DuneErosionFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public DuneErosionFailureMechanism() : base(Resources.DuneErosionFailureMechanism_DisplayName, Resources.DuneErosionFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); GeneralInput = new GeneralDuneErosionInput(); DuneLocations = new ObservableList(); } @@ -64,7 +64,7 @@ /// public ObservableList DuneLocations { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Linq; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; @@ -34,7 +35,7 @@ /// public class GrassCoverErosionInwardsFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. @@ -47,7 +48,7 @@ Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName }; GeneralInput = new GeneralGrassCoverErosionInwardsInput(); - sectionResults = new List(); + sectionResults = new ObservableList(); DikeProfiles = new DikeProfileCollection(); } @@ -71,7 +72,7 @@ public CalculationGroup CalculationsGroup { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs (.../GrassCoverErosionOutwardsFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -38,15 +38,15 @@ public class GrassCoverErosionOutwardsFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public GrassCoverErosionOutwardsFailureMechanism() : base(Resources.GrassCoverErosionOutwardsFailureMechanism_DisplayName, Resources.GrassCoverErosionOutwardsFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); GeneralInput = new GeneralGrassCoverErosionOutwardsInput(); WaveConditionsCalculationGroup = new CalculationGroup { @@ -84,7 +84,7 @@ /// public ForeshoreProfileCollection ForeshoreProfiles { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs =================================================================== diff -u -ra23cff5445d53b381fd72f50a0d9b6c200cbcd69 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision a23cff5445d53b381fd72f50a0d9b6c200cbcd69) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Linq; +using Core.Common.Base; using Ringtoets.Common.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; @@ -36,15 +37,15 @@ /// public class HeightStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults> { - private readonly List> sectionResults; + private readonly ObservableList> sectionResults; /// /// Creates a new instance of the class. /// public HeightStructuresFailureMechanism() : base(Resources.HeightStructuresFailureMechanism_DisplayName, Resources.HeightStructuresFailureMechanism_Code) { - sectionResults = new List>(); + sectionResults = new ObservableList>(); CalculationsGroup = new CalculationGroup { Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName @@ -82,7 +83,7 @@ /// public CalculationGroup CalculationsGroup { get; } - public IEnumerable> SectionResults + public ObservableList> SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffInwardsFailureMechanism.cs (.../GrassCoverSlipOffInwardsFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.Properties; @@ -33,15 +34,15 @@ /// public class GrassCoverSlipOffInwardsFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public GrassCoverSlipOffInwardsFailureMechanism() : base(Resources.GrassCoverSlipOffInwardsFailureMechanism_DisplayName, Resources.GrassCoverSlipOffInwardsFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -52,7 +53,7 @@ } } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/GrassCoverSlipOffOutwardsFailureMechanism.cs (.../GrassCoverSlipOffOutwardsFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.Properties; @@ -33,15 +34,15 @@ /// public class GrassCoverSlipOffOutwardsFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public GrassCoverSlipOffOutwardsFailureMechanism() : base(Resources.GrassCoverSlipOffOutwardsFailureMechanism_DisplayName, Resources.GrassCoverSlipOffOutwardsFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -52,7 +53,7 @@ } } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs (.../MacroStabilityOutwardsFailureMechanism.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs (.../MacroStabilityOutwardsFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.Properties; @@ -34,15 +35,15 @@ /// public class MacroStabilityOutwardsFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public MacroStabilityOutwardsFailureMechanism() : base(Resources.MacroStabilityOutwardsFailureMechanism_DisplayName, Resources.MacroStabilityOutwardsFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); MacroStabilityOutwardsProbabilityAssessmentInput = new MacroStabilityOutwardsProbabilityAssessmentInput(); } @@ -60,7 +61,7 @@ /// public MacroStabilityOutwardsProbabilityAssessmentInput MacroStabilityOutwardsProbabilityAssessmentInput { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs =================================================================== diff -u -r5dabca97fffab41012aafa58da5bc4cd0192e947 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision 5dabca97fffab41012aafa58da5bc4cd0192e947) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MicrostabilityFailureMechanism.cs (.../MicrostabilityFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.Properties; @@ -33,15 +34,15 @@ /// public class MicrostabilityFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public MicrostabilityFailureMechanism() : base(Resources.MicrostabilityFailureMechanism_DisplayName, Resources.MicrostabilityFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -52,7 +53,7 @@ } } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs =================================================================== diff -u -r4e11185058b30d0fc525382d015112be4a2e84f8 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision 4e11185058b30d0fc525382d015112be4a2e84f8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/PipingStructureFailureMechanism.cs (.../PipingStructureFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using Core.Common.Base; using Core.Common.Base.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; @@ -41,7 +42,7 @@ private static readonly Range validityRangeN = new Range(new RoundedDouble(numberOfDecimalPlacesN, 1), new RoundedDouble(numberOfDecimalPlacesN, 20)); - private readonly List sectionResults; + private readonly ObservableList sectionResults; private RoundedDouble n; /// @@ -50,7 +51,7 @@ public PipingStructureFailureMechanism() : base(Resources.PipingStructureFailureMechanism_DisplayName, Resources.PipingStructureFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); n = new RoundedDouble(numberOfDecimalPlacesN, 1.0); } @@ -81,7 +82,7 @@ } } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanism.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/StrengthStabilityLengthwiseConstructionFailureMechanism.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.Properties; @@ -33,15 +34,15 @@ /// public class StrengthStabilityLengthwiseConstructionFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public StrengthStabilityLengthwiseConstructionFailureMechanism() : base(Resources.StrengthStabilityLengthwiseConstructionFailureMechanism_DisplayName, Resources.StrengthStabilityLengthwiseConstructionFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -52,7 +53,7 @@ } } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/TechnicalInnovationFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/TechnicalInnovationFailureMechanism.cs (.../TechnicalInnovationFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/TechnicalInnovationFailureMechanism.cs (.../TechnicalInnovationFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.Properties; @@ -33,15 +34,15 @@ /// public class TechnicalInnovationFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public TechnicalInnovationFailureMechanism() : base(Resources.TechnicalInnovationFailureMechanismFailureMechanism_DisplayName, Resources.TechnicalInnovationFailureMechanismFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -52,7 +53,7 @@ } } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs =================================================================== diff -u -r0320ab3a413cb6a55e3f615d8c62706a48121588 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision 0320ab3a413cb6a55e3f615d8c62706a48121588) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/WaterPressureAsphaltCoverFailureMechanism.cs (.../WaterPressureAsphaltCoverFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Integration.Data.Properties; @@ -33,15 +34,15 @@ /// public class WaterPressureAsphaltCoverFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public WaterPressureAsphaltCoverFailureMechanism() : base(Resources.WaterPressureAsphaltCoverFailureMechanism_DisplayName, Resources.WaterPressureAsphaltCoverFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -52,7 +53,7 @@ } } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -501,7 +501,7 @@ var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); failureMechanism.Expect(fm => ((IFailureMechanism) fm).IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new List()).Repeat.Any(); + failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); failureMechanism.Expect(fm => ((IFailureMechanism) fm).InputComments).Return(new Comment()); failureMechanism.Expect(fm => ((IFailureMechanism) fm).OutputComments).Return(new Comment()); var failureMechanismContext = mocks.Stub>(failureMechanism, assessmentSection); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r65ce8c5ab171b234e33e2291998c9d89276db896 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 65ce8c5ab171b234e33e2291998c9d89276db896) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -413,7 +413,7 @@ var assessmentSection = mocks.Stub(); var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); failureMechanism.Expect(fm => ((IFailureMechanism) fm).IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new List()).Repeat.Any(); + failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); failureMechanism.Expect(fm => ((IFailureMechanism) fm).InputComments).Return(new Comment()); failureMechanism.Expect(fm => ((IFailureMechanism) fm).OutputComments).Return(new Comment()); var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r65ce8c5ab171b234e33e2291998c9d89276db896 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs) (revision 65ce8c5ab171b234e33e2291998c9d89276db896) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/PipingStructureFailureMechanismContextTreeNodeInfoTest.cs (.../PipingStructureFailureMechanismContextTreeNodeInfoTest.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -413,7 +413,7 @@ var assessmentSection = mocks.Stub(); var failureMechanism = mocks.StrictMultiMock>(typeof(IFailureMechanism)); failureMechanism.Expect(fm => ((IFailureMechanism) fm).IsRelevant).Return(true); - failureMechanism.Expect(fm => fm.SectionResults).Return(new List()).Repeat.Any(); + failureMechanism.Expect(fm => fm.SectionResults).Return(new ObservableList()).Repeat.Any(); failureMechanism.Expect(fm => ((IFailureMechanism) fm).InputComments).Return(new Comment()); failureMechanism.Expect(fm => ((IFailureMechanism) fm).OutputComments).Return(new Comment()); var failureMechanismContext = mocks.Stub(failureMechanism, assessmentSection); Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -41,6 +41,7 @@ using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.TestUtil; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; @@ -110,9 +111,9 @@ .GetFailureMechanisms() .ToList(); IEnumerable expectedAffectedItems = failureMechanisms - .SelectMany(f => f.Calculations) - .Where(c => c.HasOutput) - .ToList(); + .SelectMany(f => f.Calculations) + .Where(c => c.HasOutput) + .ToList(); // Call IEnumerable affectedItems = RingtoetsDataSynchronizationService.ClearFailureMechanismCalculationOutputs(failureMechanisms); @@ -121,8 +122,8 @@ // Note: To make sure the clear is performed regardless of what is done with // the return result, no ToArray() should be called before these assertions: CollectionAssert.IsEmpty(failureMechanisms - .SelectMany(f => f.Calculations) - .Where(c => c.HasOutput)); + .SelectMany(f => f.Calculations) + .Where(c => c.HasOutput)); CollectionAssert.AreEquivalent(expectedAffectedItems, affectedItems); } @@ -328,6 +329,7 @@ { expectedAffectedItems.Add(grassCoverErosionLocation); } + if (duneLocation.Calculation.Output != null) { expectedAffectedItems.Add(duneLocation); @@ -392,6 +394,7 @@ { expectedAffectedItems.Add(grassCoverErosionLocation); } + if (duneLocation.Calculation.Output != null) { expectedAffectedItems.Add(duneLocation); @@ -448,10 +451,12 @@ { expectedAffectedItems.Add(hydraulicBoundaryLocation); } + if (HasHydraulicBoundaryLocationOutput(grassCoverErosionLocation)) { expectedAffectedItems.Add(grassCoverErosionLocation); } + if (duneLocation.Calculation.Output != null) { expectedAffectedItems.Add(duneLocation); @@ -861,6 +866,7 @@ Assert.IsNull(calculation.InputParameters.ForeshoreProfile); CollectionAssert.Contains(array, calculation.InputParameters); } + foreach (ICalculation calculation in calculationsWithOutput) { Assert.IsFalse(calculation.HasOutput); @@ -936,6 +942,7 @@ Assert.IsNull(calculation.InputParameters.ForeshoreProfile); CollectionAssert.Contains(array, calculation.InputParameters); } + foreach (ICalculation calculation in calculationsWithOutput) { Assert.IsFalse(calculation.HasOutput); @@ -1010,6 +1017,7 @@ Assert.IsNull(calculation.InputParameters.ForeshoreProfile); CollectionAssert.Contains(array, calculation.InputParameters); } + foreach (ICalculation calculation in calculationsWithOutput) { Assert.IsFalse(calculation.HasOutput); @@ -1085,6 +1093,7 @@ Assert.IsNull(calculation.InputParameters.ForeshoreProfile); CollectionAssert.Contains(array, calculation.InputParameters); } + foreach (ICalculation calculation in calculationsWithOutput) { Assert.IsFalse(calculation.HasOutput); @@ -1160,6 +1169,7 @@ Assert.IsNull(calculation.InputParameters.ForeshoreProfile); CollectionAssert.Contains(array, calculation.InputParameters); } + foreach (ICalculation calculation in calculationsWithOutput) { Assert.IsFalse(calculation.HasOutput); @@ -1235,6 +1245,7 @@ Assert.IsNull(calculation.InputParameters.ForeshoreProfile); CollectionAssert.Contains(array, calculation.InputParameters); } + foreach (ICalculation calculation in calculationsWithOutput) { Assert.IsFalse(calculation.HasOutput); @@ -1376,6 +1387,7 @@ { Assert.IsNull(calculation.InputParameters.DikeProfile); } + foreach (GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult in sectionResults) { Assert.IsNull(sectionResult.Calculation); @@ -1390,214 +1402,259 @@ CollectionAssert.Contains(array, calculation.InputParameters); Assert.IsFalse(calculation.HasOutput); } + foreach (GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult in sectionResults) { CollectionAssert.Contains(array, sectionResult); } + Assert.AreEqual(originalNumberOfSectionResultAssignments - sectionResults.Length, failureMechanism.SectionResults.Count(sr => sr.Calculation != null), "Other section results with a different calculation/dikeprofile should still have their association."); } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(AssessmentSection assessmentSection) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(AssessmentSection assessmentSection) { var expectedRemovedObjects = new List(); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.Piping)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverErosionInwards)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.MacroStabilityInwards)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.MacroStabilityOutwards)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.Microstability)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.MacroStabilityOutwards)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.Microstability)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.StabilityStoneCover)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.WaveImpactAsphaltCover)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.WaterPressureAsphaltCover)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.WaterPressureAsphaltCover)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverErosionOutwards)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverSlipOffOutwards)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverSlipOffInwards)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverSlipOffOutwards)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.GrassCoverSlipOffInwards)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.HeightStructures)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.ClosingStructures)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.PipingStructure)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.PipingStructure)); expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.StabilityPointStructures)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.StrengthStabilityLengthwiseConstruction)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.DuneErosion)); - expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.TechnicalInnovation)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.StrengthStabilityLengthwiseConstruction)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.DuneErosion)); + expectedRemovedObjects.AddRange(GetExpectedRemovedObjectsWhenClearingReferenceLine(assessmentSection.TechnicalInnovation)); if (assessmentSection.ReferenceLine != null) { expectedRemovedObjects.Add(assessmentSection.ReferenceLine); } + return expectedRemovedObjects; } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(PipingFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(PipingFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (PipingStochasticSoilModel stochasticSoilModel in failureMechanism.StochasticSoilModels) { yield return stochasticSoilModel; } + foreach (PipingSurfaceLine surfaceLine in failureMechanism.SurfaceLines) { yield return surfaceLine; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(MacroStabilityInwardsFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(MacroStabilityInwardsFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (MacroStabilityInwardsStochasticSoilModel stochasticSoilModel in failureMechanism.StochasticSoilModels) { yield return stochasticSoilModel; } + foreach (MacroStabilityInwardsSurfaceLine surfaceLine in failureMechanism.SurfaceLines) { yield return surfaceLine; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(GrassCoverErosionInwardsFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(GrassCoverErosionInwardsFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (DikeProfile profile in failureMechanism.DikeProfiles) { yield return profile; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(StabilityStoneCoverFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(StabilityStoneCoverFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (ForeshoreProfile profile in failureMechanism.ForeshoreProfiles) { yield return profile; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(WaveImpactAsphaltCoverFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(WaveImpactAsphaltCoverFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (ForeshoreProfile profile in failureMechanism.ForeshoreProfiles) { yield return profile; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(GrassCoverErosionOutwardsFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(GrassCoverErosionOutwardsFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (ForeshoreProfile profile in failureMechanism.ForeshoreProfiles) { yield return profile; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(HeightStructuresFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(HeightStructuresFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine>(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (ForeshoreProfile profile in failureMechanism.ForeshoreProfiles) { yield return profile; } + foreach (HeightStructure structure in failureMechanism.HeightStructures) { yield return structure; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(ClosingStructuresFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(ClosingStructuresFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine>(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (ForeshoreProfile profile in failureMechanism.ForeshoreProfiles) { yield return profile; } + foreach (ClosingStructure structure in failureMechanism.ClosingStructures) { yield return structure; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(StabilityPointStructuresFailureMechanism failureMechanism) + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(StabilityPointStructuresFailureMechanism failureMechanism) { - foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine(failureMechanism)) + foreach (object failureMechanismObject in GetExpectedRemovedObjectsWhenClearingReferenceLine>(failureMechanism)) { yield return failureMechanismObject; } + foreach (ICalculationBase calculationBase in failureMechanism.CalculationsGroup.GetAllChildrenRecursive()) { yield return calculationBase; } + foreach (ForeshoreProfile profile in failureMechanism.ForeshoreProfiles) { yield return profile; } + foreach (StabilityPointStructure structure in failureMechanism.StabilityPointStructures) { yield return structure; } } - private IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(T failureMechanism) - where T : IFailureMechanism, IHasSectionResults + private static IEnumerable GetExpectedRemovedObjectsWhenClearingReferenceLine(TFailureMechanism failureMechanism) + where TFailureMechanism : IFailureMechanism, IHasSectionResults + where TSectionResult : FailureMechanismSectionResult { foreach (FailureMechanismSection section in failureMechanism.Sections) { yield return section; } - foreach (FailureMechanismSectionResult sectionResult in failureMechanism.SectionResults) + + foreach (TSectionResult sectionResult in failureMechanism.SectionResults) { yield return sectionResult; } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.MacroStabilityInwards.Data.Properties; @@ -33,7 +34,7 @@ /// public class MacroStabilityInwardsFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. @@ -49,7 +50,7 @@ Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName }; - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -78,7 +79,7 @@ public CalculationGroup CalculationsGroup { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Piping.Data.SoilProfile; @@ -33,7 +34,7 @@ /// public class PipingFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. @@ -50,7 +51,7 @@ Name = RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName }; - sectionResults = new List(); + sectionResults = new ObservableList(); } public override IEnumerable Calculations @@ -84,7 +85,7 @@ public CalculationGroup CalculationsGroup { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs =================================================================== diff -u -r56246f10e7876b30f36a5b9709ec2e3332b4010a -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision 56246f10e7876b30f36a5b9709ec2e3332b4010a) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanism.cs (.../StabilityPointStructuresFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Linq; +using Core.Common.Base; using Ringtoets.Common.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; @@ -37,7 +38,7 @@ /// public class StabilityPointStructuresFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism, IHasSectionResults> { - private readonly List> sectionResults; + private readonly ObservableList> sectionResults; /// /// Initializes a new instance of the class. @@ -51,7 +52,7 @@ }; GeneralInput = new GeneralStabilityPointStructuresInput(); StabilityPointStructures = new StructureCollection(); - sectionResults = new List>(); + sectionResults = new ObservableList>(); ForeshoreProfiles = new ForeshoreProfileCollection(); } @@ -80,7 +81,7 @@ public CalculationGroup CalculationsGroup { get; } - public IEnumerable> SectionResults + public ObservableList> SectionResults { get { Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanism.cs (.../StabilityStoneCoverFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Linq; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; @@ -35,15 +36,15 @@ /// public class StabilityStoneCoverFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public StabilityStoneCoverFailureMechanism() : base(Resources.StabilityStoneCoverFailureMechanism_DisplayName, Resources.StabilityStoneCoverFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); WaveConditionsCalculationGroup = new CalculationGroup { Name = RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName @@ -75,7 +76,7 @@ /// public ForeshoreProfileCollection ForeshoreProfiles { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get { Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs =================================================================== diff -u -ra663d0eb4c24012fdfafc00ee7aaffb18e75cb96 -rc3641f1375abfabf1c8093037c0cccd3eb77d52a --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision a663d0eb4c24012fdfafc00ee7aaffb18e75cb96) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanism.cs (.../WaveImpactAsphaltCoverFailureMechanism.cs) (revision c3641f1375abfabf1c8093037c0cccd3eb77d52a) @@ -21,6 +21,7 @@ using System.Collections.Generic; using System.Linq; +using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; @@ -36,15 +37,15 @@ /// public class WaveImpactAsphaltCoverFailureMechanism : FailureMechanismBase, IHasSectionResults { - private readonly List sectionResults; + private readonly ObservableList sectionResults; /// /// Initializes a new instance of the class. /// public WaveImpactAsphaltCoverFailureMechanism() : base(Resources.WaveImpactAsphaltCoverFailureMechanism_DisplayName, Resources.WaveImpactAsphaltCoverFailureMechanism_Code) { - sectionResults = new List(); + sectionResults = new ObservableList(); WaveConditionsCalculationGroup = new CalculationGroup { Name = RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName @@ -82,7 +83,7 @@ /// public CalculationGroup WaveConditionsCalculationGroup { get; } - public IEnumerable SectionResults + public ObservableList SectionResults { get {