Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionResultExtensions.cs
===================================================================
diff -u -r9b885a240afd6b172428ddbfb16ad5b3b2924c72 -rd6bb75c30692cf3fdb09af9eb59b77d10fa99ed0
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionResultExtensions.cs (.../FailureMechanismSectionResultExtensions.cs) (revision 9b885a240afd6b172428ddbfb16ad5b3b2924c72)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionResultExtensions.cs (.../FailureMechanismSectionResultExtensions.cs) (revision d6bb75c30692cf3fdb09af9eb59b77d10fa99ed0)
@@ -37,13 +37,13 @@
///
/// The section result to get the relevant scenarios for.
/// The calculation scenarios to get the relevant scenarios from.
- /// The func to determine whether a scenario is belonging to the given .
+ /// The function to determine whether a scenario is belonging to the given .
/// The type of the calculation scenarios.
/// A collection of relevant calculation scenarios.
/// Thrown when any parameter is null.
- public static IEnumerable GetCalculationScenarios(this FailureMechanismSectionResult sectionResult,
- IEnumerable calculationScenarios,
- Func, bool> intersectionFunc)
+ public static IEnumerable GetRelevantCalculationScenarios(this FailureMechanismSectionResult sectionResult,
+ IEnumerable calculationScenarios,
+ Func, bool> intersectionFunc)
where T : ICalculationScenario
{
if (sectionResult == null)
@@ -63,7 +63,7 @@
IEnumerable lineSegments = Math2D.ConvertPointsToLineSegments(sectionResult.Section.Points);
- return calculationScenarios.OfType().Where(pc => pc.IsRelevant && intersectionFunc(pc, lineSegments));
+ return calculationScenarios.OfType().Where(scenario => scenario.IsRelevant && intersectionFunc(scenario, lineSegments));
}
}
}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/IInitialFailureMechanismResultErrorProvider.cs
===================================================================
diff -u -r355050bc6f1bc1ec47be03cd6c9a63d6fe136680 -rd6bb75c30692cf3fdb09af9eb59b77d10fa99ed0
--- Riskeer/Common/src/Riskeer.Common.Forms/IInitialFailureMechanismResultErrorProvider.cs (.../IInitialFailureMechanismResultErrorProvider.cs) (revision 355050bc6f1bc1ec47be03cd6c9a63d6fe136680)
+++ Riskeer/Common/src/Riskeer.Common.Forms/IInitialFailureMechanismResultErrorProvider.cs (.../IInitialFailureMechanismResultErrorProvider.cs) (revision d6bb75c30692cf3fdb09af9eb59b77d10fa99ed0)
@@ -31,7 +31,7 @@
///
/// Gets the probability validation errors.
///
- /// The func to get the probability to validate.
+ /// The function to get the probability to validate.
/// Error messages when the validation fails;
/// or when there are no errors.
string GetProbabilityValidationError(Func getProbabilityFunc);
Index: Riskeer/Common/src/Riskeer.Common.Forms/InitialFailureMechanismResultErrorProvider.cs
===================================================================
diff -u -r5b91276721f50b18173bdaab2bb1af91193ac551 -rd6bb75c30692cf3fdb09af9eb59b77d10fa99ed0
--- Riskeer/Common/src/Riskeer.Common.Forms/InitialFailureMechanismResultErrorProvider.cs (.../InitialFailureMechanismResultErrorProvider.cs) (revision 5b91276721f50b18173bdaab2bb1af91193ac551)
+++ Riskeer/Common/src/Riskeer.Common.Forms/InitialFailureMechanismResultErrorProvider.cs (.../InitialFailureMechanismResultErrorProvider.cs) (revision d6bb75c30692cf3fdb09af9eb59b77d10fa99ed0)
@@ -46,7 +46,7 @@
///
/// The to validate for.
/// The calculation scenarios to validate.
- /// The func to determine whether a scenario is belonging
+ /// The function to determine whether a scenario is belonging
/// to the given .
/// Thrown when any parameter is null.
public InitialFailureMechanismResultErrorProvider(FailureMechanismSectionResult sectionResult,
@@ -83,7 +83,7 @@
throw new ArgumentNullException(nameof(getProbabilityFunc));
}
- T[] relevantScenarios = sectionResult.GetCalculationScenarios(calculationScenarios, intersectionFunc).ToArray();
+ T[] relevantScenarios = sectionResult.GetRelevantCalculationScenarios(calculationScenarios, intersectionFunc).ToArray();
if (relevantScenarios.Length == 0)
{
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanismSectionResultExtensionsTest.cs
===================================================================
diff -u -r9b885a240afd6b172428ddbfb16ad5b3b2924c72 -rd6bb75c30692cf3fdb09af9eb59b77d10fa99ed0
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanismSectionResultExtensionsTest.cs (.../FailureMechanismSectionResultExtensionsTest.cs) (revision 9b885a240afd6b172428ddbfb16ad5b3b2924c72)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanismSectionResultExtensionsTest.cs (.../FailureMechanismSectionResultExtensionsTest.cs) (revision d6bb75c30692cf3fdb09af9eb59b77d10fa99ed0)
@@ -33,10 +33,10 @@
public class FailureMechanismSectionResultExtensionsTest
{
[Test]
- public void GetCalculationScenarios_SectionResultNull_ThrowsArgumentNullException()
+ public void GetRelevantCalculationScenarios_SectionResultNull_ThrowsArgumentNullException()
{
// Call
- void Call() => FailureMechanismSectionResultExtensions.GetCalculationScenarios(
+ void Call() => FailureMechanismSectionResultExtensions.GetRelevantCalculationScenarios(
null, Enumerable.Empty(), (scenario, segments) => false);
// Assert
@@ -45,37 +45,37 @@
}
[Test]
- public void GetCalculationScenarios_CalculationScenariosNull_ThrowsArgumentNullException()
+ public void GetRelevantCalculationScenarios_CalculationScenariosNull_ThrowsArgumentNullException()
{
// Setup
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new TestFailureMechanismSectionResult(section);
// Call
- void Call() => sectionResult.GetCalculationScenarios(null, (scenario, segments) => false);
+ void Call() => sectionResult.GetRelevantCalculationScenarios(null, (scenario, segments) => false);
// Assert
var exception = Assert.Throws(Call);
Assert.AreEqual("calculationScenarios", exception.ParamName);
}
[Test]
- public void GetCalculationScenarios_IntersectionFuncNull_ThrowsArgumentNullException()
+ public void GetRelevantCalculationScenarios_IntersectionFuncNull_ThrowsArgumentNullException()
{
// Setup
FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
var sectionResult = new TestFailureMechanismSectionResult(section);
// Call
- void Call() => sectionResult.GetCalculationScenarios(Enumerable.Empty(), null);
+ void Call() => sectionResult.GetRelevantCalculationScenarios(Enumerable.Empty(), null);
// Assert
var exception = Assert.Throws(Call);
Assert.AreEqual("intersectionFunc", exception.ParamName);
}
[Test]
- public void GetCalculationScenarios_WithRelevantAndIrrelevantScenariosOfDifferentTypes_ReturnsRelevantCalculationScenarios()
+ public void GetRelevantCalculationScenarios_WithRelevantAndIrrelevantScenariosOfDifferentTypes_ReturnsRelevantCalculationScenarios()
{
// Setup
var mocks = new MockRepository();
@@ -104,7 +104,7 @@
var sectionResult = new TestFailureMechanismSectionResult(section);
// Call
- IEnumerable relevantScenarios = sectionResult.GetCalculationScenarios(
+ IEnumerable relevantScenarios = sectionResult.GetRelevantCalculationScenarios(
calculationScenarios, (scenario, segments) => true);
// Assert
@@ -113,7 +113,7 @@
}
[Test]
- public void GetCalculationScenarios_WithoutScenarioIntersectingSection_ReturnsNoCalculationScenarios()
+ public void GetRelevantCalculationScenarios_WithoutScenarioIntersectingSection_ReturnsNoCalculationScenarios()
{
// Setup
var mocks = new MockRepository();
@@ -142,7 +142,7 @@
var sectionResult = new TestFailureMechanismSectionResult(section);
// Call
- IEnumerable relevantScenarios = sectionResult.GetCalculationScenarios(
+ IEnumerable relevantScenarios = sectionResult.GetRelevantCalculationScenarios(
calculationScenarios, (scenario, segments) => false);
// Assert
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultCategoriesView.cs
===================================================================
diff -u -r9e123cbdd548d60db387f9a11395709ce410da62 -rd6bb75c30692cf3fdb09af9eb59b77d10fa99ed0
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultCategoriesView.cs (.../AssemblyResultCategoriesView.cs) (revision 9e123cbdd548d60db387f9a11395709ce410da62)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultCategoriesView.cs (.../AssemblyResultCategoriesView.cs) (revision d6bb75c30692cf3fdb09af9eb59b77d10fa99ed0)
@@ -45,7 +45,7 @@
/// Creates a new instance of .
///
/// The assessment section.
- /// The func to get the assembly categories from.
+ /// The function to get the assembly categories from.
/// Thrown when any parameter is null.
public AssemblyResultCategoriesView(AssessmentSection assessmentSection,
Func> getAssemblyCategoriesFunc)
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismSectionResultInitialFailureMechanismResultExtensions.cs
===================================================================
diff -u -r39b8396201f6e0ec8de7e0f9f3486f8c1b6426b9 -rd6bb75c30692cf3fdb09af9eb59b77d10fa99ed0
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismSectionResultInitialFailureMechanismResultExtensions.cs (.../PipingFailureMechanismSectionResultInitialFailureMechanismResultExtensions.cs) (revision 39b8396201f6e0ec8de7e0f9f3486f8c1b6426b9)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanismSectionResultInitialFailureMechanismResultExtensions.cs (.../PipingFailureMechanismSectionResultInitialFailureMechanismResultExtensions.cs) (revision d6bb75c30692cf3fdb09af9eb59b77d10fa99ed0)
@@ -40,7 +40,7 @@
///
/// The section result to get the initial failure mechanism result probability for.
/// All probabilistic calculation scenarios in the failure mechanism.
- /// The func to get the output from a calculation scenario.
+ /// The function to get the output from a calculation scenario.
/// The calculated initial failure mechanism result probability; or when there
/// are no relevant calculations, when not all relevant calculations are performed or when the
/// contribution of the relevant calculations don't add up to 1.
@@ -64,7 +64,7 @@
throw new ArgumentNullException(nameof(getOutputFunc));
}
- ProbabilisticPipingCalculationScenario[] relevantScenarios = sectionResult.GetCalculationScenarios(
+ ProbabilisticPipingCalculationScenario[] relevantScenarios = sectionResult.GetRelevantCalculationScenarios(
calculationScenarios,
(scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments))
.ToArray();
@@ -103,7 +103,7 @@
throw new ArgumentNullException(nameof(calculationScenarios));
}
- SemiProbabilisticPipingCalculationScenario[] relevantScenarios = sectionResult.GetCalculationScenarios(
+ SemiProbabilisticPipingCalculationScenario[] relevantScenarios = sectionResult.GetRelevantCalculationScenarios(
calculationScenarios,
(scenario, lineSegments) => scenario.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments))
.ToArray();