Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineInput.cs =================================================================== diff -u -r8818857bf54e26fcd900b3abdf07b999e359b3bc -r3276bf9d74661b984e1a3b9246a6e758d694ebec --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineInput.cs (.../WaveConditionsCosineInput.cs) (revision 8818857bf54e26fcd900b3abdf07b999e359b3bc) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCosineInput.cs (.../WaveConditionsCosineInput.cs) (revision 3276bf9d74661b984e1a3b9246a6e758d694ebec) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using System.Linq; namespace Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions { @@ -28,6 +29,8 @@ /// public class WaveConditionsCosineInput : WaveConditionsInput { + private readonly double c; + /// /// Creates a new instance of the class. /// @@ -39,21 +42,39 @@ /// The water level to calculate the wave conditions for. /// The a-value to use during the calculation. /// The b-value to use during the calculation. + /// The c-value to use during the calculation. public WaveConditionsCosineInput(int sectionId, long hydraulicBoundaryLocationId, double norm, IEnumerable forelandPoints, HydraRingBreakWater breakWater, double waterLevel, double a, - double b) + double b, + double c) : base(sectionId, hydraulicBoundaryLocationId, norm, forelandPoints, breakWater, waterLevel, a, - b) {} + b) + { + this.c = c; + } + public override IEnumerable Variables + { + get + { + var variables = base.Variables.ToList(); + + variables.Add(new HydraRingVariable(119, HydraRingDistributionType.Deterministic, c, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN)); + + return variables; + } + } + public override int? GetSubMechanismModelId(int subMechanismId) { switch (subMechanismId) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidInput.cs =================================================================== diff -u -r8818857bf54e26fcd900b3abdf07b999e359b3bc -r3276bf9d74661b984e1a3b9246a6e758d694ebec --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidInput.cs (.../WaveConditionsTrapezoidInput.cs) (revision 8818857bf54e26fcd900b3abdf07b999e359b3bc) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsTrapezoidInput.cs (.../WaveConditionsTrapezoidInput.cs) (revision 3276bf9d74661b984e1a3b9246a6e758d694ebec) @@ -20,6 +20,7 @@ // All rights reserved. using System.Collections.Generic; +using System.Linq; namespace Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions { @@ -28,6 +29,9 @@ /// public class WaveConditionsTrapezoidInput : WaveConditionsInput { + private readonly double beta1; + private readonly double beta2; + /// /// Creates a new instance of the class. /// @@ -39,21 +43,44 @@ /// The water level to calculate the wave conditions for. /// The a-value to use during the calculation. /// The b-value to use during the calculation. + /// The beta1-value to use during the calculation. + /// The beta2-value to use during the calculation. public WaveConditionsTrapezoidInput(int sectionId, long hydraulicBoundaryLocationId, double norm, IEnumerable forelandPoints, HydraRingBreakWater breakWater, double waterLevel, double a, - double b) + double b, + double beta1, + double beta2) : base(sectionId, hydraulicBoundaryLocationId, norm, forelandPoints, breakWater, waterLevel, a, - b) {} + b) + { + this.beta1 = beta1; + this.beta2 = beta2; + } + public override IEnumerable Variables + { + get + { + var variables = base.Variables.ToList(); + + variables.Add(new HydraRingVariable(117, HydraRingDistributionType.Deterministic, beta1, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN)); + variables.Add(new HydraRingVariable(118, HydraRingDistributionType.Deterministic, beta2, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN)); + + return variables; + } + } + public override int? GetSubMechanismModelId(int subMechanismId) { switch (subMechanismId) Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineInputTest.cs =================================================================== diff -u -r8818857bf54e26fcd900b3abdf07b999e359b3bc -r3276bf9d74661b984e1a3b9246a6e758d694ebec --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineInputTest.cs (.../WaveConditionsCosineInputTest.cs) (revision 8818857bf54e26fcd900b3abdf07b999e359b3bc) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineInputTest.cs (.../WaveConditionsCosineInputTest.cs) (revision 3276bf9d74661b984e1a3b9246a6e758d694ebec) @@ -48,7 +48,8 @@ breakWater, 5.5, 6.6, - 7.7); + 7.7, + 8.8); // Assert const int expectedCalculationTypeId = 6; @@ -81,7 +82,8 @@ new HydraRingBreakWater(1, 4.4), 5.5, 6.6, - 7.7); + 7.7, + 8.8); // Assert Assert.AreEqual(expectedSubMechanismModelId, waveConditionsCosineInput.GetSubMechanismModelId(subMechanismModelId)); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidInputTest.cs =================================================================== diff -u -r8818857bf54e26fcd900b3abdf07b999e359b3bc -r3276bf9d74661b984e1a3b9246a6e758d694ebec --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidInputTest.cs (.../WaveConditionsTrapezoidInputTest.cs) (revision 8818857bf54e26fcd900b3abdf07b999e359b3bc) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidInputTest.cs (.../WaveConditionsTrapezoidInputTest.cs) (revision 3276bf9d74661b984e1a3b9246a6e758d694ebec) @@ -48,7 +48,9 @@ breakWater, 5.5, 6.6, - 7.7); + 7.7, + 8.8, + 9.9); // Assert const int expectedCalculationTypeId = 6; @@ -81,7 +83,9 @@ new HydraRingBreakWater(1, 4.4), 5.5, 6.6, - 7.7); + 7.7, + 8.8, + 9.9); // Assert Assert.AreEqual(expectedSubMechanismModelId, waveConditionsTrapezoidInput.GetSubMechanismModelId(subMechanismModelId));