Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs =================================================================== diff -u -r49bbac8914b80005625cc41f2dee8a4812b67ab8 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs (.../DesignVariable.cs) (revision 49bbac8914b80005625cc41f2dee8a4812b67ab8) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DesignVariable.cs (.../DesignVariable.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -25,7 +25,7 @@ namespace Ringtoets.Common.Data.Probabilistics { - public abstract class DesignVariable where TDistributionType : IDistribution + public abstract class DesignVariable where TDistributionType : IDistributionBase { private TDistributionType distribution; Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DeterministicDesignVariable.cs =================================================================== diff -u -rb7563238aa805cb6207e948a97f6fcc9e52c92b2 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DeterministicDesignVariable.cs (.../DeterministicDesignVariable.cs) (revision b7563238aa805cb6207e948a97f6fcc9e52c92b2) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/DeterministicDesignVariable.cs (.../DeterministicDesignVariable.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -26,7 +26,7 @@ /// /// This class defines a design variable for a distribution. /// - public class DeterministicDesignVariable : DesignVariable where T : IDistribution + public class DeterministicDesignVariable : DesignVariable where T : IDistributionBase { private readonly double deterministicValue; Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistribution.cs =================================================================== diff -u -r332fd224ce5cd9c737e72f945271c52ae6d64c0d -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistribution.cs (.../IDistribution.cs) (revision 332fd224ce5cd9c737e72f945271c52ae6d64c0d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistribution.cs (.../IDistribution.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -28,17 +28,17 @@ /// This object represents a probabilistic distribution. /// /// - public interface IDistribution : ICloneable + public interface IDistribution : IDistributionBase { /// /// Gets or sets the mean (expected value, E(X)) of the distribution. /// - RoundedDouble Mean { get; set; } + new RoundedDouble Mean { get; set; } /// /// Gets or sets the standard deviation (square root of the Var(X)) of the distribution. /// /// Standard deviation is less than 0. - RoundedDouble StandardDeviation { get; set; } + new RoundedDouble StandardDeviation { get; set; } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistributionBase.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistributionBase.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IDistributionBase.cs (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -0,0 +1,46 @@ +// 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 System; +using Core.Common.Base.Data; + +namespace Ringtoets.Common.Data.Probabilistics +{ + public interface IDistributionBase : ICloneable + { + /// + /// Gets the mean (expected value, E(X)) of the distribution. + /// + RoundedDouble Mean { get; } + + /// + /// Gets the standard deviation (square root of the Var(X)) of the distribution. + /// + RoundedDouble StandardDeviation { get; } + + /// + /// Gets the coefficient of variation (CV, also known as relative standard + /// deviation (SRD). Defined as standard deviation / |E(X)|) of the distribution. + /// + /// Thrown when is 0. + RoundedDouble CoefficientOfVariation { get; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/ILogNormalDistribution.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/ILogNormalDistribution.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/ILogNormalDistribution.cs (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -0,0 +1,35 @@ +// 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 System; +using Core.Common.Base.Data; + +namespace Ringtoets.Common.Data.Probabilistics +{ + public interface ILogNormalDistribution : IDistributionBase + { + /// + /// Gets or sets the shift of the normal distribution which is the log of the log-normal distribution. + /// + /// Thrown when the shift is larger than the mean. + RoundedDouble Shift { get; set; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IVariationCoefficientDistribution.cs =================================================================== diff -u -r332fd224ce5cd9c737e72f945271c52ae6d64c0d -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IVariationCoefficientDistribution.cs (.../IVariationCoefficientDistribution.cs) (revision 332fd224ce5cd9c737e72f945271c52ae6d64c0d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/IVariationCoefficientDistribution.cs (.../IVariationCoefficientDistribution.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -28,21 +28,21 @@ /// This object represents a probabilistic distribution. /// /// - public interface IVariationCoefficientDistribution : ICloneable + public interface IVariationCoefficientDistribution : IDistributionBase { /// /// Gets or sets the mean (expected value, E(X)) of the distribution. /// /// As cannot be negative, the absolute /// value of the mean is used when the standard deviation needs to be calculated. - RoundedDouble Mean { get; set; } + new RoundedDouble Mean { get; set; } /// /// Gets or sets the coefficient of variation (CV, also known as relative standard /// deviation (SRD). Defined as standard deviation / |E(X)|) of the distribution. /// /// Thrown when coefficient of variation /// is less than 0. - RoundedDouble CoefficientOfVariation { get; set; } + new RoundedDouble CoefficientOfVariation { get; set; } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistribution.cs =================================================================== diff -u -r332fd224ce5cd9c737e72f945271c52ae6d64c0d -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistribution.cs (.../LogNormalDistribution.cs) (revision 332fd224ce5cd9c737e72f945271c52ae6d64c0d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistribution.cs (.../LogNormalDistribution.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -29,7 +29,7 @@ /// Class representing a log-normal distribution expressed in terms of standard deviation. /// /// - public class LogNormalDistribution : IDistribution + public class LogNormalDistribution : IDistribution, ILogNormalDistribution { private RoundedDouble mean; private RoundedDouble standardDeviation; @@ -61,7 +61,7 @@ // Initialize mean, standard deviation and shift of the normal distribution which is the log of the // log-normal distribution with scale parameter mu=0, shape parameter sigma=1 and location parameter theta=0. mean = new RoundedDouble(numberOfDecimalPlaces, Math.Exp(-0.5)); - standardDeviation = new RoundedDouble(numberOfDecimalPlaces, Math.Sqrt((Math.Exp(1) - 1)*Math.Exp(1))); + standardDeviation = new RoundedDouble(numberOfDecimalPlaces, Math.Sqrt((Math.Exp(1) - 1) * Math.Exp(1))); shift = new RoundedDouble(numberOfDecimalPlaces); } @@ -140,6 +140,14 @@ } } + public RoundedDouble CoefficientOfVariation + { + get + { + return new RoundedDouble(StandardDeviation.NumberOfDecimalPlaces, StandardDeviation / Mean); + } + } + public object Clone() { return MemberwiseClone(); Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistributionDesignVariable.cs =================================================================== diff -u -r977a58268db81a93ad74f6079b41cf40d43fb1aa -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistributionDesignVariable.cs (.../LogNormalDistributionDesignVariable.cs) (revision 977a58268db81a93ad74f6079b41cf40d43fb1aa) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/LogNormalDistributionDesignVariable.cs (.../LogNormalDistributionDesignVariable.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -27,13 +27,14 @@ /// /// This class defines a design variable for a log-normal distribution. /// - public class LogNormalDistributionDesignVariable : PercentileBasedDesignVariable + public class LogNormalDistributionDesignVariable : PercentileBasedDesignVariable + where TDistribution : ILogNormalDistribution { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// A log-normal distribution. - public LogNormalDistributionDesignVariable(LogNormalDistribution distribution) : base(distribution) {} + public LogNormalDistributionDesignVariable(TDistribution distribution) : base(distribution) {} public override RoundedDouble GetDesignValue() { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistribution.cs =================================================================== diff -u -r332fd224ce5cd9c737e72f945271c52ae6d64c0d -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision 332fd224ce5cd9c737e72f945271c52ae6d64c0d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistribution.cs (.../NormalDistribution.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -87,6 +87,14 @@ } } + public RoundedDouble CoefficientOfVariation + { + get + { + return new RoundedDouble(StandardDeviation.NumberOfDecimalPlaces, StandardDeviation / Mean); + } + } + public object Clone() { return MemberwiseClone(); Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs =================================================================== diff -u -r977a58268db81a93ad74f6079b41cf40d43fb1aa -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs (.../NormalDistributionDesignVariable.cs) (revision 977a58268db81a93ad74f6079b41cf40d43fb1aa) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/NormalDistributionDesignVariable.cs (.../NormalDistributionDesignVariable.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -26,13 +26,14 @@ /// /// This class defines a design variable for a normal distribution. /// - public class NormalDistributionDesignVariable : PercentileBasedDesignVariable + public class NormalDistributionDesignVariable : PercentileBasedDesignVariable + where TDistribution : IDistributionBase { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// A normal distribution. - public NormalDistributionDesignVariable(NormalDistribution distribution) : base(distribution) {} + public NormalDistributionDesignVariable(TDistribution distribution) : base(distribution) {} public override RoundedDouble GetDesignValue() { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs =================================================================== diff -u -re03950c62ccfad90eefe8076d668767f69c90a8e -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs (.../PercentileBasedDesignVariable.cs) (revision e03950c62ccfad90eefe8076d668767f69c90a8e) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/PercentileBasedDesignVariable.cs (.../PercentileBasedDesignVariable.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -34,7 +34,7 @@ /// /// The type of the underlying distribution from which a value is /// derived. - public abstract class PercentileBasedDesignVariable : DesignVariable where TDistributionType : IDistribution + public abstract class PercentileBasedDesignVariable : DesignVariable where TDistributionType : IDistributionBase { private static readonly Range percentileValidityRange = new Range(0, 1); private double percentile; Fisheye: Tag ab330857f161d3f884db508d80a2dd0ade36434f refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientDesignVariable.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientLogNormalDistribution.cs =================================================================== diff -u -r332fd224ce5cd9c737e72f945271c52ae6d64c0d -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientLogNormalDistribution.cs (.../VariationCoefficientLogNormalDistribution.cs) (revision 332fd224ce5cd9c737e72f945271c52ae6d64c0d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientLogNormalDistribution.cs (.../VariationCoefficientLogNormalDistribution.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -30,10 +30,11 @@ /// of variation. /// /// - public class VariationCoefficientLogNormalDistribution : IVariationCoefficientDistribution + public class VariationCoefficientLogNormalDistribution : IVariationCoefficientDistribution, ILogNormalDistribution { private RoundedDouble mean; private RoundedDouble coefficientOfVariation; + private RoundedDouble shift; /// /// Initializes a new instance of the class, @@ -54,9 +55,31 @@ { mean = new RoundedDouble(numberOfDecimalPlaces, 1.0); coefficientOfVariation = new RoundedDouble(numberOfDecimalPlaces, 1.0); + shift = new RoundedDouble(numberOfDecimalPlaces); } /// + /// Gets or sets the shift of the normal distribution which is the log of the log-normal distribution. + /// + /// Thrown when the shift is larger than the mean. + public RoundedDouble Shift + { + get + { + return shift; + } + set + { + RoundedDouble newShift = value.ToPrecision(shift.NumberOfDecimalPlaces); + if (newShift > Mean) + { + throw new ArgumentOutOfRangeException(null, Resources.LogNormalDistribution_Shift_may_not_exceed_Mean); + } + shift = newShift; + } + } + + /// /// Gets or sets the mean (expected value, E(X)) of the distribution. /// /// Expected value is less than or equal to 0. @@ -100,6 +123,14 @@ } } + public RoundedDouble StandardDeviation + { + get + { + return Mean * CoefficientOfVariation; + } + } + public object Clone() { return MemberwiseClone(); Fisheye: Tag ab330857f161d3f884db508d80a2dd0ade36434f refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientLogNormalDistributionDesignVariable.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientNormalDistribution.cs =================================================================== diff -u -r332fd224ce5cd9c737e72f945271c52ae6d64c0d -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientNormalDistribution.cs (.../VariationCoefficientNormalDistribution.cs) (revision 332fd224ce5cd9c737e72f945271c52ae6d64c0d) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probabilistics/VariationCoefficientNormalDistribution.cs (.../VariationCoefficientNormalDistribution.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -87,6 +87,14 @@ } } + public RoundedDouble StandardDeviation + { + get + { + return Mean * CoefficientOfVariation; + } + } + public object Clone() { return MemberwiseClone(); Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -r49bbac8914b80005625cc41f2dee8a4812b67ab8 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 49bbac8914b80005625cc41f2dee8a4812b67ab8) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -61,8 +61,8 @@ - - + + Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs (.../DesignVariableTest.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DesignVariableTest.cs (.../DesignVariableTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -84,9 +84,9 @@ mocks.VerifyAll(); // Expect no calls on mocks } - private class SimpleDesignVariable : DesignVariable + private class SimpleDesignVariable : DesignVariable { - public SimpleDesignVariable(IDistribution distribution) : base(distribution) {} + public SimpleDesignVariable(IDistributionBase distribution) : base(distribution) {} public override RoundedDouble GetDesignValue() { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DeterministicDesignVariableTest.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DeterministicDesignVariableTest.cs (.../DeterministicDesignVariableTest.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/DeterministicDesignVariableTest.cs (.../DeterministicDesignVariableTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -36,12 +36,12 @@ { // Setup var mocks = new MockRepository(); - var distributionMock = mocks.Stub(); - distributionMock.Mean = new RoundedDouble(); + var distributionMock = mocks.Stub(); + distributionMock.Stub(d => d.Mean).Return(new RoundedDouble()); mocks.ReplayAll(); // Call - var designVariable = new DeterministicDesignVariable(distributionMock); + var designVariable = new DeterministicDesignVariable(distributionMock); // Assert Assert.AreSame(distributionMock, designVariable.Distribution); @@ -53,7 +53,7 @@ public void ParameteredConstructor_DistributionIsNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => new DeterministicDesignVariable(null); + TestDelegate call = () => new DeterministicDesignVariable(null); // Assert var exception = Assert.Throws(call); @@ -69,10 +69,10 @@ { // Setup var mocks = new MockRepository(); - var distributionMock = mocks.StrictMock(); + var distributionMock = mocks.StrictMock(); mocks.ReplayAll(); - var designVariable = new DeterministicDesignVariable(distributionMock); + var designVariable = new DeterministicDesignVariable(distributionMock); // Call TestDelegate call = () => designVariable.Distribution = null; @@ -95,11 +95,11 @@ int numberOfDecimalPlaces = 2; var mocks = new MockRepository(); - var distributionMock = mocks.Stub(); - distributionMock.Mean = new RoundedDouble(numberOfDecimalPlaces); + var distributionMock = mocks.Stub(); + distributionMock.Stub(d => d.Mean).Return(new RoundedDouble(numberOfDecimalPlaces)); mocks.ReplayAll(); - var designVariable = new DeterministicDesignVariable(distributionMock, testValue); + var designVariable = new DeterministicDesignVariable(distributionMock, testValue); // Call var designValue = designVariable.GetDesignValue(); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionDesignVariableTest.cs =================================================================== diff -u -r2857b234df4622cdaf80bbc75abc58af36667347 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionDesignVariableTest.cs (.../LogNormalDistributionDesignVariableTest.cs) (revision 2857b234df4622cdaf80bbc75abc58af36667347) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionDesignVariableTest.cs (.../LogNormalDistributionDesignVariableTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -22,6 +22,7 @@ using System; using Core.Common.Base.Data; using NUnit.Framework; +using Rhino.Mocks; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.TestUtil; @@ -34,18 +35,21 @@ public void ParameteredConstructor_ValidLogNormalDistribution_ExpectedValues() { // Setup - var logNormalDistribution = new LogNormalDistribution(2); + var mocks = new MockRepository(); + var logNormalDistribution = mocks.Stub(); + mocks.ReplayAll(); // Call - var designValue = new LogNormalDistributionDesignVariable(logNormalDistribution); + var designValue = new LogNormalDistributionDesignVariable(logNormalDistribution); // Assert Assert.AreSame(logNormalDistribution, designValue.Distribution); Assert.AreEqual(0.5, designValue.Percentile); + mocks.VerifyAll(); } /// - /// Tests the + /// Tests the /// against the values calculated with the excel sheet in WTI-33 (timestamp: 27-11-2015 10:27). /// /// MEAN. @@ -66,13 +70,16 @@ { // Setup const int numberOfDecimalPlaces = 4; - var logNormalDistribution = new LogNormalDistribution(numberOfDecimalPlaces) - { - Mean = (RoundedDouble) expectedValue, - StandardDeviation = (RoundedDouble) Math.Sqrt(variance) - }; - var designVariable = new LogNormalDistributionDesignVariable(logNormalDistribution) + var mocks = new MockRepository(); + var logNormalDistribution = mocks.Stub(); + logNormalDistribution.Stub(l => l.Mean).Return(new RoundedDouble(numberOfDecimalPlaces, expectedValue)); + logNormalDistribution.Stub(l => l.StandardDeviation).Return(new RoundedDouble(numberOfDecimalPlaces, Math.Sqrt(variance))); + mocks.ReplayAll(); + + logNormalDistribution.Shift = new RoundedDouble(numberOfDecimalPlaces, 0); + + var designVariable = new LogNormalDistributionDesignVariable(logNormalDistribution) { Percentile = percentile }; @@ -83,10 +90,11 @@ // Assert Assert.AreEqual(numberOfDecimalPlaces, result.NumberOfDecimalPlaces); Assert.AreEqual(expectedResult, result, result.GetAccuracy()); + mocks.VerifyAll(); } /// - /// Tests the + /// Tests the /// against the values calculated with the excel sheet in WTI-688 (timestamp: 04-08-2016 09:59). /// /// MEAN. @@ -109,14 +117,16 @@ { // Setup const int numberOfDecimalPlaces = 4; - var logNormalDistribution = new LogNormalDistribution(numberOfDecimalPlaces) - { - Mean = (RoundedDouble) expectedValue, - StandardDeviation = (RoundedDouble) Math.Sqrt(variance), - Shift = (RoundedDouble) shift - }; - var designVariable = new LogNormalDistributionDesignVariable(logNormalDistribution) + var mocks = new MockRepository(); + var logNormalDistribution = mocks.Stub(); + logNormalDistribution.Stub(l => l.Mean).Return(new RoundedDouble(numberOfDecimalPlaces, expectedValue)); + logNormalDistribution.Stub(l => l.StandardDeviation).Return(new RoundedDouble(numberOfDecimalPlaces, Math.Sqrt(variance))); + mocks.ReplayAll(); + + logNormalDistribution.Shift = (RoundedDouble) shift; + + var designVariable = new LogNormalDistributionDesignVariable(logNormalDistribution) { Percentile = percentile }; @@ -142,14 +152,15 @@ { // Setup const int numberOfDecimalPlaces = 6; - var logNormalDistribution = new LogNormalDistribution(numberOfDecimalPlaces) - { - Mean = (RoundedDouble) expectedValue, - StandardDeviation = (RoundedDouble) Math.Sqrt(variance), - Shift = (RoundedDouble) 0.0 - }; + var mocks = new MockRepository(); + var logNormalDistribution = mocks.Stub(); + logNormalDistribution.Stub(l => l.Mean).Return(new RoundedDouble(numberOfDecimalPlaces, expectedValue)); + logNormalDistribution.Stub(l => l.StandardDeviation).Return(new RoundedDouble(numberOfDecimalPlaces, Math.Sqrt(variance))); + mocks.ReplayAll(); - var designVariable = new LogNormalDistributionDesignVariable(logNormalDistribution) + logNormalDistribution.Shift = (RoundedDouble) 0; + + var designVariable = new LogNormalDistributionDesignVariable(logNormalDistribution) { Percentile = percentile }; @@ -158,7 +169,7 @@ RoundedDouble result = designVariable.GetDesignValue(); // Assert - RoundedDouble expectedResult = new LogNormalDistributionDesignVariable(logNormalDistribution) + RoundedDouble expectedResult = new LogNormalDistributionDesignVariable(logNormalDistribution) { Percentile = percentile }.GetDesignValue(); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -rf2a9c4ae5677049bb5d34537984c114965daa251 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision f2a9c4ae5677049bb5d34537984c114965daa251) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -39,6 +39,7 @@ // Assert Assert.IsInstanceOf(distribution); + Assert.IsInstanceOf(distribution); int numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; double expectedAccuracy = Math.Pow(10.0, -numberOfDecimalPlaces); @@ -62,6 +63,7 @@ // Assert Assert.IsInstanceOf(distribution); + Assert.IsInstanceOf(distribution); double expectedAccuracy = Math.Pow(10.0, -numberOfDecimalPlaces); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionDesignVariableTest.cs =================================================================== diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionDesignVariableTest.cs (.../NormalDistributionDesignVariableTest.cs) (revision 5b8f476716cb75977616203318fa250f608fe7a5) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionDesignVariableTest.cs (.../NormalDistributionDesignVariableTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -22,6 +22,7 @@ using System; using Core.Common.Base.Data; using NUnit.Framework; +using Rhino.Mocks; using Ringtoets.Common.Data.Probabilistics; namespace Ringtoets.Common.Data.Test.Probabilistics @@ -33,18 +34,21 @@ public void ParameterdConstructor_ValidLogNormalDistribution_ExpectedValues() { // Setup - var normalDistribution = new NormalDistribution(3); + var mocks = new MockRepository(); + var normalDistribution = mocks.Stub(); + mocks.ReplayAll(); // Call - var designValue = new NormalDistributionDesignVariable(normalDistribution); + var designValue = new NormalDistributionDesignVariable(normalDistribution); // Assert Assert.AreSame(normalDistribution, designValue.Distribution); Assert.AreEqual(0.5, designValue.Percentile); + mocks.VerifyAll(); } /// - /// Tests the + /// Tests the /// against the values calculated with the excel sheet in WTI-33 (timestamp: 27-11-2015 10:27). /// /// MEAN. @@ -64,13 +68,15 @@ double expectedResult) { // Setup - var normalDistribution = new NormalDistribution(4) - { - Mean = (RoundedDouble) expectedValue, - StandardDeviation = (RoundedDouble) Math.Sqrt(variance) - }; + const int numberOfDecimalPlaces = 4; - var designVariable = new NormalDistributionDesignVariable(normalDistribution) + var mocks = new MockRepository(); + var normalDistribution = mocks.Stub(); + normalDistribution.Stub(d => d.Mean).Return(new RoundedDouble(numberOfDecimalPlaces, expectedValue)); + normalDistribution.Stub(d => d.StandardDeviation).Return(new RoundedDouble(numberOfDecimalPlaces, Math.Sqrt(variance))); + mocks.ReplayAll(); + + var designVariable = new NormalDistributionDesignVariable(normalDistribution) { Percentile = percentile }; Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -rf2a9c4ae5677049bb5d34537984c114965daa251 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision f2a9c4ae5677049bb5d34537984c114965daa251) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -38,7 +38,7 @@ var distribution = new NormalDistribution(); // Assert - Assert.IsInstanceOf(distribution); + Assert.IsInstanceOf(distribution); int numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; @@ -58,7 +58,7 @@ var distribution = new NormalDistribution(numberOfDecimalPlaces); // Assert - Assert.IsInstanceOf(distribution); + Assert.IsInstanceOf(distribution); Assert.AreEqual(0.0, distribution.Mean.Value); Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/PercentileBasedDesignVariableTest.cs =================================================================== diff -u -r974fb1eadbd8a630c7a992648ad42ac85ec205b1 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/PercentileBasedDesignVariableTest.cs (.../PercentileBasedDesignVariableTest.cs) (revision 974fb1eadbd8a630c7a992648ad42ac85ec205b1) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/PercentileBasedDesignVariableTest.cs (.../PercentileBasedDesignVariableTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -35,14 +35,14 @@ { // Setup var mocks = new MockRepository(); - var distributionMock = mocks.StrictMock(); + var distributionMock = mocks.StrictMock(); mocks.ReplayAll(); // Call var designVariable = new SimpleDesignVariable(distributionMock); // Assert - Assert.IsInstanceOf>(designVariable); + Assert.IsInstanceOf>(designVariable); Assert.AreSame(distributionMock, designVariable.Distribution); Assert.AreEqual(0.5, designVariable.Percentile); mocks.VerifyAll(); // Expect no calls on mocks @@ -59,7 +59,7 @@ { // Setup var mocks = new MockRepository(); - var distributionMock = mocks.StrictMock(); + var distributionMock = mocks.StrictMock(); mocks.ReplayAll(); var designVariable = new SimpleDesignVariable(distributionMock); @@ -85,7 +85,7 @@ { // Setup var mocks = new MockRepository(); - var distributionMock = mocks.StrictMock(); + var distributionMock = mocks.StrictMock(); mocks.ReplayAll(); var designVariable = new SimpleDesignVariable(distributionMock); @@ -98,9 +98,9 @@ mocks.VerifyAll(); // Expect no calls on mocks } - private class SimpleDesignVariable : PercentileBasedDesignVariable + private class SimpleDesignVariable : PercentileBasedDesignVariable { - public SimpleDesignVariable(IDistribution distribution) : base(distribution) {} + public SimpleDesignVariable(IDistributionBase distribution) : base(distribution) {} public override RoundedDouble GetDesignValue() { Fisheye: Tag ab330857f161d3f884db508d80a2dd0ade36434f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientDesignVariableTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ab330857f161d3f884db508d80a2dd0ade36434f refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionDesignVariableTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs =================================================================== diff -u -rf2a9c4ae5677049bb5d34537984c114965daa251 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision f2a9c4ae5677049bb5d34537984c114965daa251) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -40,6 +40,7 @@ // Assert Assert.IsInstanceOf(distribution); + Assert.IsInstanceOf(distribution); int numberOfDecimals = RoundedDouble.MaximumNumberOfDecimalPlaces; @@ -60,6 +61,7 @@ // Assert Assert.IsInstanceOf(distribution); + Assert.IsInstanceOf(distribution); Assert.AreEqual(numberOfDecimals, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, distribution.Mean.Value); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj =================================================================== diff -u -r49bbac8914b80005625cc41f2dee8a4812b67ab8 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision 49bbac8914b80005625cc41f2dee8a4812b67ab8) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -74,8 +74,6 @@ - - Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/LimitedPrecisionHelperTest.cs =================================================================== diff -u -r332fd224ce5cd9c737e72f945271c52ae6d64c0d -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/LimitedPrecisionHelperTest.cs (.../LimitedPrecisionHelperTest.cs) (revision 332fd224ce5cd9c737e72f945271c52ae6d64c0d) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/LimitedPrecisionHelperTest.cs (.../LimitedPrecisionHelperTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -82,15 +82,17 @@ Assert.AreEqual(expectedPrecision, accuracy); } - private class SimpleDistribution : IDistribution + private class SimpleDistribution : IDistributionBase { public RoundedDouble Mean { get; set; } - public RoundedDouble StandardDeviation { get; set; } + public RoundedDouble StandardDeviation { get; } + public RoundedDouble CoefficientOfVariation { get; } public object Clone() { throw new NotImplementedException(); } + } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/LimitedPrecisionHelper.cs =================================================================== diff -u -r2857b234df4622cdaf80bbc75abc58af36667347 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/LimitedPrecisionHelper.cs (.../LimitedPrecisionHelper.cs) (revision 2857b234df4622cdaf80bbc75abc58af36667347) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/LimitedPrecisionHelper.cs (.../LimitedPrecisionHelper.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -42,7 +42,7 @@ /// Gets the accuracy for a . /// /// Assumes that all the parameters of the distribution share the same accuracy. - public static double GetAccuracy(this IDistribution distribution) + public static double GetAccuracy(this IDistributionBase distribution) { return distribution.Mean.GetAccuracy(); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs =================================================================== diff -u -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (.../PipingSemiProbabilisticDesignValueFactory.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (.../PipingSemiProbabilisticDesignValueFactory.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -30,15 +30,15 @@ { private static DesignVariable CreateDesignVariable(NormalDistribution distribution, double percentile) { - return new NormalDistributionDesignVariable(distribution) + return new NormalDistributionDesignVariable(distribution) { Percentile = percentile }; } private static DesignVariable CreateDesignVariable(LogNormalDistribution distribution, double percentile) { - return new LogNormalDistributionDesignVariable(distribution) + return new LogNormalDistributionDesignVariable(distribution) { Percentile = percentile }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs =================================================================== diff -u -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -64,7 +64,7 @@ mockRepository.ReplayAll(); var distribution = new LogNormalDistribution(); - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); @@ -93,7 +93,7 @@ Mean = (RoundedDouble) 1, StandardDeviation = (RoundedDouble) 2 }; - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs =================================================================== diff -u -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs (.../LogNormalDistributionDesignVariablePropertiesTest.cs) (revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs (.../LogNormalDistributionDesignVariablePropertiesTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -50,7 +50,7 @@ { // Setup var distribution = new LogNormalDistribution(); - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new LogNormalDistributionDesignVariableProperties(designVariable); @@ -91,7 +91,7 @@ mockRepository.ReplayAll(); var distribution = new LogNormalDistribution(); - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All, @@ -116,7 +116,7 @@ mockRepository.ReplayAll(); var distribution = new LogNormalDistribution(); - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, @@ -168,7 +168,7 @@ Mean = new RoundedDouble(2, 1), StandardDeviation = new RoundedDouble(2, 2) }; - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs =================================================================== diff -u -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs (.../NormalDistributionDesignVariablePropertiesTest.cs) (revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs (.../NormalDistributionDesignVariablePropertiesTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -62,7 +62,7 @@ mockRepository.ReplayAll(); var distribution = new NormalDistribution(); - var designVariable = new NormalDistributionDesignVariable(distribution); + var designVariable = new NormalDistributionDesignVariable(distribution); // Call var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All, @@ -87,7 +87,7 @@ mockRepository.ReplayAll(); var distribution = new NormalDistribution(); - var designVariable = new NormalDistributionDesignVariable(distribution); + var designVariable = new NormalDistributionDesignVariable(distribution); // Call var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, @@ -139,7 +139,7 @@ Mean = new RoundedDouble(2, 1), StandardDeviation = new RoundedDouble(2, 2) }; - var designVariable = new NormalDistributionDesignVariable(distribution); + var designVariable = new NormalDistributionDesignVariable(distribution); // Call var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r7d922899412d52bcc7c2f1432589dfcd62d364b4 -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 7d922899412d52bcc7c2f1432589dfcd62d364b4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -564,13 +564,13 @@ RingtoetsPipingSurfaceLine surfaceLine = ValidSurfaceLine(0.0, 4.0); StochasticSoilModel soilModel = ValidStochasticSoilModel(0.0, 4.0); StochasticSoilProfile soilProfile = soilModel.StochasticSoilProfiles.First(); - var dampingFactorExit = new LogNormalDistributionDesignVariable( + var dampingFactorExit = new LogNormalDistributionDesignVariable( new LogNormalDistribution(3) { Mean = (RoundedDouble) 1.55, StandardDeviation = (RoundedDouble) 0.22 }); - var phreaticLevelExit = new NormalDistributionDesignVariable( + var phreaticLevelExit = new NormalDistributionDesignVariable( new NormalDistribution(3) { Mean = (RoundedDouble) 1.55, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs =================================================================== diff -u -r0eef796eb9da995e56fd1e4a61296ec3c25dcfad -rab330857f161d3f884db508d80a2dd0ade36434f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs (.../ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs) (revision 0eef796eb9da995e56fd1e4a61296ec3c25dcfad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs (.../ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs) (revision ab330857f161d3f884db508d80a2dd0ade36434f) @@ -50,7 +50,7 @@ { // Setup var distribution = new LogNormalDistribution(); - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new ShiftedLogNormalDistributionDesignVariableProperties(designVariable); @@ -91,7 +91,7 @@ mockRepository.ReplayAll(); var distribution = new LogNormalDistribution(); - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All, @@ -116,7 +116,7 @@ mockRepository.ReplayAll(); var distribution = new LogNormalDistribution(); - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, @@ -175,7 +175,7 @@ Mean = new RoundedDouble(2, 1), StandardDeviation = new RoundedDouble(2, 2) }; - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, @@ -204,7 +204,7 @@ StandardDeviation = new RoundedDouble(2, 2), Shift = new RoundedDouble(2, 0.3) }; - var designVariable = new LogNormalDistributionDesignVariable(distribution); + var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None,