Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/AssemblyToolHelper.cs (.../AssemblyToolHelper.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -98,7 +98,7 @@ return double.NaN; } - FailurePathAssemblyResult assemblyResult = failureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult; if (assemblyResult.ProbabilityResultType == FailurePathAssemblyProbabilityResultType.Manual) { return assemblyResult.ManualFailurePathAssemblyProbability; Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs =================================================================== diff -u --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs (revision 0) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResult.cs (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -0,0 +1,66 @@ +// Copyright (C) Stichting Deltares 2021. 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 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 General Public License for more details. +// +// You should have received a copy of the GNU 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. + +using System; +using Core.Common.Base; +using Riskeer.Common.Data.Probability; +using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; + +namespace Riskeer.Common.Data.FailureMechanism +{ + /// + /// Class containing the assembly result of an entire failure mechanism. + /// + public class FailureMechanismAssemblyResult : Observable + { + private double manualFailurePathAssemblyProbability; + + /// + /// Creates a new instance of . + /// + public FailureMechanismAssemblyResult() + { + ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic; + ManualFailurePathAssemblyProbability = double.NaN; + } + + /// + /// Gets or sets the . + /// + public FailurePathAssemblyProbabilityResultType ProbabilityResultType { get; set; } + + /// + /// Gets or sets the probability of a failure mechanism assembly. + /// + /// Thrown when is not in range [0,1]. + public double ManualFailurePathAssemblyProbability + { + get => manualFailurePathAssemblyProbability; + set + { + ProbabilityHelper.ValidateProbability(value, null, + RiskeerCommonDataResources.FailureProbability_Value_needs_to_be_in_Range_0_, + true); + manualFailurePathAssemblyProbability = value; + } + } + } +} \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResultExtensions.cs =================================================================== diff -u -r0ff2f92dfb5465fc3a8d2eda2470c04811c22d0e -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResultExtensions.cs (.../FailureMechanismAssemblyResultExtensions.cs) (revision 0ff2f92dfb5465fc3a8d2eda2470c04811c22d0e) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismAssemblyResultExtensions.cs (.../FailureMechanismAssemblyResultExtensions.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -24,17 +24,17 @@ namespace Riskeer.Common.Data.FailureMechanism { /// - /// Extension methods for . + /// Extension methods for . /// public static class FailureMechanismAssemblyResultExtensions { /// - /// Gets whether the is a manual probability. + /// Gets whether the is a manual probability. /// - /// The to determine. - /// An indicator whether the is a manual probability. + /// The to determine. + /// An indicator whether the is a manual probability. /// Thrown when is null. - public static bool IsManualProbability(this FailurePathAssemblyResult result) + public static bool IsManualProbability(this FailureMechanismAssemblyResult result) { if (result == null) { Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs =================================================================== diff -u -rbf234b4ba1cd2d8820e75644bf337a09cfad9d1f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision bf234b4ba1cd2d8820e75644bf337a09cfad9d1f) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -59,7 +59,7 @@ InAssemblyOutputComments = new Comment(); NotInAssemblyComments = new Comment(); - AssemblyResult = new FailurePathAssemblyResult(); + AssemblyResult = new FailureMechanismAssemblyResult(); sectionResults = new ObservableList(); } @@ -69,7 +69,7 @@ public IEnumerable Sections => sectionCollection; - public FailurePathAssemblyResult AssemblyResult { get; } + public FailureMechanismAssemblyResult AssemblyResult { get; } public string FailureMechanismSectionSourcePath => sectionCollection.SourcePath; Fisheye: Tag af2197c2746678b756546687bea4c6d2bd89cffc refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailurePathAssemblyResult.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IFailureMechanism.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -74,7 +74,7 @@ /// /// Gets the assembly result of the failure mechanism. /// - FailurePathAssemblyResult AssemblyResult { get; } + FailureMechanismAssemblyResult AssemblyResult { get; } /// /// Sets a collection of to . Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailureMechanism.cs =================================================================== diff -u -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailureMechanism.cs (.../SpecificFailureMechanism.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/SpecificFailureMechanism.cs (.../SpecificFailureMechanism.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -50,7 +50,7 @@ InAssemblyOutputComments = new Comment(); NotInAssemblyComments = new Comment(); - AssemblyResult = new FailurePathAssemblyResult(); + AssemblyResult = new FailureMechanismAssemblyResult(); sectionResults = new ObservableList(); } @@ -60,7 +60,7 @@ public IEnumerable Sections => sectionCollection; - public FailurePathAssemblyResult AssemblyResult { get; } + public FailureMechanismAssemblyResult AssemblyResult { get; } public string FailureMechanismSectionSourcePath => sectionCollection.SourcePath; Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailurePathAssemblyResultValidationHelper.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailurePathAssemblyResultValidationHelper.cs (.../FailurePathAssemblyResultValidationHelper.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/FailurePathAssemblyResultValidationHelper.cs (.../FailurePathAssemblyResultValidationHelper.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -26,17 +26,17 @@ namespace Riskeer.Common.Forms.Helpers { /// - /// Class containing validation helper methods for a + /// Class containing validation helper methods for a /// public static class FailurePathAssemblyResultValidationHelper { /// - /// Gets the validation error for a . + /// Gets the validation error for a . /// - /// The to get the validation messages for. + /// The to get the validation messages for. /// An error message when the validation fails or when there are no errors. /// Thrown when is null. - public static string GetValidationError(FailurePathAssemblyResult result) + public static string GetValidationError(FailureMechanismAssemblyResult result) { if (result == null) { Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/src/Riskeer.Common.Forms/Views/FailureMechanismResultView.cs (.../FailureMechanismResultView.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -220,7 +220,7 @@ { ClearErrorMessage(); - FailurePathAssemblyResult assemblyResult = FailureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = FailureMechanism.AssemblyResult; double failurePathAssemblyProbability = assemblyResult.IsManualProbability() ? assemblyResult.ManualFailurePathAssemblyProbability : TryGetFailurePathAssemblyProbability(); @@ -308,7 +308,7 @@ return; } - FailurePathAssemblyResult assemblyResult = FailureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = FailureMechanism.AssemblyResult; assemblyResult.ProbabilityResultType = (FailurePathAssemblyProbabilityResultType) probabilityResultTypeComboBox.SelectedValue; assemblyResult.NotifyObservers(); @@ -349,7 +349,7 @@ { double probability = ProbabilityParsingHelper.Parse(failurePathAssemblyProbabilityTextBox.Text); - FailurePathAssemblyResult failureMechanismAssemblyResult = FailureMechanism.AssemblyResult; + FailureMechanismAssemblyResult failureMechanismAssemblyResult = FailureMechanism.AssemblyResult; failureMechanismAssemblyResult.ManualFailurePathAssemblyProbability = probability; failureMechanismAssemblyResult.NotifyObservers(); @@ -367,7 +367,7 @@ { failurePathAssemblyProbabilityTextBox.Text = ProbabilityFormattingHelper.FormatWithDiscreteNumbers(probability); - FailurePathAssemblyResult assemblyResult = FailureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = FailureMechanism.AssemblyResult; if (assemblyResult.IsManualProbability()) { SetErrorMessage(FailurePathAssemblyResultValidationHelper.GetValidationError(assemblyResult)); Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/AssemblyToolHelperTest.cs (.../AssemblyToolHelperTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -158,7 +158,7 @@ var mocks = new MockRepository(); var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailurePathAssemblyResult + .Return(new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual, ManualFailurePathAssemblyProbability = expectedAssemblyResult @@ -185,7 +185,7 @@ var mocks = new MockRepository(); var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailurePathAssemblyResult + .Return(new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic, ManualFailurePathAssemblyProbability = double.NaN @@ -232,7 +232,7 @@ var mocks = new MockRepository(); var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailurePathAssemblyResult + .Return(new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic, ManualFailurePathAssemblyProbability = double.NaN @@ -273,7 +273,7 @@ var mocks = new MockRepository(); var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailurePathAssemblyResult + .Return(new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic, ManualFailurePathAssemblyProbability = double.NaN @@ -310,7 +310,7 @@ var mocks = new MockRepository(); var failurePath = mocks.Stub>(); failurePath.Stub(fp => fp.AssemblyResult) - .Return(new FailurePathAssemblyResult + .Return(new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic, ManualFailurePathAssemblyProbability = double.NaN Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs =================================================================== diff -u -r0ff2f92dfb5465fc3a8d2eda2470c04811c22d0e -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs (.../FailureMechanismAssemblyResultExtensionsTest.cs) (revision 0ff2f92dfb5465fc3a8d2eda2470c04811c22d0e) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultExtensionsTest.cs (.../FailureMechanismAssemblyResultExtensionsTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -46,7 +46,7 @@ FailurePathAssemblyProbabilityResultType resultType, bool expectedResult) { // Setup - var result = new FailurePathAssemblyResult + var result = new FailureMechanismAssemblyResult { ProbabilityResultType = resultType }; Index: Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs =================================================================== diff -u --- Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs (revision 0) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailureMechanismAssemblyResultTest.cs (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -0,0 +1,84 @@ +// Copyright (C) Stichting Deltares 2021. 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 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 General Public License for more details. +// +// You should have received a copy of the GNU 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. + +using System; +using Core.Common.Base; +using Core.Common.TestUtil; +using NUnit.Framework; +using Riskeer.Common.Data.FailureMechanism; + +namespace Riskeer.Common.Data.Test.FailureMechanism +{ + [TestFixture] + public class FailureMechanismAssemblyResultTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Call + var result = new FailureMechanismAssemblyResult(); + + // Assert + Assert.IsInstanceOf(result); + + Assert.AreEqual(FailurePathAssemblyProbabilityResultType.Automatic, result.ProbabilityResultType); + Assert.IsNaN(result.ManualFailurePathAssemblyProbability); + } + + [Test] + [SetCulture("nl-NL")] + [TestCase(-20)] + [TestCase(-1e-6)] + [TestCase(1 + 1e-6)] + [TestCase(12)] + public void ManualInitialFailureMechanismResultProfileProbability_InvalidValue_ThrowsArgumentOutOfRangeException(double newValue) + { + // Setup + var result = new FailureMechanismAssemblyResult(); + + // Call + void Call() => result.ManualFailurePathAssemblyProbability = 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 ManualInitialFailureMechanismResultProfileProbability_ValidValue_NewValueSet(double newValue) + { + // Setup + var result = new FailureMechanismAssemblyResult(); + + // Call + result.ManualFailurePathAssemblyProbability = newValue; + + // Assert + Assert.AreEqual(newValue, result.ManualFailurePathAssemblyProbability); + } + } +} \ No newline at end of file Fisheye: Tag af2197c2746678b756546687bea4c6d2bd89cffc refers to a dead (removed) revision in file `Riskeer/Common/test/Riskeer.Common.Data.Test/FailureMechanism/FailurePathAssemblyResultTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailurePath.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailurePath.cs (.../TestFailurePath.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/TestFailurePath.cs (.../TestFailurePath.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -48,7 +48,7 @@ InAssemblyInputComments = new Comment(); InAssemblyOutputComments = new Comment(); NotInAssemblyComments = new Comment(); - AssemblyResult = new FailurePathAssemblyResult(); + AssemblyResult = new FailureMechanismAssemblyResult(); sectionResults = new ObservableList(); } @@ -60,7 +60,7 @@ public IEnumerable Sections => sectionCollection; - public FailurePathAssemblyResult AssemblyResult { get; } + public FailureMechanismAssemblyResult AssemblyResult { get; } public string FailureMechanismSectionSourcePath => sectionCollection.SourcePath; Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs (.../FailurePathAssemblyResultValidationHelperTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailurePathAssemblyResultValidationHelperTest.cs (.../FailurePathAssemblyResultValidationHelperTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -44,7 +44,7 @@ public void GetValidationError_WithResultManualAndInvalidProbability_ReturnsErrorMessage() { // Setup - var result = new FailurePathAssemblyResult + var result = new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual, ManualFailurePathAssemblyProbability = double.NaN @@ -62,7 +62,7 @@ { // Setup var random = new Random(21); - var result = new FailurePathAssemblyResult + var result = new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual, ManualFailurePathAssemblyProbability = random.NextDouble() @@ -79,7 +79,7 @@ public void GetValidationError_WithResultAutomatic_ReturnsEmptyMessage() { // Setup - var result = new FailurePathAssemblyResult + var result = new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic }; Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/FailureMechanismAssemblyResultRowFactory.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/FailureMechanismAssemblyResultRowFactory.cs (.../FailureMechanismAssemblyResultRowFactory.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/FailureMechanismAssemblyResultRowFactory.cs (.../FailureMechanismAssemblyResultRowFactory.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -64,7 +64,7 @@ private static FailureMechanismAssemblyResultRow CreateManualAssemblyRow(IFailureMechanism failureMechanism) { - FailurePathAssemblyResult assemblyResult = failureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult; string validationError = FailurePathAssemblyResultValidationHelper.GetValidationError(assemblyResult); return !string.IsNullOrEmpty(validationError) Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs =================================================================== diff -u -rc5219e29c90757003a649a2b39d0e18fcbad1782 -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs (.../FailureMechanismAssemblyResultRowFactoryTest.cs) (revision c5219e29c90757003a649a2b39d0e18fcbad1782) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/FailureMechanismAssemblyResultRowFactoryTest.cs (.../FailureMechanismAssemblyResultRowFactoryTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -105,7 +105,7 @@ var failureMechanism = mocks.Stub(); failureMechanism.Stub(fm => fm.Name).Return(failureMechanismName); failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode); - failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailurePathAssemblyResult + failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic }); @@ -141,7 +141,7 @@ var failureMechanism = mocks.Stub(); failureMechanism.Stub(fm => fm.Name).Return(failureMechanismName); failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode); - failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailurePathAssemblyResult + failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult { ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Automatic }); @@ -177,7 +177,7 @@ var failureMechanism = mocks.Stub(); failureMechanism.Stub(fm => fm.Name).Return(failureMechanismName); failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode); - failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailurePathAssemblyResult + failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult { ManualFailurePathAssemblyProbability = assemblyResult, ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual @@ -210,7 +210,7 @@ var failureMechanism = mocks.Stub(); failureMechanism.Stub(fm => fm.Name).Return(failureMechanismName); failureMechanism.Stub(fm => fm.Code).Return(failureMechanismCode); - failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailurePathAssemblyResult + failureMechanism.Stub(fm => fm.AssemblyResult).Return(new FailureMechanismAssemblyResult { ManualFailurePathAssemblyProbability = double.NaN, ProbabilityResultType = FailurePathAssemblyProbabilityResultType.Manual Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs =================================================================== diff -u -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs (.../FailurePathCreateExtensions.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/FailurePathCreateExtensions.cs (.../FailurePathCreateExtensions.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -116,7 +116,7 @@ private static T Create(this IFailureMechanism failurePath, PersistenceRegistry registry) where T : IFailureMechanismEntity, new() { - FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; var entity = new T { InAssembly = Convert.ToByte(failurePath.InAssembly), Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs =================================================================== diff -u -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailurePathEntityReadExtensions.cs (.../FailurePathEntityReadExtensions.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -105,7 +105,7 @@ /// The object keeping track of read operations. /// Thrown when any argument is null. internal static SpecificFailureMechanism ReadSpecificFailurePath(this SpecificFailurePathEntity entity, - ReadConversionCollector collector) + ReadConversionCollector collector) { if (entity == null) { @@ -134,7 +134,7 @@ private static void ReadAssemblyResult(IFailureMechanismEntity entity, IFailureMechanism failurePath) { - FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; assemblyResult.ProbabilityResultType = (FailurePathAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType; if (entity.ManualFailurePathAssemblyProbability != null) { Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs =================================================================== diff -u -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/FailurePathCreateExtensionsTest.cs (.../FailurePathCreateExtensionsTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -88,7 +88,7 @@ Assert.IsNull(entity.InAssemblyOutputComments); Assert.IsNull(entity.NotInAssemblyComments); - FailurePathAssemblyResult assemblyResult = failureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult; Assert.AreEqual(Convert.ToByte(assemblyResult.ProbabilityResultType), entity.FailurePathAssemblyProbabilityResultType); Assert.AreEqual(assemblyResult.ManualFailurePathAssemblyProbability, entity.ManualFailurePathAssemblyProbability); } @@ -104,7 +104,7 @@ var registry = new PersistenceRegistry(); // Precondition - FailurePathAssemblyResult assemblyResult = failureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult; Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability); // Call @@ -245,7 +245,7 @@ Assert.IsNull(entity.InAssemblyOutputComments); Assert.IsNull(entity.NotInAssemblyComments); - FailurePathAssemblyResult assemblyResult = failureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult; Assert.AreEqual(Convert.ToByte(assemblyResult.ProbabilityResultType), entity.FailurePathAssemblyProbabilityResultType); Assert.AreEqual(assemblyResult.ManualFailurePathAssemblyProbability, entity.ManualFailurePathAssemblyProbability); } @@ -261,7 +261,7 @@ var registry = new PersistenceRegistry(); // Precondition - FailurePathAssemblyResult assemblyResult = failureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failureMechanism.AssemblyResult; Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability); // Call @@ -406,7 +406,7 @@ Assert.IsNull(entity.InAssemblyOutputComments); Assert.IsNull(entity.NotInAssemblyComments); - FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; Assert.AreEqual(Convert.ToByte(assemblyResult.ProbabilityResultType), entity.FailurePathAssemblyProbabilityResultType); Assert.AreEqual(assemblyResult.ManualFailurePathAssemblyProbability, entity.ManualFailurePathAssemblyProbability); } @@ -419,7 +419,7 @@ var registry = new PersistenceRegistry(); // Precondition - FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability); // Call Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -394,8 +394,8 @@ AssertFailurePathAssemblyResult(expectedFailureMechanism.AssemblyResult, actualFailureMechanism.AssemblyResult); } - private static void AssertFailurePathAssemblyResult(FailurePathAssemblyResult expectedResult, - FailurePathAssemblyResult actualResult) + private static void AssertFailurePathAssemblyResult(FailureMechanismAssemblyResult expectedResult, + FailureMechanismAssemblyResult actualResult) { Assert.AreEqual(expectedResult.ProbabilityResultType, actualResult.ProbabilityResultType); Assert.AreEqual(expectedResult.ManualFailurePathAssemblyProbability, actualResult.ManualFailurePathAssemblyProbability); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs =================================================================== diff -u -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailurePathEntityReadExtensionsTest.cs (.../FailurePathEntityReadExtensionsTest.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -378,7 +378,7 @@ SpecificFailureMechanism specificFailureMechanism = entity.ReadSpecificFailurePath(collector); // Assert - FailurePathAssemblyResult assemblyResult = specificFailureMechanism.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = specificFailureMechanism.AssemblyResult; Assert.IsNaN(assemblyResult.ManualFailurePathAssemblyProbability); } @@ -454,7 +454,7 @@ Assert.AreEqual(entity.NotInAssemblyComments, failurePath.NotInAssemblyComments.Body); var probabilityResultType = (FailurePathAssemblyProbabilityResultType) entity.FailurePathAssemblyProbabilityResultType; - FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; Assert.AreEqual(probabilityResultType, assemblyResult.ProbabilityResultType); Assert.AreEqual(entity.ManualFailurePathAssemblyProbability, assemblyResult.ManualFailurePathAssemblyProbability); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs =================================================================== diff -u -r74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f -raf2197c2746678b756546687bea4c6d2bd89cffc --- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 74a4b453f00a27ed2dd4d0ef4aa9fc5ca762a35f) +++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision af2197c2746678b756546687bea4c6d2bd89cffc) @@ -459,7 +459,7 @@ private static void SetFailurePathAssemblyResults(IFailureMechanism failurePath, int seed) { var random = new Random(seed); - FailurePathAssemblyResult assemblyResult = failurePath.AssemblyResult; + FailureMechanismAssemblyResult assemblyResult = failurePath.AssemblyResult; assemblyResult.ProbabilityResultType = random.NextEnumValue(); assemblyResult.ManualFailurePathAssemblyProbability = random.NextDouble(); } @@ -1660,11 +1660,11 @@ new Point3D(5.8, 6.0, -2.3), // Dike toe at river new Point3D(5.6, 6.0, 3.4), new Point3D(4.2, 6.0, 3.5), - new Point3D(4.0, 6.0, 0.5), // Dike toe at polder - new Point3D(3.8, 6.0, 0.5), // Ditch dike side - new Point3D(3.6, 6.0, 0.2), // Bottom ditch dike side + new Point3D(4.0, 6.0, 0.5), // Dike toe at polder + new Point3D(3.8, 6.0, 0.5), // Ditch dike side + new Point3D(3.6, 6.0, 0.2), // Bottom ditch dike side new Point3D(3.4, 6.0, 0.25), // Bottom ditch polder side - new Point3D(3.2, 6.0, 0.5), // Ditch polder side + new Point3D(3.2, 6.0, 0.5), // Ditch polder side new Point3D(3.0, 6.0, 0.5) }; surfaceLine.SetGeometry(geometryPoints);