Index: Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/EmptyProbabilisticOutput.cs =================================================================== diff -u -r4aa6d896646fee50b7bc6fadd9c2251b4fdd4f2e -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/EmptyProbabilisticOutput.cs (.../EmptyProbabilisticOutput.cs) (revision 4aa6d896646fee50b7bc6fadd9c2251b4fdd4f2e) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/EmptyProbabilisticOutput.cs (.../EmptyProbabilisticOutput.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -19,6 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using Ringtoets.Common.Data.Probability; + namespace Ringtoets.Common.Data.Calculation { /// Fisheye: Tag 539c8246735ec295942d90a7abfb08a9cfffaa9f refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Calculation/ProbabilisticOutput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilisticOutput.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilisticOutput.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilisticOutput.cs (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -0,0 +1,75 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets 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 Core.Common.Base; +using Core.Common.Base.Data; +using Ringtoets.Common.Data.Calculation; + +namespace Ringtoets.Common.Data.Probability +{ + /// + /// This class contains the results of a probabilistic assessment calculation. + /// + public class ProbabilisticOutput : Observable, ICalculationOutput + { + /// + /// Creates a new instance of . + /// + /// The required (maximum allowed) probability of failure. + /// The required (maximum allowed) reliability of the failure mechanism. + /// The probability of failure. + /// The reliability of the failure mechanism. + /// The factor of safety of the failure mechanism. + public ProbabilisticOutput(double requiredProbability, double requiredReliability, double probability, double reliability, double factorOfSafety) + { + RequiredProbability = new RoundedDouble(2, requiredProbability); + RequiredReliability = new RoundedDouble(3, requiredReliability); + Probability = new RoundedDouble(2, probability); + Reliability = new RoundedDouble(3, reliability); + FactorOfSafety = new RoundedDouble(3, factorOfSafety); + } + + /// + /// Gets the required (maximum allowed) probability of failure. + /// + public RoundedDouble RequiredProbability { get; private set; } + + /// + /// Get the required (maximum allowed) reliability of the failure mechanism. + /// + public RoundedDouble RequiredReliability { get; private set; } + + /// + /// Gets the probability of failure. + /// + public RoundedDouble Probability { get; private set; } + + /// + /// Gets the reliability of the failure mechanism. + /// + public RoundedDouble Reliability { get; private set; } + + /// + /// Gets the factor of safety of the failure mechanism. + /// + public RoundedDouble FactorOfSafety { get; private set; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 49084c971c0de5668befdcf5c8d6b65debf0b659) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -44,7 +44,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/ProbabilisticOutputTest.cs =================================================================== diff -u -r8047e7fd59525ed424105aaefc4ee88b9ae8def6 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/ProbabilisticOutputTest.cs (.../ProbabilisticOutputTest.cs) (revision 8047e7fd59525ed424105aaefc4ee88b9ae8def6) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/ProbabilisticOutputTest.cs (.../ProbabilisticOutputTest.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -24,6 +24,7 @@ using Core.Common.Base.Data; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; namespace Ringtoets.Common.Data.Test.Calculation { @@ -54,50 +55,5 @@ Assert.AreEqual(reliability, output.Reliability); Assert.AreEqual(factorOfSafety, output.FactorOfSafety); } - - [Test] - public void FactorOfSafety_BigRoundedDouble_ReturnsExpectedValues() - { - // Setup - var bigRoundedDouble = new RoundedDouble(15, 9.12345678901234567); - var output = new ProbabilisticOutput(0.0, 0.0, 0.0, 0.0, bigRoundedDouble); - - // Call - output.FactorOfSafety = bigRoundedDouble; - - // Assert - var expectedRoundedDouble = new RoundedDouble(3, bigRoundedDouble); - Assert.AreEqual(expectedRoundedDouble, output.FactorOfSafety); - } - - [Test] - public void Reliability_BigRoundedDouble_ReturnsExpectedValues() - { - // Setup - var bigRoundedDouble = new RoundedDouble(15, 9.12345678901234567); - var output = new ProbabilisticOutput(0.0, 0.0, 0.0, bigRoundedDouble, 0.0); - - // Call - output.Reliability = bigRoundedDouble; - - // Assert - var expectedRoundedDouble = new RoundedDouble(3, bigRoundedDouble); - Assert.AreEqual(expectedRoundedDouble, output.Reliability); - } - - [Test] - public void Probability_BigRoundedDouble_ReturnsExpectedValues() - { - // Setup - var bigRoundedDouble = new RoundedDouble(15, 9.12345678901234567); - var output = new ProbabilisticOutput(0.0, 0.0, bigRoundedDouble, 0.0, 0.0); - - // Call - output.Probability = bigRoundedDouble; - - // Assert - var expectedRoundedDouble = new RoundedDouble(2, bigRoundedDouble); - Assert.AreEqual(expectedRoundedDouble, output.Probability); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs =================================================================== diff -u -r8047e7fd59525ed424105aaefc4ee88b9ae8def6 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs (.../GrassCoverErosionInwardsOutputProperties.cs) (revision 8047e7fd59525ed424105aaefc4ee88b9ae8def6) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsOutputProperties.cs (.../GrassCoverErosionInwardsOutputProperties.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -24,6 +24,7 @@ using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.GrassCoverErosionInwards.Forms.Properties; namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs =================================================================== diff -u -r3c1ed9049be26ab9460bf2192c55149c45fbba3c -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -32,6 +32,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.Forms.TreeNodeInfos; Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsOutputCalculationService.cs =================================================================== diff -u -r54a4d89e3e07a6ff825c5ba2d2322a77d31e995e -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsOutputCalculationService.cs (.../GrassCoverErosionInwardsOutputCalculationService.cs) (revision 54a4d89e3e07a6ff825c5ba2d2322a77d31e995e) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsOutputCalculationService.cs (.../GrassCoverErosionInwardsOutputCalculationService.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -22,6 +22,7 @@ using System; using MathNet.Numerics.Distributions; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.GrassCoverErosionInwards.Data; namespace Ringtoets.GrassCoverErosionInwards.Service Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs =================================================================== diff -u -r8047e7fd59525ed424105aaefc4ee88b9ae8def6 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 8047e7fd59525ed424105aaefc4ee88b9ae8def6) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs (.../GrassCoverErosionInwardsOutputPropertiesTest.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -25,6 +25,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses; namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.PropertyClasses Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs =================================================================== diff -u -ra97bb5cc5d80058a536b95a62c4cde7c89d6ef76 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs (.../ProbabilisticOutputTreeNodeInfoTest.cs) (revision a97bb5cc5d80058a536b95a62c4cde7c89d6ef76) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs (.../ProbabilisticOutputTreeNodeInfoTest.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -27,6 +27,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.GrassCoverErosionInwards.Plugin; using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs =================================================================== diff -u -ra61d9a646a09ddee65775c179bba12c40003cf84 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs (.../GrassCoverErosionInwardsGuiPluginTest.cs) (revision a61d9a646a09ddee65775c179bba12c40003cf84) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs (.../GrassCoverErosionInwardsGuiPluginTest.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -28,6 +28,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs =================================================================== diff -u -r3c1ed9049be26ab9460bf2192c55149c45fbba3c -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -32,6 +32,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.Common.Forms.TreeNodeInfos; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs =================================================================== diff -u -ra97bb5cc5d80058a536b95a62c4cde7c89d6ef76 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs (.../ProbabilisticOutputTreeNodeInfoTest.cs) (revision a97bb5cc5d80058a536b95a62c4cde7c89d6ef76) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs (.../ProbabilisticOutputTreeNodeInfoTest.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -27,6 +27,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.HeightStructures.Plugin; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs =================================================================== diff -u -r37a53b1ca9a4cdfc6e6df7f065cd540c627f2622 -r539c8246735ec295942d90a7abfb08a9cfffaa9f --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs (.../HeightStructuresGuiPluginTest.cs) (revision 37a53b1ca9a4cdfc6e6df7f065cd540c627f2622) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresGuiPluginTest.cs (.../HeightStructuresGuiPluginTest.cs) (revision 539c8246735ec295942d90a7abfb08a9cfffaa9f) @@ -28,6 +28,7 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Forms.PresentationObjects;