Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs =================================================================== diff -u -r89c7c9e14125203dc769583b62808b291bd3558b -r597f2ecd0c9cb1aedf4bef978b209d49f63b08fe --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision 89c7c9e14125203dc769583b62808b291bd3558b) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil/ClosingStructurePermutationHelper.cs (.../ClosingStructurePermutationHelper.cs) (revision 597f2ecd0c9cb1aedf4bef978b209d49f63b08fe) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -91,8 +90,7 @@ { AllowedLevelIncreaseStorage = { - Mean = (RoundedDouble) random.Next(), - Shift = random.NextRoundedDouble(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentAllowedLevelIncreaseStorage_{testResultDescription}"); @@ -101,8 +99,7 @@ { AreaFlowApertures = { - Mean = (RoundedDouble) random.Next(), - Shift = random.NextRoundedDouble(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentAreaFlowApertures_{testResultDescription}"); @@ -111,7 +108,7 @@ { CriticalOvertoppingDischarge = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), CoefficientOfVariation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentCriticalOvertoppingDischarge_{testResultDescription}"); @@ -120,8 +117,7 @@ { FlowWidthAtBottomProtection = { - Mean = (RoundedDouble) random.Next(), - Shift = random.NextRoundedDouble(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentFlowWidthAtBottomProtection_{testResultDescription}"); @@ -130,7 +126,7 @@ { InsideWaterLevel = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentInsideWaterLevel_{testResultDescription}"); @@ -139,7 +135,7 @@ { LevelCrestStructureNotClosing = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentLevelCrestStructureNotClosing_{testResultDescription}"); @@ -148,7 +144,7 @@ { StorageStructureArea = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), CoefficientOfVariation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentStorageStructureArea_{testResultDescription}"); @@ -157,7 +153,7 @@ { ThresholdHeightOpenWeir = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentThresholdHeightOpenWeir_{testResultDescription}"); @@ -166,7 +162,7 @@ { WidthFlowApertures = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentWidthFlowApertures_{testResultDescription}"); @@ -220,13 +216,11 @@ AllowedLevelIncreaseStorage = { Mean = referenceStructure.AllowedLevelIncreaseStorage.Mean, - Shift = referenceStructure.AllowedLevelIncreaseStorage.Shift, StandardDeviation = referenceStructure.AllowedLevelIncreaseStorage.StandardDeviation }, AreaFlowApertures = { Mean = referenceStructure.AreaFlowApertures.Mean, - Shift = referenceStructure.AreaFlowApertures.Shift, StandardDeviation = referenceStructure.AreaFlowApertures.StandardDeviation }, CriticalOvertoppingDischarge = @@ -237,7 +231,6 @@ FlowWidthAtBottomProtection = { Mean = referenceStructure.FlowWidthAtBottomProtection.Mean, - Shift = referenceStructure.FlowWidthAtBottomProtection.Shift, StandardDeviation = referenceStructure.FlowWidthAtBottomProtection.StandardDeviation }, InsideWaterLevel = Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructurePermutationHelper.cs =================================================================== diff -u -rc5390b303f47e65a1a8e0ba271017c77dae24bbc -r597f2ecd0c9cb1aedf4bef978b209d49f63b08fe --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructurePermutationHelper.cs (.../HeightStructurePermutationHelper.cs) (revision c5390b303f47e65a1a8e0ba271017c77dae24bbc) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructurePermutationHelper.cs (.../HeightStructurePermutationHelper.cs) (revision 597f2ecd0c9cb1aedf4bef978b209d49f63b08fe) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -91,8 +90,7 @@ { AllowedLevelIncreaseStorage = { - Mean = (RoundedDouble) random.Next(), - Shift = random.NextRoundedDouble(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentAllowedLevelIncreaseStorage_{testResultDescription}"); @@ -101,7 +99,7 @@ { CriticalOvertoppingDischarge = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), CoefficientOfVariation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentCriticalOvertoppingDischarge_{testResultDescription}"); @@ -110,8 +108,7 @@ { FlowWidthAtBottomProtection = { - Mean = (RoundedDouble) random.Next(), - Shift = random.NextRoundedDouble(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentFlowWidthAtBottomProtection_{testResultDescription}"); @@ -120,7 +117,7 @@ { LevelCrestStructure = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentLevelCrestStructure_{testResultDescription}"); @@ -129,7 +126,7 @@ { StorageStructureArea = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), CoefficientOfVariation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentStorageStructureArea_{testResultDescription}"); @@ -138,7 +135,7 @@ { WidthFlowApertures = { - Mean = (RoundedDouble) random.Next(), + Mean = random.NextRoundedDouble(), StandardDeviation = random.NextRoundedDouble() } }).SetName($"{targetName}_DifferentWidthFlowApertures_{testResultDescription}"); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs =================================================================== diff -u -r89c7c9e14125203dc769583b62808b291bd3558b -r597f2ecd0c9cb1aedf4bef978b209d49f63b08fe --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs (.../StabilityPointStructurePermutationHelper.cs) (revision 89c7c9e14125203dc769583b62808b291bd3558b) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs (.../StabilityPointStructurePermutationHelper.cs) (revision 597f2ecd0c9cb1aedf4bef978b209d49f63b08fe) @@ -187,7 +187,7 @@ StabilityPointStructure.ConstructionProperties differentEvaluationLevelConstructionProperties = CreateTestStabilityPointStructureConstructionProperties(); - differentEvaluationLevelConstructionProperties.EvaluationLevel = random.NextRoundedDouble(); + differentEvaluationLevelConstructionProperties.EvaluationLevel = random.NextDouble(); yield return new TestCaseData(new StabilityPointStructure(differentEvaluationLevelConstructionProperties)) .SetName($"{targetName}_DifferentEvaluationLevel_{testResultDescription}"); @@ -202,7 +202,7 @@ StabilityPointStructure.ConstructionProperties differentVerticalDistanceConstructionProperties = CreateTestStabilityPointStructureConstructionProperties(); - differentVerticalDistanceConstructionProperties.VerticalDistance = random.NextRoundedDouble(); + differentVerticalDistanceConstructionProperties.VerticalDistance = random.NextDouble(); yield return new TestCaseData(new StabilityPointStructure(differentVerticalDistanceConstructionProperties)) .SetName($"{targetName}_DifferentVerticalDistance_{testResultDescription}");