Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs =================================================================== diff -u -ra3d814e04e773ba9f672e0237419e090a02ddd9f -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a3d814e04e773ba9f672e0237419e090a02ddd9f) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -280,7 +280,7 @@ } /// - /// Looks up a localized string similar to De faalkans per vak moet groter zijn dan of gelijk zijn aan de faalkans per doorsnede. + /// Looks up a localized string similar to De faalkans per vak moet groter zijn dan of gelijk zijn aan de faalkans per doorsnede.. /// internal static string AssemblyErrorMessageCreator_ProfileProbabilityGreaterThanSectionProbability { get { Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.resx =================================================================== diff -u -ra3d814e04e773ba9f672e0237419e090a02ddd9f -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.resx (.../Resources.resx) (revision a3d814e04e773ba9f672e0237419e090a02ddd9f) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Properties/Resources.resx (.../Resources.resx) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -199,7 +199,7 @@ Er ontbreekt invoer voor de assemblage rekenmodule waardoor de assemblage niet uitgevoerd kan worden. - De faalkans per vak moet groter zijn dan of gelijk zijn aan de faalkans per doorsnede + De faalkans per vak moet groter zijn dan of gelijk zijn aan de faalkans per doorsnede. Er is een onverwachte fout opgetreden. Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs =================================================================== diff -u -ra3d814e04e773ba9f672e0237419e090a02ddd9f -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs (.../AssemblyErrorMessageCreatorTest.cs) (revision a3d814e04e773ba9f672e0237419e090a02ddd9f) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs (.../AssemblyErrorMessageCreatorTest.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -73,7 +73,7 @@ [TestCase(EAssemblyErrors.SectionsWithoutCategory, "Er zijn een of meerdere vakindelingen gevonden die geen categorie hebben.")] [TestCase(EAssemblyErrors.InvalidCategoryLimits, "De categoriegrenzen zijn niet aaneengesloten en spannen niet de volledige faalkansruimte.")] [TestCase(EAssemblyErrors.EmptyResultsList, "Er ontbreekt invoer voor de assemblage rekenmodule waardoor de assemblage niet uitgevoerd kan worden.")] - [TestCase(EAssemblyErrors.ProfileProbabilityGreaterThanSectionProbability, "De faalkans per vak moet groter zijn dan of gelijk zijn aan de faalkans per doorsnede")] + [TestCase(EAssemblyErrors.ProfileProbabilityGreaterThanSectionProbability, "De faalkans per vak moet groter zijn dan of gelijk zijn aan de faalkans per doorsnede.")] [TestCase(EAssemblyErrors.ValueMayNotBeNaN, "Er is ongeldige invoer gedefinieerd voor de gebruikte methode.")] [TestCase(EAssemblyErrors.ErrorConstructingErrorMessage, "Er is een onverwachte fout opgetreden.")] [TestCase(EAssemblyErrors.DominantSectionCannotBeAssembled, "Er zijn een of meerdere vakken met duidingsklasse 'Dominant'. Dit kan niet verder geassembleerd worden.")] Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableWithProfileProbabilityFailureMechanismSectionResult.cs =================================================================== diff -u -r9f7be8fc3aefac2d7f28d1a4925f7025aa8a5990 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableWithProfileProbabilityFailureMechanismSectionResult.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResult.cs) (revision 9f7be8fc3aefac2d7f28d1a4925f7025aa8a5990) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/AdoptableWithProfileProbabilityFailureMechanismSectionResult.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResult.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -48,7 +48,7 @@ /// /// Gets or sets the value of the manual initial failure mechanism result per profile as a probability. /// - /// Thrown when is not in range [0,1]. + /// Thrown when is not in range [0,1]. public double ManualInitialFailureMechanismResultProfileProbability { get => manualInitialFailureMechanismResultProfileProbability; @@ -67,7 +67,7 @@ /// /// Gets or sets the value of the refined probability per profile. /// - /// Thrown when is not in range [0,1]. + /// Thrown when is not in range [0,1]. public double RefinedProfileProbability { get => refinedProfileProbability; Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionResult.cs =================================================================== diff -u -r9f7be8fc3aefac2d7f28d1a4925f7025aa8a5990 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionResult.cs (.../FailureMechanismSectionResult.cs) (revision 9f7be8fc3aefac2d7f28d1a4925f7025aa8a5990) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismSectionResult.cs (.../FailureMechanismSectionResult.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -62,7 +62,7 @@ /// /// Gets or sets the value of the manual initial failure mechanism result per failure mechanism section as a probability. /// - /// Thrown when is not in range [0,1]. + /// Thrown when is not in range [0,1]. public double ManualInitialFailureMechanismResultSectionProbability { get => manualInitialFailureMechanismResultSectionProbability; @@ -81,7 +81,7 @@ /// /// Gets or sets the value of the refined probability per failure mechanism section. /// - /// Thrown when is not in range [0,1]. + /// Thrown when is not in range [0,1]. public double RefinedSectionProbability { get => refinedSectionProbability; Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs =================================================================== diff -u -r9f7be8fc3aefac2d7f28d1a4925f7025aa8a5990 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs) (revision 9f7be8fc3aefac2d7f28d1a4925f7025aa8a5990) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResult.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -42,7 +42,7 @@ /// /// Gets or sets the value of the manual initial failure mechanism result per profile as a probability. /// - /// Thrown when is not in range [0,1]. + /// Thrown when is not in range [0,1]. public double ManualInitialFailureMechanismResultProfileProbability { get => manualInitialFailureMechanismResultProfileProbability; @@ -56,7 +56,7 @@ /// /// Gets or sets the value of the refined probability per profile. /// - /// Thrown when is not in range [0,1]. + /// Thrown when is not in range [0,1]. public double RefinedProfileProbability { get => refinedProfileProbability; Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r120949d24c1618b832393f3ed6e6925ae93a7322 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 120949d24c1618b832393f3ed6e6925ae93a7322) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -1701,15 +1701,6 @@ } /// - /// Looks up a localized string similar to De waarde voor de faalkans ontbreekt.. - /// - public static string FailureMechanismResultView_ManualFailurePathAssemblyProbablity_must_be_a_number { - get { - return ResourceManager.GetString("FailureMechanismResultView_ManualFailurePathAssemblyProbablity_must_be_a_number", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Aanscherpen faalkans. /// public static string FailureMechanismResultView_ProbabilityRefinementType_DisplayName { @@ -1850,15 +1841,6 @@ } /// - /// 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 { @@ -1998,6 +1980,15 @@ } /// + /// Looks up a localized string similar to Er moet een waarde worden ingevuld voor de faalkans.. + /// + public static string FailureProbability_must_not_be_NaN { + get { + return ResourceManager.GetString("FailureProbability_must_not_be_NaN", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Voorlandprofiel. /// public static string Foreshore_DisplayName { Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r120949d24c1618b832393f3ed6e6925ae93a7322 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 120949d24c1618b832393f3ed6e6925ae93a7322) +++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -1628,10 +1628,7 @@ <afgeleid> - - De waarde voor de faalkans ontbreekt. + + Er moet een waarde worden ingevuld voor de faalkans. - - De waarde voor de faalkans ontbreekt. - \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowErrorProvider.cs =================================================================== diff -u -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowErrorProvider.cs (.../FailureMechanismSectionResultRowErrorProvider.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993) +++ Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowErrorProvider.cs (.../FailureMechanismSectionResultRowErrorProvider.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -30,7 +30,7 @@ { public string GetManualProbabilityValidationError(double probability) { - return double.IsNaN(probability) ? Resources.FailureMechanismSectionResultRowErrorProvider_Probability_must_not_be_NaN : string.Empty; + return double.IsNaN(probability) ? Resources.FailureProbability_must_not_be_NaN : string.Empty; } } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs =================================================================== diff -u -rfbbfd3cafa217c67f9d9b9b7756570c3d59a8993 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs (.../FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs) (revision fbbfd3cafa217c67f9d9b9b7756570c3d59a8993) +++ Riskeer/Common/src/Riskeer.Common.Forms/Providers/FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs (.../FailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -74,9 +74,6 @@ this.intersectionFunc = intersectionFunc; } - /// - /// Thrown when - /// is null. public string GetCalculatedProbabilityValidationError(Func getProbabilityFunc) { if (getProbabilityFunc == null) Index: Riskeer/Common/src/Riskeer.Common.Forms/Providers/IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs =================================================================== diff -u -re55b0df15fe406aed1091a906aa7d9d4c5f2ae34 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Forms/Providers/IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs (.../IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs) (revision e55b0df15fe406aed1091a906aa7d9d4c5f2ae34) +++ Riskeer/Common/src/Riskeer.Common.Forms/Providers/IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs (.../IFailureMechanismSectionResultRowWithCalculatedProbabilityErrorProvider.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -35,6 +35,7 @@ /// The function to get the probability to validate. /// An error message when the validation fails; /// or when there are no errors. + /// Thrown when is null. string GetCalculatedProbabilityValidationError(Func getProbabilityFunc); } } \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -re3f96d953b0b3e82352b7de282861e22f120c1f5 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision e3f96d953b0b3e82352b7de282861e22f120c1f5) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -352,7 +352,7 @@ failurePathAssemblyProbabilityTextBox.Text = ProbabilityFormattingHelper.FormatWithDiscreteNumbers(probability); if (IsManualAssembly() && double.IsNaN(probability)) { - SetErrorMessage(Resources.FailureMechanismResultView_ManualFailurePathAssemblyProbablity_must_be_a_number); + SetErrorMessage(Resources.FailureProbability_must_not_be_NaN); } } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Providers/FailureMechanismSectionResultRowErrorProviderTest.cs =================================================================== diff -u -r9832fc5218794de3fc633aa59c6420792e4a41a6 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Providers/FailureMechanismSectionResultRowErrorProviderTest.cs (.../FailureMechanismSectionResultRowErrorProviderTest.cs) (revision 9832fc5218794de3fc633aa59c6420792e4a41a6) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Providers/FailureMechanismSectionResultRowErrorProviderTest.cs (.../FailureMechanismSectionResultRowErrorProviderTest.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -47,7 +47,7 @@ string errorMessage = errorProvider.GetManualProbabilityValidationError(double.NaN); // Assert - Assert.AreEqual("De waarde voor de faalkans ontbreekt.", errorMessage); + Assert.AreEqual("Er moet een waarde worden ingevuld voor de faalkans.", errorMessage); } [Test] Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs =================================================================== diff -u -r0a6627e48527f2ca1528ab956c37d9147347d688 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 0a6627e48527f2ca1528ab956c37d9147347d688) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/FailureMechanismResultViewTest.cs (.../FailureMechanismResultViewTest.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -972,7 +972,7 @@ Assert.IsNaN(failureMechanism.AssemblyResult.ManualFailurePathAssemblyProbability); errorMessage = errorProvider.GetError(failurePathAssemblyProbabilityTextBox); - Assert.AreEqual("De waarde voor de faalkans ontbreekt.", errorMessage); + Assert.AreEqual("Er moet een waarde worden ingevuld voor de faalkans.", errorMessage); } mocks.VerifyAll(); Index: Riskeer/Common/test/Riskeer.Common.Plugin.Test/FileImporters/AdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r9e10166c6ca470d10982c3a35496a845080e5f09 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/test/Riskeer.Common.Plugin.Test/FileImporters/AdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 9e10166c6ca470d10982c3a35496a845080e5f09) +++ Riskeer/Common/test/Riskeer.Common.Plugin.Test/FileImporters/AdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs (.../AdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -42,18 +42,16 @@ protected override AdoptableWithProfileProbabilityFailureMechanismSectionResult CreateConfiguredSectionResult() { var random = new Random(39); - double initialProfileProbability = random.NextDouble(); - double refinedProfileProbability = random.NextDouble(); return new AdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { IsRelevant = random.NextBoolean(), InitialFailureMechanismResultType = random.NextEnumValue(), FurtherAnalysisType = random.NextEnumValue(), - ManualInitialFailureMechanismResultProfileProbability = initialProfileProbability, - ManualInitialFailureMechanismResultSectionProbability = initialProfileProbability + 0.1, + ManualInitialFailureMechanismResultProfileProbability = random.NextDouble(), + ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(), ProbabilityRefinementType = random.NextEnumValue(), - RefinedProfileProbability = refinedProfileProbability, - RefinedSectionProbability = refinedProfileProbability + 0.1 + RefinedProfileProbability = random.NextDouble(), + RefinedSectionProbability = random.NextDouble() }; } Index: Riskeer/Common/test/Riskeer.Common.Plugin.Test/FileImporters/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r9e10166c6ca470d10982c3a35496a845080e5f09 -r00a56244b50c5a359475c5135cccc004aa9d3689 --- Riskeer/Common/test/Riskeer.Common.Plugin.Test/FileImporters/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 9e10166c6ca470d10982c3a35496a845080e5f09) +++ Riskeer/Common/test/Riskeer.Common.Plugin.Test/FileImporters/NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs (.../NonAdoptableWithProfileProbabilityFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 00a56244b50c5a359475c5135cccc004aa9d3689) @@ -42,17 +42,15 @@ protected override NonAdoptableWithProfileProbabilityFailureMechanismSectionResult CreateConfiguredSectionResult() { var random = new Random(39); - double initialProfileProbability = random.NextDouble(); - double refinedProfileProbability = random.NextDouble(); return new NonAdoptableWithProfileProbabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { IsRelevant = random.NextBoolean(), InitialFailureMechanismResultType = random.NextEnumValue(), - ManualInitialFailureMechanismResultProfileProbability = initialProfileProbability, - ManualInitialFailureMechanismResultSectionProbability = initialProfileProbability + 0.1, + ManualInitialFailureMechanismResultProfileProbability = random.NextDouble(), + ManualInitialFailureMechanismResultSectionProbability = random.NextDouble(), FurtherAnalysisType = random.NextEnumValue(), - RefinedProfileProbability = refinedProfileProbability, - RefinedSectionProbability = refinedProfileProbability + 0.1 + RefinedProfileProbability = random.NextDouble(), + RefinedSectionProbability = random.NextDouble() }; }