Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs =================================================================== diff -u -rbe70b32f3df7234e2763c5125b4093ed17a5f23a -r5edeb0ef7899f4554c0c06d0e3f3b8269666e65e --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision be70b32f3df7234e2763c5125b4093ed17a5f23a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilLayerTest.cs (.../PipingSoilLayerTest.cs) (revision 5edeb0ef7899f4554c0c06d0e3f3b8269666e65e) @@ -109,6 +109,9 @@ { PipingSoilLayer baseLayer = CreateRandomLayer(seed); + var random = new Random(21); + double offset = random.NextDouble(); + yield return new TestCaseData(new PipingSoilLayer(double.NaN) { MaterialName = "Different Name", @@ -156,7 +159,7 @@ MaterialName = baseLayer.MaterialName, Color = baseLayer.Color, IsAquifer = baseLayer.IsAquifer, - BelowPhreaticLevelDeviation = baseLayer.BelowPhreaticLevelDeviation + 10, + BelowPhreaticLevelDeviation = baseLayer.BelowPhreaticLevelDeviation + offset, BelowPhreaticLevelMean = baseLayer.BelowPhreaticLevelMean, BelowPhreaticLevelShift = baseLayer.BelowPhreaticLevelShift, DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation, @@ -171,7 +174,7 @@ Color = baseLayer.Color, IsAquifer = baseLayer.IsAquifer, BelowPhreaticLevelDeviation = baseLayer.BelowPhreaticLevelDeviation, - BelowPhreaticLevelMean = baseLayer.BelowPhreaticLevelMean + 10, + BelowPhreaticLevelMean = baseLayer.BelowPhreaticLevelMean + offset, BelowPhreaticLevelShift = baseLayer.BelowPhreaticLevelShift, DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation, DiameterD70Mean = baseLayer.DiameterD70Mean, @@ -186,7 +189,7 @@ IsAquifer = baseLayer.IsAquifer, BelowPhreaticLevelDeviation = baseLayer.BelowPhreaticLevelDeviation, BelowPhreaticLevelMean = baseLayer.BelowPhreaticLevelMean, - BelowPhreaticLevelShift = baseLayer.BelowPhreaticLevelShift + 10, + BelowPhreaticLevelShift = baseLayer.BelowPhreaticLevelShift + offset, DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation, DiameterD70Mean = baseLayer.DiameterD70Mean, PermeabilityCoefficientOfVariation = baseLayer.PermeabilityCoefficientOfVariation, @@ -201,7 +204,7 @@ BelowPhreaticLevelDeviation = baseLayer.BelowPhreaticLevelDeviation, BelowPhreaticLevelMean = baseLayer.BelowPhreaticLevelMean, BelowPhreaticLevelShift = baseLayer.BelowPhreaticLevelShift, - DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation + 70, + DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation + offset, DiameterD70Mean = baseLayer.DiameterD70Mean, PermeabilityCoefficientOfVariation = baseLayer.PermeabilityCoefficientOfVariation, PermeabilityMean = baseLayer.PermeabilityMean @@ -216,7 +219,7 @@ BelowPhreaticLevelMean = baseLayer.BelowPhreaticLevelMean, BelowPhreaticLevelShift = baseLayer.BelowPhreaticLevelShift, DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation, - DiameterD70Mean = baseLayer.DiameterD70Mean + 70, + DiameterD70Mean = baseLayer.DiameterD70Mean + offset, PermeabilityCoefficientOfVariation = baseLayer.PermeabilityCoefficientOfVariation, PermeabilityMean = baseLayer.PermeabilityMean }).SetName("DiameterD70Mean"); @@ -231,7 +234,7 @@ BelowPhreaticLevelShift = baseLayer.BelowPhreaticLevelShift, DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation, DiameterD70Mean = baseLayer.DiameterD70Mean, - PermeabilityCoefficientOfVariation = baseLayer.PermeabilityCoefficientOfVariation + 10, + PermeabilityCoefficientOfVariation = baseLayer.PermeabilityCoefficientOfVariation + offset, PermeabilityMean = baseLayer.PermeabilityMean }).SetName("PermeabilityCoefficientOfVariation"); @@ -246,46 +249,29 @@ DiameterD70CoefficientOfVariation = baseLayer.DiameterD70CoefficientOfVariation, DiameterD70Mean = baseLayer.DiameterD70Mean, PermeabilityCoefficientOfVariation = baseLayer.PermeabilityCoefficientOfVariation, - PermeabilityMean = baseLayer.PermeabilityMean + 10 + PermeabilityMean = baseLayer.PermeabilityMean + offset }).SetName("PermeabilityMean"); } - } - private static PipingSoilLayer CreateRandomLayer(int randomSeed) - { - var random = new Random(randomSeed); - return new PipingSoilLayer(random.NextDouble()) + private static PipingSoilLayer CreateRandomLayer(int randomSeed) { - MaterialName = string.Join("", Enumerable.Repeat('x', random.Next(0, 40))), - Color = Color.FromKnownColor(random.NextEnumValue()), - IsAquifer = random.NextBoolean(), - BelowPhreaticLevelDeviation = random.NextDouble(), - BelowPhreaticLevelMean = random.NextDouble(), - BelowPhreaticLevelShift = random.NextDouble(), - DiameterD70CoefficientOfVariation = random.NextDouble(), - DiameterD70Mean = random.NextDouble(), - PermeabilityCoefficientOfVariation = random.NextDouble(), - PermeabilityMean = random.NextDouble() - }; + var random = new Random(randomSeed); + return new PipingSoilLayer(random.NextDouble()) + { + MaterialName = string.Join("", Enumerable.Repeat('x', random.Next(0, 40))), + Color = Color.FromKnownColor(random.NextEnumValue()), + IsAquifer = random.NextBoolean(), + BelowPhreaticLevelDeviation = random.NextDouble(), + BelowPhreaticLevelMean = random.NextDouble(), + BelowPhreaticLevelShift = random.NextDouble(), + DiameterD70CoefficientOfVariation = random.NextDouble(), + DiameterD70Mean = random.NextDouble(), + PermeabilityCoefficientOfVariation = random.NextDouble(), + PermeabilityMean = random.NextDouble() + }; + } } - private static PipingSoilLayer CreateNaNLayer(string name, Color color, bool isAquifer) - { - return new PipingSoilLayer(double.NaN) - { - MaterialName = name, - Color = color, - IsAquifer = isAquifer, - BelowPhreaticLevelDeviation = double.NaN, - BelowPhreaticLevelMean = double.NaN, - BelowPhreaticLevelShift = double.NaN, - DiameterD70CoefficientOfVariation = double.NaN, - DiameterD70Mean = double.NaN, - PermeabilityCoefficientOfVariation = double.NaN, - PermeabilityMean = double.NaN - }; - } - private class TestLayer : PipingSoilLayer { public TestLayer(PipingSoilLayer layer)