Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf829a22044dcee5fbd56296c248c051193564a54 -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f829a22044dcee5fbd56296c248c051193564a54)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
@@ -1850,6 +1850,55 @@
}
///
+ /// Looks up a localized string similar to De waarde voor de faalkans ontbreekt..
+ ///
+ public static string FailureMechanismSectionResultRowErrorProvider_Probability_must_not_be_NaN {
+ get {
+ return ResourceManager.GetString("FailureMechanismSectionResultRowErrorProvider_Probability_must_not_be_NaN", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten een geldige uitkomst hebben..
+ ///
+ public static string FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_All_relevant_calculation_scenarios_must_have_valid_output {
+ get {
+ return ResourceManager.GetString("FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_All_releva" +
+ "nt_calculation_scenarios_must_have_valid_output", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Er moet minimaal één maatgevende berekening voor dit vak worden gedefinieerd..
+ ///
+ public static string FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_No_relevant_calculation_scenarios_present {
+ get {
+ return ResourceManager.GetString("FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_No_relevan" +
+ "t_calculation_scenarios_present", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten uitgevoerd zijn..
+ ///
+ public static string FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_Not_all_relevant_calculation_scenarios_have_been_executed {
+ get {
+ return ResourceManager.GetString("FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_Not_all_re" +
+ "levant_calculation_scenarios_have_been_executed", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to De bijdragen van de maatgevende scenario's voor dit vak moeten opgeteld gelijk zijn aan 100%..
+ ///
+ public static string FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_Scenario_contribution_for_this_section_not_100 {
+ get {
+ return ResourceManager.GetString("FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_Scenario_c" +
+ "ontribution_for_this_section_not_100", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Vakindeling waarmee de waterkering voor dit toetsspoor is geschematiseerd ten behoeve van de beoordeling..
///
public static string FailureMechanismSections_Description {
@@ -2517,46 +2566,6 @@
}
///
- /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten een geldige uitkomst hebben..
- ///
- public static string InitialFailureMechanismResultErrorProvider_All_relevant_calculation_scenarios_must_have_valid_output {
- get {
- return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_All_relevant_calculation_scenarios_mus" +
- "t_have_valid_output", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Er moet minimaal één maatgevende berekening voor dit vak worden gedefinieerd..
- ///
- public static string InitialFailureMechanismResultErrorProvider_No_relevant_calculation_scenarios_present {
- get {
- return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_No_relevant_calculation_scenarios_pres" +
- "ent", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Alle maatgevende berekeningen voor dit vak moeten uitgevoerd zijn..
- ///
- public static string InitialFailureMechanismResultErrorProvider_Not_all_relevant_calculation_scenarios_have_been_executed {
- get {
- return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_Not_all_relevant_calculation_scenarios" +
- "_have_been_executed", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to De bijdragen van de maatgevende scenario's voor dit vak moeten opgeteld gelijk zijn aan 100%..
- ///
- public static string InitialFailureMechanismResultErrorProvider_Scenario_contribution_for_this_section_not_100 {
- get {
- return ResourceManager.GetString("InitialFailureMechanismResultErrorProvider_Scenario_contribution_for_this_section" +
- "_not_100", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap InputFolderIcon {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rf829a22044dcee5fbd56296c248c051193564a54 -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision f829a22044dcee5fbd56296c248c051193564a54)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
@@ -272,15 +272,15 @@
PublicKeyToken=b03f5f7f11d50a3a
-
De bijdragen van de maatgevende scenario's voor dit vak moeten opgeteld gelijk zijn aan 100%.
-
Alle maatgevende berekeningen voor dit vak moeten uitgevoerd zijn.
-
Alle maatgevende berekeningen voor dit vak moeten een geldige uitkomst hebben.
@@ -852,7 +852,7 @@
Dijkprofielen
-
Er moet minimaal één maatgevende berekening voor dit vak worden gedefinieerd.
@@ -1640,4 +1640,7 @@
De waarde voor de faalkans ontbreekt.
+
+ De waarde voor de faalkans ontbreekt.
+
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowErrorProvider.cs
===================================================================
diff -u -r9832fc5218794de3fc633aa59c6420792e4a41a6 -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993
--- Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowErrorProvider.cs (.../FailureMechanismSectionResultRowErrorProvider.cs) (revision 9832fc5218794de3fc633aa59c6420792e4a41a6)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowErrorProvider.cs (.../FailureMechanismSectionResultRowErrorProvider.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
@@ -19,6 +19,8 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
+using Riskeer.Common.Forms.Properties;
+
namespace Riskeer.Common.Forms.Providers
{
///
@@ -28,7 +30,7 @@
{
public string GetManualProbabilityValidationError(double probability)
{
- return double.IsNaN(probability) ? "De waarde voor de faalkans ontbreekt." : string.Empty;
+ return double.IsNaN(probability) ? Resources.FailureMechanismSectionResultRowErrorProvider_Probability_must_not_be_NaN : string.Empty;
}
}
}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs
===================================================================
diff -u -re55b0df15fe406aed1091a906aa7d9d4c5f2ae34 -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993
--- Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs (.../FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs) (revision e55b0df15fe406aed1091a906aa7d9d4c5f2ae34)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs (.../FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
@@ -88,22 +88,22 @@
if (relevantScenarios.Length == 0)
{
- return Resources.InitialFailureMechanismResultErrorProvider_No_relevant_calculation_scenarios_present;
+ return Resources.FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_No_relevant_calculation_scenarios_present;
}
if (Math.Abs(CalculationScenarioHelper.GetTotalContribution(relevantScenarios) - 1.0) > 1e-6)
{
- return Resources.InitialFailureMechanismResultErrorProvider_Scenario_contribution_for_this_section_not_100;
+ return Resources.FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_Scenario_contribution_for_this_section_not_100;
}
if (!relevantScenarios.All(s => s.HasOutput))
{
- return Resources.InitialFailureMechanismResultErrorProvider_Not_all_relevant_calculation_scenarios_have_been_executed;
+ return Resources.FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_Not_all_relevant_calculation_scenarios_have_been_executed;
}
if (double.IsNaN(getProbabilityFunc()))
{
- return Resources.InitialFailureMechanismResultErrorProvider_All_relevant_calculation_scenarios_must_have_valid_output;
+ return Resources.FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider_All_relevant_calculation_scenarios_must_have_valid_output;
}
return string.Empty;
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs
===================================================================
diff -u -rfcc76bf13fe9e45c556267b212d90c7499a1eb96 -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs (.../NonAdoptableFailureMechanismResultView.cs) (revision fcc76bf13fe9e45c556267b212d90c7499a1eb96)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableFailureMechanismResultView.cs (.../NonAdoptableFailureMechanismResultView.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
@@ -79,7 +79,8 @@
return new NonAdoptableFailureMechanismSectionResultRow(
sectionResult,
CreateErrorProvider(),
- assessmentSection, new NonAdoptableFailureMechanismSectionResultRow.ConstructionProperties
+ assessmentSection,
+ new NonAdoptableFailureMechanismSectionResultRow.ConstructionProperties
{
InitialFailureMechanismResultTypeIndex = initialFailureMechanismResultTypeIndex,
InitialFailureMechanismResultSectionProbabilityIndex = initialFailureMechanismResultSectionProbabilityIndex,
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs
===================================================================
diff -u -rbeb53090653c24721fa1d9c3cd066a08efa06415 -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs) (revision beb53090653c24721fa1d9c3cd066a08efa06415)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismResultView.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
@@ -99,7 +99,8 @@
sectionResult,
CreateErrorProvider(),
CreateLengthEffectProvider(),
- assessmentSection, new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRow.ConstructionProperties
+ assessmentSection,
+ new NonAdoptableWithProfileProbabilityFailureMechanismSectionResultRow.ConstructionProperties
{
InitialFailureMechanismResultTypeIndex = initialFailureMechanismResultTypeIndex,
InitialFailureMechanismResultProfileProbabilityIndex = initialFailureMechanismResultProfileProbabilityIndex,
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re8a590f71b19fb8495d2ec5d007058fbb04484df -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs) (revision e8a590f71b19fb8495d2ec5d007058fbb04484df)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismSectionResults/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntityReadExtensionsTest.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993)
@@ -67,10 +67,10 @@
bool isRelevant = random.NextBoolean();
var initialFailureMechanismResultType = random.NextEnumValue();
double manualProfileProbability = random.NextDouble();
- double manualSectionProbability = manualProfileProbability + 0.1;
+ double manualSectionProbability = manualProfileProbability + 1e-3;
var furtherAnalysisType = random.NextEnumValue();
double refinedProfileProbability = random.NextDouble();
- double refinedSectionProbability = refinedProfileProbability + 0.1;
+ double refinedSectionProbability = refinedProfileProbability + 1e-3;
var entity = new StabilityStoneCoverSectionResultEntity
{