Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyInput.cs
===================================================================
diff -u -r5f7afeb5da4572e7e4c9932d7eecb5fac86f44aa -r9f244919473b0a2faf72a567c632d0f39a2cff2e
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyInput.cs (.../FailureMechanismSectionAssemblyInput.cs) (revision 5f7afeb5da4572e7e4c9932d7eecb5fac86f44aa)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyInput.cs (.../FailureMechanismSectionAssemblyInput.cs) (revision 9f244919473b0a2faf72a567c632d0f39a2cff2e)
@@ -8,22 +8,24 @@
///
/// Creates a new instance of .
///
- /// The signaling norm.
/// The lower limit norm.
+ /// The signaling norm.
/// The indicator whether the section is relevant.
/// The initial probability for the profile.
/// The initial probability for the section.
/// The indicator whether the section needs further analysis.
/// The refined probability for the profile.
/// The refined probability for the section.
- public FailureMechanismSectionAssemblyInput(double signalingNorm, double lowerLimitNorm,
+ public FailureMechanismSectionAssemblyInput(double lowerLimitNorm,
+ double signalingNorm,
bool isRelevant,
double initialProfileProbability, double initialSectionProbability,
bool furtherAnalysisNeeded,
double refinedProfileProbability, double refinedSectionProbability)
{
- SignalingNorm = signalingNorm;
LowerLimitNorm = lowerLimitNorm;
+ SignalingNorm = signalingNorm;
+
IsRelevant = isRelevant;
InitialProfileProbability = initialProfileProbability;
InitialSectionProbability = initialSectionProbability;
@@ -33,14 +35,14 @@
}
///
- /// Gets the signaling norm.
+ /// Gets the lower limit norm.
///
- public double SignalingNorm { get; }
+ public double LowerLimitNorm { get; }
///
- /// Gets the lower limit norm.
+ /// Gets the signaling norm.
///
- public double LowerLimitNorm { get; }
+ public double SignalingNorm { get; }
///
/// Gets the indicator whether the section is relevant.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyInputTest.cs
===================================================================
diff -u -r877f80f8669e3bae22e1a5151480634ebf4c3d0d -r9f244919473b0a2faf72a567c632d0f39a2cff2e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyInputTest.cs (.../FailureMechanismSectionAssemblyInputTest.cs) (revision 877f80f8669e3bae22e1a5151480634ebf4c3d0d)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyInputTest.cs (.../FailureMechanismSectionAssemblyInputTest.cs) (revision 9f244919473b0a2faf72a567c632d0f39a2cff2e)
@@ -12,8 +12,8 @@
{
// Setup
var random = new Random(21);
- double signalingNorm = random.NextDouble();
double lowerLimitNorm = random.NextDouble();
+ double signalingNorm = random.NextDouble();
bool isRelevant = random.NextBoolean();
double profileProbability = random.NextDouble();
double sectionProbability = random.NextDouble();
@@ -22,11 +22,11 @@
double refinedSectionProbability = random.NextDouble();
// Call
- var input = new FailureMechanismSectionAssemblyInput(signalingNorm, lowerLimitNorm,
- isRelevant,
- profileProbability, sectionProbability,
- furtherAnalysisNeeded,
- refinedProfileProbability, refinedSectionProbability);
+ var input = new FailureMechanismSectionAssemblyInput(lowerLimitNorm,
+ signalingNorm,
+ isRelevant, profileProbability,
+ sectionProbability,
+ furtherAnalysisNeeded, refinedProfileProbability, refinedSectionProbability);
// Assert
Assert.AreEqual(signalingNorm, input.SignalingNorm);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r90d72cc06acb24ca5e8c57351b7e6bde83886369 -r9f244919473b0a2faf72a567c632d0f39a2cff2e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 90d72cc06acb24ca5e8c57351b7e6bde83886369)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 9f244919473b0a2faf72a567c632d0f39a2cff2e)
@@ -96,11 +96,11 @@
const double lowerLimitNorm = 0.001;
var random = new Random(21);
- var input = new FailureMechanismSectionAssemblyInput(signalingNorm, lowerLimitNorm,
- random.NextBoolean(),
- random.NextDouble(), random.NextDouble(),
- random.NextBoolean(),
- random.NextDouble(), random.NextDouble());
+ var input = new FailureMechanismSectionAssemblyInput(lowerLimitNorm,
+ signalingNorm,
+ random.NextBoolean(), random.NextDouble(),
+ random.NextDouble(),
+ random.NextBoolean(), random.NextDouble(), random.NextDouble());
using (new AssemblyToolKernelFactoryConfig())
{
var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
@@ -263,11 +263,11 @@
const double signalingNorm = 0.0001;
var random = new Random(21);
- return new FailureMechanismSectionAssemblyInput(signalingNorm, lowerLimitNorm,
- random.NextBoolean(),
- random.NextDouble(), random.NextDouble(),
- random.NextBoolean(),
- random.NextDouble(), random.NextDouble());
+ return new FailureMechanismSectionAssemblyInput(lowerLimitNorm,
+ signalingNorm,
+ random.NextBoolean(), random.NextDouble(),
+ random.NextDouble(),
+ random.NextBoolean(), random.NextDouble(), random.NextDouble());
}
private static CategoriesList CreateCategoryLimits()
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyGroupBoundariesCreatorTest.cs
===================================================================
diff -u -r7547caf55a454c8aa66b1cf88885f520123e4ea9 -r9f244919473b0a2faf72a567c632d0f39a2cff2e
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyGroupBoundariesCreatorTest.cs (.../AssemblyGroupBoundariesCreatorTest.cs) (revision 7547caf55a454c8aa66b1cf88885f520123e4ea9)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyGroupBoundariesCreatorTest.cs (.../AssemblyGroupBoundariesCreatorTest.cs) (revision 9f244919473b0a2faf72a567c632d0f39a2cff2e)
@@ -39,10 +39,10 @@
public void CreateFailureMechanismSectionAssemblyGroupBoundaries_CategoriesNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => AssemblyGroupBoundariesCreator.CreateFailureMechanismSectionAssemblyGroupBoundaries(null);
+ void Call() => AssemblyGroupBoundariesCreator.CreateFailureMechanismSectionAssemblyGroupBoundaries(null);
// Assert
- var exception = Assert.Throws(call);
+ var exception = Assert.Throws(Call);
Assert.AreEqual("categories", exception.ParamName);
}
@@ -78,11 +78,11 @@
});
// Call
- TestDelegate test = () => AssemblyGroupBoundariesCreator.CreateFailureMechanismSectionAssemblyGroupBoundaries(categories);
+ void Call() => AssemblyGroupBoundariesCreator.CreateFailureMechanismSectionAssemblyGroupBoundaries(categories);
// Assert
var exceptionMessage = $"The value of argument 'category' (99) is invalid for Enum type '{nameof(EInterpretationCategory)}'.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, exceptionMessage);
+ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, exceptionMessage);
}
}
}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs
===================================================================
diff -u -r877f80f8669e3bae22e1a5151480634ebf4c3d0d -r9f244919473b0a2faf72a567c632d0f39a2cff2e
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs (.../FailureMechanismSectionAssemblyGroupFactory.cs) (revision 877f80f8669e3bae22e1a5151480634ebf4c3d0d)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupFactory.cs (.../FailureMechanismSectionAssemblyGroupFactory.cs) (revision 9f244919473b0a2faf72a567c632d0f39a2cff2e)
@@ -84,12 +84,11 @@
double refinedProfileProbability, double refinedSectionProbability)
{
FailureMechanismContribution failureMechanismContribution = assessmentSection.FailureMechanismContribution;
- return new FailureMechanismSectionAssemblyInput(failureMechanismContribution.SignalingNorm,
- failureMechanismContribution.LowerLimitNorm,
- isRelevant,
- initialProfileProbability, initialSectionProbability,
- furtherAnalysisNeeded,
- refinedProfileProbability, refinedSectionProbability);
+ return new FailureMechanismSectionAssemblyInput(failureMechanismContribution.LowerLimitNorm,
+ failureMechanismContribution.SignalingNorm,
+ isRelevant, initialProfileProbability,
+ initialSectionProbability,
+ furtherAnalysisNeeded, refinedProfileProbability, refinedSectionProbability);
}
}
}
\ No newline at end of file