Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs =================================================================== diff -u -r4952fd2efa09812567b6f12734e85776a65e0ff4 -rf0d517be0aa08a31686e7e428809ab28de7dfa51 --- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 4952fd2efa09812567b6f12734e85776a65e0ff4) +++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision f0d517be0aa08a31686e7e428809ab28de7dfa51) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.ComponentModel; using Core.Common.Base; -using Core.Common.Base.Data; using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data; using Riskeer.Common.Data.AssessmentSection; @@ -56,8 +55,6 @@ private readonly ObservableList waterLevelCalculationsForSignalingNorm = new ObservableList(); private readonly ObservableList waterLevelCalculationsForLowerLimitNorm = new ObservableList(); - private RoundedDouble failureProbabilityMarginFactor; - /// /// Initializes a new instance of the class. /// @@ -112,8 +109,6 @@ PipingStructure = new PipingStructureFailureMechanism(); DuneErosion = new DuneErosionFailureMechanism(); - failureProbabilityMarginFactor = new RoundedDouble(2); - FailureMechanismContribution = new FailureMechanismContribution(lowerLimitNorm, signalingNorm); ChangeComposition(composition); } @@ -193,37 +188,10 @@ /// public DuneErosionFailureMechanism DuneErosion { get; set; } - /// - /// Gets the failure probability margin factor. - /// - public RoundedDouble FailureProbabilityMarginFactor - { - get - { - return failureProbabilityMarginFactor; - } - private set - { - failureProbabilityMarginFactor = value.ToPrecision(failureProbabilityMarginFactor.NumberOfDecimalPlaces); - } - } + public IObservableEnumerable WaterLevelCalculationsForSignalingNorm => waterLevelCalculationsForSignalingNorm; - public IObservableEnumerable WaterLevelCalculationsForSignalingNorm - { - get - { - return waterLevelCalculationsForSignalingNorm; - } - } + public IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm => waterLevelCalculationsForLowerLimitNorm; - public IObservableEnumerable WaterLevelCalculationsForLowerLimitNorm - { - get - { - return waterLevelCalculationsForLowerLimitNorm; - } - } - public ObservableList WaterLevelCalculationsForUserDefinedTargetProbabilities { get; } public ObservableList WaveHeightCalculationsForUserDefinedTargetProbabilities { get; } @@ -303,8 +271,6 @@ /// /// Thrown when /// is not a valid enum value of . - /// Thrown when - /// is not supported. public void ChangeComposition(AssessmentSectionComposition newComposition) { if (!Enum.IsDefined(typeof(AssessmentSectionComposition), newComposition)) @@ -314,21 +280,6 @@ typeof(AssessmentSectionComposition)); } - switch (newComposition) - { - case AssessmentSectionComposition.Dike: - FailureProbabilityMarginFactor = (RoundedDouble) 0.58; - break; - case AssessmentSectionComposition.Dune: - FailureProbabilityMarginFactor = (RoundedDouble) 0; - break; - case AssessmentSectionComposition.DikeAndDune: - FailureProbabilityMarginFactor = (RoundedDouble) 0.58; - break; - default: - throw new NotSupportedException(); - } - Composition = newComposition; SetFailureMechanismsToBeInAssembly(); }