Index: Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingOutput.cs
===================================================================
diff -u -rb5f6de56734adc256e71ee5e487ac22d7217a6d4 -r133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956
--- Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingOutput.cs (.../ProbabilisticPipingOutput.cs) (revision b5f6de56734adc256e71ee5e487ac22d7217a6d4)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/Probabilistic/ProbabilisticPipingOutput.cs (.../ProbabilisticPipingOutput.cs) (revision 133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956)
@@ -32,38 +32,38 @@
///
/// Creates a new instance of .
///
- /// The result of the sub-calculation that takes into account the section length.
- /// The result of the sub-calculation that doesn't take into account the section length.
+ /// The result of the sub-calculation that takes into account the section length.
+ /// The result of the sub-calculation that doesn't take into account the section length.
/// The input parameters are not checked for being null as (one of the) the sub-calculation results might
/// be missing due to calculation failure.
- public ProbabilisticPipingOutput(PartialProbabilisticPipingOutput resultWithLength, PartialProbabilisticPipingOutput resultWithoutLength)
+ public ProbabilisticPipingOutput(PartialProbabilisticPipingOutput sectionSpecificOutput, PartialProbabilisticPipingOutput profileSpecificOutput)
{
- ResultWithLength = resultWithLength;
- ResultWithoutLength = resultWithoutLength;
+ SectionSpecificOutput = sectionSpecificOutput;
+ ProfileSpecificOutput = profileSpecificOutput;
}
///
/// Gets the result of the sub-calculation that takes into account the section length.
///
- public PartialProbabilisticPipingOutput ResultWithLength { get; private set; }
+ public PartialProbabilisticPipingOutput SectionSpecificOutput { get; private set; }
///
/// Gets the result of the sub-calculation that doesn't take into account the section length.
///
- public PartialProbabilisticPipingOutput ResultWithoutLength { get; private set; }
+ public PartialProbabilisticPipingOutput ProfileSpecificOutput { get; private set; }
public override object Clone()
{
var clone = (ProbabilisticPipingOutput) base.Clone();
- if (ResultWithLength != null)
+ if (SectionSpecificOutput != null)
{
- clone.ResultWithLength = (PartialProbabilisticPipingOutput) ResultWithLength.Clone();
+ clone.SectionSpecificOutput = (PartialProbabilisticPipingOutput) SectionSpecificOutput.Clone();
}
- if (ResultWithoutLength != null)
+ if (ProfileSpecificOutput != null)
{
- clone.ResultWithoutLength = (PartialProbabilisticPipingOutput) ResultWithoutLength.Clone();
+ clone.ProfileSpecificOutput = (PartialProbabilisticPipingOutput) ProfileSpecificOutput.Clone();
}
return clone;
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs
===================================================================
diff -u -rfc485da07b4e72ca041d014eef9a280446d2a751 -r133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs (.../ProbabilisticPipingOutputTest.cs) (revision fc485da07b4e72ca041d014eef9a280446d2a751)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/Probabilistic/ProbabilisticPipingOutputTest.cs (.../ProbabilisticPipingOutputTest.cs) (revision 133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956)
@@ -36,17 +36,17 @@
public void Constructor_ExpectedValues()
{
// Setup
- PartialProbabilisticPipingOutput resultWithLength = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
- PartialProbabilisticPipingOutput resultWithoutLength = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
+ PartialProbabilisticPipingOutput sectionSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
+ PartialProbabilisticPipingOutput profileSpecificOutput = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint());
// Call
- var output = new ProbabilisticPipingOutput(resultWithLength, resultWithoutLength);
+ var output = new ProbabilisticPipingOutput(sectionSpecificOutput, profileSpecificOutput);
// Assert
Assert.IsInstanceOf(output);
Assert.IsInstanceOf(output);
- Assert.AreSame(resultWithLength, output.ResultWithLength);
- Assert.AreSame(resultWithoutLength, output.ResultWithoutLength);
+ Assert.AreSame(sectionSpecificOutput, output.SectionSpecificOutput);
+ Assert.AreSame(profileSpecificOutput, output.ProfileSpecificOutput);
}
[Test]
@@ -63,7 +63,7 @@
}
[Test]
- public void Clone_OnlyOutputWithLengthSet_ReturnNewInstanceWithCopiedValues()
+ public void Clone_OnlySectionSpecificOutputSet_ReturnNewInstanceWithCopiedValues()
{
// Setup
var original = new ProbabilisticPipingOutput(PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint()), null);
@@ -76,7 +76,7 @@
}
[Test]
- public void Clone_OnlyOutputWithoutLengthSet_ReturnNewInstanceWithCopiedValues()
+ public void Clone_OnlyProfileSpecificOutputSet_ReturnNewInstanceWithCopiedValues()
{
// Setup
var original = new ProbabilisticPipingOutput(null, PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput(new TestGeneralResultFaultTreeIllustrationPoint()));
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs
===================================================================
diff -u -r6dd7fee279347b7bb713cefd4367315a75ee984a -r133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs (.../PipingTestDataGeneratorTest.cs) (revision 6dd7fee279347b7bb713cefd4367315a75ee984a)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs (.../PipingTestDataGeneratorTest.cs) (revision 133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956)
@@ -256,12 +256,12 @@
ProbabilisticPipingOutput output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutput();
// Assert
- Assert.IsNotNull(output.ResultWithLength);
- Assert.IsTrue(IsValidDouble(output.ResultWithLength.Reliability));
- Assert.IsNotNull(output.ResultWithLength.GeneralResult);
- Assert.IsNotNull(output.ResultWithoutLength);
- Assert.IsTrue(IsValidDouble(output.ResultWithoutLength.Reliability));
- Assert.IsNotNull(output.ResultWithoutLength.GeneralResult);
+ Assert.IsNotNull(output.SectionSpecificOutput);
+ Assert.IsTrue(IsValidDouble(output.SectionSpecificOutput.Reliability));
+ Assert.IsNotNull(output.SectionSpecificOutput.GeneralResult);
+ Assert.IsNotNull(output.ProfileSpecificOutput);
+ Assert.IsTrue(IsValidDouble(output.ProfileSpecificOutput.Reliability));
+ Assert.IsNotNull(output.ProfileSpecificOutput.GeneralResult);
}
private static void AssertCalculationScenario(SemiProbabilisticPipingCalculationScenario calculation,
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCloneAssert.cs
===================================================================
diff -u -r7eaa0116d2daa5cfb492223dfa5be16ad5be63f5 -r133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCloneAssert.cs (.../PipingCloneAssert.cs) (revision 7eaa0116d2daa5cfb492223dfa5be16ad5be63f5)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCloneAssert.cs (.../PipingCloneAssert.cs) (revision 133d3d7a7dcd3b2d4ebe0e83c0d8df4fbf2a1956)
@@ -63,8 +63,8 @@
/// are not clones.
public static void AreClones(ProbabilisticPipingOutput original, ProbabilisticPipingOutput clone)
{
- CoreCloneAssert.AreObjectClones(original.ResultWithLength, clone.ResultWithLength, AreClones);
- CoreCloneAssert.AreObjectClones(original.ResultWithoutLength, clone.ResultWithoutLength, AreClones);
+ CoreCloneAssert.AreObjectClones(original.SectionSpecificOutput, clone.SectionSpecificOutput, AreClones);
+ CoreCloneAssert.AreObjectClones(original.ProfileSpecificOutput, clone.ProfileSpecificOutput, AreClones);
}
///