Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactory.cs
===================================================================
diff -u -rb9fc39a93d07ed886353585dc2c195e475121d6e -ra043233edc226e2d853e9b828d60fc035f54cf4e
--- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactory.cs (.../DerivedSemiProbabilisticPipingOutputFactory.cs) (revision b9fc39a93d07ed886353585dc2c195e475121d6e)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactory.cs (.../DerivedSemiProbabilisticPipingOutputFactory.cs) (revision a043233edc226e2d853e9b828d60fc035f54cf4e)
@@ -21,7 +21,6 @@
using System;
using Core.Common.Util;
-using Riskeer.Common.Data.AssessmentSection;
namespace Riskeer.Piping.Data.SemiProbabilistic
{
@@ -34,31 +33,17 @@
/// Creates a new based on the given parameters.
///
/// The output of a calculation.
- /// The failure mechanism the calculation belongs to.
- /// The assessment section the calculation belongs to.
+ /// The norm to assess for.
/// The created .
- /// Thrown when any parameter is null.
+ /// Thrown when is null.
public static DerivedSemiProbabilisticPipingOutput Create(SemiProbabilisticPipingOutput output,
- PipingFailureMechanism failureMechanism,
- IAssessmentSection assessmentSection)
+ double norm)
{
if (output == null)
{
throw new ArgumentNullException(nameof(output));
}
- if (failureMechanism == null)
- {
- throw new ArgumentNullException(nameof(failureMechanism));
- }
-
- if (assessmentSection == null)
- {
- throw new ArgumentNullException(nameof(assessmentSection));
- }
-
- double norm = assessmentSection.FailureMechanismContribution.Norm;
-
double upliftFactorOfSafety = output.UpliftFactorOfSafety;
double heaveFactorOfSafety = output.HeaveFactorOfSafety;
double sellmeijerFactorOfSafety = output.SellmeijerFactorOfSafety;
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactoryTest.cs
===================================================================
diff -u -rb9fc39a93d07ed886353585dc2c195e475121d6e -ra043233edc226e2d853e9b828d60fc035f54cf4e
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactoryTest.cs (.../DerivedSemiProbabilisticPipingOutputFactoryTest.cs) (revision b9fc39a93d07ed886353585dc2c195e475121d6e)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingOutputFactoryTest.cs (.../DerivedSemiProbabilisticPipingOutputFactoryTest.cs) (revision a043233edc226e2d853e9b828d60fc035f54cf4e)
@@ -21,8 +21,6 @@
using System;
using NUnit.Framework;
-using Rhino.Mocks;
-using Riskeer.Common.Data.AssessmentSection;
using Riskeer.Common.Data.TestUtil;
using Riskeer.Piping.Data.SemiProbabilistic;
@@ -34,65 +32,18 @@
[Test]
public void Create_OutputNull_ThrowsArgumentNullException()
{
- // Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
// Call
- void Call() => DerivedSemiProbabilisticPipingOutputFactory.Create(null, new PipingFailureMechanism(), assessmentSection);
+ void Call() => DerivedSemiProbabilisticPipingOutputFactory.Create(null, 0.1);
// Assert
var exception = Assert.Throws(Call);
Assert.AreEqual("output", exception.ParamName);
- mocks.VerifyAll();
}
[Test]
- public void Create_FailureMechanismNull_ThrowsArgumentNullException()
- {
- // Setup
- var mocks = new MockRepository();
- var assessmentSection = mocks.Stub();
- mocks.ReplayAll();
-
- // Call
- void Call() => DerivedSemiProbabilisticPipingOutputFactory.Create(new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties()),
- null,
- assessmentSection);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("failureMechanism", exception.ParamName);
- mocks.VerifyAll();
- }
-
- [Test]
- public void Create_AssessmentSectionNull_ThrowsArgumentNullException()
- {
- // Call
- void Call() => DerivedSemiProbabilisticPipingOutputFactory.Create(new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties()),
- new PipingFailureMechanism(),
- null);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("assessmentSection", exception.ParamName);
- }
-
- [Test]
public void Create_ValidData_ReturnsExpectedValue()
{
// Setup
- var failureMechanism = new PipingFailureMechanism
- {
- Contribution = 100
- };
-
- var mocks = new MockRepository();
- IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
- mocks.ReplayAll();
-
var calculatorResult = new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties
{
UpliftFactorOfSafety = 1.2,
@@ -101,14 +52,13 @@
});
// Call
- DerivedSemiProbabilisticPipingOutput derivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculatorResult, failureMechanism, assessmentSection);
+ DerivedSemiProbabilisticPipingOutput derivedOutput = DerivedSemiProbabilisticPipingOutputFactory.Create(calculatorResult, 0.1);
// Assert
Assert.AreEqual(0.0030333773290253025, derivedOutput.UpliftProbability, 1e-6);
Assert.AreEqual(0.00017624686431291146, derivedOutput.HeaveProbability, 1e-6);
Assert.AreEqual(0.13596896289025881, derivedOutput.SellmeijerProbability, 1e-6);
Assert.AreEqual(3.57331, derivedOutput.PipingReliability, derivedOutput.PipingReliability.GetAccuracy());
- mocks.VerifyAll();
}
}
}
\ No newline at end of file