Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs =================================================================== diff -u -r719fdf29c8274e201e877c3ee5d6717448b6c94c -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 719fdf29c8274e201e877c3ee5d6717448b6c94c) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -208,7 +208,7 @@ /// [1/year] /// /// Thrown when the value of the probability - /// is not between [0, 1]. + /// is not in the interval [0, 1]. public double FailureProbabilityOpenStructure { get @@ -230,7 +230,7 @@ /// [1/year] /// /// Thrown when the value of the probability - /// is not between [0, 1]. + /// is not in the interval [0, 1]. public double FailureProbabilityReparation { get @@ -248,7 +248,7 @@ } /// - /// Gets or sets the amount of identical apertures to use during the calculation. + /// Gets or sets the amount of identical apertures. /// public int IdenticalApertures { get; set; } @@ -273,7 +273,7 @@ /// Gets or sets the failure probability of an open structure before flooding. /// /// Thrown when the value of the probability - /// is not between [0, 1]. + /// is not in the interval [0, 1]. public double ProbabilityOpenStructureBeforeFlooding { get Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs =================================================================== diff -u -r91e808c7d6bb3884977b8d4e74b9c6cc28394329 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision 91e808c7d6bb3884977b8d4e74b9c6cc28394329) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/GeneralClosingStructuresInputTest.cs (.../GeneralClosingStructuresInputTest.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -56,22 +56,22 @@ // Assert Assert.AreEqual(2, inputParameters.C.NumberOfDecimalPlaces); - AssertEqualValue(0.5, inputParameters.C); + AssertAreEqual(0.5, inputParameters.C); Assert.AreEqual(1, inputParameters.N2A); Assert.AreEqual(2, inputParameters.N.NumberOfDecimalPlaces); - AssertEqualValue(1, inputParameters.N); + AssertAreEqual(1, inputParameters.N); Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces); - AssertEqualValue(9.81, inputParameters.GravitationalAcceleration); + AssertAreEqual(9.81, inputParameters.GravitationalAcceleration); DistributionAssert.AreEqual(modelFactorOvertoppingFlow, inputParameters.ModelFactorOvertoppingFlow); DistributionAssert.AreEqual(modelFactorSubCriticalFlow, inputParameters.ModelFactorSubCriticalFlow); DistributionAssert.AreEqual(modelFactorStorageVolume, inputParameters.ModelFactorStorageVolume); Assert.AreEqual(2, inputParameters.ModelFactorInflowVolume.NumberOfDecimalPlaces); - AssertEqualValue(1.0, inputParameters.ModelFactorInflowVolume); + AssertAreEqual(1.0, inputParameters.ModelFactorInflowVolume); } [Test] @@ -94,7 +94,7 @@ Assert.AreEqual(expected, n, n.GetAccuracy()); } - private void AssertEqualValue(double expected, RoundedDouble actual) + private static void AssertAreEqual(double expected, RoundedDouble actual) { Assert.AreEqual(expected, actual, actual.GetAccuracy()); } Index: Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs =================================================================== diff -u -r0b6cce0bd86288273634f7ead3817885a7c20fd0 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 0b6cce0bd86288273634f7ead3817885a7c20fd0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Contribution/FailureMechanismContribution.cs (.../FailureMechanismContribution.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -47,8 +47,8 @@ /// The norm defined on a assessment section. /// Thrown when: /// - /// any of the has a value for not in interval [0, 100]. - /// the value of is not in interval [0, 100] + /// any of the has a value for not in the interval [0, 100]. + /// the value of is not in the interval [0, 100] /// /// /// Thrown when is null. @@ -100,8 +100,8 @@ /// Thrown when: /// /// any of the has a value for - /// not in interval [0, 100]. - /// the value of is not in interval [0, 100] + /// not in the interval [0, 100]. + /// the value of is not in the interval [0, 100] /// /// public void UpdateContributions(IEnumerable newFailureMechanisms, double otherContribution) @@ -132,7 +132,7 @@ /// list supported within Ringtoets. /// /// The contribution to set for other failure mechanisms. - /// Thrown when is not in interval [0, 100] + /// Thrown when is not in the interval [0, 100] private void AddOtherContributionItem(double otherContribution) { var otherFailureMechanism = new OtherFailureMechanism Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs =================================================================== diff -u -r28743d8fed7b8b658764829b629fda81786aa808 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision 28743d8fed7b8b658764829b629fda81786aa808) +++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/IFailureMechanism.cs (.../IFailureMechanism.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -35,7 +35,7 @@ /// Gets or sets the amount of contribution as a percentage [0, 100] for the /// as part of the overall verdict. /// - /// Thrown when the is not in interval [0, 100]. + /// Thrown when the is not in the interval [0, 100]. double Contribution { get; set; } /// Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r4a43331dbd65968b57983f4a40099d086553b4a7 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4a43331dbd65968b57983f4a40099d086553b4a7) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -191,7 +191,7 @@ } /// - /// Looks up a localized string similar to De waarde voor de toegestane bijdrage aan de faalkans moet in interval [0, 100] liggen.. + /// Looks up a localized string similar to De waarde voor de toegestane bijdrage aan de faalkans moet in het bereik [0, 100] liggen.. /// public static string Contribution_Value_should_be_in_interval_0_100 { get { @@ -337,7 +337,7 @@ } /// - /// Looks up a localized string similar to De waarde voor 'N' moet in interval [1, 20] liggen.. + /// Looks up a localized string similar to De waarde voor 'N' moet in het bereik [1, 20] liggen.. /// public static string N_Value_should_be_in_interval_1_20 { get { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -r4a43331dbd65968b57983f4a40099d086553b4a7 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 4a43331dbd65968b57983f4a40099d086553b4a7) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - De waarde voor de toegestane bijdrage aan de faalkans moet in interval [0, 100] liggen. + De waarde voor de toegestane bijdrage aan de faalkans moet in het bereik [0, 100] liggen. De geometrie die opgegeven werd voor de referentielijn heeft geen waarde. @@ -211,7 +211,7 @@ Hydraulische randvoorwaarden - De waarde voor 'N' moet in interval [1, 20] liggen. + De waarde voor 'N' moet in het bereik [1, 20] liggen. De waarde voor de faalkans moet in het bereik [0, 1] liggen. Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs =================================================================== diff -u -r7e24cbef3a5a475fef4442be00ced9e5305e0b24 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision 7e24cbef3a5a475fef4442be00ced9e5305e0b24) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -129,6 +129,11 @@ /// protected abstract void UpdateStructureProperties(); + /// + /// Validates the provided probability value. + /// + /// The probability value to validate. + /// True when the provided value is valid, false otherwise. protected static bool ValidProbabilityValue(double probability) { return !double.IsNaN(probability) && probability <= 1 && probability >= 0; @@ -177,7 +182,8 @@ /// Gets or sets the orientation of the normal of the structure. /// [degrees] /// - ///Thrown when the value for the orientation is not between [0,360] degrees. + ///Thrown when the value of the orientation + /// is not in the interval [0, 360]. public RoundedDouble StructureNormalOrientation { get @@ -268,7 +274,7 @@ /// [1/year] /// /// Thrown when the value of the probability - /// is not between [0, 1]. + /// is not in the interval [0, 1]. public double FailureProbabilityStructureWithErosion { get Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs =================================================================== diff -u -r15ead312ec6f70a6f5b3fd75a01b2735cca3e616 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision 15ead312ec6f70a6f5b3fd75a01b2735cca3e616) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -96,7 +96,7 @@ Assert.IsNull(input.Structure); Assert.IsNull(input.HydraulicBoundaryLocation); - AssertEqualValue(double.NaN, input.StructureNormalOrientation); + AssertAreEqual(double.NaN, input.StructureNormalOrientation); Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); Assert.IsNull(input.ForeshoreProfile); @@ -249,7 +249,7 @@ // Assert Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces); - AssertEqualValue(orientation, input.StructureNormalOrientation); + AssertAreEqual(orientation, input.StructureNormalOrientation); } [Test] @@ -508,7 +508,7 @@ Assert.IsTrue(input.Updated); } - private static void AssertEqualValue(double expectedValue, RoundedDouble actualValue) + private static void AssertAreEqual(double expectedValue, RoundedDouble actualValue) { Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); } @@ -538,7 +538,6 @@ private class SimpleStructure : StructureBase { public SimpleStructure(ConstructionProperties constructionProperties) : base(constructionProperties) {} - public SimpleStructure(string name, string id, Point2D location, double structureNormalOrientation) : base(name, id, location, structureNormalOrientation) {} } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GeneralGrassCoverErosionInwardsInput.cs =================================================================== diff -u -rf2053e36f2f245041599654de6aff095721e81bf -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GeneralGrassCoverErosionInwardsInput.cs (.../GeneralGrassCoverErosionInwardsInput.cs) (revision f2053e36f2f245041599654de6aff095721e81bf) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GeneralGrassCoverErosionInwardsInput.cs (.../GeneralGrassCoverErosionInwardsInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -68,8 +68,8 @@ /// /// Gets or sets the 'N' parameter used to factor in the 'length effect'. /// - /// Thrown when the is not in interval - /// [1, 20]. + /// Thrown when the is not in + /// the interval [1, 20]. public int N { get Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GeneralGrassCoverErosionOutwardsInput.cs =================================================================== diff -u -r7ac7d2230eac8ce6eb3233596157002c9cb7bc19 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GeneralGrassCoverErosionOutwardsInput.cs (.../GeneralGrassCoverErosionOutwardsInput.cs) (revision 7ac7d2230eac8ce6eb3233596157002c9cb7bc19) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GeneralGrassCoverErosionOutwardsInput.cs (.../GeneralGrassCoverErosionOutwardsInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -51,8 +51,8 @@ /// /// Gets or sets the 'N' parameter used to factor in the 'length effect'. /// - /// Thrown when the is not in interval - /// [1, 20]. + /// Thrown when the is not in + /// the interval [1, 20]. public int N { get Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs =================================================================== diff -u -r57eb47b74e13d3893ded8879b38f18c1e0ae58a1 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs (.../GeneralHeightStructuresInput.cs) (revision 57eb47b74e13d3893ded8879b38f18c1e0ae58a1) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/GeneralHeightStructuresInput.cs (.../GeneralHeightStructuresInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -60,8 +60,8 @@ /// /// Gets or sets the 'N' parameter used to factor in the 'length effect'. /// - /// Thrown when the is not in interval - /// [1, 20]. + /// Thrown when the is not in + /// the interval [1, 20]. public int N { get Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs =================================================================== diff -u -rfdac52e3f5d96b98aebf00e516ea9cf77b449da3 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs (.../GeneralHeightStructuresInputTest.cs) (revision fdac52e3f5d96b98aebf00e516ea9cf77b449da3) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/GeneralHeightStructuresInputTest.cs (.../GeneralHeightStructuresInputTest.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -94,7 +94,7 @@ TestDelegate test = () => generalHeightStructuresInput.N = value; // Assert - const string expectedMessage = "De waarde voor 'N' moet in interval [1, 20] liggen."; + const string expectedMessage = "De waarde voor 'N' moet in het bereik [1, 20] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs =================================================================== diff -u -r4372d557e868f50a1cecc2f22e28645fa6d44083 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision 4372d557e868f50a1cecc2f22e28645fa6d44083) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/VariableDefaultsProvider.cs (.../VariableDefaultsProvider.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -295,7 +295,7 @@ 66, new VariableDefaults(999999) }, { - 67, new VariableDefaults(999999) + 67, new VariableDefaults(999999) }, { 68, new VariableDefaults(999999) Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs =================================================================== diff -u -rf2295cd5ced4b2e2e116dede857b6ec78cde0ee9 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision f2295cd5ced4b2e2e116dede857b6ec78cde0ee9) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -100,7 +100,8 @@ /// Gets or sets the orientation of the foreshore profile geometry with respect to North /// in degrees. A positive value equals a clockwise rotation. /// - ///Thrown when the value for the orientation is not between [0, 360] degrees. + ///Thrown when the value of the orientation + /// is not in the interval [0, 360]. public RoundedDouble Orientation { get Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs =================================================================== diff -u -rf2053e36f2f245041599654de6aff095721e81bf -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs (.../GeneralStabilityPointStructuresInput.cs) (revision f2053e36f2f245041599654de6aff095721e81bf) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs (.../GeneralStabilityPointStructuresInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -85,8 +85,8 @@ /// /// Gets or sets the 'N' parameter used to factor in the 'length effect'. /// - /// Thrown when the is not in interval - /// [1, 20]. + /// Thrown when the is not in + /// the interval [1, 20]. public int N { get Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs =================================================================== diff -u -r719fdf29c8274e201e877c3ee5d6717448b6c94c -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 719fdf29c8274e201e877c3ee5d6717448b6c94c) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -402,7 +402,8 @@ /// Gets or sets the failure probability of repairing a closure. /// [1/year] /// - /// Thrown when the probability is not in interval [0,1]. + /// Thrown when the value of the probability + /// is not in the interval [0, 1]. public double FailureProbabilityRepairClosure { get @@ -480,7 +481,8 @@ /// Gets or sets the probability of a secondary collision on the structure per levelling. /// [1/year/levelling] /// - /// Thrown when the probability is not in interval [0,1]. + /// Thrown when the value of the probability + /// is not in the interval [0, 1]. public double ProbabilityCollisionSecondaryStructure { get Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs =================================================================== diff -u -rf211e80f654ef76473f816c8846521a28232d591 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision f211e80f654ef76473f816c8846521a28232d591) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -119,7 +119,7 @@ TestDelegate test = () => generalStabilityPointStructuresInput.N = value; // Assert - const string expectedMessage = "De waarde voor 'N' moet in interval [1, 20] liggen."; + const string expectedMessage = "De waarde voor 'N' moet in het bereik [1, 20] liggen."; TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); } } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs =================================================================== diff -u -raf62e374c37713df98c2866ec4bfa64206b5b2b3 -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision af62e374c37713df98c2866ec4bfa64206b5b2b3) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664) @@ -133,7 +133,7 @@ // Assert Assert.IsInstanceOf>(input); - AssertEqualValue(9.81, input.VolumicWeightWater); + AssertAreEqual(9.81, input.VolumicWeightWater); Assert.AreEqual(2, input.VolumicWeightWater.NumberOfDecimalPlaces); DistributionAssert.AreEqual(insideWaterLevelFailureConstruction, input.InsideWaterLevelFailureConstruction); DistributionAssert.AreEqual(insideWaterLevel, input.InsideWaterLevel); @@ -158,9 +158,9 @@ Assert.AreEqual(double.NaN, input.ProbabilityCollisionSecondaryStructure); DistributionAssert.AreEqual(bankWidth, input.BankWidth); Assert.AreEqual(2, input.EvaluationLevel.NumberOfDecimalPlaces); - AssertEqualValue(0, input.EvaluationLevel); + AssertAreEqual(0, input.EvaluationLevel); Assert.AreEqual(2, input.VerticalDistance.NumberOfDecimalPlaces); - AssertEqualValue(double.NaN, input.VerticalDistance); + AssertAreEqual(double.NaN, input.VerticalDistance); } # region Calculation inputs @@ -213,7 +213,7 @@ // Assert Assert.AreEqual(2, input.VolumicWeightWater.NumberOfDecimalPlaces); - AssertEqualValue(volumicWeightWater, input.VolumicWeightWater); + AssertAreEqual(volumicWeightWater, input.VolumicWeightWater); } [Test] @@ -288,7 +288,7 @@ // Assert Assert.AreEqual(2, input.FactorStormDurationOpenStructure.NumberOfDecimalPlaces); - AssertEqualValue(factorStormDuration, input.FactorStormDurationOpenStructure); + AssertAreEqual(factorStormDuration, input.FactorStormDurationOpenStructure); } [Test] @@ -741,7 +741,7 @@ // Assert Assert.AreEqual(2, input.EvaluationLevel.NumberOfDecimalPlaces); - AssertEqualValue(evaluationLevel, input.EvaluationLevel); + AssertAreEqual(evaluationLevel, input.EvaluationLevel); } [Test] @@ -758,7 +758,7 @@ // Assert Assert.AreEqual(2, input.VerticalDistance.NumberOfDecimalPlaces); - AssertEqualValue(verticalDistance, input.VerticalDistance); + AssertAreEqual(verticalDistance, input.VerticalDistance); } [Test] @@ -797,15 +797,15 @@ { Assert.IsNull(input.Structure); var defaultInput = new StabilityPointStructuresInput(); - AssertEqualValue(defaultInput.StructureNormalOrientation, input.StructureNormalOrientation); + AssertAreEqual(defaultInput.StructureNormalOrientation, input.StructureNormalOrientation); DistributionAssert.AreEqual(defaultInput.AllowedLevelIncreaseStorage, input.AllowedLevelIncreaseStorage); DistributionAssert.AreEqual(defaultInput.AreaFlowApertures, input.AreaFlowApertures); DistributionAssert.AreEqual(defaultInput.BankWidth, input.BankWidth); DistributionAssert.AreEqual(defaultInput.ConstructiveStrengthLinearLoadModel, input.ConstructiveStrengthLinearLoadModel); DistributionAssert.AreEqual(defaultInput.ConstructiveStrengthQuadraticLoadModel, input.ConstructiveStrengthQuadraticLoadModel); DistributionAssert.AreEqual(defaultInput.CriticalOvertoppingDischarge, input.CriticalOvertoppingDischarge); - AssertEqualValue(defaultInput.EvaluationLevel, input.EvaluationLevel); + AssertAreEqual(defaultInput.EvaluationLevel, input.EvaluationLevel); DistributionAssert.AreEqual(defaultInput.FailureCollisionEnergy, input.FailureCollisionEnergy); Assert.AreEqual(defaultInput.FailureProbabilityRepairClosure, input.FailureProbabilityRepairClosure); DistributionAssert.AreEqual(defaultInput.FlowVelocityStructureClosable, input.FlowVelocityStructureClosable); @@ -822,7 +822,7 @@ DistributionAssert.AreEqual(defaultInput.StabilityQuadraticLoadModel, input.StabilityQuadraticLoadModel); DistributionAssert.AreEqual(defaultInput.StorageStructureArea, input.StorageStructureArea); DistributionAssert.AreEqual(defaultInput.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); - AssertEqualValue(defaultInput.VerticalDistance, input.VerticalDistance); + AssertAreEqual(defaultInput.VerticalDistance, input.VerticalDistance); DistributionAssert.AreEqual(defaultInput.WidthFlowApertures, input.WidthFlowApertures); } else @@ -833,7 +833,7 @@ DistributionAssert.AreEqual(expectedStructure.ConstructiveStrengthLinearLoadModel, input.ConstructiveStrengthLinearLoadModel); DistributionAssert.AreEqual(expectedStructure.ConstructiveStrengthQuadraticLoadModel, input.ConstructiveStrengthQuadraticLoadModel); DistributionAssert.AreEqual(expectedStructure.CriticalOvertoppingDischarge, input.CriticalOvertoppingDischarge); - AssertEqualValue(expectedStructure.EvaluationLevel, input.EvaluationLevel); + AssertAreEqual(expectedStructure.EvaluationLevel, input.EvaluationLevel); DistributionAssert.AreEqual(expectedStructure.FailureCollisionEnergy, input.FailureCollisionEnergy); Assert.AreEqual(expectedStructure.FailureProbabilityRepairClosure, input.FailureProbabilityRepairClosure); DistributionAssert.AreEqual(expectedStructure.FlowVelocityStructureClosable, input.FlowVelocityStructureClosable); @@ -850,12 +850,12 @@ DistributionAssert.AreEqual(expectedStructure.StabilityQuadraticLoadModel, input.StabilityQuadraticLoadModel); DistributionAssert.AreEqual(expectedStructure.StorageStructureArea, input.StorageStructureArea); DistributionAssert.AreEqual(expectedStructure.ThresholdHeightOpenWeir, input.ThresholdHeightOpenWeir); - AssertEqualValue(expectedStructure.VerticalDistance, input.VerticalDistance); + AssertAreEqual(expectedStructure.VerticalDistance, input.VerticalDistance); DistributionAssert.AreEqual(expectedStructure.WidthFlowApertures, input.WidthFlowApertures); } } - private static void AssertEqualValue(double expectedValue, RoundedDouble actualValue) + private static void AssertAreEqual(double expectedValue, RoundedDouble actualValue) { Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy()); }