Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs =================================================================== diff -u -r92372ba046f1df1593268f692339a53dc1b94e12 -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs (.../GeneralClosingStructuresInput.cs) (revision 92372ba046f1df1593268f692339a53dc1b94e12) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/GeneralClosingStructuresInput.cs (.../GeneralClosingStructuresInput.cs) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) @@ -54,7 +54,7 @@ StandardDeviation = (RoundedDouble) 0.2 }; - ModelFactorSubCriticalFlow = new VariationCoefficientNormalDistribution(1) + ModelFactorSubCriticalFlow = new VariationCoefficientNormalDistribution(2) { Mean = (RoundedDouble) 1, CoefficientOfVariation = (RoundedDouble) 0.1 Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs =================================================================== diff -u -r92372ba046f1df1593268f692339a53dc1b94e12 -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision 92372ba046f1df1593268f692339a53dc1b94e12) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) @@ -32,6 +32,25 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + var modelFactorOverToppingFlow = new LogNormalDistribution(3) + { + Mean = (RoundedDouble) 0.09, + StandardDeviation = (RoundedDouble) 0.06 + }; + + var modelFactorSubCriticalFlow = new VariationCoefficientNormalDistribution(2) + { + Mean = (RoundedDouble) 1, + CoefficientOfVariation = (RoundedDouble) 0.1 + }; + + var modelFactorStorageVolume = new LogNormalDistribution(2) + { + Mean = (RoundedDouble) 1.0, + StandardDeviation = (RoundedDouble) 0.2 + }; + // Call var inputParameters = new GeneralClosingStructuresInput(); @@ -47,18 +66,10 @@ Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces); AssertEqualValue(9.81, inputParameters.GravitationalAcceleration); - Assert.IsInstanceOf(inputParameters.ModelFactorOvertoppingFlow); - AssertEqualValue(0.09, inputParameters.ModelFactorOvertoppingFlow.Mean); - AssertEqualValue(0.06, inputParameters.ModelFactorOvertoppingFlow.StandardDeviation); - - Assert.IsInstanceOf(inputParameters.ModelFactorSubCriticalFlow); - AssertEqualValue(1, inputParameters.ModelFactorSubCriticalFlow.Mean); - AssertEqualValue(0.1, inputParameters.ModelFactorSubCriticalFlow.CoefficientOfVariation); + DistributionAssert.AreEqual(modelFactorOverToppingFlow, inputParameters.ModelFactorOvertoppingFlow); + DistributionAssert.AreEqual(modelFactorSubCriticalFlow, inputParameters.ModelFactorSubCriticalFlow); + DistributionAssert.AreEqual(modelFactorStorageVolume, inputParameters.ModelFactorStorageVolume); - Assert.IsInstanceOf(inputParameters.ModelFactorStorageVolume); - AssertEqualValue(1.0, inputParameters.ModelFactorStorageVolume.Mean); - AssertEqualValue(0.2, inputParameters.ModelFactorStorageVolume.StandardDeviation); - Assert.AreEqual(2, inputParameters.ModelFactorInflowVolume.NumberOfDecimalPlaces); AssertEqualValue(1.0, inputParameters.ModelFactorInflowVolume); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GeneralGrassCoverErosionInwardsInputTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GeneralGrassCoverErosionInwardsInputTest.cs (.../GeneralGrassCoverErosionInwardsInputTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GeneralGrassCoverErosionInwardsInputTest.cs (.../GeneralGrassCoverErosionInwardsInputTest.cs) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) @@ -25,6 +25,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.Properties; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.GrassCoverErosionInwards.Data.Test { @@ -34,40 +35,42 @@ [Test] public void Constructor_ExpectedValues() { - // Call - var inputParameters = new GeneralGrassCoverErosionInwardsInput(); - - // Assert - Assert.AreEqual(2, inputParameters.N); - + // Setup var fbFactor = new NormalDistribution(2) { - Mean = new RoundedDouble(2, 4.75), StandardDeviation = new RoundedDouble(2, 0.5) + Mean = (RoundedDouble) 4.75, + StandardDeviation = (RoundedDouble) 0.5 }; - Assert.AreEqual(fbFactor.Mean, inputParameters.FbFactor.Mean); - Assert.AreEqual(fbFactor.StandardDeviation, inputParameters.FbFactor.StandardDeviation); var fnFactor = new NormalDistribution(2) { - Mean = new RoundedDouble(2, 2.6), StandardDeviation = new RoundedDouble(2, 0.35) + Mean = (RoundedDouble) 2.6, + StandardDeviation = (RoundedDouble) 0.35 }; - Assert.AreEqual(fnFactor.Mean, inputParameters.FnFactor.Mean); - Assert.AreEqual(fnFactor.StandardDeviation, inputParameters.FnFactor.StandardDeviation); var fshallow = new NormalDistribution(2) { - Mean = new RoundedDouble(2, 0.92), StandardDeviation = new RoundedDouble(2, 0.24) + Mean = (RoundedDouble) 0.92, + StandardDeviation = (RoundedDouble) 0.24 }; - Assert.AreEqual(fshallow.Mean, inputParameters.FshallowModelFactor.Mean); - Assert.AreEqual(fshallow.StandardDeviation, inputParameters.FshallowModelFactor.StandardDeviation); var frunupModelFactor = new NormalDistribution(2) { - Mean = new RoundedDouble(2, 1), StandardDeviation = new RoundedDouble(2, 0.07) + Mean = (RoundedDouble) 1, + StandardDeviation = (RoundedDouble) 0.07 }; - Assert.AreEqual(frunupModelFactor.Mean, inputParameters.FrunupModelFactor.Mean); - Assert.AreEqual(frunupModelFactor.StandardDeviation, inputParameters.FrunupModelFactor.StandardDeviation); + // Call + var inputParameters = new GeneralGrassCoverErosionInwardsInput(); + + // Assert + Assert.AreEqual(2, inputParameters.N); + + DistributionAssert.AreEqual(fbFactor, inputParameters.FbFactor); + DistributionAssert.AreEqual(fnFactor, inputParameters.FnFactor); + DistributionAssert.AreEqual(fshallow, inputParameters.FshallowModelFactor); + DistributionAssert.AreEqual(frunupModelFactor, inputParameters.FrunupModelFactor); + Assert.AreEqual(1, inputParameters.CriticalOvertoppingModelFactor); Assert.AreEqual(1, inputParameters.OvertoppingModelFactor); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj =================================================================== diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/Ringtoets.GrassCoverErosionInwards.Data.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Data.Test.csproj) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) @@ -79,6 +79,10 @@ {D4200F43-3F72-4F42-AF0A-8CED416A38EC} Ringtoets.Common.Data + + {4843D6E5-066F-4795-94F5-1D53932DD03C} + Ringtoets.Common.Data.TestUtil + {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} Ringtoets.HydraRing.Data Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs =================================================================== diff -u -ra574ad95af2b4a3f862062d11797d3842051e130 -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs (.../GeneralHeightStructuresInputTest.cs) (revision a574ad95af2b4a3f862062d11797d3842051e130) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs (.../GeneralHeightStructuresInputTest.cs) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) @@ -34,6 +34,19 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + var modelFactorStorageVolume = new LogNormalDistribution(2) + { + Mean = (RoundedDouble) 1.00, + StandardDeviation = (RoundedDouble) 0.20 + }; + + var modelFactorOvertoppingFlow = new LogNormalDistribution(3) + { + Mean = (RoundedDouble) 0.09, + StandardDeviation = (RoundedDouble) 0.06 + }; + // Call var generalHeightStructuresInput = new GeneralHeightStructuresInput(); @@ -43,24 +56,9 @@ Assert.AreEqual(2, generalHeightStructuresInput.GravitationalAcceleration.NumberOfDecimalPlaces); Assert.AreEqual(9.81, generalHeightStructuresInput.GravitationalAcceleration, generalHeightStructuresInput.GravitationalAcceleration.GetAccuracy()); - var modelFactorOvertopping = new LogNormalDistribution(3) - { - Mean = new RoundedDouble(3, 0.09), - StandardDeviation = new RoundedDouble(3, 0.06) - }; - Assert.IsInstanceOf(generalHeightStructuresInput.ModelFactorOvertoppingFlow); - Assert.AreEqual(modelFactorOvertopping.Mean, generalHeightStructuresInput.ModelFactorOvertoppingFlow.Mean); - Assert.AreEqual(modelFactorOvertopping.StandardDeviation, generalHeightStructuresInput.ModelFactorOvertoppingFlow.StandardDeviation); + DistributionAssert.AreEqual(modelFactorOvertoppingFlow, generalHeightStructuresInput.ModelFactorOvertoppingFlow); + DistributionAssert.AreEqual(modelFactorStorageVolume, generalHeightStructuresInput.ModelFactorStorageVolume); - var modelFactorStorageVolume = new LogNormalDistribution(2) - { - Mean = new RoundedDouble(2, 1.00), - StandardDeviation = new RoundedDouble(2, 0.20) - }; - Assert.IsInstanceOf(generalHeightStructuresInput.ModelFactorStorageVolume); - Assert.AreEqual(modelFactorStorageVolume.Mean, generalHeightStructuresInput.ModelFactorStorageVolume.Mean); - Assert.AreEqual(modelFactorStorageVolume.StandardDeviation, generalHeightStructuresInput.ModelFactorStorageVolume.StandardDeviation); - Assert.AreEqual(2, generalHeightStructuresInput.ModelFactorInflowVolume.NumberOfDecimalPlaces); Assert.AreEqual(1, generalHeightStructuresInput.ModelFactorInflowVolume, generalHeightStructuresInput.ModelFactorInflowVolume.GetAccuracy()); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs =================================================================== diff -u -r961ed77a3573d1ca432e7118e0714723aa170c5c -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision 961ed77a3573d1ca432e7118e0714723aa170c5c) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) @@ -34,6 +34,31 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + var modelFactorStorageVolume = new LogNormalDistribution(2) + { + Mean = (RoundedDouble) 1, + StandardDeviation = (RoundedDouble) 0.2 + }; + + var modelFactorSubCriticalFlow = new VariationCoefficientNormalDistribution(2) + { + Mean = (RoundedDouble) 1, + CoefficientOfVariation = (RoundedDouble) 0.1 + }; + + var modelFactorCollisionLoad = new VariationCoefficientNormalDistribution(1) + { + Mean = (RoundedDouble) 1, + CoefficientOfVariation = (RoundedDouble) 0.2 + }; + + var modelFactorLoadEffect = new NormalDistribution(2) + { + Mean = (RoundedDouble) 1, + StandardDeviation = (RoundedDouble) 0.05 + }; + // Call var inputParameters = new GeneralStabilityPointStructuresInput(); @@ -43,22 +68,11 @@ Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces); Assert.AreEqual(9.81, inputParameters.GravitationalAcceleration, inputParameters.GravitationalAcceleration.GetAccuracy()); - Assert.IsInstanceOf(inputParameters.ModelFactorStorageVolume); - Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorStorageVolume.Mean); - Assert.AreEqual(new RoundedDouble(2, 0.2), inputParameters.ModelFactorStorageVolume.StandardDeviation); + DistributionAssert.AreEqual(modelFactorStorageVolume, inputParameters.ModelFactorStorageVolume); + DistributionAssert.AreEqual(modelFactorSubCriticalFlow, inputParameters.ModelFactorSubCriticalFlow); + DistributionAssert.AreEqual(modelFactorCollisionLoad, inputParameters.ModelFactorCollisionLoad); + DistributionAssert.AreEqual(modelFactorLoadEffect, inputParameters.ModelFactorLoadEffect); - Assert.IsInstanceOf(inputParameters.ModelFactorSubCriticalFlow); - Assert.AreEqual(new RoundedDouble(1, 1), inputParameters.ModelFactorSubCriticalFlow.Mean); - Assert.AreEqual(new RoundedDouble(1, 0.1), inputParameters.ModelFactorSubCriticalFlow.CoefficientOfVariation); - - Assert.IsInstanceOf(inputParameters.ModelFactorCollisionLoad); - Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorCollisionLoad.Mean); - Assert.AreEqual(new RoundedDouble(2, 0.2), inputParameters.ModelFactorCollisionLoad.CoefficientOfVariation); - - Assert.IsInstanceOf(inputParameters.ModelFactorLoadEffect); - Assert.AreEqual(new RoundedDouble(2, 1), inputParameters.ModelFactorLoadEffect.Mean); - Assert.AreEqual(new RoundedDouble(2, 0.05), inputParameters.ModelFactorLoadEffect.StandardDeviation); - Assert.AreEqual(2, inputParameters.ModelFactorInflowVolume.NumberOfDecimalPlaces); Assert.AreEqual(1, inputParameters.ModelFactorInflowVolume, inputParameters.ModelFactorInflowVolume.GetAccuracy());