Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs =================================================================== diff -u -rae93bd6b8ccbffa91f7c5c10e898736b5919b73d -rde24943cc5de951dd42ba93671c9816046ae7607 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision ae93bd6b8ccbffa91f7c5c10e898736b5919b73d) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision de24943cc5de951dd42ba93671c9816046ae7607) @@ -296,18 +296,18 @@ return waterLevels; } - waterLevels.Add(lowerBoundary); + waterLevels.Add(upperBoundary); double stepSizeValue = StepSize.AsValue(); - RoundedDouble currentWaterLevel = new RoundedDouble(2, Math.Floor(lowerBoundary/stepSizeValue)*stepSizeValue + stepSizeValue); + RoundedDouble currentWaterLevel = new RoundedDouble(2, Math.Ceiling(upperBoundary/stepSizeValue)*stepSizeValue - stepSizeValue); - while (currentWaterLevel < upperBoundary) + while (currentWaterLevel > lowerBoundary) { waterLevels.Add(currentWaterLevel); - currentWaterLevel = new RoundedDouble(currentWaterLevel.NumberOfDecimalPlaces, currentWaterLevel + stepSizeValue); + currentWaterLevel = new RoundedDouble(currentWaterLevel.NumberOfDecimalPlaces, currentWaterLevel - stepSizeValue); } - waterLevels.Add(upperBoundary); + waterLevels.Add(lowerBoundary); return waterLevels; } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs =================================================================== diff -u -rae93bd6b8ccbffa91f7c5c10e898736b5919b73d -rde24943cc5de951dd42ba93671c9816046ae7607 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision ae93bd6b8ccbffa91f7c5c10e898736b5919b73d) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision de24943cc5de951dd42ba93671c9816046ae7607) @@ -43,57 +43,57 @@ { yield return new TestCaseData(WaveConditionsInputStepSize.Two, 2.58, 6.10, 2.40, 3.89, 5.99, new[] { - new RoundedDouble(2, 2.58), - new RoundedDouble(2, 3.89) + new RoundedDouble(2, 3.89), + new RoundedDouble(2, 2.58) }); yield return new TestCaseData(WaveConditionsInputStepSize.Half, 3.58, 6.10, 3.40, 5.88, 5.99, new[] { - new RoundedDouble(2, 3.58), - new RoundedDouble(2, 4), - new RoundedDouble(2, 4.5), - new RoundedDouble(2, 5), + new RoundedDouble(2, 5.88), new RoundedDouble(2, 5.5), - new RoundedDouble(2, 5.88) + new RoundedDouble(2, 5), + new RoundedDouble(2, 4.5), + new RoundedDouble(2, 4), + new RoundedDouble(2, 3.58) }); yield return new TestCaseData(WaveConditionsInputStepSize.One, -1.30, 5.80, -1.20, 6.01, 6.10, new[] { - new RoundedDouble(2, -1.20), - new RoundedDouble(2, -1), - new RoundedDouble(2), - new RoundedDouble(2, 1), - new RoundedDouble(2, 2), - new RoundedDouble(2, 3), - new RoundedDouble(2, 4), + new RoundedDouble(2, 5.80), new RoundedDouble(2, 5), - new RoundedDouble(2, 5.80) + new RoundedDouble(2, 4), + new RoundedDouble(2, 3), + new RoundedDouble(2, 2), + new RoundedDouble(2, 1), + new RoundedDouble(2), + new RoundedDouble(2, -1), + new RoundedDouble(2, -1.20) }); yield return new TestCaseData(WaveConditionsInputStepSize.Two, -4.29, 8.67, -4.29, 8.58, 8.58, new[] { - new RoundedDouble(2, -4.29), - new RoundedDouble(2, -4), - new RoundedDouble(2, -2), - new RoundedDouble(2), - new RoundedDouble(2, 2), - new RoundedDouble(2, 4), - new RoundedDouble(2, 6), + new RoundedDouble(2, 8.57), new RoundedDouble(2, 8), - new RoundedDouble(2, 8.57) + new RoundedDouble(2, 6), + new RoundedDouble(2, 4), + new RoundedDouble(2, 2), + new RoundedDouble(2), + new RoundedDouble(2, -2), + new RoundedDouble(2, -4), + new RoundedDouble(2, -4.29) }); yield return new TestCaseData(WaveConditionsInputStepSize.Two, -4.29, 8.67, double.NaN, double.NaN, 8.58, new[] { - new RoundedDouble(2, -4.29), - new RoundedDouble(2, -4), - new RoundedDouble(2, -2), - new RoundedDouble(2), - new RoundedDouble(2, 2), - new RoundedDouble(2, 4), - new RoundedDouble(2, 6), + new RoundedDouble(2, 8.57), new RoundedDouble(2, 8), - new RoundedDouble(2, 8.57) + new RoundedDouble(2, 6), + new RoundedDouble(2, 4), + new RoundedDouble(2, 2), + new RoundedDouble(2), + new RoundedDouble(2, -2), + new RoundedDouble(2, -4), + new RoundedDouble(2, -4.29) }); } }