Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs =================================================================== diff -u -rd8060bb8ac069ffc11a45d46814ca9387bbe7230 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision d8060bb8ac069ffc11a45d46814ca9387bbe7230) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -36,57 +36,55 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - var insideWaterLevel = new NormalDistribution(2) + // Call + var input = new ClosingStructuresInput(); + + // Assert + Assert.IsInstanceOf>(input); + + Assert.AreEqual(0, input.FailureProbabilityOpenStructure); + Assert.AreEqual(0, input.FailureProbabilityReparation); + + Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces); + Assert.AreEqual(1.0, input.FactorStormDurationOpenStructure, input.FactorStormDurationOpenStructure.GetAccuracy()); + Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces); + Assert.AreEqual(0.0, input.DeviationWaveDirection, input.DeviationWaveDirection.GetAccuracy()); + + var expectedInsideWaterLevel = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = (RoundedDouble)0.1 }; - var drainCoefficient = new NormalDistribution(2) + var expectedDrainCoefficient = new NormalDistribution(2) { - Mean = (RoundedDouble) 1, - StandardDeviation = (RoundedDouble) 0.2 + Mean = (RoundedDouble)1, + StandardDeviation = (RoundedDouble)0.2 }; - var thresholdHeightOpenWeir = new NormalDistribution(2) + var expectedThresholdHeightOpenWeir = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = (RoundedDouble)0.1 }; - var areaFlowApertures = new LogNormalDistribution(2) + var expectedAreaFlowApertures = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.01 + StandardDeviation = (RoundedDouble)0.01 }; - var levelCrestStructureNotClosing = new NormalDistribution(2) + var expectedLevelCrestStructureNotClosing = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.05 + StandardDeviation = (RoundedDouble)0.05 }; + DistributionAssert.AreEqual(expectedInsideWaterLevel, input.InsideWaterLevel); + DistributionAssert.AreEqual(expectedDrainCoefficient, input.DrainCoefficient); + DistributionAssert.AreEqual(expectedThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); + DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); + DistributionAssert.AreEqual(expectedLevelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); - // Call - var input = new ClosingStructuresInput(); - - // Assert - Assert.IsInstanceOf>(input); - - Assert.AreEqual(0, input.FailureProbabilityOpenStructure); - Assert.AreEqual(0, input.FailureProbabilityReparation); - - Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces); - Assert.AreEqual(1.0, input.FactorStormDurationOpenStructure, input.FactorStormDurationOpenStructure.GetAccuracy()); - Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces); - Assert.AreEqual(0.0, input.DeviationWaveDirection, input.DeviationWaveDirection.GetAccuracy()); - - DistributionAssert.AreEqual(insideWaterLevel, input.InsideWaterLevel); - DistributionAssert.AreEqual(drainCoefficient, input.DrainCoefficient); - DistributionAssert.AreEqual(thresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); - DistributionAssert.AreEqual(areaFlowApertures, input.AreaFlowApertures); - DistributionAssert.AreEqual(levelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); - Assert.AreEqual(1.0, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreEqual(0, input.IdenticalApertures); } @@ -114,10 +112,10 @@ Structure = structure }; - var expectedFactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure; - var expectedDrainCoefficient = input.DrainCoefficient; - var expectedDeviationWaveDirection = input.DeviationWaveDirection; - var expectedInsideWaterLevel = input.InsideWaterLevel; + RoundedDouble expectedFactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure; + NormalDistribution expectedDrainCoefficient = input.DrainCoefficient; + RoundedDouble expectedDeviationWaveDirection = input.DeviationWaveDirection; + NormalDistribution expectedInsideWaterLevel = input.InsideWaterLevel; // Pre-condition AssertClosingStructure(structure, input); @@ -138,27 +136,27 @@ DistributionAssert.AreEqual(expectedInsideWaterLevel, input.InsideWaterLevel); DistributionAssert.AreEqual(expectedDrainCoefficient, input.DrainCoefficient); - var thresholdHeightOpenWeir = new NormalDistribution(2) + var expectedThresholdHeightOpenWeir = new NormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble)0.1 }; - var areaFlowApertures = new LogNormalDistribution(2) + var expectedAreaFlowApertures = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble)0.01 }; - var levelCrestStructureNotClosing = new NormalDistribution(2) + var expectedLevelCrestStructureNotClosing = new NormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble)0.05 }; - DistributionAssert.AreEqual(thresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); - DistributionAssert.AreEqual(areaFlowApertures, input.AreaFlowApertures); - DistributionAssert.AreEqual(levelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); + DistributionAssert.AreEqual(expectedThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); + DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); + DistributionAssert.AreEqual(expectedLevelCrestStructureNotClosing, input.LevelCrestStructureNotClosing); Assert.AreEqual(1.0, input.ProbabilityOrFrequencyOpenStructureBeforeFlooding); Assert.AreEqual(0, input.IdenticalApertures); @@ -188,11 +186,6 @@ var input = new ClosingStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -203,6 +196,11 @@ input.InsideWaterLevel = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.InsideWaterLevel, distributionToSet, expectedDistribution); } @@ -304,11 +302,6 @@ var input = new ClosingStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -319,6 +312,11 @@ input.ThresholdHeightOpenWeir = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.ThresholdHeightOpenWeir, distributionToSet, expectedDistribution); } @@ -330,11 +328,6 @@ var input = new ClosingStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new LogNormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new LogNormalDistribution(5) { Mean = mean, @@ -345,6 +338,11 @@ input.AreaFlowApertures = distributionToSet; // Assert + var expectedDistribution = new LogNormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.AreaFlowApertures, distributionToSet, expectedDistribution); } @@ -420,11 +418,6 @@ var input = new ClosingStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -435,6 +428,11 @@ input.LevelCrestStructureNotClosing = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.LevelCrestStructureNotClosing, distributionToSet, expectedDistribution); } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs =================================================================== diff -u -r47554b7d8ad564919abb9e23374dbd8235be9b32 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision 47554b7d8ad564919abb9e23374dbd8235be9b32) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/LogNormalDistributionTest.cs (.../LogNormalDistributionTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -37,9 +37,11 @@ var distribution = new LogNormalDistribution(); // Assert - var numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; Assert.IsInstanceOf(distribution); + + int numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; double expectedAccuracy = Math.Pow(10.0, -numberOfDecimalPlaces); + Assert.AreEqual(Math.Exp(-0.5), distribution.Mean, expectedAccuracy); Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(Math.Sqrt((Math.Exp(1) - 1) * Math.Exp(1)), distribution.StandardDeviation, expectedAccuracy); @@ -59,7 +61,9 @@ // Assert Assert.IsInstanceOf(distribution); + double expectedAccuracy = Math.Pow(10.0, -numberOfDecimalPlaces); + Assert.AreEqual(Math.Exp(-0.5), distribution.Mean, expectedAccuracy); Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(Math.Sqrt((Math.Exp(1) - 1)*Math.Exp(1)), distribution.StandardDeviation, expectedAccuracy); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs =================================================================== diff -u -r47554b7d8ad564919abb9e23374dbd8235be9b32 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision 47554b7d8ad564919abb9e23374dbd8235be9b32) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/NormalDistributionTest.cs (.../NormalDistributionTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -37,8 +37,10 @@ var distribution = new NormalDistribution(); // Assert - var numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; Assert.IsInstanceOf(distribution); + + int numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; + Assert.AreEqual(0.0, distribution.Mean.Value); Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, distribution.StandardDeviation.Value); @@ -56,6 +58,7 @@ // Assert Assert.IsInstanceOf(distribution); + Assert.AreEqual(0.0, distribution.Mean.Value); Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, distribution.StandardDeviation.Value); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs =================================================================== diff -u -r47554b7d8ad564919abb9e23374dbd8235be9b32 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision 47554b7d8ad564919abb9e23374dbd8235be9b32) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientLogNormalDistributionTest.cs (.../VariationCoefficientLogNormalDistributionTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -38,8 +38,10 @@ var distribution = new VariationCoefficientLogNormalDistribution(); // Assert - var numberOfDecimals = RoundedDouble.MaximumNumberOfDecimalPlaces; Assert.IsInstanceOf(distribution); + + int numberOfDecimals = RoundedDouble.MaximumNumberOfDecimalPlaces; + Assert.AreEqual(numberOfDecimals, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, distribution.Mean.Value); Assert.AreEqual(numberOfDecimals, distribution.CoefficientOfVariation.NumberOfDecimalPlaces); @@ -57,6 +59,7 @@ // Assert Assert.IsInstanceOf(distribution); + Assert.AreEqual(numberOfDecimals, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, distribution.Mean.Value); Assert.AreEqual(numberOfDecimals, distribution.CoefficientOfVariation.NumberOfDecimalPlaces); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs =================================================================== diff -u -r47554b7d8ad564919abb9e23374dbd8235be9b32 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision 47554b7d8ad564919abb9e23374dbd8235be9b32) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/VariationCoefficientNormalDistributionTest.cs (.../VariationCoefficientNormalDistributionTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -37,8 +37,10 @@ var distribution = new VariationCoefficientNormalDistribution(); // Assert - var numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; Assert.IsInstanceOf(distribution); + + int numberOfDecimalPlaces = RoundedDouble.MaximumNumberOfDecimalPlaces; + Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, distribution.Mean.Value); Assert.AreEqual(numberOfDecimalPlaces, distribution.CoefficientOfVariation.NumberOfDecimalPlaces); @@ -56,6 +58,7 @@ // Assert Assert.IsInstanceOf(distribution); + Assert.AreEqual(numberOfDecimalPlaces, distribution.Mean.NumberOfDecimalPlaces); Assert.AreEqual(1.0, distribution.Mean.Value); Assert.AreEqual(numberOfDecimalPlaces, distribution.CoefficientOfVariation.NumberOfDecimalPlaces); @@ -67,8 +70,6 @@ [TestCase(16)] public void Constructor_InvalidNumberOfDecimalPlaces_ThrowsArgumentOutOfRangeException(int numberOfDecimalPlaces) { - // Setup - // Call TestDelegate call = () => new VariationCoefficientNormalDistribution(numberOfDecimalPlaces); Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs =================================================================== diff -u -rd8060bb8ac069ffc11a45d46814ca9387bbe7230 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision d8060bb8ac069ffc11a45d46814ca9387bbe7230) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -40,80 +40,79 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - var modelFactorSuperCriticalFlow = new NormalDistribution(2) + // Call + var input = new SimpleStructuresInput(); + + // Assert + Assert.IsInstanceOf(input); + Assert.IsInstanceOf>(input); + Assert.IsInstanceOf(input); + Assert.IsInstanceOf(input); + + Assert.IsNull(input.Structure); + Assert.IsNull(input.HydraulicBoundaryLocation); + + AssertAreEqual(double.NaN, input.StructureNormalOrientation); + Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); + + Assert.IsNull(input.ForeshoreProfile); + Assert.IsFalse(input.UseBreakWater); + Assert.AreEqual(BreakWaterType.Dam, input.BreakWater.Type); + Assert.AreEqual(0, input.BreakWater.Height.Value); + Assert.AreEqual(2, input.BreakWater.Height.NumberOfDecimalPlaces); + Assert.IsFalse(input.UseForeshore); + CollectionAssert.IsEmpty(input.ForeshoreGeometry); + + var expectedModelFactorSuperCriticalFlow = new NormalDistribution(2) { - Mean = (RoundedDouble) 1.1, - StandardDeviation = (RoundedDouble) 0.03 + Mean = (RoundedDouble)1.1, + StandardDeviation = (RoundedDouble)0.03 }; - var allowedLevelIncreaseStorage = new LogNormalDistribution(2) + var expectedAllowedLevelIncreaseStorage = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = (RoundedDouble)0.1 }; - var storageStructureArea = new VariationCoefficientLogNormalDistribution(2) + var expectedStorageStructureArea = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = (RoundedDouble)0.1 }; - var flowWidthAtBottomProtection = new LogNormalDistribution(2) + var expectedFlowWidthAtBottomProtection = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.05 + StandardDeviation = (RoundedDouble)0.05 }; - var criticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2) + var expectedCriticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.15 + CoefficientOfVariation = (RoundedDouble)0.15 }; - var widthFlowApertures = new VariationCoefficientNormalDistribution(2) + var expectedWidthFlowApertures = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.05 + CoefficientOfVariation = (RoundedDouble)0.05 }; - var stormDuration = new VariationCoefficientLogNormalDistribution(2) + var expectedStormDuration = new VariationCoefficientLogNormalDistribution(2) { - Mean = (RoundedDouble) 6.0, - CoefficientOfVariation = (RoundedDouble) 0.25 + Mean = (RoundedDouble)6.0, + CoefficientOfVariation = (RoundedDouble)0.25 }; - // Call - var input = new SimpleStructuresInput(); + DistributionAssert.AreEqual(expectedModelFactorSuperCriticalFlow, input.ModelFactorSuperCriticalFlow); + DistributionAssert.AreEqual(expectedAllowedLevelIncreaseStorage, input.AllowedLevelIncreaseStorage); + DistributionAssert.AreEqual(expectedStorageStructureArea, input.StorageStructureArea); + DistributionAssert.AreEqual(expectedFlowWidthAtBottomProtection, input.FlowWidthAtBottomProtection); + DistributionAssert.AreEqual(expectedCriticalOvertoppingDischarge, input.CriticalOvertoppingDischarge); + DistributionAssert.AreEqual(expectedWidthFlowApertures, input.WidthFlowApertures); + DistributionAssert.AreEqual(expectedStormDuration, input.StormDuration); - // Assert - Assert.IsInstanceOf(input); - Assert.IsInstanceOf>(input); - Assert.IsInstanceOf(input); - Assert.IsInstanceOf(input); - - Assert.IsNull(input.Structure); - Assert.IsNull(input.HydraulicBoundaryLocation); - - AssertAreEqual(double.NaN, input.StructureNormalOrientation); - Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - - Assert.IsNull(input.ForeshoreProfile); - Assert.IsFalse(input.UseBreakWater); - Assert.AreEqual(BreakWaterType.Dam, input.BreakWater.Type); - Assert.AreEqual(0, input.BreakWater.Height.Value); - Assert.AreEqual(2, input.BreakWater.Height.NumberOfDecimalPlaces); - Assert.IsFalse(input.UseForeshore); - CollectionAssert.IsEmpty(input.ForeshoreGeometry); - - DistributionAssert.AreEqual(modelFactorSuperCriticalFlow, input.ModelFactorSuperCriticalFlow); - DistributionAssert.AreEqual(allowedLevelIncreaseStorage, input.AllowedLevelIncreaseStorage); - DistributionAssert.AreEqual(storageStructureArea, input.StorageStructureArea); - DistributionAssert.AreEqual(flowWidthAtBottomProtection, input.FlowWidthAtBottomProtection); - DistributionAssert.AreEqual(criticalOvertoppingDischarge, input.CriticalOvertoppingDischarge); - DistributionAssert.AreEqual(widthFlowApertures, input.WidthFlowApertures); - DistributionAssert.AreEqual(stormDuration, input.StormDuration); - Assert.AreEqual(1.0, input.FailureProbabilityStructureWithErosion); } @@ -152,13 +151,13 @@ Id = "id" }); - var input = new SimpleStructuresInput() + var input = new SimpleStructuresInput { Structure = structure }; - var expectedStormDuraation = input.StormDuration; - var expectedModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow; + VariationCoefficientLogNormalDistribution expectedStormDuraation = input.StormDuration; + NormalDistribution expectedModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow; // Pre-condition Assert.AreSame(structure, input.Structure); @@ -173,41 +172,41 @@ AssertAreEqual(double.NaN, input.StructureNormalOrientation); Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - var allowedLevelIncreaseStorage = new LogNormalDistribution(2) + var expectedAllowedLevelIncreaseStorage = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble) 0.1 }; - var storageStructureArea = new VariationCoefficientLogNormalDistribution(2) + var expectedStorageStructureArea = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.1 }; - var flowWidthAtBottomProtection = new LogNormalDistribution(2) + var expectedFlowWidthAtBottomProtection = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble) 0.05 }; - var criticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2) + var expectedCriticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.15 }; - var widthFlowApertures = new VariationCoefficientNormalDistribution(2) + var expectedWidthFlowApertures = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.05 }; - DistributionAssert.AreEqual(allowedLevelIncreaseStorage, input.AllowedLevelIncreaseStorage); - DistributionAssert.AreEqual(storageStructureArea, input.StorageStructureArea); - DistributionAssert.AreEqual(flowWidthAtBottomProtection, input.FlowWidthAtBottomProtection); - DistributionAssert.AreEqual(criticalOvertoppingDischarge, input.CriticalOvertoppingDischarge); - DistributionAssert.AreEqual(widthFlowApertures, input.WidthFlowApertures); + DistributionAssert.AreEqual(expectedAllowedLevelIncreaseStorage, input.AllowedLevelIncreaseStorage); + DistributionAssert.AreEqual(expectedStorageStructureArea, input.StorageStructureArea); + DistributionAssert.AreEqual(expectedFlowWidthAtBottomProtection, input.FlowWidthAtBottomProtection); + DistributionAssert.AreEqual(expectedCriticalOvertoppingDischarge, input.CriticalOvertoppingDischarge); + DistributionAssert.AreEqual(expectedWidthFlowApertures, input.WidthFlowApertures); Assert.AreEqual(1.0, input.FailureProbabilityStructureWithErosion); } @@ -221,7 +220,7 @@ var random = new Random(22); var input = new SimpleStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) + NormalDistribution expectedDistribution = new NormalDistribution(2) { Mean = mean, StandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation @@ -333,11 +332,6 @@ var input = new SimpleStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new LogNormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new LogNormalDistribution(5) { Mean = mean, @@ -348,6 +342,11 @@ input.AllowedLevelIncreaseStorage = distributionToSet; // Assert + var expectedDistribution = new LogNormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.AllowedLevelIncreaseStorage, distributionToSet, expectedDistribution); } @@ -359,11 +358,6 @@ var input = new SimpleStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientLogNormalDistribution(5) { Mean = mean, @@ -374,6 +368,11 @@ input.StorageStructureArea = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.StorageStructureArea, distributionToSet, expectedDistribution); } @@ -385,11 +384,6 @@ var input = new SimpleStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new LogNormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new LogNormalDistribution(5) { Mean = mean, @@ -400,6 +394,11 @@ input.FlowWidthAtBottomProtection = distributionToSet; // Assert + var expectedDistribution = new LogNormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.FlowWidthAtBottomProtection, distributionToSet, expectedDistribution); } @@ -411,11 +410,6 @@ var input = new SimpleStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientLogNormalDistribution(5) { Mean = mean, @@ -426,6 +420,11 @@ input.CriticalOvertoppingDischarge = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.CriticalOvertoppingDischarge, distributionToSet, expectedDistribution); } @@ -469,11 +468,6 @@ var input = new SimpleStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientNormalDistribution(5) { Mean = mean, @@ -484,6 +478,11 @@ input.WidthFlowApertures = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.WidthFlowApertures, distributionToSet, expectedDistribution); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs =================================================================== diff -u -rd8060bb8ac069ffc11a45d46814ca9387bbe7230 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision d8060bb8ac069ffc11a45d46814ca9387bbe7230) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -36,20 +36,18 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - var levelCrestStructure = new NormalDistribution(2) - { - Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.05 - }; - // Call var input = new HeightStructuresInput(); // Assert Assert.IsInstanceOf>(input); - DistributionAssert.AreEqual(levelCrestStructure, input.LevelCrestStructure); + var expectedLevelCrestStructure = new NormalDistribution(2) + { + Mean = RoundedDouble.NaN, + StandardDeviation = (RoundedDouble)0.05 + }; + DistributionAssert.AreEqual(expectedLevelCrestStructure, input.LevelCrestStructure); Assert.AreEqual(2, input.DeviationWaveDirection.NumberOfDecimalPlaces); Assert.AreEqual(0.0, input.DeviationWaveDirection, input.DeviationWaveDirection.GetAccuracy()); @@ -78,7 +76,7 @@ Structure = structure }; - var expectedDeviationWaveDirection = input.DeviationWaveDirection; + RoundedDouble expectedDeviationWaveDirection = input.DeviationWaveDirection; // Pre-condition AssertHeightStructure(structure, input); @@ -89,13 +87,13 @@ // Then AssertAreEqual(expectedDeviationWaveDirection, input.DeviationWaveDirection); - var levelCrestStructure = new NormalDistribution(2) + var expectedLevelCrestStructure = new NormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble)0.05 }; - DistributionAssert.AreEqual(levelCrestStructure, input.LevelCrestStructure); + DistributionAssert.AreEqual(expectedLevelCrestStructure, input.LevelCrestStructure); } [Test] @@ -122,11 +120,6 @@ var input = new HeightStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -137,6 +130,11 @@ input.LevelCrestStructure = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs =================================================================== diff -u -rd8060bb8ac069ffc11a45d46814ca9387bbe7230 -r1bd1adf2f50f50a4043cb3ae1f159979f8e59d90 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision d8060bb8ac069ffc11a45d46814ca9387bbe7230) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 1bd1adf2f50f50a4043cb3ae1f159979f8e59d90) @@ -36,129 +36,129 @@ [Test] public void Constructor_ExpectedValues() { - // Setup - var insideWaterLevelFailureConstruction = new NormalDistribution(2) + // Call + var input = new StabilityPointStructuresInput(); + + // Assert + Assert.IsInstanceOf>(input); + + Assert.AreEqual(LoadSchematizationType.Linear, input.LoadSchematizationType); + + AssertAreEqual(9.81, input.VolumicWeightWater); + Assert.AreEqual(2, input.VolumicWeightWater.NumberOfDecimalPlaces); + + var expectedInsideWaterLevelFailureConstruction = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = (RoundedDouble)0.1 }; - var insideWaterLevel = new NormalDistribution(2) + var expectedInsideWaterLevel = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = (RoundedDouble)0.1 }; - var drainCoefficient = new NormalDistribution(2) + var expectedDrainCoefficient = new NormalDistribution(2) { - Mean = (RoundedDouble) 1, - StandardDeviation = (RoundedDouble) 0.2 + Mean = (RoundedDouble)1, + StandardDeviation = (RoundedDouble)0.2 }; - var flowVelocityStructureClosable = new NormalDistribution(2) + var expectedFlowVelocityStructureClosable = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 1 + StandardDeviation = (RoundedDouble)1 }; - var levelCrestStructure = new NormalDistribution(2) + var expectedLevelCrestStructure = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.05 + StandardDeviation = (RoundedDouble)0.05 }; - var thresholdHeightOpenWeir = new NormalDistribution(2) + var expectedThresholdHeightOpenWeir = new NormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.1 + StandardDeviation = (RoundedDouble)0.1 }; - var areaFlowApertures = new LogNormalDistribution(2) + var expectedAreaFlowApertures = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, - StandardDeviation = (RoundedDouble) 0.01 + StandardDeviation = (RoundedDouble)0.01 }; - var constructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedConstructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = (RoundedDouble)0.1 }; - var constructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedConstructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = (RoundedDouble)0.1 }; - var stabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedStabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = (RoundedDouble)0.1 }; - var stabilityQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedStabilityQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.1 + CoefficientOfVariation = (RoundedDouble)0.1 }; - var failureCollisionEnergy = new VariationCoefficientLogNormalDistribution(2) + var expectedFailureCollisionEnergy = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.3 + CoefficientOfVariation = (RoundedDouble)0.3 }; - var shipMass = new VariationCoefficientNormalDistribution(2) + var expectedShipMass = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = (RoundedDouble)0.2 }; - var shipVelocity = new VariationCoefficientNormalDistribution(2) + var expectedShipVelocity = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, - CoefficientOfVariation = (RoundedDouble) 0.2 + CoefficientOfVariation = (RoundedDouble)0.2 }; - var bankWidth = new NormalDistribution(2) + var expectedBankWidth = new NormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = RoundedDouble.NaN }; - // Call - var input = new StabilityPointStructuresInput(); + DistributionAssert.AreEqual(expectedInsideWaterLevelFailureConstruction, input.InsideWaterLevelFailureConstruction); + DistributionAssert.AreEqual(expectedInsideWaterLevel, input.InsideWaterLevel); - // Assert - Assert.IsInstanceOf>(input); - - Assert.AreEqual(LoadSchematizationType.Linear, input.LoadSchematizationType); - - AssertAreEqual(9.81, input.VolumicWeightWater); - Assert.AreEqual(2, input.VolumicWeightWater.NumberOfDecimalPlaces); - DistributionAssert.AreEqual(insideWaterLevelFailureConstruction, input.InsideWaterLevelFailureConstruction); - DistributionAssert.AreEqual(insideWaterLevel, input.InsideWaterLevel); - Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces); Assert.AreEqual(1.0, input.FactorStormDurationOpenStructure, input.FactorStormDurationOpenStructure.GetAccuracy()); - DistributionAssert.AreEqual(drainCoefficient, input.DrainCoefficient); - DistributionAssert.AreEqual(flowVelocityStructureClosable, input.FlowVelocityStructureClosable); + DistributionAssert.AreEqual(expectedDrainCoefficient, input.DrainCoefficient); + DistributionAssert.AreEqual(expectedFlowVelocityStructureClosable, input.FlowVelocityStructureClosable); - DistributionAssert.AreEqual(levelCrestStructure, input.LevelCrestStructure); - DistributionAssert.AreEqual(thresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); - DistributionAssert.AreEqual(areaFlowApertures, input.AreaFlowApertures); - DistributionAssert.AreEqual(constructiveStrengthLinearLoadModel, input.ConstructiveStrengthLinearLoadModel); - DistributionAssert.AreEqual(constructiveStrengthQuadraticLoadModel, input.ConstructiveStrengthQuadraticLoadModel); - DistributionAssert.AreEqual(stabilityLinearLoadModel, input.StabilityLinearLoadModel); - DistributionAssert.AreEqual(stabilityQuadraticLoadModel, input.StabilityQuadraticLoadModel); + DistributionAssert.AreEqual(expectedLevelCrestStructure, input.LevelCrestStructure); + DistributionAssert.AreEqual(expectedThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); + DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); + DistributionAssert.AreEqual(expectedConstructiveStrengthLinearLoadModel, input.ConstructiveStrengthLinearLoadModel); + DistributionAssert.AreEqual(expectedConstructiveStrengthQuadraticLoadModel, input.ConstructiveStrengthQuadraticLoadModel); + DistributionAssert.AreEqual(expectedStabilityLinearLoadModel, input.StabilityLinearLoadModel); + DistributionAssert.AreEqual(expectedStabilityQuadraticLoadModel, input.StabilityQuadraticLoadModel); Assert.AreEqual(0, input.FailureProbabilityRepairClosure); - DistributionAssert.AreEqual(failureCollisionEnergy, input.FailureCollisionEnergy); - DistributionAssert.AreEqual(shipMass, input.ShipMass); - DistributionAssert.AreEqual(shipVelocity, input.ShipVelocity); + DistributionAssert.AreEqual(expectedFailureCollisionEnergy, input.FailureCollisionEnergy); + DistributionAssert.AreEqual(expectedShipMass, input.ShipMass); + DistributionAssert.AreEqual(expectedShipVelocity, input.ShipVelocity); Assert.AreEqual(0, input.LevellingCount); Assert.AreEqual(0, input.ProbabilityCollisionSecondaryStructure); - DistributionAssert.AreEqual(bankWidth, input.BankWidth); + DistributionAssert.AreEqual(expectedBankWidth, input.BankWidth); Assert.AreEqual(2, input.EvaluationLevel.NumberOfDecimalPlaces); AssertAreEqual(0, input.EvaluationLevel); Assert.AreEqual(2, input.VerticalDistance.NumberOfDecimalPlaces); @@ -183,14 +183,14 @@ { // Given var structure = new TestStabilityPointStructure(); - var input = new StabilityPointStructuresInput() + var input = new StabilityPointStructuresInput { Structure = structure }; - var expectedVolumicWeightWater = input.VolumicWeightWater; - var expectedDrainCoefficient = input.DrainCoefficient; - var expectedFactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure; + RoundedDouble expectedVolumicWeightWater = input.VolumicWeightWater; + NormalDistribution expectedDrainCoefficient = input.DrainCoefficient; + RoundedDouble expectedFactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure; // Pre-condition AssertStabilityPointStructure(structure, input); @@ -210,86 +210,86 @@ DistributionAssert.AreEqual(structure.FlowVelocityStructureClosable, input.FlowVelocityStructureClosable); DistributionAssert.AreEqual(expectedDrainCoefficient, input.DrainCoefficient); - var levelCrestStructure = new NormalDistribution(2) + var expectedLevelCrestStructure = new NormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble) 0.05 }; - var thresholdHeightOpenWeir = new NormalDistribution(2) + var expectedThresholdHeightOpenWeir = new NormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble) 0.1 }; - var areaFlowApertures = new LogNormalDistribution(2) + var expectedAreaFlowApertures = new LogNormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = (RoundedDouble) 0.01 }; - var constructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedConstructiveStrengthLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.1 }; - var constructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedConstructiveStrengthQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.1 }; - var stabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedStabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.1 }; - var stabilityQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) + var expectedStabilityQuadraticLoadModel = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.1 }; - var failureCollisionEnergy = new VariationCoefficientLogNormalDistribution(2) + var expectedFailureCollisionEnergy = new VariationCoefficientLogNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.3 }; - var shipMass = new VariationCoefficientNormalDistribution(2) + var expectedShipMass = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.2 }; - var shipVelocity = new VariationCoefficientNormalDistribution(2) + var expectedShipVelocity = new VariationCoefficientNormalDistribution(2) { Mean = RoundedDouble.NaN, CoefficientOfVariation = (RoundedDouble) 0.2 }; - var bankWidth = new NormalDistribution(2) + var expectedBankWidth = new NormalDistribution(2) { Mean = RoundedDouble.NaN, StandardDeviation = RoundedDouble.NaN }; - DistributionAssert.AreEqual(levelCrestStructure, input.LevelCrestStructure); - DistributionAssert.AreEqual(thresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); - DistributionAssert.AreEqual(areaFlowApertures, input.AreaFlowApertures); - DistributionAssert.AreEqual(constructiveStrengthLinearLoadModel, input.ConstructiveStrengthLinearLoadModel); - DistributionAssert.AreEqual(constructiveStrengthQuadraticLoadModel, input.ConstructiveStrengthQuadraticLoadModel); - DistributionAssert.AreEqual(stabilityLinearLoadModel, input.StabilityLinearLoadModel); - DistributionAssert.AreEqual(stabilityQuadraticLoadModel, input.StabilityQuadraticLoadModel); + DistributionAssert.AreEqual(expectedLevelCrestStructure, input.LevelCrestStructure); + DistributionAssert.AreEqual(expectedThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); + DistributionAssert.AreEqual(expectedAreaFlowApertures, input.AreaFlowApertures); + DistributionAssert.AreEqual(expectedConstructiveStrengthLinearLoadModel, input.ConstructiveStrengthLinearLoadModel); + DistributionAssert.AreEqual(expectedConstructiveStrengthQuadraticLoadModel, input.ConstructiveStrengthQuadraticLoadModel); + DistributionAssert.AreEqual(expectedStabilityLinearLoadModel, input.StabilityLinearLoadModel); + DistributionAssert.AreEqual(expectedStabilityQuadraticLoadModel, input.StabilityQuadraticLoadModel); Assert.AreEqual(0, input.FailureProbabilityRepairClosure); - DistributionAssert.AreEqual(failureCollisionEnergy, input.FailureCollisionEnergy); - DistributionAssert.AreEqual(shipMass, input.ShipMass); - DistributionAssert.AreEqual(shipVelocity, input.ShipVelocity); + DistributionAssert.AreEqual(expectedFailureCollisionEnergy, input.FailureCollisionEnergy); + DistributionAssert.AreEqual(expectedShipMass, input.ShipMass); + DistributionAssert.AreEqual(expectedShipVelocity, input.ShipVelocity); Assert.AreEqual(0, input.LevellingCount); Assert.AreEqual(0, input.ProbabilityCollisionSecondaryStructure); - DistributionAssert.AreEqual(bankWidth, input.BankWidth); + DistributionAssert.AreEqual(expectedBankWidth, input.BankWidth); Assert.AreEqual(2, input.EvaluationLevel.NumberOfDecimalPlaces); AssertAreEqual(0, input.EvaluationLevel); Assert.AreEqual(2, input.VerticalDistance.NumberOfDecimalPlaces); @@ -336,11 +336,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -351,6 +346,11 @@ input.InsideWaterLevelFailureConstruction = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.InsideWaterLevelFailureConstruction, distributionToSet, expectedDistribution); } @@ -362,11 +362,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -377,6 +372,11 @@ input.InsideWaterLevel = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.InsideWaterLevel, distributionToSet, expectedDistribution); } @@ -434,11 +434,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -449,6 +444,11 @@ input.FlowVelocityStructureClosable = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.FlowVelocityStructureClosable, distributionToSet, expectedDistribution); } @@ -464,11 +464,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -479,6 +474,11 @@ input.LevelCrestStructure = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.LevelCrestStructure, distributionToSet, expectedDistribution); } @@ -490,11 +490,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -505,6 +500,11 @@ input.ThresholdHeightOpenWeir = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.ThresholdHeightOpenWeir, distributionToSet, expectedDistribution); } @@ -516,11 +516,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new LogNormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new LogNormalDistribution(5) { Mean = mean, @@ -531,6 +526,11 @@ input.AreaFlowApertures = distributionToSet; // Assert + var expectedDistribution = new LogNormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.AreaFlowApertures, distributionToSet, expectedDistribution); } @@ -542,11 +542,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientLogNormalDistribution(5) { Mean = mean, @@ -557,6 +552,11 @@ input.ConstructiveStrengthLinearLoadModel = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.ConstructiveStrengthLinearLoadModel, distributionToSet, expectedDistribution); } @@ -568,11 +568,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientLogNormalDistribution(5) { Mean = mean, @@ -583,6 +578,11 @@ input.ConstructiveStrengthQuadraticLoadModel = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.ConstructiveStrengthQuadraticLoadModel, distributionToSet, expectedDistribution); } @@ -594,11 +594,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientLogNormalDistribution(5) { Mean = mean, @@ -609,6 +604,11 @@ input.StabilityLinearLoadModel = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.StabilityLinearLoadModel, distributionToSet, expectedDistribution); } @@ -620,11 +620,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientLogNormalDistribution(5) { Mean = mean, @@ -634,7 +629,12 @@ // Call input.StabilityQuadraticLoadModel = distributionToSet; - // Assert + // Assert + var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.StabilityQuadraticLoadModel, distributionToSet, expectedDistribution); } @@ -678,11 +678,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientLogNormalDistribution(5) { Mean = mean, @@ -693,6 +688,11 @@ input.FailureCollisionEnergy = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientLogNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.FailureCollisionEnergy, distributionToSet, expectedDistribution); } @@ -704,11 +704,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientNormalDistribution(5) { Mean = mean, @@ -719,6 +714,11 @@ input.ShipMass = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.ShipMass, distributionToSet, expectedDistribution); } @@ -730,11 +730,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var variation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new VariationCoefficientNormalDistribution(2) - { - Mean = mean, - CoefficientOfVariation = variation - }; var distributionToSet = new VariationCoefficientNormalDistribution(5) { Mean = mean, @@ -745,6 +740,11 @@ input.ShipVelocity = distributionToSet; // Assert + var expectedDistribution = new VariationCoefficientNormalDistribution(2) + { + Mean = mean, + CoefficientOfVariation = variation + }; AssertDistributionCorrectlySet(input.ShipVelocity, distributionToSet, expectedDistribution); } @@ -788,11 +788,6 @@ var input = new StabilityPointStructuresInput(); var mean = (RoundedDouble) (0.01 + random.NextDouble()); var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble()); - var expectedDistribution = new NormalDistribution(2) - { - Mean = mean, - StandardDeviation = standardDeviation - }; var distributionToSet = new NormalDistribution(5) { Mean = mean, @@ -803,6 +798,11 @@ input.BankWidth = distributionToSet; // Assert + var expectedDistribution = new NormalDistribution(2) + { + Mean = mean, + StandardDeviation = standardDeviation + }; AssertDistributionCorrectlySet(input.BankWidth, distributionToSet, expectedDistribution); }