Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs
===================================================================
diff -u -r3504be0f64dfd5594e2347fdba6899bc2f0754f1 -r88e9859a054c294d2c441c91d6cd23e435d6cf6d
--- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs) (revision 3504be0f64dfd5594e2347fdba6899bc2f0754f1)
+++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs) (revision 88e9859a054c294d2c441c91d6cd23e435d6cf6d)
@@ -52,7 +52,7 @@
get => manualInitialFailureMechanismResultProfileProbability;
set
{
- ValidateInitialProfileProbability(value);
+ ValidateFailureProbability(value);
manualInitialFailureMechanismResultProfileProbability = value;
}
}
@@ -70,45 +70,9 @@
get => refinedProfileProbability;
set
{
- ValidateRefinedProfileProbability(value);
+ ValidateFailureProbability(value);
refinedProfileProbability = value;
}
}
-
- private void ValidateInitialProfileProbability(double value)
- {
- ValidateFailureProbability(value);
- ValidateProbabilities(value, ManualInitialFailureMechanismResultSectionProbability,
- RiskeerCommonDataResources.WithProfileProbabilityFailureMechanismSectionResult_ManualInitialFailureMechanismResultSectionProbability_must_be_greater_than_ManualInitialFailureMechanismResultProfileProbability);
- }
-
- protected override void ValidateInitialSectionProbability(double value)
- {
- base.ValidateInitialSectionProbability(value);
- ValidateProbabilities(ManualInitialFailureMechanismResultProfileProbability, value,
- RiskeerCommonDataResources.WithProfileProbabilityFailureMechanismSectionResult_ManualInitialFailureMechanismResultSectionProbability_must_be_greater_than_ManualInitialFailureMechanismResultProfileProbability);
- }
-
- private void ValidateRefinedProfileProbability(double value)
- {
- ValidateFailureProbability(value);
- ValidateProbabilities(value, RefinedSectionProbability,
- RiskeerCommonDataResources.WithProfileProbabilityFailureMechanismSectionResult_RefinedSectionProbability_must_be_greater_than_RefinedProfileProbability);
- }
-
- protected override void ValidateRefinedSectionProbability(double value)
- {
- base.ValidateRefinedSectionProbability(value);
- ValidateProbabilities(RefinedProfileProbability, value,
- RiskeerCommonDataResources.WithProfileProbabilityFailureMechanismSectionResult_RefinedSectionProbability_must_be_greater_than_RefinedProfileProbability);
- }
-
- private static void ValidateProbabilities(double profileProbability, double sectionProbability, string errorMessage)
- {
- if (profileProbability > sectionProbability)
- {
- throw new ArgumentOutOfRangeException(null, errorMessage);
- }
- }
}
}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r9e10166c6ca470d10982c3a35496a845080e5f09 -r88e9859a054c294d2c441c91d6cd23e435d6cf6d
--- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9e10166c6ca470d10982c3a35496a845080e5f09)
+++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 88e9859a054c294d2c441c91d6cd23e435d6cf6d)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
//
// This file is part of Riskeer.
//
@@ -980,26 +980,5 @@
"ue_items", resourceCulture);
}
}
-
- ///
- /// Looks up a localized string similar to De faalkans van het initiële mechanisme per doorsnede moet kleiner of gelijk zijn aan de faalkans van het initiële mechanisme per vak..
- ///
- public static string WithProfileProbabilityFailureMechanismSectionResult_ManualInitialFailureMechanismResultSectionProbability_must_be_greater_than_ManualInitialFailureMechanismResultProfileProbability {
- get {
- return ResourceManager.GetString("WithProfileProbabilityFailureMechanismSectionResult_ManualInitialFailureMechanism" +
- "ResultSectionProbability_must_be_greater_than_ManualInitialFailureMechanismResul" +
- "tProfileProbability", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to De aangescherpte faalkans per doorsnede moet kleiner of gelijk zijn aan de aangescherpte faalkans per vak..
- ///
- public static string WithProfileProbabilityFailureMechanismSectionResult_RefinedSectionProbability_must_be_greater_than_RefinedProfileProbability {
- get {
- return ResourceManager.GetString("WithProfileProbabilityFailureMechanismSectionResult_RefinedSectionProbability_mus" +
- "t_be_greater_than_RefinedProfileProbability", resourceCulture);
- }
- }
}
}
Index: Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx
===================================================================
diff -u -r9e10166c6ca470d10982c3a35496a845080e5f09 -r88e9859a054c294d2c441c91d6cd23e435d6cf6d
--- Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 9e10166c6ca470d10982c3a35496a845080e5f09)
+++ Riskeer/Common/src/Riskeer.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 88e9859a054c294d2c441c91d6cd23e435d6cf6d)
@@ -414,12 +414,4 @@
Handmatig invullen
-
- De faalkans van het initiële mechanisme per doorsnede moet kleiner of gelijk zijn aan de faalkans van het initiële mechanisme per vak.
-
-
- De aangescherpte faalkans per doorsnede moet kleiner of gelijk zijn aan de aangescherpte faalkans per vak.
-
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultTest.cs
===================================================================
diff -u -r3504be0f64dfd5594e2347fdba6899bc2f0754f1 -r88e9859a054c294d2c441c91d6cd23e435d6cf6d
--- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultTest.cs) (revision 3504be0f64dfd5594e2347fdba6899bc2f0754f1)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultTest.cs) (revision 88e9859a054c294d2c441c91d6cd23e435d6cf6d)
@@ -66,92 +66,12 @@
}
[Test]
- [TestCase(0.2)]
- [TestCase(0.1 + 1e-5)]
- public void GivenValidSectionResult_WhenSettingInitialProfileProbabilityGreaterThanSectionProbability_ThenArgumentOutOfRangeExceptionThrown(double invalidProbability)
- {
- // Given
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)
- {
- ManualInitialFailureMechanismResultSectionProbability = 0.1
- };
-
- // When
- void Call() => result.ManualInitialFailureMechanismResultProfileProbability = invalidProbability;
-
- // Then
- const string message = "De faalkans van het initiële mechanisme per doorsnede moet kleiner of gelijk zijn aan de faalkans van het initiële mechanisme per vak.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message);
- }
-
- [Test]
- [SetCulture("nl-NL")]
- [TestCase(-20)]
- [TestCase(-1e-6)]
- [TestCase(1 + 1e-6)]
- [TestCase(12)]
- public void ManualInitialFailureMechanismResultSectionProbability_InvalidValue_ThrowsArgumentOutOfRangeException(double newValue)
- {
- // Setup
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section);
-
- // Call
- void Call() => result.ManualInitialFailureMechanismResultSectionProbability = newValue;
-
- // Assert
- const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message);
- }
-
- [Test]
[TestCase(0)]
[TestCase(1e-6)]
[TestCase(0.5)]
[TestCase(1 - 1e-6)]
[TestCase(1)]
[TestCase(double.NaN)]
- public void ManualInitialFailureMechanismResultSectionProbability_ValidValue_NewValueSet(double newValue)
- {
- // Setup
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section);
-
- // Call
- result.ManualInitialFailureMechanismResultSectionProbability = newValue;
-
- // Assert
- Assert.AreEqual(newValue, result.ManualInitialFailureMechanismResultSectionProbability);
- }
-
- [Test]
- [TestCase(0.2)]
- [TestCase(0.3 - 1e-5)]
- public void GivenValidSectionResult_WhenSettingInitialSectionProbabilitySmallerThanProfileProbability_ThenArgumentOutOfRangeExceptionThrown(double invalidProbability)
- {
- // Given
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)
- {
- ManualInitialFailureMechanismResultProfileProbability = 0.3
- };
-
- // When
- void Call() => result.ManualInitialFailureMechanismResultSectionProbability = invalidProbability;
-
- // Then
- const string message = "De faalkans van het initiële mechanisme per doorsnede moet kleiner of gelijk zijn aan de faalkans van het initiële mechanisme per vak.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message);
- }
-
- [Test]
- [TestCase(0)]
- [TestCase(1e-6)]
- [TestCase(0.5)]
- [TestCase(1 - 1e-6)]
- [TestCase(1)]
- [TestCase(double.NaN)]
public void ManualInitialFailureMechanismResultProfileProbability_ValidValue_NewValueSet(double newValue)
{
// Setup
@@ -186,92 +106,12 @@
}
[Test]
- [SetCulture("nl-NL")]
- [TestCase(-20)]
- [TestCase(-1e-6)]
- [TestCase(1 + 1e-6)]
- [TestCase(12)]
- public void RefinedSectionProbability_InvalidValue_ThrowsArgumentOutOfRangeException(double newValue)
- {
- // Setup
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section);
-
- // Call
- void Call() => result.RefinedSectionProbability = newValue;
-
- // Assert
- const string message = "De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message);
- }
-
- [Test]
[TestCase(0)]
[TestCase(1e-6)]
[TestCase(0.5)]
[TestCase(1 - 1e-6)]
[TestCase(1)]
[TestCase(double.NaN)]
- public void RefinedSectionProbability_ValidValue_NewValueSet(double newValue)
- {
- // Setup
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section);
-
- // Call
- result.RefinedSectionProbability = newValue;
-
- // Assert
- Assert.AreEqual(newValue, result.RefinedSectionProbability);
- }
-
- [Test]
- [TestCase(0.2)]
- [TestCase(0.1 + 1e-5)]
- public void GivenValidSectionResult_WhenSettingRefinedProfileProbabilityGreaterThanSectionProbability_ThenArgumentOutOfRangeExceptionThrown(double invalidProbability)
- {
- // Given
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)
- {
- RefinedSectionProbability = 0.1
- };
-
- // When
- void Call() => result.RefinedProfileProbability = invalidProbability;
-
- // Then
- const string message = "De aangescherpte faalkans per doorsnede moet kleiner of gelijk zijn aan de aangescherpte faalkans per vak.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message);
- }
-
- [Test]
- [TestCase(0.2)]
- [TestCase(0.3 - 1e-5)]
- public void GivenValidSectionResult_WhenSettingRefinedSectionProbabilitySmallerThanProfileProbability_ThenArgumentOutOfRangeExceptionThrown(double invalidProbability)
- {
- // Given
- FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
- var result = new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(section)
- {
- RefinedProfileProbability = 0.3
- };
-
- // When
- void Call() => result.RefinedSectionProbability = invalidProbability;
-
- // Then
- const string message = "De aangescherpte faalkans per doorsnede moet kleiner of gelijk zijn aan de aangescherpte faalkans per vak.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(Call, message);
- }
-
- [Test]
- [TestCase(0)]
- [TestCase(1e-6)]
- [TestCase(0.5)]
- [TestCase(1 - 1e-6)]
- [TestCase(1)]
- [TestCase(double.NaN)]
public void RefinedProfileProbability_ValidValue_NewValueSet(double newValue)
{
// Setup