Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs =================================================================== diff -u -r445fd3483c7414e0c4dc546b82c73479d7fa1d79 -r87f4387086869f85cd07dc03f391bb3c01d51a58 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 445fd3483c7414e0c4dc546b82c73479d7fa1d79) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 87f4387086869f85cd07dc03f391bb3c01d51a58) @@ -101,6 +101,8 @@ this.criticalOvertoppingStandardDeviation = criticalOvertoppingStandardDeviation; } + public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.HydraulicLoads; + public override int VariableId { get; } = 1; public override IEnumerable Variables Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs =================================================================== diff -u -r2a896243ca24205f8e98db1b61e8148d1d9b9062 -r87f4387086869f85cd07dc03f391bb3c01d51a58 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 2a896243ca24205f8e98db1b61e8148d1d9b9062) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 87f4387086869f85cd07dc03f391bb3c01d51a58) @@ -121,8 +121,6 @@ this.breakWater = breakWater; } - public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.HydraulicLoads; - public override HydraRingSection Section { get Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs =================================================================== diff -u -re8f9c763f4be7e479304c747afa28727cdced621 -r87f4387086869f85cd07dc03f391bb3c01d51a58 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision e8f9c763f4be7e479304c747afa28727cdced621) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision 87f4387086869f85cd07dc03f391bb3c01d51a58) @@ -98,6 +98,8 @@ this.dikeHeight = dikeHeight; } + public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.OvertoppingRate; + public override int VariableId { get; } = 17; public override int CalculationTypeId Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -r2a896243ca24205f8e98db1b61e8148d1d9b9062 -r87f4387086869f85cd07dc03f391bb3c01d51a58 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 2a896243ca24205f8e98db1b61e8148d1d9b9062) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 87f4387086869f85cd07dc03f391bb3c01d51a58) @@ -38,7 +38,7 @@ public void Constructor_Always_ExpectedValues() { // Setup - const double norm = 1.0/10000; + const double norm = 1.0 / 10000; const int hydraulicBoundaryLocationId = 1000; const double sectionNormal = 21.1; @@ -115,7 +115,7 @@ public void GetSubMechanismModelId_Always_ReturnsExpectedValues(int subMechanismModelId, int? expectedSubMechanismModelId) { // Call - var input = new DikeHeightCalculationInput(1, 1.0/1000, double.NaN, + var input = new DikeHeightCalculationInput(1, 1.0 / 1000, double.NaN, new List(), new List(), new HydraRingBreakWater(0, 1.1), Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs =================================================================== diff -u -r2a896243ca24205f8e98db1b61e8148d1d9b9062 -r87f4387086869f85cd07dc03f391bb3c01d51a58 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 2a896243ca24205f8e98db1b61e8148d1d9b9062) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 87f4387086869f85cd07dc03f391bb3c01d51a58) @@ -39,7 +39,7 @@ public void Constructor_Always_ExpectedValues() { // Setup - const double norm = 1.0/10000; + const double norm = 1.0 / 10000; const int hydraulicBoundaryLocationId = 1000; const double sectionNormal = 19.9; @@ -91,7 +91,6 @@ Assert.IsInstanceOf(input); Assert.AreEqual(9, input.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); - Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); Assert.IsNotNull(input.Section); HydraRingDataEqualityHelper.AreEqual(GetDefaultHydraulicLoadsVariables().ToArray(), input.Variables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, input.ProfilePoints); @@ -113,7 +112,7 @@ public void GetSubMechanismModelId_Always_ReturnsExpectedValues(int subMechanismModelId, int? expectedSubMechanismModelId) { // Call - var input = new HydraulicLoadsCalculationInputImplementation(1, 1.0/1000, double.NaN, + var input = new HydraulicLoadsCalculationInputImplementation(1, 1.0 / 1000, double.NaN, new List(), new List(), new HydraRingBreakWater(0, 1.1), @@ -167,6 +166,8 @@ exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation, exponentModelFactorShallowLowerBoundary, exponentModelFactorShallowUpperBoundary) {} + public override HydraRingFailureMechanismType FailureMechanismType { get; } = (HydraRingFailureMechanismType) 1000; + public override int VariableId { get; } = -1; } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs =================================================================== diff -u -re8f9c763f4be7e479304c747afa28727cdced621 -r87f4387086869f85cd07dc03f391bb3c01d51a58 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision e8f9c763f4be7e479304c747afa28727cdced621) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs (.../OvertoppingRateCalculationInputTest.cs) (revision 87f4387086869f85cd07dc03f391bb3c01d51a58) @@ -38,7 +38,7 @@ public void Constructor_Always_ExpectedValues() { // Setup - const double norm = 1.0/10000; + const double norm = 1.0 / 10000; const int hydraulicBoundaryLocationId = 1000; const double sectionNormal = 20.0; @@ -92,7 +92,7 @@ Assert.IsInstanceOf(input); Assert.AreEqual(2, input.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId); - Assert.AreEqual(HydraRingFailureMechanismType.HydraulicLoads, input.FailureMechanismType); + Assert.AreEqual(HydraRingFailureMechanismType.OvertoppingRate, input.FailureMechanismType); Assert.AreEqual(17, input.VariableId); Assert.IsNotNull(input.Section); HydraRingDataEqualityHelper.AreEqual(GetDefaultOvertoppingRateVariables().ToArray(), input.Variables.ToArray());