Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs =================================================================== diff -u -r12cec002453a1828efc68633fbd25219632c6c47 -r4d4b20488a5b3b562c3745f46975a848761c3a19 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision 12cec002453a1828efc68633fbd25219632c6c47) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision 4d4b20488a5b3b562c3745f46975a848761c3a19) @@ -192,11 +192,9 @@ AllowedLevelIncreaseStorage.Mean = fromStructure.AllowedLevelIncreaseStorage.Mean; AllowedLevelIncreaseStorage.StandardDeviation = fromStructure.AllowedLevelIncreaseStorage.StandardDeviation; - AllowedLevelIncreaseStorage.Shift = fromStructure.AllowedLevelIncreaseStorage.Shift; AreaFlowApertures.Mean = fromStructure.AreaFlowApertures.Mean; AreaFlowApertures.StandardDeviation = fromStructure.AreaFlowApertures.StandardDeviation; - AreaFlowApertures.Shift = fromStructure.AreaFlowApertures.Shift; CriticalOvertoppingDischarge.Mean = fromStructure.CriticalOvertoppingDischarge.Mean; CriticalOvertoppingDischarge.CoefficientOfVariation = fromStructure.CriticalOvertoppingDischarge.CoefficientOfVariation; @@ -209,7 +207,6 @@ FlowWidthAtBottomProtection.Mean = fromStructure.FlowWidthAtBottomProtection.Mean; FlowWidthAtBottomProtection.StandardDeviation = fromStructure.FlowWidthAtBottomProtection.StandardDeviation; - FlowWidthAtBottomProtection.Shift = fromStructure.FlowWidthAtBottomProtection.Shift; InflowModelType = fromStructure.InflowModelType; Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs =================================================================== diff -u -r28abc553b8d4a144cc7f2b238b204104da928d59 -r4d4b20488a5b3b562c3745f46975a848761c3a19 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision 28abc553b8d4a144cc7f2b238b204104da928d59) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision 4d4b20488a5b3b562c3745f46975a848761c3a19) @@ -22,6 +22,7 @@ using System; using Core.Common.Base.Data; using Core.Common.Base.Geometry; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.ClosingStructures.Data.TestUtil; using Ringtoets.Common.Data; @@ -296,50 +297,48 @@ StructureNormalOrientation = (RoundedDouble) random.Next(), AllowedLevelIncreaseStorage = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - Shift = (RoundedDouble) random.NextDouble(), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, AreaFlowApertures = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, CriticalOvertoppingDischarge = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - CoefficientOfVariation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + CoefficientOfVariation = random.NextRoundedDouble() }, FlowWidthAtBottomProtection = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - Shift = (RoundedDouble) random.NextDouble(), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, InsideWaterLevel = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, LevelCrestStructureNotClosing = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, StorageStructureArea = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - CoefficientOfVariation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + CoefficientOfVariation = random.NextRoundedDouble() }, ThresholdHeightOpenWeir = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, WidthFlowApertures = { - Mean = (RoundedDouble) (random.NextDouble() + 1.0), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, FailureProbabilityOpenStructure = random.NextDouble(), FailureProbabilityReparation = random.NextDouble(), @@ -356,38 +355,26 @@ Assert.AreEqual(otherStructure.Name, structure.Name); Assert.AreEqual(otherStructure.Location, structure.Location); Assert.AreEqual(otherStructure.StructureNormalOrientation, structure.StructureNormalOrientation); - Assert.AreEqual(otherStructure.AllowedLevelIncreaseStorage.Mean, structure.AllowedLevelIncreaseStorage.Mean); Assert.AreEqual(otherStructure.AllowedLevelIncreaseStorage.StandardDeviation, structure.AllowedLevelIncreaseStorage.StandardDeviation); - Assert.AreEqual(otherStructure.AllowedLevelIncreaseStorage.Shift, structure.AllowedLevelIncreaseStorage.Shift); - Assert.AreEqual(otherStructure.AreaFlowApertures.Mean, structure.AreaFlowApertures.Mean); Assert.AreEqual(otherStructure.AreaFlowApertures.StandardDeviation, structure.AreaFlowApertures.StandardDeviation); - Assert.AreEqual(otherStructure.CriticalOvertoppingDischarge.Mean, structure.CriticalOvertoppingDischarge.Mean); Assert.AreEqual(otherStructure.CriticalOvertoppingDischarge.CoefficientOfVariation, structure.CriticalOvertoppingDischarge.CoefficientOfVariation); - Assert.AreEqual(otherStructure.FailureProbabilityOpenStructure, structure.FailureProbabilityOpenStructure); Assert.AreEqual(otherStructure.FailureProbabilityReparation, structure.FailureProbabilityReparation); Assert.AreEqual(otherStructure.IdenticalApertures, structure.IdenticalApertures); Assert.AreEqual(otherStructure.ProbabilityOrFrequencyOpenStructureBeforeFlooding, structure.ProbabilityOrFrequencyOpenStructureBeforeFlooding); - Assert.AreEqual(otherStructure.FlowWidthAtBottomProtection.Mean, structure.FlowWidthAtBottomProtection.Mean); Assert.AreEqual(otherStructure.FlowWidthAtBottomProtection.StandardDeviation, structure.FlowWidthAtBottomProtection.StandardDeviation); - Assert.AreEqual(otherStructure.FlowWidthAtBottomProtection.Shift, structure.FlowWidthAtBottomProtection.Shift); - Assert.AreEqual(otherStructure.InsideWaterLevel.Mean, structure.InsideWaterLevel.Mean); Assert.AreEqual(otherStructure.InsideWaterLevel.StandardDeviation, structure.InsideWaterLevel.StandardDeviation); - Assert.AreEqual(otherStructure.LevelCrestStructureNotClosing.Mean, structure.LevelCrestStructureNotClosing.Mean); Assert.AreEqual(otherStructure.LevelCrestStructureNotClosing.StandardDeviation, structure.LevelCrestStructureNotClosing.StandardDeviation); - Assert.AreEqual(otherStructure.StorageStructureArea.Mean, structure.StorageStructureArea.Mean); Assert.AreEqual(otherStructure.StorageStructureArea.CoefficientOfVariation, structure.StorageStructureArea.CoefficientOfVariation); - Assert.AreEqual(otherStructure.ThresholdHeightOpenWeir.Mean, structure.ThresholdHeightOpenWeir.Mean); Assert.AreEqual(otherStructure.ThresholdHeightOpenWeir.StandardDeviation, structure.ThresholdHeightOpenWeir.StandardDeviation); - Assert.AreEqual(otherStructure.WidthFlowApertures.Mean, structure.WidthFlowApertures.Mean); Assert.AreEqual(otherStructure.WidthFlowApertures.StandardDeviation, structure.WidthFlowApertures.StandardDeviation); } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs =================================================================== diff -u -rce24d4fc808e32e5cebe7114ab03919770240d07 -r4d4b20488a5b3b562c3745f46975a848761c3a19 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision ce24d4fc808e32e5cebe7114ab03919770240d07) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 4d4b20488a5b3b562c3745f46975a848761c3a19) @@ -130,7 +130,6 @@ AllowedLevelIncreaseStorage.Mean = fromStructure.AllowedLevelIncreaseStorage.Mean; AllowedLevelIncreaseStorage.StandardDeviation = fromStructure.AllowedLevelIncreaseStorage.StandardDeviation; - AllowedLevelIncreaseStorage.Shift = fromStructure.AllowedLevelIncreaseStorage.Shift; CriticalOvertoppingDischarge.Mean = fromStructure.CriticalOvertoppingDischarge.Mean; CriticalOvertoppingDischarge.CoefficientOfVariation = fromStructure.CriticalOvertoppingDischarge.CoefficientOfVariation; @@ -139,7 +138,6 @@ FlowWidthAtBottomProtection.Mean = fromStructure.FlowWidthAtBottomProtection.Mean; FlowWidthAtBottomProtection.StandardDeviation = fromStructure.FlowWidthAtBottomProtection.StandardDeviation; - FlowWidthAtBottomProtection.Shift = fromStructure.FlowWidthAtBottomProtection.Shift; LevelCrestStructure.Mean = fromStructure.LevelCrestStructure.Mean; LevelCrestStructure.StandardDeviation = fromStructure.LevelCrestStructure.StandardDeviation; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs =================================================================== diff -u -r25078f3b8ee4f3007979c40275a1964013adb483 -r4d4b20488a5b3b562c3745f46975a848761c3a19 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs (.../HeightStructureTest.cs) (revision 25078f3b8ee4f3007979c40275a1964013adb483) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructureTest.cs (.../HeightStructureTest.cs) (revision 4d4b20488a5b3b562c3745f46975a848761c3a19) @@ -22,6 +22,7 @@ using System; using Core.Common.Base.Data; using Core.Common.Base.Geometry; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data; using Ringtoets.Common.Data.Probabilistics; @@ -230,39 +231,37 @@ Name = "otherName", Id = "otherId", Location = new Point2D(1, 1), - StructureNormalOrientation = (RoundedDouble) random.NextDouble(), + StructureNormalOrientation = random.NextRoundedDouble(), AllowedLevelIncreaseStorage = { - Mean = (RoundedDouble) random.Next(1, 10), - Shift = (RoundedDouble) random.NextDouble(), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, CriticalOvertoppingDischarge = { - Mean = (RoundedDouble) random.Next(1, 10), - CoefficientOfVariation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + CoefficientOfVariation = random.NextRoundedDouble() }, FailureProbabilityStructureWithErosion = random.NextDouble(), FlowWidthAtBottomProtection = { - Mean = (RoundedDouble) random.Next(1, 10), - Shift = (RoundedDouble) random.NextDouble(), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, LevelCrestStructure = { - Mean = (RoundedDouble) random.Next(1, 10), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() }, StorageStructureArea = { - Mean = (RoundedDouble) random.Next(1, 10), - CoefficientOfVariation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + CoefficientOfVariation = random.NextRoundedDouble() }, WidthFlowApertures = { - Mean = (RoundedDouble) random.Next(1, 10), - StandardDeviation = (RoundedDouble) random.NextDouble() + Mean = random.NextRoundedDouble(), + StandardDeviation = random.NextRoundedDouble() } }); @@ -274,26 +273,17 @@ Assert.AreEqual(otherStructure.Name, structure.Name); Assert.AreEqual(otherStructure.Location, structure.Location); Assert.AreEqual(otherStructure.StructureNormalOrientation, structure.StructureNormalOrientation); - Assert.AreEqual(otherStructure.AllowedLevelIncreaseStorage.Mean, structure.AllowedLevelIncreaseStorage.Mean); Assert.AreEqual(otherStructure.AllowedLevelIncreaseStorage.StandardDeviation, structure.AllowedLevelIncreaseStorage.StandardDeviation); - Assert.AreEqual(otherStructure.AllowedLevelIncreaseStorage.Shift, structure.AllowedLevelIncreaseStorage.Shift); - Assert.AreEqual(otherStructure.CriticalOvertoppingDischarge.Mean, structure.CriticalOvertoppingDischarge.Mean); Assert.AreEqual(otherStructure.CriticalOvertoppingDischarge.CoefficientOfVariation, structure.CriticalOvertoppingDischarge.CoefficientOfVariation); - Assert.AreEqual(otherStructure.FailureProbabilityStructureWithErosion, structure.FailureProbabilityStructureWithErosion); - Assert.AreEqual(otherStructure.FlowWidthAtBottomProtection.Mean, structure.FlowWidthAtBottomProtection.Mean); Assert.AreEqual(otherStructure.FlowWidthAtBottomProtection.StandardDeviation, structure.FlowWidthAtBottomProtection.StandardDeviation); - Assert.AreEqual(otherStructure.FlowWidthAtBottomProtection.Shift, structure.FlowWidthAtBottomProtection.Shift); - Assert.AreEqual(otherStructure.LevelCrestStructure.Mean, structure.LevelCrestStructure.Mean); Assert.AreEqual(otherStructure.LevelCrestStructure.StandardDeviation, structure.LevelCrestStructure.StandardDeviation); - Assert.AreEqual(otherStructure.StorageStructureArea.Mean, structure.StorageStructureArea.Mean); Assert.AreEqual(otherStructure.StorageStructureArea.CoefficientOfVariation, structure.StorageStructureArea.CoefficientOfVariation); - Assert.AreEqual(otherStructure.WidthFlowApertures.Mean, structure.WidthFlowApertures.Mean); Assert.AreEqual(otherStructure.WidthFlowApertures.StandardDeviation, structure.WidthFlowApertures.StandardDeviation); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructurePermutationHelper.cs =================================================================== diff -u -rb869895cec4a159381b5d2db15b48744dd66ab60 -r4d4b20488a5b3b562c3745f46975a848761c3a19 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructurePermutationHelper.cs (.../HeightStructurePermutationHelper.cs) (revision b869895cec4a159381b5d2db15b48744dd66ab60) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.TestUtil/HeightStructurePermutationHelper.cs (.../HeightStructurePermutationHelper.cs) (revision 4d4b20488a5b3b562c3745f46975a848761c3a19) @@ -191,7 +191,6 @@ AllowedLevelIncreaseStorage = { Mean = referenceStructure.AllowedLevelIncreaseStorage.Mean, - Shift = referenceStructure.AllowedLevelIncreaseStorage.Shift, StandardDeviation = referenceStructure.AllowedLevelIncreaseStorage.StandardDeviation }, CriticalOvertoppingDischarge = @@ -202,7 +201,6 @@ FlowWidthAtBottomProtection = { Mean = referenceStructure.FlowWidthAtBottomProtection.Mean, - Shift = referenceStructure.FlowWidthAtBottomProtection.Shift, StandardDeviation = referenceStructure.FlowWidthAtBottomProtection.StandardDeviation }, LevelCrestStructure =