Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs
===================================================================
diff -u -r6b3753a9bfc048980b06342b163783b28c2d8a24 -rc292d279a83c6a04d7020f53fff8a2ad99c68b48
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs (.../FailureMechanismSectionAssemblyGroupFactory.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs (.../FailureMechanismSectionAssemblyGroupFactory.cs) (revision c292d279a83c6a04d7020f53fff8a2ad99c68b48)
@@ -86,9 +86,8 @@
/// The refined probability for the profile.
/// The refined probability for the section.
/// The of the section.
- /// The to get the N of the section.
- /// Thrown when
- /// or is null.
+ /// The N of the section.
+ /// Thrown when is null.
/// Thrown when
/// or is invalid.
/// Thrown when the section could not be successfully assembled.
@@ -98,18 +97,13 @@
double initialProfileProbability, double initialSectionProbability,
bool furtherAnalysisNeeded,
double refinedProfileProbability, double refinedSectionProbability,
- ProbabilityRefinementType probabilityRefinementType, Func getNFunc)
+ ProbabilityRefinementType probabilityRefinementType, double sectionN)
{
if (assessmentSection == null)
{
throw new ArgumentNullException(nameof(assessmentSection));
}
- if (getNFunc == null)
- {
- throw new ArgumentNullException(nameof(getNFunc));
- }
-
if (!Enum.IsDefined(typeof(AdoptableInitialFailureMechanismResultType), initialFailureMechanismResultType))
{
throw new InvalidEnumArgumentException(nameof(initialFailureMechanismResultType),
@@ -127,7 +121,7 @@
FailureMechanismSectionAssemblyInput input = CreateInput(
assessmentSection, isRelevant, initialFailureMechanismResultType,
initialProfileProbability, initialSectionProbability, furtherAnalysisNeeded,
- refinedProfileProbability, refinedSectionProbability, probabilityRefinementType, getNFunc);
+ refinedProfileProbability, refinedSectionProbability, probabilityRefinementType, sectionN);
return PerformAssembly(input);
}
@@ -152,10 +146,8 @@
double initialProfileProbability, double initialSectionProbability,
bool furtherAnalysisNeeded,
double refinedProfileProbability, double refinedSectionProbability,
- ProbabilityRefinementType probabilityRefinementType, Func getNFunc)
+ ProbabilityRefinementType probabilityRefinementType, double sectionN)
{
- double sectionN = getNFunc();
-
if (probabilityRefinementType == ProbabilityRefinementType.Profile)
{
refinedSectionProbability = refinedProfileProbability * sectionN;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs
===================================================================
diff -u -r10fa7dc4e89445117c00b565a973ce4307333f0b -rc292d279a83c6a04d7020f53fff8a2ad99c68b48
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs) (revision 10fa7dc4e89445117c00b565a973ce4307333f0b)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultRow.cs) (revision c292d279a83c6a04d7020f53fff8a2ad99c68b48)
@@ -307,7 +307,7 @@
assessmentSection, IsRelevant, InitialFailureMechanismResult, InitialFailureMechanismResultProfileProbability,
InitialFailureMechanismResultSectionProbability, FurtherAnalysisNeeded,
SectionResult.RefinedProfileProbability, SectionResult.RefinedSectionProbability,
- ProbabilityRefinementType, getNFunc);
+ ProbabilityRefinementType, getNFunc());
}
catch (AssemblyException e)
{
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupFactoryTest.cs
===================================================================
diff -u -r6b3753a9bfc048980b06342b163783b28c2d8a24 -rc292d279a83c6a04d7020f53fff8a2ad99c68b48
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupFactoryTest.cs (.../FailureMechanismSectionAssemblyGroupFactoryTest.cs) (revision 6b3753a9bfc048980b06342b163783b28c2d8a24)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupFactoryTest.cs (.../FailureMechanismSectionAssemblyGroupFactoryTest.cs) (revision c292d279a83c6a04d7020f53fff8a2ad99c68b48)
@@ -180,31 +180,14 @@
void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
null, random.NextBoolean(), random.NextEnumValue(), random.NextDouble(),
random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(),
- random.NextEnumValue(), () => double.NaN);
+ random.NextEnumValue(), double.NaN);
// Assert
var exception = Assert.Throws(Call);
Assert.AreEqual("assessmentSection", exception.ParamName);
}
[Test]
- public void AssembleSectionWithProfileProbability_GetNFuncNull_ThrowsArgumentNullException()
- {
- // Setup
- var random = new Random(21);
-
- // Call
- void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
- new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(),
- random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(),
- random.NextEnumValue(), null);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("getNFunc", exception.ParamName);
- }
-
- [Test]
public void AssembleSectionWithProfileProbability_InvalidInitialFailureMechanismResultType_ThrowsInvalidEnumArgumentException()
{
// Setup
@@ -216,7 +199,7 @@
void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
new AssessmentSectionStub(), random.NextBoolean(), initialFailureMechanismResultType,
random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(),
- random.NextEnumValue(), () => double.NaN);
+ random.NextEnumValue(), double.NaN);
// Assert
var expectedMessage = $"The value of argument 'initialFailureMechanismResultType' ({initialFailureMechanismResultType}) is invalid for Enum type '{nameof(AdoptableInitialFailureMechanismResultType)}'.";
@@ -235,7 +218,7 @@
void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(),
random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(),
- probabilityRefinementType, () => double.NaN);
+ probabilityRefinementType, double.NaN);
// Assert
var expectedMessage = $"The value of argument 'probabilityRefinementType' ({probabilityRefinementType}) is invalid for Enum type '{nameof(ProbabilityRefinementType)}'.";
@@ -269,7 +252,7 @@
FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
assessmentSection, isRelevant, initialFailureMechanismResultType, profileProbability, sectionProbability,
furtherAnalysisNeeded, refinedProfileProbability, refinedSectionProbability,
- ProbabilityRefinementType.Both, () => 1.0);
+ ProbabilityRefinementType.Both, 1.0);
// Assert
FailureMechanismSectionAssemblyInput calculatorInput = calculator.FailureMechanismSectionAssemblyInput;
@@ -308,7 +291,7 @@
FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(),
random.NextDouble(), random.NextDouble(), random.NextBoolean(), refinedProfileProbability, refinedSectionProbability,
- probabilityRefinementType, () => 2.0);
+ probabilityRefinementType, 2.0);
// Assert
FailureMechanismSectionAssemblyInput calculatorInput = calculator.FailureMechanismSectionAssemblyInput;
@@ -333,7 +316,7 @@
FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(),
random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(),
- random.NextEnumValue(), () => 1.0);
+ random.NextEnumValue(), 1.0);
// Assert
FailureMechanismSectionAssemblyResult calculatorOutput = calculator.FailureMechanismSectionAssemblyResultOutput;
@@ -359,7 +342,7 @@
void Call() => FailureMechanismSectionAssemblyGroupFactory.AssembleSection(
new AssessmentSectionStub(), random.NextBoolean(), random.NextEnumValue(),
random.NextDouble(), random.NextDouble(), random.NextBoolean(), random.NextDouble(), random.NextDouble(),
- random.NextEnumValue(), () => double.NaN);
+ random.NextEnumValue(), double.NaN);
// Assert
var exception = Assert.Throws(Call);