Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -ra2ae3dc9df93f5ffff98cddcc931200de5fd7515 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs) (revision a2ae3dc9df93f5ffff98cddcc931200de5fd7515) @@ -92,7 +92,7 @@ inputParameters.LowerBoundaryRevetment = (RoundedDouble) entity.LowerBoundaryRevetment.ToNullAsNaN(); inputParameters.UpperBoundaryWaterLevels = (RoundedDouble) entity.UpperBoundaryWaterLevels.ToNullAsNaN(); inputParameters.LowerBoundaryWaterLevels = (RoundedDouble) entity.LowerBoundaryWaterLevels.ToNullAsNaN(); - inputParameters.StepSize = (WaveConditionsInputStepSize) entity.StepSize; + inputParameters.StepSize = (RoundedDouble) entity.StepSize; inputParameters.CalculationType = (GrassCoverErosionOutwardsWaveConditionsCalculationType) entity.CalculationType; inputParameters.WaterLevelType = (WaveConditionsInputWaterLevelType) entity.WaterLevelType; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -ra2ae3dc9df93f5ffff98cddcc931200de5fd7515 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision a2ae3dc9df93f5ffff98cddcc931200de5fd7515) @@ -93,7 +93,7 @@ inputParameters.LowerBoundaryRevetment = (RoundedDouble) entity.LowerBoundaryRevetment.ToNullAsNaN(); inputParameters.UpperBoundaryWaterLevels = (RoundedDouble) entity.UpperBoundaryWaterLevels.ToNullAsNaN(); inputParameters.LowerBoundaryWaterLevels = (RoundedDouble) entity.LowerBoundaryWaterLevels.ToNullAsNaN(); - inputParameters.StepSize = (WaveConditionsInputStepSize) entity.StepSize; + inputParameters.StepSize = (RoundedDouble) entity.StepSize; inputParameters.CalculationType = (StabilityStoneCoverWaveConditionsCalculationType) entity.CalculationType; inputParameters.WaterLevelType = (WaveConditionsInputWaterLevelType) entity.WaterLevelType; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -ra2ae3dc9df93f5ffff98cddcc931200de5fd7515 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision a2ae3dc9df93f5ffff98cddcc931200de5fd7515) @@ -93,7 +93,7 @@ inputParameters.LowerBoundaryRevetment = (RoundedDouble) entity.LowerBoundaryRevetment.ToNullAsNaN(); inputParameters.UpperBoundaryWaterLevels = (RoundedDouble) entity.UpperBoundaryWaterLevels.ToNullAsNaN(); inputParameters.LowerBoundaryWaterLevels = (RoundedDouble) entity.LowerBoundaryWaterLevels.ToNullAsNaN(); - inputParameters.StepSize = (WaveConditionsInputStepSize) entity.StepSize; + inputParameters.StepSize = (RoundedDouble) entity.StepSize; inputParameters.WaterLevelType = (WaveConditionsInputWaterLevelType) entity.WaterLevelType; } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -ra2ae3dc9df93f5ffff98cddcc931200de5fd7515 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs) (revision a2ae3dc9df93f5ffff98cddcc931200de5fd7515) @@ -83,7 +83,7 @@ LowerBoundaryRevetment = (RoundedDouble) 3.58, UpperBoundaryWaterLevels = (RoundedDouble) 5.88, LowerBoundaryWaterLevels = (RoundedDouble) 3.40, - StepSize = random.NextEnumValue(), + StepSize = (RoundedDouble) 0.25, CalculationType = random.NextEnumValue(), WaterLevelType = random.NextEnumValue() } @@ -103,7 +103,7 @@ Assert.AreEqual(input.LowerBoundaryRevetment, entity.LowerBoundaryRevetment, input.LowerBoundaryRevetment.GetAccuracy()); Assert.AreEqual(input.UpperBoundaryWaterLevels, entity.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy()); Assert.AreEqual(input.LowerBoundaryWaterLevels, entity.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy()); - Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize); + Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize, input.StepSize.GetAccuracy()); Assert.AreEqual(Convert.ToByte(input.CalculationType), entity.CalculationType); Assert.AreEqual(Convert.ToByte(input.WaterLevelType), entity.WaterLevelType); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -ra2ae3dc9df93f5ffff98cddcc931200de5fd7515 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision a2ae3dc9df93f5ffff98cddcc931200de5fd7515) @@ -82,7 +82,7 @@ LowerBoundaryRevetment = (RoundedDouble) 3.58, UpperBoundaryWaterLevels = (RoundedDouble) 5.88, LowerBoundaryWaterLevels = (RoundedDouble) 3.40, - StepSize = random.NextEnumValue(), + StepSize = (RoundedDouble) 0.25, WaterLevelType = random.NextEnumValue(), CalculationType = random.NextEnumValue() } @@ -102,7 +102,7 @@ Assert.AreEqual(input.LowerBoundaryRevetment, entity.LowerBoundaryRevetment, input.LowerBoundaryRevetment.GetAccuracy()); Assert.AreEqual(input.UpperBoundaryWaterLevels, entity.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy()); Assert.AreEqual(input.LowerBoundaryWaterLevels, entity.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy()); - Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize); + Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize, input.StepSize.GetAccuracy()); Assert.AreEqual(Convert.ToByte(input.CalculationType), entity.CalculationType); Assert.AreEqual(Convert.ToByte(input.WaterLevelType), entity.WaterLevelType); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -ra2ae3dc9df93f5ffff98cddcc931200de5fd7515 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision a2ae3dc9df93f5ffff98cddcc931200de5fd7515) @@ -82,7 +82,7 @@ LowerBoundaryRevetment = (RoundedDouble) 3.58, UpperBoundaryWaterLevels = (RoundedDouble) 5.88, LowerBoundaryWaterLevels = (RoundedDouble) 3.40, - StepSize = random.NextEnumValue() + StepSize = (RoundedDouble) 0.25 } }; @@ -100,7 +100,7 @@ Assert.AreEqual(input.LowerBoundaryRevetment, entity.LowerBoundaryRevetment, input.LowerBoundaryRevetment.GetAccuracy()); Assert.AreEqual(input.UpperBoundaryWaterLevels, entity.UpperBoundaryWaterLevels, input.UpperBoundaryWaterLevels.GetAccuracy()); Assert.AreEqual(input.LowerBoundaryWaterLevels, entity.LowerBoundaryWaterLevels, input.LowerBoundaryWaterLevels.GetAccuracy()); - Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize); + Assert.AreEqual(Convert.ToByte(input.StepSize), entity.StepSize, input.StepSize.GetAccuracy()); Assert.AreEqual(Convert.ToByte(input.WaterLevelType), entity.WaterLevelType); Assert.AreEqual(order, entity.Order);