Index: Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -ree120d063723b2694988f2670db940d1f89e38a2 --- Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/src/Riskeer.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision ee120d063723b2694988f2670db940d1f89e38a2) @@ -48,7 +48,7 @@ /// public sealed class AssessmentSection : Observable, IAssessmentSection { - private const double defaultNorm = 1.0 / 30000; + private const double defaultFloodingProbability = 1.0 / 30000; private const RiskeerWellKnownTileSource defaultWellKnownTileSource = RiskeerWellKnownTileSource.BingAerial; private readonly ObservableList waterLevelCalculationsForSignalingNorm = new ObservableList(); @@ -59,22 +59,22 @@ /// /// The composition of the assessment section, e.g. what /// type of elements can be found within the assessment section. - /// The lower limit norm of the assessment section. - /// The signaling norm of the assessment section. + /// The maximum allowable flooding probability of the assessment section. + /// The signal flooding probability of the assessment section. /// Thrown when: /// - /// is not in the interval [0.000001, 0.1] or is ; - /// is not in the interval [0.000001, 0.1] or is ; - /// The is larger than . + /// is not in the interval [0.000001, 0.1] or is ; + /// is not in the interval [0.000001, 0.1] or is ; + /// The is larger than . /// /// /// Thrown when /// is not a valid enum value of . /// Thrown when /// is not supported. public AssessmentSection(AssessmentSectionComposition composition, - double lowerLimitNorm = defaultNorm, - double signalingNorm = defaultNorm) + double maximumAllowableFloodingProbability = defaultFloodingProbability, + double signalFloodingProbability = defaultFloodingProbability) { Name = Resources.AssessmentSection_DisplayName; Comments = new Comment(); @@ -108,7 +108,7 @@ PipingStructure = new PipingStructureFailureMechanism(); DuneErosion = new DuneErosionFailureMechanism(); - FailureMechanismContribution = new FailureMechanismContribution(lowerLimitNorm, signalingNorm); + FailureMechanismContribution = new FailureMechanismContribution(maximumAllowableFloodingProbability, signalFloodingProbability); ChangeComposition(composition); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs =================================================================== diff -u -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 -ree120d063723b2694988f2670db940d1f89e38a2 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Dialogs/ReferenceLineMetaSelectionDialog.cs (.../ReferenceLineMetaSelectionDialog.cs) (revision ee120d063723b2694988f2670db940d1f89e38a2) @@ -111,16 +111,16 @@ ? NormativeProbabilityType.SignalFloodingProbability : NormativeProbabilityType.MaximumAllowableFloodingProbability; - double lowerLimitNormValue = GetNormValue(referenceLineMetaSelectionRow.MaximumAllowableFloodingProbabilityReturnPeriod); + double maximumAllowableFloodingProbability = GetFloodingProbability(referenceLineMetaSelectionRow.MaximumAllowableFloodingProbabilityReturnPeriod); - SelectedMaximumAllowableFloodingProbability = lowerLimitNormValue; + SelectedMaximumAllowableFloodingProbability = maximumAllowableFloodingProbability; SelectedSignalFloodingProbability = referenceLineMetaSelectionRow.SignalFloodingProbabilityReturnPeriod.HasValue - ? GetNormValue(referenceLineMetaSelectionRow.SignalFloodingProbabilityReturnPeriod.Value) - : lowerLimitNormValue; + ? GetFloodingProbability(referenceLineMetaSelectionRow.SignalFloodingProbabilityReturnPeriod.Value) + : maximumAllowableFloodingProbability; } } - private static double GetNormValue(int returnPeriod) + private static double GetFloodingProbability(int returnPeriod) { return 1.0 / returnPeriod; } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs =================================================================== diff -u -r19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d -ree120d063723b2694988f2670db940d1f89e38a2 --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 19e6d4ac96b28f25e8f2a5c0f164118dd0a05c0d) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision ee120d063723b2694988f2670db940d1f89e38a2) @@ -117,20 +117,20 @@ } [Test] - [TestCaseSource(nameof(GetInvalidNormValues), + [TestCaseSource(nameof(GetInvalidProbabilities), new object[] { - "Constructor_InvalidLowerLimitNorm_ThrowsArgumentOutOfRangeException" + "Constructor_InvalidMaximumAllowableFloodingProbability_ThrowsArgumentOutOfRangeException" })] [SetCulture("nl-NL")] - public void Constructor_InvalidLowerLimitNorm_ThrowsArgumentOutOfRangeException(double invalidNorm) + public void Constructor_InvalidMaximumAllowableFloodingProbability_ThrowsArgumentOutOfRangeException(double invalidProbability) { // Setup var random = new Random(21); var composition = random.NextEnumValue(); // Call - void Call() => new AssessmentSection(composition, invalidNorm, 0.000001); + void Call() => new AssessmentSection(composition, invalidProbability, 0.000001); // Assert const string expectedMessage = "De waarde van de norm moet in het bereik [0,000001, 0,1] liggen."; @@ -139,20 +139,20 @@ } [Test] - [TestCaseSource(nameof(GetInvalidNormValues), + [TestCaseSource(nameof(GetInvalidProbabilities), new object[] { - "Constructor_InvalidSignalingNorm_ThrowsArgumentOutOfRangeException" + "Constructor_InvalidSignalFloodingProbability_ThrowsArgumentOutOfRangeException" })] [SetCulture("nl-NL")] - public void Constructor_InvalidSignalingNorm_ThrowsArgumentOutOfRangeException(double invalidNorm) + public void Constructor_InvalidSignalFloodingProbability_ThrowsArgumentOutOfRangeException(double invalidProbability) { // Setup var random = new Random(21); var composition = random.NextEnumValue(); // Call - void Call() => new AssessmentSection(composition, 0.1, invalidNorm); + void Call() => new AssessmentSection(composition, 0.1, invalidProbability); // Assert const string expectedMessage = "De waarde van de norm moet in het bereik [0,000001, 0,1] liggen."; @@ -177,36 +177,6 @@ } [Test] - public void Name_SetingNewValue_GetNewValue() - { - // Setup - var random = new Random(21); - var assessmentSection = new AssessmentSection(random.NextEnumValue()); - const string newValue = "new value"; - - // Call - assessmentSection.Name = newValue; - - // Assert - Assert.AreEqual(newValue, assessmentSection.Name); - } - - [Test] - public void Comments_SettingNewValue_GetNewValue() - { - // Setup - var random = new Random(21); - var assessmentSection = new AssessmentSection(random.NextEnumValue()); - const string newValue = "new comment value"; - - // Call - assessmentSection.Comments.Body = newValue; - - // Assert - Assert.AreEqual(newValue, assessmentSection.Comments.Body); - } - - [Test] [TestCase(AssessmentSectionComposition.Dike)] [TestCase(AssessmentSectionComposition.Dune)] [TestCase(AssessmentSectionComposition.DikeAndDune)] @@ -412,7 +382,7 @@ }); } - private static IEnumerable GetInvalidNormValues(string name) + private static IEnumerable GetInvalidProbabilities(string name) { yield return new TestCaseData(double.PositiveInfinity) .SetName($"{name} positive infinity");