Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismSectionProbabilityAssessmentRow.cs
===================================================================
diff -u -r07fad131acfb09fc9736d890ab76f0e2e542c84e -r828558d9bcb3134b16a9acee46e4cba9d94ae893
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismSectionProbabilityAssessmentRow.cs (.../FailureMechanismSectionProbabilityAssessmentRow.cs) (revision 07fad131acfb09fc9736d890ab76f0e2e542c84e)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismSectionProbabilityAssessmentRow.cs (.../FailureMechanismSectionProbabilityAssessmentRow.cs) (revision 828558d9bcb3134b16a9acee46e4cba9d94ae893)
@@ -31,6 +31,9 @@
///
public class FailureMechanismSectionProbabilityAssessmentRow : FailureMechanismSectionRow
{
+ private readonly FailureMechanismSection section;
+ private readonly ProbabilityAssessmentInput probabilityAssessmentInput;
+
///
/// Creates a new instance of .
///
@@ -46,13 +49,20 @@
throw new ArgumentNullException(nameof(probabilityAssessmentInput));
}
- N = new RoundedDouble(2, probabilityAssessmentInput.GetN(section.Length));
+ this.section = section;
+ this.probabilityAssessmentInput = probabilityAssessmentInput;
}
///
/// Gets the N of the section.
/// [-]
///
- public RoundedDouble N { get; }
+ public RoundedDouble N
+ {
+ get
+ {
+ return new RoundedDouble(2, probabilityAssessmentInput.GetN(section.Length));
+ }
+ }
}
}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsProbabilityAssessmentViewTest.cs
===================================================================
diff -u -rfdfadac14aca46b2ffde145e6532ee7bb18d2507 -r828558d9bcb3134b16a9acee46e4cba9d94ae893
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsProbabilityAssessmentViewTest.cs (.../FailureMechanismSectionsProbabilityAssessmentViewTest.cs) (revision fdfadac14aca46b2ffde145e6532ee7bb18d2507)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismSectionsProbabilityAssessmentViewTest.cs (.../FailureMechanismSectionsProbabilityAssessmentViewTest.cs) (revision 828558d9bcb3134b16a9acee46e4cba9d94ae893)
@@ -153,9 +153,9 @@
var sections = new[]
{
- CreateFailureMechanismSection("a"),
- CreateFailureMechanismSection("b"),
- CreateFailureMechanismSection("c")
+ CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0),
+ CreateFailureMechanismSection("b", 1.0, 1.0, 2.0, 2.0),
+ CreateFailureMechanismSection("c", 2.0, 2.0, 3.0, 3.0)
};
ProbabilityAssessmentInput probabilityAssessmentInput = CreateProbabilityAssessmentInput();
@@ -179,7 +179,7 @@
{
// Given
var failureMechanism = new TestFailureMechanism();
- failureMechanism.AddSection(CreateFailureMechanismSection("a"));
+ failureMechanism.AddSection(CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0));
ProbabilityAssessmentInput probabilityAssessmentInput = CreateProbabilityAssessmentInput();
@@ -193,7 +193,7 @@
AssertSectionsDataGridViewControl(failureMechanism.Sections.ToArray(), probabilityAssessmentInput, sectionsDataGridViewControl);
// When
- failureMechanism.AddSection(CreateFailureMechanismSection("b"));
+ failureMechanism.AddSection(CreateFailureMechanismSection("a", 1.0, 1.0, 2.0, 2.0));
failureMechanism.NotifyObservers();
// Then
@@ -206,7 +206,7 @@
{
// Given
var failureMechanism = new TestFailureMechanism();
- failureMechanism.AddSection(CreateFailureMechanismSection("a"));
+ failureMechanism.AddSection(CreateFailureMechanismSection("a", 0.0, 0.0, 1.0, 1.0));
ProbabilityAssessmentInput probabilityAssessmentInput = CreateProbabilityAssessmentInput();
@@ -228,13 +228,12 @@
}
}
- private static FailureMechanismSection CreateFailureMechanismSection(string name)
+ private static FailureMechanismSection CreateFailureMechanismSection(string name, double x1, double y1, double x2, double y2)
{
- var random = new Random(39);
-
return new FailureMechanismSection(name, new[]
{
- new Point2D(random.NextDouble(), random.NextDouble())
+ new Point2D(x1, y1),
+ new Point2D(x2, y2)
});
}