Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs
===================================================================
diff -u -rc0263fd00d9cc433209bbc0f4f68798bfd845bae -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs (.../AssemblyCategoriesInput.cs) (revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs (.../AssemblyCategoriesInput.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -29,17 +29,16 @@
///
/// Creates a new instance of .
///
- /// The 'N' parameter of the failure mechanism
- /// used to factor in the 'length effect'.
+ /// The 'N' parameter used to factor in the 'length effect'.
/// The contribution of a failure mechanism.
/// The signaling norm of the assessment section.
/// The lower limit norm of the assessment section.
- public AssemblyCategoriesInput(double n,
+ public AssemblyCategoriesInput(double failureMechanismN,
double failureMechanismContribution,
double signalingNorm,
double lowerLimitNorm)
{
- N = n;
+ N = failureMechanismN;
FailureMechanismContribution = failureMechanismContribution / 100;
SignalingNorm = signalingNorm;
LowerLimitNorm = lowerLimitNorm;
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r508157dfe8615caaf50d75a9dd5d5b8c86e3ee81 -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 508157dfe8615caaf50d75a9dd5d5b8c86e3ee81)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -116,10 +116,10 @@
public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
double probability,
- double n,
+ double failureMechanismSectionN,
AssemblyCategoriesInput assemblyCategoriesInput)
{
- return GetDetailedAssembly(detailedAssessmentResult, probability, n, assemblyCategoriesInput);
+ return GetDetailedAssembly(detailedAssessmentResult, probability, failureMechanismSectionN, assemblyCategoriesInput);
}
public FailureMechanismSectionAssemblyCategoryGroup AssembleDetailedAssessment(
@@ -148,6 +148,57 @@
}
}
+ private FailureMechanismSectionAssembly GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
+ double probability,
+ AssemblyCategoriesInput assemblyCategoriesInput)
+ {
+ try
+ {
+ IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
+ FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0G3(
+ new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+ new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
+ GetAssessmentResultTypeG2(detailedAssessmentResult, probability),
+ probability);
+
+ return FailureMechanismSectionAssemblyCreator.Create(output);
+ }
+ catch (Exception e)
+ {
+ throw new FailureMechanismSectionAssemblyCalculatorException(e.Message, e);
+ }
+ }
+
+ private FailureMechanismSectionAssembly GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
+ double probability,
+ double failureMechanismSectionN,
+ AssemblyCategoriesInput assemblyCategoriesInput)
+ {
+ try
+ {
+ IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
+ FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0G5(
+ new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
+ new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
+ failureMechanismSectionN,
+ GetAssessmentResultTypeG2(detailedAssessmentResult, probability),
+ probability);
+
+ return FailureMechanismSectionAssemblyCreator.Create(output);
+ }
+ catch (Exception e)
+ {
+ throw new FailureMechanismSectionAssemblyCalculatorException(e.Message, e);
+ }
+ }
+
+ private static EAssessmentResultTypeG2 GetAssessmentResultTypeG2(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability)
+ {
+ return double.IsNaN(probability) && detailedAssessmentResult == DetailedAssessmentProbabilityOnlyResultType.Probability
+ ? EAssessmentResultTypeG2.Gr
+ : FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessmentResult);
+ }
+
#endregion
#region Tailor Made Assessment
@@ -217,7 +268,7 @@
public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
double probability,
- double n,
+ double failureMechanismSectionN,
AssemblyCategoriesInput assemblyCategoriesInput)
{
try
@@ -226,7 +277,7 @@
FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0T5(
new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
- n,
+ failureMechanismSectionN,
double.IsNaN(probability) && tailorMadeAssessmentResult == TailorMadeAssessmentProbabilityCalculationResultType.Probability
? EAssessmentResultTypeT3.Gr
: FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeT3(tailorMadeAssessmentResult),
@@ -326,57 +377,21 @@
}
}
- public FailureMechanismSectionAssembly AssembleManual(double probability, AssemblyCategoriesInput assemblyCategoriesInput)
- {
- return GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType.Probability, probability, assemblyCategoriesInput);
- }
+ #endregion
- public FailureMechanismSectionAssembly AssembleManual(double probability, double n, AssemblyCategoriesInput assemblyCategoriesInput)
- {
- return GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType.Probability, probability, n, assemblyCategoriesInput);
- }
+ #region Manual Assembly
- private FailureMechanismSectionAssembly GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, AssemblyCategoriesInput assemblyCategoriesInput)
+ public FailureMechanismSectionAssembly AssembleManual(double probability,
+ AssemblyCategoriesInput assemblyCategoriesInput)
{
- try
- {
- IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
- FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0G3(
- new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
- new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
- double.IsNaN(probability) && detailedAssessmentResult == DetailedAssessmentProbabilityOnlyResultType.Probability
- ? EAssessmentResultTypeG2.Gr
- : FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessmentResult),
- probability);
-
- return FailureMechanismSectionAssemblyCreator.Create(output);
- }
- catch (Exception e)
- {
- throw new FailureMechanismSectionAssemblyCalculatorException(e.Message, e);
- }
+ return GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType.Probability, probability, assemblyCategoriesInput);
}
- private FailureMechanismSectionAssembly GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, double n, AssemblyCategoriesInput assemblyCategoriesInput)
+ public FailureMechanismSectionAssembly AssembleManual(double probability,
+ double failureMechanismSectionN,
+ AssemblyCategoriesInput assemblyCategoriesInput)
{
- try
- {
- IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
- FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0G5(
- new AssessmentSection(1, assemblyCategoriesInput.SignalingNorm, assemblyCategoriesInput.LowerLimitNorm),
- new FailureMechanism(assemblyCategoriesInput.N, assemblyCategoriesInput.FailureMechanismContribution),
- n,
- double.IsNaN(probability) && detailedAssessmentResult == DetailedAssessmentProbabilityOnlyResultType.Probability
- ? EAssessmentResultTypeG2.Gr
- : FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeG2(detailedAssessmentResult),
- probability);
-
- return FailureMechanismSectionAssemblyCreator.Create(output);
- }
- catch (Exception e)
- {
- throw new FailureMechanismSectionAssemblyCalculatorException(e.Message, e);
- }
+ return GetDetailedAssembly(DetailedAssessmentProbabilityOnlyResultType.Probability, probability, failureMechanismSectionN, assemblyCategoriesInput);
}
#endregion
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r508157dfe8615caaf50d75a9dd5d5b8c86e3ee81 -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision 508157dfe8615caaf50d75a9dd5d5b8c86e3ee81)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -62,9 +62,8 @@
/// Assembles the detailed assessment based on the input parameters.
///
/// The to assemble for.
- /// The calculated probability.
- /// The object containing the input parameters for
- /// determining the assembly categories.
+ /// The probability to calculate with.
+ /// The input parameters used to determine the assembly categories.
/// A .
/// Thrown when is
/// an invalid .
@@ -80,16 +79,15 @@
/// Assembles the detailed assessment based on the input parameters.
///
/// The to assemble for.
- /// The calculated probability.
- /// The 'N' parameter of the failure mechanism section used to factor in the 'length effect'.
- /// The object containing the input parameters for
- /// determining the assembly categories.
+ /// The probability to calculate with.
+ /// The 'N' parameter used to factor in the 'length effect'.
+ /// The input parameters used to determine the assembly categories.
/// A .
/// Thrown when
/// an error occurs when performing the assembly.
FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
double probability,
- double n,
+ double failureMechanismSectionN,
AssemblyCategoriesInput assemblyCategoriesInput);
///
@@ -130,9 +128,8 @@
///
/// The
/// to assemble for.
- /// The calculated probability.
- /// The object containing the input parameters for
- /// determining the assembly categories.
+ /// The probability to calculate with.
+ /// The input parameters used to determine the assembly categories.
/// A .
/// Thrown when
/// an error occurs when performing the assembly.
@@ -145,9 +142,8 @@
///
/// The
/// to assemble for.
- /// The calculated probability.
- /// The object containing the input parameters for
- /// determining the assembly categories.
+ /// The probability to calculate with.
+ /// The input parameters used to determine the assembly categories.
/// A .
/// Thrown when
/// an error occurs when performing the assembly.
@@ -160,16 +156,15 @@
///
/// The
/// to assemble for.
- /// The calculated probability.
- /// The 'N' parameter of the failure mechanism section used to factor in the 'length effect'.
- /// The object containing the input parameters for
- /// determining the assembly categories.
+ /// The probability to calculate with.
+ /// The 'N' parameter used to factor in the 'length effect'.
+ /// The input parameters used to determine the assembly categories.
/// A .
/// Thrown when
/// an error occurs when performing the assembly.
FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
double probability,
- double n,
+ double failureMechanismSectionN,
AssemblyCategoriesInput assemblyCategoriesInput);
///
@@ -211,9 +206,8 @@
///
/// Assembles the manual assembly based on the input parameters.
///
- /// The calculated probability.
- /// The object containing the input parameters for
- /// determining the assembly categories.
+ /// The probability to calculate with.
+ /// The input parameters used to determine the assembly categories.
/// A .
/// Thrown when
/// an error occurs when performing the assembly.
@@ -223,15 +217,14 @@
///
/// Assembles the manual assembly based on the input parameters.
///
- /// The calculated probability.
- /// The 'N' parameter of the failure mechanism section used to factor in the 'length effect'.
- /// The object containing the input parameters for
- /// determining the assembly categories.
+ /// The probability to calculate with.
+ /// The 'N' parameter used to factor in the 'length effect'.
+ /// The input parameters used to determine the assembly categories.
/// A .
/// Thrown when
/// an error occurs when performing the assembly.
FailureMechanismSectionAssembly AssembleManual(double probability,
- double n,
+ double failureMechanismSectionN,
AssemblyCategoriesInput assemblyCategoriesInput);
}
}
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r76d5e546e8087c3cd169dd2e6bb04556d88eec87 -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 76d5e546e8087c3cd169dd2e6bb04556d88eec87)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs (.../FailureMechanismSectionAssemblyCalculatorStubTest.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -44,7 +44,7 @@
Assert.AreEqual((SimpleAssessmentValidityOnlyResultType) 0, calculator.SimpleAssessmentValidityOnlyInput);
Assert.IsNull(calculator.SimpleAssessmentAssemblyOutput);
- Assert.AreEqual(0.0, calculator.DetailedAssessmentNInput);
+ Assert.AreEqual(0.0, calculator.DetailedAssessmentFailureMechanismSectionNInput);
Assert.AreEqual(0.0, calculator.DetailedAssessmentProbabilityInput);
Assert.AreEqual((DetailedAssessmentProbabilityOnlyResultType) 0, calculator.DetailedAssessmentProbabilityOnlyResultInput);
Assert.IsNull(calculator.DetailedAssessmentAssemblyOutput);
@@ -429,7 +429,7 @@
// Assert
Assert.AreEqual(detailedAssessmentResult, calculator.DetailedAssessmentProbabilityOnlyResultInput);
Assert.AreEqual(probability, calculator.DetailedAssessmentProbabilityInput);
- Assert.AreEqual(n, calculator.DetailedAssessmentNInput);
+ Assert.AreEqual(n, calculator.DetailedAssessmentFailureMechanismSectionNInput);
Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
}
@@ -843,7 +843,7 @@
// Assert
Assert.AreEqual(tailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
Assert.AreEqual(probability, calculator.TailorMadeAssessmentProbabilityInput);
- Assert.AreEqual(n, calculator.TailorMadeAssessmentNInput);
+ Assert.AreEqual(n, calculator.TailorMadeAssessmentFailureMechanismSectionNInput);
Assert.AreSame(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
}
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -r76d5e546e8087c3cd169dd2e6bb04556d88eec87 -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision 76d5e546e8087c3cd169dd2e6bb04556d88eec87)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -74,7 +74,7 @@
///
/// Gets the 'N' parameter input of the detailed assessment calculation.
///
- public double DetailedAssessmentNInput { get; private set; }
+ public double DetailedAssessmentFailureMechanismSectionNInput { get; private set; }
///
/// Gets the detailed assessment result input for cat Iv - IIv.
@@ -129,7 +129,7 @@
///
/// Gets the 'N' parameter input of the tailor made assessment calculation.
///
- public double TailorMadeAssessmentNInput { get; private set; }
+ public double TailorMadeAssessmentFailureMechanismSectionNInput { get; private set; }
///
/// Gets the category group input of the tailor made assessment calculation.
@@ -273,7 +273,7 @@
public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult,
double probability,
- double n,
+ double failureMechanismSectionN,
AssemblyCategoriesInput assemblyCategoriesInput)
{
if (ThrowExceptionOnCalculate)
@@ -284,7 +284,7 @@
DetailedAssessmentProbabilityOnlyResultInput = detailedAssessmentResult;
DetailedAssessmentProbabilityInput = probability;
AssemblyCategoriesInput = assemblyCategoriesInput;
- DetailedAssessmentNInput = n;
+ DetailedAssessmentFailureMechanismSectionNInput = failureMechanismSectionN;
return DetailedAssessmentAssemblyOutput ??
(DetailedAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(0, FailureMechanismSectionAssemblyCategoryGroup.VIv));
@@ -369,7 +369,7 @@
public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult,
double probability,
- double n,
+ double failureMechanismSectionN,
AssemblyCategoriesInput assemblyCategoriesInput)
{
if (ThrowExceptionOnCalculate)
@@ -380,7 +380,7 @@
TailorMadeAssessmentProbabilityCalculationResultInput = tailorMadeAssessmentResult;
TailorMadeAssessmentProbabilityInput = probability;
AssemblyCategoriesInput = assemblyCategoriesInput;
- TailorMadeAssessmentNInput = n;
+ TailorMadeAssessmentFailureMechanismSectionNInput = failureMechanismSectionN;
return TailorMadeAssessmentAssemblyOutput ??
(TailorMadeAssessmentAssemblyOutput = new FailureMechanismSectionAssembly(1, FailureMechanismSectionAssemblyCategoryGroup.VIv));
@@ -454,7 +454,7 @@
(ManualAssemblyAssemblyOutput = new FailureMechanismSectionAssembly(0, FailureMechanismSectionAssemblyCategoryGroup.IIv));
}
- public FailureMechanismSectionAssembly AssembleManual(double probability, double n, AssemblyCategoriesInput assemblyCategoriesInput)
+ public FailureMechanismSectionAssembly AssembleManual(double probability, double failureMechanismSectionN, AssemblyCategoriesInput assemblyCategoriesInput)
{
if (ThrowExceptionOnCalculate)
{
@@ -463,7 +463,7 @@
ManualAssemblyProbabilityInput = probability;
AssemblyCategoriesInput = assemblyCategoriesInput;
- ManualAssemblyNInput = n;
+ ManualAssemblyNInput = failureMechanismSectionN;
return ManualAssemblyAssemblyOutput ??
(ManualAssemblyAssemblyOutput = new FailureMechanismSectionAssembly(1.0, FailureMechanismSectionAssemblyCategoryGroup.VIIv));
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs (.../ClosingStructuresFailureMechanismAssemblyFactory.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismAssemblyFactory.cs (.../ClosingStructuresFailureMechanismAssemblyFactory.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -265,7 +265,7 @@
///
/// The failure mechanism to assemble for.
/// The the failure mechanism belongs to.
- /// The object containing the input parameters for determining the assembly categories.
+ /// The input parameters used to determine the assembly categories.
/// Thrown when a
/// could not be created.
/// A collection of all section assembly results.
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs (.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -267,7 +267,7 @@
///
/// The failure mechanism to assemble for.
/// The the failure mechanism belongs to.
- /// The object containing the input parameters for determining the assembly categories.
+ /// The input parameters used to determine the assembly categories.
/// Thrown when a
/// could not be created.
/// A collection of all section assembly results.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs (.../HeightStructuresFailureMechanismAssemblyFactory.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs (.../HeightStructuresFailureMechanismAssemblyFactory.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -267,7 +267,7 @@
///
/// The failure mechanism to assemble for.
/// The the failure mechanism belongs to.
- /// The object containing the input parameters for determining the assembly categories.
+ /// The input parameters used to determine the assembly categories.
/// Thrown when a
/// could not be created.
/// A collection of all section assembly results.
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -285,7 +285,7 @@
///
/// The failure mechanism to assemble for.
/// The the failure mechanism belongs to.
- /// The object containing the input parameters for determining the assembly categories.
+ /// The input parameters used to determine the assembly categories.
/// Thrown when a
/// could not be created.
/// A collection of all section assembly results.
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -260,7 +260,7 @@
assessmentSection),
calculator.DetailedAssessmentProbabilityInput);
Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(sectionResult.Section.Length),
- calculator.DetailedAssessmentNInput);
+ calculator.DetailedAssessmentFailureMechanismSectionNInput);
AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput);
}
}
@@ -426,7 +426,7 @@
Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput);
Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
Assert.AreEqual(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(sectionResult.Section.Length),
- calculator.TailorMadeAssessmentNInput);
+ calculator.TailorMadeAssessmentFailureMechanismSectionNInput);
AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput);
mocks.VerifyAll();
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs (.../PipingFailureMechanismAssemblyFactory.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs (.../PipingFailureMechanismAssemblyFactory.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -285,7 +285,7 @@
///
/// The failure mechanism to assemble for.
/// The the failure mechanism belongs to.
- /// The object containing the input parameters for determining the assembly categories.
+ /// The input parameters used to determine the assembly categories.
/// Thrown when a
/// could not be created.
/// A collection of all section assembly results.
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -259,7 +259,7 @@
assessmentSection),
calculator.DetailedAssessmentProbabilityInput);
Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetN(sectionResult.Section.Length),
- calculator.DetailedAssessmentNInput);
+ calculator.DetailedAssessmentFailureMechanismSectionNInput);
AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput);
}
}
@@ -427,7 +427,7 @@
Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput);
Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityCalculationResultInput);
Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.GetN(sectionResult.Section.Length),
- calculator.TailorMadeAssessmentNInput);
+ calculator.TailorMadeAssessmentFailureMechanismSectionNInput);
AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput);
mocks.VerifyAll();
}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r618b76f6429ba110aae26879a227af8f4f3762f0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs) (revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs (.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0)
@@ -265,7 +265,7 @@
///
/// The failure mechanism to assemble for.
/// The the failure mechanism belongs to.
- /// The object containing the input parameters for determining the assembly categories.
+ /// The input parameters used to determine the assembly categories.
/// Thrown when a
/// could not be created.
/// A collection of all section assembly results.