Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs
===================================================================
diff -u -r80c86231452b9beb7e8b8eba3698ceb9c0551de3 -r80404901c704ca22397f36ebe46f81e73059e30a
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 80c86231452b9beb7e8b8eba3698ceb9c0551de3)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision 80404901c704ca22397f36ebe46f81e73059e30a)
@@ -20,11 +20,7 @@
// All rights reserved.
using System;
-using System.Collections.Generic;
-using System.Linq;
using Core.Common.Base.Data;
-using Core.Common.Base.Geometry;
-using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.FailureMechanism;
namespace Ringtoets.Piping.Data
@@ -35,96 +31,20 @@
///
public class PipingFailureMechanismSectionResult : FailureMechanismSectionResult
{
- private readonly CalculationGroup calculationsGroup;
-
///
/// Creates a new instance of .
///
/// The to get the result from.
- ///
/// Thrown when is null.
- public PipingFailureMechanismSectionResult(FailureMechanismSection section, CalculationGroup calculationsGroup = null) : base(section)
- {
- this.calculationsGroup = calculationsGroup;
- }
+ public PipingFailureMechanismSectionResult(FailureMechanismSection section) : base(section)
+ {}
///
- /// Gets the value of assessment layer two a.
- ///
- ///
- public RoundedDouble GetAssessmentLayerTwoA(IEnumerable calculations)
- {
- var calculationScenarios = GetCalculationScenarios(calculations).Where(cs => cs.Status == CalculationScenarioStatus.Done).ToList();
-
- return calculationScenarios.Any()
- ? (RoundedDouble) (1.0/calculationScenarios.Sum(scenario => (scenario.Probability.Value)*scenario.Contribution.Value))
- : (RoundedDouble) 0.0;
- }
-
- ///
/// Gets or sets the value of assessment layer three.
///
public RoundedDouble AssessmentLayerThree { get; set; }
///
- /// Gets the contribution of all relevant together.
- ///
- ///
- public RoundedDouble GetTotalContribution(IEnumerable calculations)
- {
- return (RoundedDouble) GetCalculationScenarios(calculations).Aggregate(0, (current, calculationScenario) => current + calculationScenario.Contribution);
- }
-
- ///
- /// Gets a list of .
- ///
- ///
- public IEnumerable GetCalculationScenarios(IEnumerable calculations)
- {
- var lineSegments = Math2D.ConvertLinePointsToLineSegments(Section.Points);
- return calculations
- .Where(pc => pc.IsRelevant && pc.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments));
- }
-
- ///
- /// Gets the status of the section result depending on the calculation scenarios.
- ///
- ///
- public CalculationScenarioStatus GetCalculationScenarioStatus(IEnumerable calculations)
- {
- bool failed = false;
- bool notCalculated = false;
- foreach (var calculationScenario in GetCalculationScenarios(calculations).Where(cs => cs.IsRelevant))
- {
- switch (calculationScenario.Status)
- {
- case CalculationScenarioStatus.Failed:
- failed = true;
- break;
- case CalculationScenarioStatus.NotCalculated:
- notCalculated = true;
- break;
- case CalculationScenarioStatus.Done:
- continue;
- default:
- throw new ArgumentOutOfRangeException();
- }
- }
-
- if (failed)
- {
- return CalculationScenarioStatus.Failed;
- }
-
- if (notCalculated)
- {
- return CalculationScenarioStatus.NotCalculated;
- }
-
- return CalculationScenarioStatus.Done;
- }
-
- ///
/// Gets or sets the state of the assessment layer one.
///
public bool AssessmentLayerOne { get; set; }