Index: Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re14e1189b03c6f97f7b692fce02b344c9f7ab20c -r423d1b9192b360e75473602879f55cb4c2c570f7
--- Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e14e1189b03c6f97f7b692fce02b344c9f7ab20c)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 423d1b9192b360e75473602879f55cb4c2c570f7)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -19,7 +40,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
@@ -61,7 +82,7 @@
}
///
- /// Looks up a localized string similar to Alle faalkansen kleiner dan 1/100000 zijn afgerond weergegeven in wetenschappelijke notatie. Door een node te selecteren, wordt het bijhorende volledige getal in het eigenschappenpaneel weergegeven..
+ /// Looks up a localized string similar to Alle faalkansen kleiner dan 1/100.000 zijn afgerond weergegeven in wetenschappelijke notatie. Door een node te selecteren, wordt het bijhorende volledige getal in het eigenschappenpaneel weergegeven..
///
public static string Value_In_Scientific_Notation {
get {
Index: Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.resx
===================================================================
diff -u -re14e1189b03c6f97f7b692fce02b344c9f7ab20c -r423d1b9192b360e75473602879f55cb4c2c570f7
--- Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.resx (.../Resources.resx) (revision e14e1189b03c6f97f7b692fce02b344c9f7ab20c)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.resx (.../Resources.resx) (revision 423d1b9192b360e75473602879f55cb4c2c570f7)
@@ -118,7 +118,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Alle faalkansen kleiner dan 1/100000 zijn afgerond weergegeven in wetenschappelijke notatie. Door een node te selecteren, wordt het bijhorende volledige getal in het eigenschappenpaneel weergegeven.
+ Alle faalkansen kleiner dan 1/100.000 zijn afgerond weergegeven in wetenschappelijke notatie. Door een node te selecteren, wordt het bijhorende volledige getal in het eigenschappenpaneel weergegeven.
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/RiskeerGraphNodeFactory.cs
===================================================================
diff -u -re14e1189b03c6f97f7b692fce02b344c9f7ab20c -r423d1b9192b360e75473602879f55cb4c2c570f7
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/RiskeerGraphNodeFactory.cs (.../RiskeerGraphNodeFactory.cs) (revision e14e1189b03c6f97f7b692fce02b344c9f7ab20c)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/RiskeerGraphNodeFactory.cs (.../RiskeerGraphNodeFactory.cs) (revision 423d1b9192b360e75473602879f55cb4c2c570f7)
@@ -164,10 +164,15 @@
{
double probability = StatisticsConverter.ReliabilityToProbability(beta);
+ if (probability == 0)
+ {
+ return string.Format(Resources.GraphNodeConverter_GraphNodeContent_Probability_0_Beta_1, probability, beta);
+ }
+
return string.Format(Resources.GraphNodeConverter_GraphNodeContent_Probability_0_Beta_1,
- probability == 0 || probability >= 0.00001 ?
- ProbabilityFormattingHelper.Format(StatisticsConverter.ReliabilityToProbability(beta)) :
- probability.ToString("0.#####E+0", CultureInfo.CurrentCulture), beta);
+ probability >= 0.00001
+ ? ProbabilityFormattingHelper.Format(StatisticsConverter.ReliabilityToProbability(beta))
+ : probability.ToString("0.#####E+0", CultureInfo.CurrentCulture), beta);
}
}
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/RiskeerGraphNodeFactoryTest.cs
===================================================================
diff -u -re14e1189b03c6f97f7b692fce02b344c9f7ab20c -r423d1b9192b360e75473602879f55cb4c2c570f7
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/RiskeerGraphNodeFactoryTest.cs (.../RiskeerGraphNodeFactoryTest.cs) (revision e14e1189b03c6f97f7b692fce02b344c9f7ab20c)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/RiskeerGraphNodeFactoryTest.cs (.../RiskeerGraphNodeFactoryTest.cs) (revision 423d1b9192b360e75473602879f55cb4c2c570f7)
@@ -160,7 +160,7 @@
[TestCase(0.000012, "1/83.332")]
[TestCase(0.00000123, "1,22998E-6")]
[TestCase(0.0000099, "9,90019E-6")]
- [TestCase(0, "1/Oneindig")]
+ [TestCase(0, "0")]
public void CreateGraphNode_FaultTreeIllustrationPointNodeDataWithChildren_ReturnsExpectedGraphNodeContent(double probability, string expectedProbability)
{
// Setup