Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs =================================================================== diff -u -r1c6f3ac4b5c73708b74e7d6491b6988c3ff4aa1a -r46ab9597ce97c9fb74ab0b46ade99b438a60f785 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision 1c6f3ac4b5c73708b74e7d6491b6988c3ff4aa1a) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision 46ab9597ce97c9fb74ab0b46ade99b438a60f785) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using Core.Common.Base; using Ringtoets.Common.Data.Calculation; @@ -35,11 +34,6 @@ public class DuneErosionFailureMechanism : FailureMechanismBase, IHasSectionResults { private readonly ObservableList sectionResults; - private readonly ObservableList calculationsForMechanismSpecificFactorizedSignalingNorm = new ObservableList(); - private readonly ObservableList calculationsForMechanismSpecificSignalingNorm = new ObservableList(); - private readonly ObservableList calculationsForMechanismSpecificLowerLimitNorm = new ObservableList(); - private readonly ObservableList calculationsForLowerLimitNorm = new ObservableList(); - private readonly ObservableList calculationsForFactorizedLowerLimitNorm = new ObservableList(); /// /// Initializes a new instance of the class. @@ -50,12 +44,6 @@ sectionResults = new ObservableList(); GeneralInput = new GeneralDuneErosionInput(); DuneLocations = new ObservableList(); - - CalculationsForMechanismSpecificFactorizedSignalingNorm = calculationsForMechanismSpecificFactorizedSignalingNorm; - CalculationsForMechanismSpecificSignalingNorm = calculationsForMechanismSpecificSignalingNorm; - CalculationsForMechanismSpecificLowerLimitNorm = calculationsForMechanismSpecificLowerLimitNorm; - CalculationsForLowerLimitNorm = calculationsForLowerLimitNorm; - CalculationsForFactorizedLowerLimitNorm = calculationsForFactorizedLowerLimitNorm; } public override IEnumerable Calculations @@ -76,31 +64,6 @@ /// public ObservableList DuneLocations { get; } - /// - /// Gets the calculations corresponding to the mechanism specific factorized signaling norm. - /// - public IObservableEnumerable CalculationsForMechanismSpecificFactorizedSignalingNorm { get; } - - /// - /// Gets the calculations corresponding to the mechanism specific signaling norm. - /// - public IObservableEnumerable CalculationsForMechanismSpecificSignalingNorm { get; } - - /// - /// Gets the calculations corresponding to the mechanism specific lower limit norm. - /// - public IObservableEnumerable CalculationsForMechanismSpecificLowerLimitNorm { get; } - - /// - /// Gets the calculations corresponding to the lower limit norm. - /// - public IObservableEnumerable CalculationsForLowerLimitNorm { get; } - - /// - /// Gets the calculations corresponding to the factorized lower limit norm. - /// - public IObservableEnumerable CalculationsForFactorizedLowerLimitNorm { get; set; } - public IObservableEnumerable SectionResults { get @@ -109,25 +72,6 @@ } } - /// - /// Sets dune location calculations for . - /// - /// The dune locations to add calculations for. - /// Thrown when is null. - public void SetDuneLocationCalculations(IEnumerable duneLocations) - { - if (duneLocations == null) - { - throw new ArgumentNullException(nameof(duneLocations)); - } - - ClearAllCalculations(); - foreach (DuneLocation duneLocation in duneLocations) - { - AddCalculationsForDuneLocation(duneLocation); - } - } - public override void AddSection(FailureMechanismSection section) { base.AddSection(section); @@ -140,23 +84,5 @@ base.ClearAllSections(); sectionResults.Clear(); } - - private void ClearAllCalculations() - { - calculationsForMechanismSpecificFactorizedSignalingNorm.Clear(); - calculationsForMechanismSpecificSignalingNorm.Clear(); - calculationsForMechanismSpecificLowerLimitNorm.Clear(); - calculationsForLowerLimitNorm.Clear(); - calculationsForFactorizedLowerLimitNorm.Clear(); - } - - private void AddCalculationsForDuneLocation(DuneLocation duneLocation) - { - calculationsForMechanismSpecificFactorizedSignalingNorm.Add(new DuneLocationCalculation(duneLocation)); - calculationsForMechanismSpecificSignalingNorm.Add(new DuneLocationCalculation(duneLocation)); - calculationsForMechanismSpecificLowerLimitNorm.Add(new DuneLocationCalculation(duneLocation)); - calculationsForLowerLimitNorm.Add(new DuneLocationCalculation(duneLocation)); - calculationsForFactorizedLowerLimitNorm.Add(new DuneLocationCalculation(duneLocation)); - } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs =================================================================== diff -u -rc36d1359e5853619d9fcb8a57d3b5ee2e3d9f1d9 -r46ab9597ce97c9fb74ab0b46ade99b438a60f785 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision c36d1359e5853619d9fcb8a57d3b5ee2e3d9f1d9) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision 46ab9597ce97c9fb74ab0b46ade99b438a60f785) @@ -19,13 +19,11 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Linq; using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.DuneErosion.Data.TestUtil; namespace Ringtoets.DuneErosion.Data.Test { @@ -45,12 +43,6 @@ CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.DuneLocations); Assert.IsNotNull(failureMechanism.GeneralInput); - - CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificSignalingNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForLowerLimitNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForFactorizedLowerLimitNorm); } [Test] @@ -95,94 +87,5 @@ CollectionAssert.IsEmpty(failureMechanism.Sections); CollectionAssert.IsEmpty(failureMechanism.SectionResults); } - - [Test] - public void SetDuneLocationCalculations_DuneLocationsNull_ThrowsArgumentNullException() - { - // Setup - var failureMechanism = new DuneErosionFailureMechanism(); - - // Call - TestDelegate test = () => failureMechanism.SetDuneLocationCalculations(null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("duneLocations", paramName); - } - - [Test] - public void SetDuneLocationCalculations_Always_PreviousCalculationsCleared() - { - // Setup - var failureMechanism = new DuneErosionFailureMechanism(); - - failureMechanism.SetDuneLocationCalculations(new DuneLocation[] - { - new TestDuneLocation() - }); - - // Precondition - CollectionAssert.IsNotEmpty(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm); - CollectionAssert.IsNotEmpty(failureMechanism.CalculationsForMechanismSpecificSignalingNorm); - CollectionAssert.IsNotEmpty(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm); - CollectionAssert.IsNotEmpty(failureMechanism.CalculationsForLowerLimitNorm); - CollectionAssert.IsNotEmpty(failureMechanism.CalculationsForFactorizedLowerLimitNorm); - - // Call - failureMechanism.SetDuneLocationCalculations(Enumerable.Empty()); - - // Assert - CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificSignalingNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForLowerLimitNorm); - CollectionAssert.IsEmpty(failureMechanism.CalculationsForFactorizedLowerLimitNorm); - } - - [Test] - public void SetDuneLocationCalculations_MultipleDuneLocations_SetsExpectedCalculations() - { - // Setup - var failureMechanism = new DuneErosionFailureMechanism(); - var duneLocation1 = new TestDuneLocation(); - var duneLocation2 = new TestDuneLocation(); - var duneLocations = new[] - { - duneLocation1, - duneLocation2 - }; - - // Call - failureMechanism.SetDuneLocationCalculations(duneLocations); - - // Assert - AssertNumberOfDuneLocationCalculations(failureMechanism, duneLocations.Length); - AssertDuneLocationCalculations(failureMechanism, 0, duneLocation1); - AssertDuneLocationCalculations(failureMechanism, 1, duneLocation2); - } - - private static void AssertNumberOfDuneLocationCalculations(DuneErosionFailureMechanism failureMechanism, int expectedNumberOfCalculations) - { - Assert.AreEqual(expectedNumberOfCalculations, failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.Count()); - Assert.AreEqual(expectedNumberOfCalculations, failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Count()); - Assert.AreEqual(expectedNumberOfCalculations, failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Count()); - Assert.AreEqual(expectedNumberOfCalculations, failureMechanism.CalculationsForLowerLimitNorm.Count()); - Assert.AreEqual(expectedNumberOfCalculations, failureMechanism.CalculationsForFactorizedLowerLimitNorm.Count()); - } - - private void AssertDuneLocationCalculations(DuneErosionFailureMechanism failureMechanism, int index, DuneLocation expectedDuneLocation) - { - AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm.ElementAt(index)); - AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForMechanismSpecificSignalingNorm.ElementAt(index)); - AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.ElementAt(index)); - AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForLowerLimitNorm.ElementAt(index)); - AssertDefaultDuneLocationCalculation(expectedDuneLocation, failureMechanism.CalculationsForFactorizedLowerLimitNorm.ElementAt(index)); - } - - private static void AssertDefaultDuneLocationCalculation(DuneLocation expectedDuneLocation, DuneLocationCalculation calculation) - { - Assert.AreSame(expectedDuneLocation, calculation.DuneLocation); - Assert.IsNull(calculation.Output); - } } } \ No newline at end of file