Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs =================================================================== diff -u -rd2a7680f8ca1a7845ab2555c7b7ec9f4b26dd047 -rd7d464797eb33a3aea4ebd488a97a3bc10efde1f --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision d2a7680f8ca1a7845ab2555c7b7ec9f4b26dd047) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Data/DuneErosionFailureMechanism.cs (.../DuneErosionFailureMechanism.cs) (revision d7d464797eb33a3aea4ebd488a97a3bc10efde1f) @@ -36,11 +36,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(); private readonly ObservableList duneLocationCollection = new ObservableList(); /// @@ -75,61 +70,6 @@ /// public ObservableList DuneLocationCalculationsForUserDefinedTargetProbabilities { get; } - /// - /// Gets the calculations corresponding to the mechanism specific factorized signaling norm. - /// - public IObservableEnumerable CalculationsForMechanismSpecificFactorizedSignalingNorm - { - get - { - return calculationsForMechanismSpecificFactorizedSignalingNorm; - } - } - - /// - /// Gets the calculations corresponding to the mechanism specific signaling norm. - /// - public IObservableEnumerable CalculationsForMechanismSpecificSignalingNorm - { - get - { - return calculationsForMechanismSpecificSignalingNorm; - } - } - - /// - /// Gets the calculations corresponding to the mechanism specific lower limit norm. - /// - public IObservableEnumerable CalculationsForMechanismSpecificLowerLimitNorm - { - get - { - return calculationsForMechanismSpecificLowerLimitNorm; - } - } - - /// - /// Gets the calculations corresponding to the lower limit norm. - /// - public IObservableEnumerable CalculationsForLowerLimitNorm - { - get - { - return calculationsForLowerLimitNorm; - } - } - - /// - /// Gets the calculations corresponding to the factorized lower limit norm. - /// - public IObservableEnumerable CalculationsForFactorizedLowerLimitNorm - { - get - { - return calculationsForFactorizedLowerLimitNorm; - } - } - public override IEnumerable Calculations { get @@ -161,21 +101,6 @@ duneLocationCollection.Clear(); duneLocationCollection.AddRange(duneLocations); - calculationsForMechanismSpecificFactorizedSignalingNorm.Clear(); - calculationsForMechanismSpecificFactorizedSignalingNorm.AddRange(duneLocations.Select(dl => new DuneLocationCalculation(dl))); - - calculationsForMechanismSpecificSignalingNorm.Clear(); - calculationsForMechanismSpecificSignalingNorm.AddRange(duneLocations.Select(dl => new DuneLocationCalculation(dl))); - - calculationsForMechanismSpecificLowerLimitNorm.Clear(); - calculationsForMechanismSpecificLowerLimitNorm.AddRange(duneLocations.Select(dl => new DuneLocationCalculation(dl))); - - calculationsForLowerLimitNorm.Clear(); - calculationsForLowerLimitNorm.AddRange(duneLocations.Select(dl => new DuneLocationCalculation(dl))); - - calculationsForFactorizedLowerLimitNorm.Clear(); - calculationsForFactorizedLowerLimitNorm.AddRange(duneLocations.Select(dl => new DuneLocationCalculation(dl))); - DuneLocationCalculationsForUserDefinedTargetProbabilities.ForEach(dlc => { dlc.DuneLocationCalculations.Clear(); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs =================================================================== diff -u -rc83058d87a9988e201849887565c4329f1c121f9 -rd7d464797eb33a3aea4ebd488a97a3bc10efde1f --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision c83058d87a9988e201849887565c4329f1c121f9) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision d7d464797eb33a3aea4ebd488a97a3bc10efde1f) @@ -47,12 +47,6 @@ CollectionAssert.IsEmpty(failureMechanism.DuneLocations); CollectionAssert.IsEmpty(failureMechanism.DuneLocationCalculationsForUserDefinedTargetProbabilities); 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]